Allow label on mtd to be in any column.

These are converted into `mlabeledtr` (with the label in the first column)

Author: NSoiffer

Rules/Intent/general.yaml

@@ -805,31 +805,33 @@
   # Note: child hasn't been processed, so 'intent' hasn't been processed/turned into data-intent-property
   match: "count(*) > 1 and
           ($TableProperty = 'piecewise' or $TableProperty = 'system-of-equations' or $TableProperty = 'lines') and
-          (self::m:mlabeledtr or *[1][contains(@intent, ':equation-label')])"
+          (self::m:mlabeledtr or *[contains(@intent, ':equation-label')])"
   replace:
   - intent:
       name: "mlabeledtr"
       children:
-      - x: "*[1]"
+      - x: "*[contains(@intent, ':equation-label')]"
       - intent:
           name: "mtd"
-          attrs: "id='*[2]/@id'"
+          attrs: "id=*[not(contains(@intent, ':equation-label'))][1]/*[1]/@id"
           children: 
           - intent:
               name: "mrow"
-              attrs: "id='*[2]/*[1]/@id'"
-              children: [x: "*[position()>1]"]
+              attrs: "id=*[not(contains(@intent, ':equation-label'))][1]/*[1]/@id"
+              children: [x: "*[not(contains(@intent, ':equation-label'))]"]
 
 -
   # convert a mtr to a mlabeledtr
   name: mlabeledtr
   tag: mtr
   # Note: child hasn't been processed, so 'intent' hasn't been processed/turned into data-intent-property
-  match: "count(*) > 1 and *[1][contains(@intent, ':equation-label')]"
+  match: "count(*) > 1 and *[contains(@intent, ':equation-label')]"
   replace:
   - intent:
       name: "mlabeledtr"
-      children: [x: "*"]
+      children:
+      - x: "*[contains(@intent, ':equation-label')]"
+      - x: "*[not(contains(@intent, ':equation-label'))]"
 
 -
   # merge all the mtd into a single mtd
@@ -853,9 +855,11 @@
 
 -
   # We need to preserve any intent properties that are on the mtd (e.g., :pause)
+  # Note: at this point "intent" has been processed so we look at @data-intent-property
   name: mtd-to-mrow
   tag: mtd
-  match: "$TableProperty = 'piecewise' or $TableProperty = 'system-of-equations' or $TableProperty = 'lines'"
+  match: "($TableProperty = 'piecewise' or $TableProperty = 'system-of-equations' or $TableProperty = 'lines') and
+          not(contains(@data-intent-property, ':equation-label'))"
   replace:
   - test:
       if: "@data-intent-property"

Rules/Languages/en/ClearSpeak_Rules.yaml

@@ -702,11 +702,11 @@
           then: [t: "step"]      # phrase(this is a 'step' by step process)
           # else 'None -- don't say anything'
       - x: "count(preceding-sibling::*[not(contains(@data-intent-property, ':continued-row:'))]) + 1"
-      - test:
-          if: "self::m:mlabeledtr"
-          then:
-          - t: "with label"      # phrase(the diagram is complete 'with label')
-          - x: "*[1]/*"
+  - test:
+      if: "self::m:mlabeledtr"
+      then:
+      - t: "with label"      # phrase(the diagram is complete 'with label')
+      - x: "*[1]/*"
   - test:
     - if: "$ClearSpeak_MultiLineLabel='None'"
       then: [pause: xlong]   # need a very long pause with no line labels

Rules/Languages/en/SharedRules/default.yaml

@@ -411,7 +411,9 @@
 
 - name: default
   tag: mtable
-  variables: [IsColumnSilent: false()]
+  variables:
+  - IsColumnSilent: "false()"
+  - NumColumns: "count(*[1]/*) - IfThenElse(*/self::m:mlabeledtr, 1, 0)"
   match: "."
   replace:
   - t: "table with"      # phrase(the 'table with' 3 rows)
@@ -421,9 +423,9 @@
       then: [t: "row"]      # phrase(the table with 1 'row')
       else: [t: "rows"]      # phrase(the table with 3 'rows')
   - t: "and"      # phrase(the table with 3 rows 'and' 4 columns)
-  - x: "count(*[1]/*)"
+  - x: "$NumColumns"
   - test:
