Turn OpAttr into a bitset (#865)

Author: tmke8

crates/math-core/src/commands.rs

@@ -1,5 +1,5 @@
 use mathml_renderer::attribute::{
-    FracAttr, HtmlTextStyle, MathVariant, Notation, OpAttr, ParenType, Size, Style, TextTransform,
+    FracAttr, HtmlTextStyle, MathVariant, Notation, OpAttrs, ParenType, Size, Style, TextTransform,
 };
 use mathml_renderer::symbol::{self, Rel};
 
@@ -119,7 +119,7 @@ static COMMANDS: phf::Map<&'static str, Token> = phf::phf_map! {
     "_" => Letter(symbol::LOW_LINE.as_op().as_char(), Mode::MathOrText),
     "`" => TextMode(TextToken::Accent(symbol::COMBINING_GRAVE_ACCENT)),
     "aa" => TextMode(TextToken::Letter('å')),
-    "acute" => Accent(symbol::ACUTE_ACCENT, true, None),
+    "acute" => Accent(symbol::ACUTE_ACCENT, true, OpAttrs::empty()),
     "ae" => TextMode(TextToken::Letter('æ')),
     "aleph" => Letter(symbol::ALEF_SYMBOL, Mode::Math),
     "alpha" => Letter(symbol::GREEK_SMALL_LETTER_ALPHA, Mode::Math),
@@ -142,7 +142,7 @@ static COMMANDS: phf::Map<&'static str, Token> = phf::phf_map! {
     "backsimeq" => Relation(symbol::REVERSED_TILDE_EQUALS),
     "backslash" => Ord(symbol::REVERSE_SOLIDUS),
     "backtrprime" => Ord(symbol::REVERSED_TRIPLE_PRIME),
-    "bar" => Accent(symbol::MACRON, true, Some(OpAttr::StretchyFalse)),
+    "bar" => Accent(symbol::MACRON, true, OpAttrs::STRETCHY_FALSE),
     "barwedge" => BinaryOp(symbol::NAND),
     "bcancel" => Enclose(Notation::DOWN_DIAGONAL),
     "because" => Relation(symbol::BECAUSE),
@@ -195,7 +195,7 @@ static COMMANDS: phf::Map<&'static str, Token> = phf::phf_map! {
     "boxslash" => BinaryOp(symbol::SQUARED_RISING_DIAGONAL_SLASH),
     "boxtimes" => ForceBinaryOp(symbol::SQUARED_TIMES.as_op()),
     "bra" => CustomCmd(1, &predefined::BRA),
-    "breve" => Accent(symbol::BREVE, true, None),
+    "breve" => Accent(symbol::BREVE, true, OpAttrs::empty()),
     "bullet" => ForceBinaryOp(symbol::BULLET_OPERATOR.as_op()),
     "bumpeq" => Relation(symbol::DIFFERENCE_BETWEEN),
     "c" => TextMode(TextToken::Accent(symbol::COMBINING_CEDILLA)),
@@ -206,7 +206,7 @@ static COMMANDS: phf::Map<&'static str, Token> = phf::phf_map! {
     "cdots" => CustomCmd(0, &predefined::CDOTS),
     "centerdot" => ForceBinaryOp(symbol::BULLET_OPERATOR.as_op()),
     "cfrac" => Frac(Some(FracAttr::CFracStyle)),
-    "check" => Accent(symbol::CARON, true, Some(OpAttr::StretchyFalse)),
+    "check" => Accent(symbol::CARON, true, OpAttrs::STRETCHY_FALSE),
     "checkmark" => Letter('✓', Mode::Math),
     "chi" => Letter(symbol::GREEK_SMALL_LETTER_CHI, Mode::Math),
     "circ" => ForceBinaryOp(symbol::RING_OPERATOR.as_op()),
@@ -244,9 +244,9 @@ static COMMANDS: phf::Map<&'static str, Token> = phf::phf_map! {
     "dblcolon" => Relation(symbol::PROPORTION),
     "ddag" => Letter(symbol::DOUBLE_DAGGER, Mode::Math),
     "ddagger" => Letter(symbol::DOUBLE_DAGGER, Mode::Math),
-    "ddddot" => Accent(symbol::COMBINING_FOUR_DOTS_ABOVE, true, Some(OpAttr::StretchyFalse)),
-    "dddot" => Accent(symbol::COMBINING_THREE_DOTS_ABOVE, true, Some(OpAttr::StretchyFalse)),
-    "ddot" => Accent(symbol::DIAERESIS, true, Some(OpAttr::StretchyFalse)),
+    "ddddot" => Accent(symbol::COMBINING_FOUR_DOTS_ABOVE, true, OpAttrs::STRETCHY_FALSE),
+    "dddot" => Accent(symbol::COMBINING_THREE_DOTS_ABOVE, true, OpAttrs::STRETCHY_FALSE),
+    "ddot" => Accent(symbol::DIAERESIS, true, OpAttrs::STRETCHY_FALSE),
     "ddots" => Relation(symbol::DOWN_RIGHT_DIAGONAL_ELLIPSIS),
     "delta" => Letter(symbol::GREEK_SMALL_LETTER_DELTA, Mode::Math),
     "dfrac" => Frac(Some(FracAttr::DisplayStyleTrue)),
@@ -258,7 +258,7 @@ static COMMANDS: phf::Map<&'static str, Token> = phf::phf_map! {
     "div" => BinaryOp(symbol::DIVISION_SIGN),
     "divideontimes" => ForceBinaryOp(symbol::DIVISION_TIMES.as_op()),
     "dj" => TextMode(TextToken::Letter('đ')),
-    "dot" => Accent(symbol::DOT_ABOVE, true, None),
+    "dot" => Accent(symbol::DOT_ABOVE, true, OpAttrs::empty()),
     "doteq" => Relation(symbol::APPROACHES_THE_LIMIT),
     "doteqdot" => Relation(symbol::GEOMETRICALLY_EQUAL_TO),
     "dotplus" => BinaryOp(symbol::DOT_PLUS),
@@ -315,14 +315,14 @@ static COMMANDS: phf::Map<&'static str, Token> = phf::phf_map! {
     "gneq" => Relation(symbol::GREATER_THAN_AND_SINGLE_LINE_NOT_EQUAL_TO),
     "gneqq" => Relation(symbol::GREATER_THAN_BUT_NOT_EQUAL_TO),
     "gnsim" => Relation(symbol::GREATER_THAN_BUT_NOT_EQUIVALENT_TO),
-    "grave" => Accent(symbol::GRAVE_ACCENT, true, None),
+    "grave" => Accent(symbol::GRAVE_ACCENT, true, OpAttrs::empty()),
     "gt" => OpGreaterThan,
     "gtrapprox" => Relation(symbol::GREATER_THAN_OR_APPROXIMATE),
     "gtreqless" => Relation(symbol::GREATER_THAN_EQUAL_TO_OR_LESS_THAN),
     "gtreqqless" => Relation(symbol::GREATER_THAN_ABOVE_DOUBLE_LINE_EQUAL_ABOVE_LESS_THAN),
     "gtrless" => Relation(symbol::GREATER_THAN_OR_LESS_THAN),
     "gtrsim" => Relation(symbol::GREATER_THAN_OR_EQUIVALENT_TO),
-    "hat" => Accent(symbol::COMBINING_CIRCUMFLEX_ACCENT, true, Some(OpAttr::StretchyFalse)),
+    "hat" => Accent(symbol::COMBINING_CIRCUMFLEX_ACCENT, true, OpAttrs::STRETCHY_FALSE),
     "hbar" => Letter(symbol::PLANCK_CONSTANT_OVER_TWO_PI, Mode::Math),
     "heartsuit" => Letter(symbol::WHITE_HEART_SUIT, Mode::Math),
     "hookleftarrow" => Relation(symbol::LEFTWARDS_ARROW_WITH_HOOK),
@@ -511,10 +511,10 @@ static COMMANDS: phf::Map<&'static str, Token> = phf::phf_map! {
     "otimes" => ForceBinaryOp(symbol::CIRCLED_TIMES.as_op()),
     "overbrace" => OverUnderBrace(symbol::TOP_CURLY_BRACKET, true),
     "overbracket" => OverUnderBrace(symbol::TOP_SQUARE_BRACKET, true),
-    "overleftarrow" => Accent(symbol::LEFTWARDS_ARROW, true, None),
-    "overline" => Accent(symbol::LOW_LINE, true, None),
+    "overleftarrow" => Accent(symbol::LEFTWARDS_ARROW, true, OpAttrs::empty()),
+    "overline" => Accent(symbol::LOW_LINE, true, OpAttrs::empty()),
     "overparen" => OverUnderBrace(symbol::TOP_PARENTHESIS, true),
-    "overrightarrow" => Accent(symbol::RIGHTWARDS_ARROW, true, None),
+    "overrightarrow" => Accent(symbol::RIGHTWARDS_ARROW, true, OpAttrs::empty()),
     "overset" => Overset,
     "parallel" => Relation(symbol::PARALLEL_TO),
     "partial" => Letter(symbol::PARTIAL_DIFFERENTIAL, Mode::Math),
@@ -641,7 +641,7 @@ static COMMANDS: phf::Map<&'static str, Token> = phf::phf_map! {
     "theta" => Letter(symbol::GREEK_SMALL_LETTER_THETA, Mode::Math),
     "thickspace" => Space(LatexUnit::Mu.length_with_unit(5.0)),
     "thinspace" => Space(LatexUnit::Mu.length_with_unit(3.0)),
-    "tilde" => Accent(symbol::COMBINING_TILDE, true, Some(OpAttr::StretchyTrue)), // should be stretchy=false, but Safari has a bug
+    "tilde" => Accent(symbol::COMBINING_TILDE, true, OpAttrs::STRETCHY_TRUE), // should be stretchy=false, but Safari has a bug
     "times" => ForceBinaryOp(symbol::MULTIPLICATION_SIGN.as_op()),
     "to" => Relation(symbol::RIGHTWARDS_ARROW),
     "top" => Letter(symbol::DOWN_TACK, Mode::Math),
@@ -658,7 +658,7 @@ static COMMANDS: phf::Map<&'static str, Token> = phf::phf_map! {
     "ulcorner" => Letter(symbol::TOP_LEFT_CORNER, Mode::Math),
     "underbrace" => OverUnderBrace(symbol::BOTTOM_CURLY_BRACKET, false),
     "underbracket" => OverUnderBrace(symbol::BOTTOM_SQUARE_BRACKET, false),
-    "underline" => Accent(symbol::LOW_LINE, false, None),
+    "underline" => Accent(symbol::LOW_LINE, false, OpAttrs::empty()),
     "underparen" => OverUnderBrace(symbol::BOTTOM_PARENTHESIS, false),
     "underset" => Underset,
     "unlhd" => Relation(symbol::NORMAL_SUBGROUP_OF_OR_EQUAL_TO),
@@ -696,18 +696,18 @@ static COMMANDS: phf::Map<&'static str, Token> = phf::phf_map! {
     "vartriangle" => Letter(symbol::WHITE_UP_POINTING_TRIANGLE, Mode::Math),
     "vdash" => Relation(symbol::RIGHT_TACK),
     "vdots" => Relation(symbol::VERTICAL_ELLIPSIS),
-    "vec" => Accent(symbol::COMBINING_RIGHT_ARROW_ABOVE, true, Some(OpAttr::StretchyFalse)),
+    "vec" => Accent(symbol::COMBINING_RIGHT_ARROW_ABOVE, true, OpAttrs::STRETCHY_FALSE),
     "vee" => BinaryOp(symbol::LOGICAL_OR),
     "veebar" => BinaryOp(symbol::XOR),
     "veeeq" => Relation(symbol::EQUIANGULAR_TO), // from "stix"
     "venus" => Letter(symbol::FEMALE_SIGN, Mode::Math),
     "vert" => Ord(symbol::VERTICAL_LINE),
     "wedge" => BinaryOp(symbol::LOGICAL_AND),
     "wedgeq" => Relation(symbol::ESTIMATES), // from "stix"
-    "widecheck" => Accent(symbol::CARON, true, None),
-    "widehat" => Accent(symbol::COMBINING_CIRCUMFLEX_ACCENT, true, Some(OpAttr::StretchyTrue)),
+    "widecheck" => Accent(symbol::CARON, true, OpAttrs::empty()),
+    "widehat" => Accent(symbol::COMBINING_CIRCUMFLEX_ACCENT, true, OpAttrs::STRETCHY_TRUE),
     "wideparen" => OverUnderBrace(symbol::TOP_PARENTHESIS, true),
-    "widetilde" => Accent(symbol::TILDE, true, None),
+    "widetilde" => Accent(symbol::TILDE, true, OpAttrs::empty()),
     "wp" => Letter(symbol::SCRIPT_CAPITAL_P, Mode::Math),
     "wr" => ForceBinaryOp(symbol::WREATH_PRODUCT.as_op()),
     "xcancel" => Enclose(Notation::UP_DIAGONAL.union(Notation::DOWN_DIAGONAL)),