Fix #526

Author: NSoiffer

Rules/Intent/general.yaml

@@ -824,18 +824,19 @@
   match: "count(*) > 1 and
           ($TableProperty = 'piecewise' or $TableProperty = 'system-of-equations' or $TableProperty = 'lines') and
           (self::m:mlabeledtr or *[contains(@intent, ':equation-label')])"
+  variables: [Label: "*[contains(@intent, ':equation-label')]"]
   replace:
   - intent:
       name: "mlabeledtr"
       children:
-      - x: "*[contains(@intent, ':equation-label')]"
+      - x: "IfThenElse($Label, $Label, (*[1]))"
       - intent:
           name: "mtd"
           children: 
           - intent:
               name: "mrow"
               attrs: "id='concat(@id, \"-mrow\")'"
-              children: [x: "*[not(contains(@intent, ':equation-label'))]"]
+              children: [x: "IfThenElse($Label, (*[not(contains(@intent, ':equation-label'))]), (*[position() > 1]))"]
 
 -
   # convert a mtr to a mlabeledtr

tests/Languages/intent/tables.rs

@@ -313,5 +313,36 @@ fn lines() -> Result<()> {
         </math>";
     test_intent(mathml, intent, vec![])?;
     return Ok(());
+}
+
 
+#[test]
+fn mlabelledtr_bug_526() -> Result<()> {
+    let mathml = r#"<math><mtable>
+            <mlabeledtr>
+                <mtd>
+                <mtext>foo</mtext>
+                </mtd>
+                <mtd>
+                    <mi>m</mi>
+                </mtd>
+            </mlabeledtr>
+            </mtable></math>"#;
+    let intent = "<math data-from-mathml='math'>
+    <lines data-from-mathml='mtable'>
+      <mlabeledtr data-from-mathml='mlabeledtr'>
+        <TEMP_NAME>
+          <mtext data-from-mathml='mtext'>foo</mtext>
+        </TEMP_NAME>
+        <mtd data-from-mathml='mlabeledtr'>
+          <mrow data-from-mathml='mlabeledtr'>
+            <mi data-from-mathml='mi'>m</mi>
+          </mrow>
+        </mtd>
+      </mlabeledtr>
+    </lines>
+   </math>";
+    test_intent(mathml, intent, vec![])?;
+    return Ok(());
 }
+