-      if: "count(*[1]/*)=1"
+      if: "NumColumns=1"
       then: [t: "column"]      # phrase(the table with 3 rows and 1 'column')
       else: [t: "columns"]      # phrase(the table with 3 rows and 4 'columns')
   - pause: long
@@ -439,14 +441,14 @@
   - t: "row"      # phrase(the first 'row' of a matrix)
   - x: "count(preceding-sibling::*)+1"
   - test:
-      if: .[self::m:mlabeledtr]
+      if: self::m:mlabeledtr
       then:
       - t: "with label"      # phrase(the line 'with label' first equation)
       - x: "*[1]/*"
       - pause: short
   - pause: medium
   - test:
-      if: .[self::m:mlabeledtr]
+      if: self::m:mlabeledtr
       then: [x: "*[position()>1]"]
       else: {x: "*"}
 
@@ -461,7 +463,7 @@
       if: "not($IsColumnSilent)"
       then:
       - t: "column"      # phrase(the first 'column' of the matrix)
-      - x: "count(preceding-sibling::*)+1"
+      - x: "count(preceding-sibling::*)+IfThenElse(parent::m:mlabeledtr, 0, 1)"
       - pause: medium
   - x: "*"
   - test:

Rules/Languages/es/SharedRules/default.yaml

@@ -358,7 +358,9 @@
 
 - name: default
   tag: mtable
-  variables: [IsColumnSilent: false()]
+  variables:
+  - IsColumnSilent: "false()"
+  - NumColumns: "count(*[1]/*) - IfThenElse(*/self::m:mlabeledtr, 1, 0)"
   match: "."
   replace:
   - T: "tabla con"
@@ -368,9 +370,9 @@
       then: [T: "fila"]
       else: [T: "filas"]
   - T: y
-  - x: "count(*[1]/*)"
+  - x: "$NumColumns"
   - test:
-      if: "count(*[1]/*)=1"
+      if: "$NumColumns"
       then: [T: "columna"]
       else: [t: "columnas"]
   - pause: long
@@ -389,7 +391,7 @@
   match: "."
   replace:
   - T: "columna"
-  - x: "count(preceding-sibling::*)+1"
+  - x: "count(preceding-sibling::*)+IfThenElse(parent::m:mlabeledtr, 0, 1)"
   - pause: medium
   - x: "*" # speak the entry
   - pause: long

Rules/Languages/fi/SharedRules/default.yaml

@@ -401,7 +401,9 @@
 
 - name: default
   tag: mtable
-  variables: [IsColumnSilent: false()]
+  variables:
+  - IsColumnSilent: "false()"
+  - NumColumns: "count(*[1]/*) - IfThenElse(*/self::m:mlabeledtr, 1, 0)"
   match: "."
   replace:
   - T: "taulukko, jossa"      # phrase(the 'table with' 3 rows)
@@ -411,9 +413,9 @@
       then: [T: "rivi"]      # phrase(the table with 1 'row') # FI: singular
       else: [T: "riviä"]      # phrase(the table with 3 'rows') # FI: plural
   - T: "ja"      # phrase(the table with 3 rows 'and' 4 columns)
-  - x: "count(*[1]/*)"
+  - x: "$NumColumns"
   - test:
-      if: "count(*[1]/*)=1"
+      if: "$NumColumns"
       then: [T: "sarake"]      # phrase(the table with 3 rows and 1 'column') # FI: singular
       else: [T: "saraketta"]      # phrase(the table with 3 rows and 4 'columns') # FI: plural
   - pause: long
@@ -429,14 +431,14 @@
   - T: "rivi"      # phrase(the first 'row' of a matrix)
   - x: "count(preceding-sibling::*)+1"
   - test:
-      if: .[self::m:mlabeledtr]
+      if: self::m:mlabeledtr
       then:
       - T: "merkinnällä"      # phrase(the line 'with label' first equation)
       - x: "*[1]/*"
       - pause: short
   - pause: medium
   - test:
-      if: .[self::m:mlabeledtr]
+      if: self::m:mlabeledtr
       then: [{x: "*[position()>1]"}]
       else: {x: "*"}
 
@@ -451,7 +453,7 @@
       if: "not($IsColumnSilent)"
       then:
       - T: "sarake"      # phrase(the first 'column' of the matrix)
