Make the hard-coding of \mathstrut more generally usable (#344)

tmke8 · Feb 5, 2025 · 942b550 · 942b550
1 parent 56c975d
commit 942b550
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 16 deletions.
diff --git a/latex2mmlc/src/ast.rs b/latex2mmlc/src/ast.rs
@@ -76,7 +76,6 @@ pub enum Node<'arena> {
         style: Option<Style>,
     },
     PseudoRow(NodeList<'arena>),
-    Mathstrut,
     Fenced {
         style: Option<Style>,
         open: &'static ParenOp,
@@ -106,6 +105,7 @@ pub enum Node<'arena> {
         args: NodeList<'arena>,
     },
     CustomCmdArg(usize),
+    HardcodedMathML(&'static str),
 }
 
 impl PartialEq for &'static Node<'static> {
@@ -415,12 +415,6 @@ impl<'arena> MathMLEmitter<'arena> {
                     self.emit(node, base_indent);
                 }
             }
-            Node::Mathstrut => {
-                push!(
-                    self.s,
-                    r#"<mpadded width="0" style="visibility:hidden"><mo stretchy="false">(</mo></mpadded>"#
-                );
-            }
             Node::Fenced {
                 open,
                 close,
@@ -542,6 +536,9 @@ impl<'arena> MathMLEmitter<'arena> {
                     self.emit(arg, base_indent);
                 }
             }
+            Node::HardcodedMathML(mathml) => {
+                push!(self.s, mathml);
+            }
         }
     }
 
@@ -901,11 +898,8 @@ mod tests {
     }
 
     #[test]
-    fn render_mathstrut() {
-        assert_eq!(
-            render(&Node::Mathstrut),
-            r#"<mpadded width="0" style="visibility:hidden"><mo stretchy="false">(</mo></mpadded>"#
-        );
+    fn render_hardcoded_mathml() {
+        assert_eq!(render(&Node::HardcodedMathML("<mi>hi</mi>")), "<mi>hi</mi>");
     }
 
     #[test]

diff --git a/latex2mmlc/src/commands.rs b/latex2mmlc/src/commands.rs
@@ -393,7 +393,7 @@ static COMMANDS: phf::Map<&'static str, Token> = phf::phf_map! {
     "mathrm" => Token::Transform(MathVariant::Normal),
     "mathscr" => Token::Transform(MathVariant::Transform(TextTransform::Script)),
     "mathsf" => Token::Transform(MathVariant::Transform(TextTransform::SansSerif)),
-    "mathstrut" => Token::Mathstrut,
+    "mathstrut" => Token::HardcodedMathML(r#"<mpadded width="0" style="visibility:hidden"><mo stretchy="false">(</mo></mpadded>"#),
     "mathtt" => Token::Transform(MathVariant::Transform(TextTransform::Monospace)),
     "max" => Token::Lim("max"),
     "measeq" => Token::Operator(ops::MEASURED_BY), // from "stix"

diff --git a/latex2mmlc/src/parse.rs b/latex2mmlc/src/parse.rs
@@ -649,7 +649,6 @@ where
             }
             Token::Ampersand => Node::ColumnSeparator,
             Token::NewLine => Node::RowSeparator,
-            Token::Mathstrut => Node::Mathstrut,
             Token::Style(style) => {
                 let content = self.parse_group(Token::GroupEnd)?;
                 Node::Row {
@@ -727,6 +726,7 @@ where
                     ));
                 }
             },
+            Token::HardcodedMathML(mathml) => Node::HardcodedMathML(mathml),
         };
         Ok(self.commit(node))
     }

diff --git a/latex2mmlc/src/token.rs b/latex2mmlc/src/token.rs
@@ -91,11 +91,10 @@ pub enum Token<'source> {
     Not,
     #[strum(serialize = r"\text*")]
     Text(Option<TextTransform>),
-    #[strum(serialize = r"\mathstrut")]
-    Mathstrut,
     Style(Style),
     CustomCmd(usize, &'static Node<'static>),
     GetCollectedLetters,
+    HardcodedMathML(&'static str),
     UnknownCommand(&'source str),
 }