-      - x: "count(preceding-sibling::*)+1"
+      - x: "count(preceding-sibling::*)+IfThenElse(parent::m:mlabeledtr, 0, 1)"
       - pause: medium
   - x: "*"
   - test:

Rules/Languages/id/SharedRules/default.yaml

@@ -294,7 +294,9 @@
 
 - name: default
   tag: mtable
-  variables: [{IsColumnSilent: false()}]
+  variables:
+  - IsColumnSilent: "false()"
+  - NumColumns: "count(*[1]/*) - IfThenElse(*/self::m:mlabeledtr, 1, 0)"
   match: "."
   replace:
   - T: 'tabel dengan'
@@ -304,9 +306,9 @@
       then: {T: 'baris'}
       else: {T: 'baris'}
   - T: dan
-  - x: "count(*[1]/*)"
+  - x: "$NumColumns"
   - test:
-      if: "count(*[1]/*)=1"
+      if: "$NumColumns"
       then: {T: 'kolom'}
       else: {T: 'kolom'}
   - pause: long

Rules/Languages/sv/SharedRules/default.yaml

@@ -415,9 +415,9 @@
       then: [T: "rad"]      # phrase(the table with 1 'row')
       else: [T: "rader"]      # phrase(the table with 3 'rows')
   - T: "och"      # phrase(the table with 3 rows 'and' 4 columns)
-  - x: "count(*[1]/*)"
+  - x: "$NumColumns"
   - test:
-      if: "count(*[1]/*)=1"
+      if: "$NumColumns"
       then: [T: "kolumn"]      # phrase(the table with 3 rows and 1 'column')
       else: [T: "kolumner"]      # phrase(the table with 3 rows and 4 'columns')
   - pause: long
@@ -433,14 +433,14 @@
   - T: "rad"      # phrase(the first 'row' of a matrix)
   - x: "count(preceding-sibling::*)+1"
   - test:
-      if: .[self::m:mlabeledtr]
+      if: self::m:mlabeledtr
       then:
       - T: "med etiketten"      # phrase(the line 'with label' first equation)
       - x: "*[1]/*"
       - pause: short
   - pause: medium
   - test:
-      if: .[self::m:mlabeledtr]
+      if: self::m:mlabeledtr
       then: [{x: "*[position()>1]"}]
       else: {x: "*"}
 
@@ -455,7 +455,7 @@
       if: "not($IsColumnSilent)"
       then:
       - T: "kolumn"      # phrase(the first 'column' of the matrix)
-      - x: "count(preceding-sibling::*)+1"
+      - x: "count(preceding-sibling::*)+IfThenElse(parent::m:mlabeledtr, 0, 1)"
       - pause: medium
   - x: "*"
   - test:

Rules/Languages/vi/SharedRules/default.yaml

@@ -422,7 +422,9 @@
 
 - name: default
   tag: mtable
-  variables: [{IsColumnSilent: false()}]
+  variables:
+  - IsColumnSilent: "false()"
+  - NumColumns: "count(*[1]/*) - IfThenElse(*/self::m:mlabeledtr, 1, 0)"
   match: "."
   replace:
   - T: "bảng gồm"
@@ -432,9 +434,9 @@
       then: {T: "dòng"}
       else: {T: "dòng"}
   - T: và
-  - x: "count(*[1]/*)"
+  - x: "$NumColumns"
   - test:
-      if: "count(*[1]/*)=1"
+      if: "$NumColumns"
       then: {T: "cột"}
       else: {T: "cột"}
   - pause: long
@@ -450,14 +452,14 @@
   - T: "dòng"      # phrase(the first 'row' of a matrix)
   - x: "count(preceding-sibling::*)+1"
   - test:
-      if: .[self::m:mlabeledtr]
+      if: self::m:mlabeledtr
       then:
       - T: "có nhãn"      # phrase(the line 'with label' first equation)
       - x: "*[1]/*"
       - pause: short
   - pause: medium
   - test:
-      if: .[self::m:mlabeledtr]
+      if: self::m:mlabeledtr
       then: [{x: "*[position()>1]"}]
       else: {x: "*"}
 
@@ -472,7 +474,7 @@
       if: "not($IsColumnSilent)"
       then:
       - T: "cột"      # phrase(the first 'column' of the matrix)
-      - x: "count(preceding-sibling::*)+1"
+      - x: "count(preceding-sibling::*)+IfThenElse(parent::m:mlabeledtr, 0, 1)"
       - pause: medium
   - x: "*"
   - test:

Rules/Languages/zh/tw/SharedRules/default.yaml

@@ -401,7 +401,9 @@
 
 - name: default
   tag: mtable
-  variables: [IsColumnSilent: false()]
+  variables:
+  - IsColumnSilent: "false()"
+  - NumColumns: "count(*[1]/*) - IfThenElse(*/self::m:mlabeledtr, 1, 0)"
   match: "."
   replace:
   - T: "表"      # phrase(the 'table with' 3 rows)
@@ -411,9 +413,9 @@
       then: [T: "列"]      # phrase(the table with 1 'row')
       else: [T: "列"]      # phrase(the table with 3 'rows')
   - T: "與"      # phrase(the table with 3 rows 'and' 4 columns)
-  - x: "count(*[1]/*)"
+  - x: "$NumColumns"
   - test:
-      if: "count(*[1]/*)=1"
+      if: "$NumColumns"
       then: [T: "行"]      # phrase(the table with 3 rows and 1 'column')
       else: [T: "行"]      # phrase(the table with 3 rows and 4 'columns')
   - pause: long
@@ -429,14 +431,14 @@
   - T: "列"      # phrase(the first 'row' of a matrix)
   - x: "count(preceding-sibling::*)+1"
   - test:
-      if: .[self::m:mlabeledtr]
+      if: self::m:mlabeledtr
       then:
       - T: "帶有標籤"      # phrase(the line 'with label' first equation)
       - x: "*[1]/*"
       - pause: short
   - pause: medium
   - test:
-      if: .[self::m:mlabeledtr]
+      if: self::m:mlabeledtr
       then: [{x: "*[position()>1]"}]
       else: {x: "*"}
 
@@ -451,7 +453,7 @@
       if: "not($IsColumnSilent)"
       then:
       - T: "行"      # phrase(the first 'column' of the matrix)
-      - x: "count(preceding-sibling::*)+1"
+      - x: "count(preceding-sibling::*)+IfThenElse(parent::m:mlabeledtr, 0, 1)"
       - pause: medium
   - x: "*"
   - test:

tests/Languages/en/mtable.rs

@@ -258,10 +258,10 @@ fn matrix_2x3_labeled() {
     </math>
                                 ";
     test("en", "ClearSpeak",  expr,
-        "the 2 by 3 matrix; row 1 with label (3.1); column 2; 3, column 3; 1, column 4; 4; \
+        "the 2 by 3 matrix; row 1 with label (3.1); column 1; 3, column 2; 1, column 3; 4; \
                                    row 2; column 1; 0, column 2; 2, column 3; 6");
     test("en", "SimpleSpeak", expr,
-        "the 2 by 3 matrix; row 1 with label (3.1); column 2; 3, column 3; 1, column 4; 4; \
+        "the 2 by 3 matrix; row 1 with label (3.1); column 1; 3, column 2; 1, column 3; 4; \
                                    row 2; column 1; 0, column 2; 2, column 3; 6");
 }
 
@@ -1082,3 +1082,19 @@ fn diagonal_matrix() {
   // test_prefs("en", "SimpleSpeak", vec![("Verbosity", "Verbose")],
   //     expr, "the 3 by 3 diagonal matrix; row 1, column 1, 2; row 2, column 2, 1; row 3, column 3, x squared");
 }
+
+#[test]
+fn single_line_with_label() {
+  let expr = r#"<math>
+  <mtable class="gather" displaystyle="true" intent=":system-of-equations">
+    <mtr>
+      <mtd intent=":equation-label"> <mtext>(2)</mtext> </mtd>
+      <mtd> <mi>𝑏</mi> <mo>=</mo> <mn>2</mn> </mtd>
+    </mtr>
+  </mtable>
+  </math>"#;
+  test_prefs("en", "ClearSpeak", vec![("Verbosity", "Terse")],
+      expr, "1 line, with label 2; b equals 2");
+  test_prefs("en", "SimpleSpeak", vec![("Verbosity", "Terse")],
+      expr, "1 equation, with label 2; b equals 2");
+}