Merge branch 'NSoiffer:main' into main

Author: MartheGjelstad

Rules/Intent/general.yaml

@@ -581,11 +581,10 @@
 
 # Pseudo-script characters are characters such as "degree sign" ('°') that are raised but in MathML should be in a superscript.
 # They are not spoken as if in a superscript (e.g "x degrees", not "x superscripts degrees")
-
 -
   name: skip-super
   tag: [msup, msubsup]
-  match: "*[last()][translate(., '′″‴⁗†‡°*', '')='']"
+  match: "*[last()][translate(., '′″‴⁗\"†‡°*', '')='' or .=\"'\"]"  # you can't have both ' and " in an xpath string
   replace:
   - intent:
       name: "skip-super"

Rules/Languages/en/ClearSpeak_Rules.yaml

@@ -131,9 +131,12 @@
 # Units (e.g., meters per second)
 - name: per-fraction
   tag: fraction
-  match: "$ClearSpeak_Fractions='Per' or
-          BaseNode(*[1])[contains(@data-intent-property, ':unit') or (self::m:mrow and self::*[3][contains(@data-intent-property, ':unit')])] and
-          BaseNode(*[1])[contains(@data-intent-property, ':unit') or (self::m:mrow and self::*[3][contains(@data-intent-property, ':unit')])]"
+  match:
+  - "$ClearSpeak_Fractions='Per' or"
+  - "(BaseNode(*[1])[contains(@data-intent-property, ':unit') or"
+  - "                ( self::m:mrow and count(*)=3 and"  # maybe a bit paranoid checking the structure...
+  - "                 *[1][self::m:mn] and *[2][.='\u2062'] and BaseNode(*[3])[contains(@data-intent-property, ':unit')] ) ] and"
+  - " BaseNode(*[2])[contains(@data-intent-property, ':unit')] )"
   replace:
   - x: "*[1]"
   - t: "per"      # phrase('5 meters 'per' second)

Rules/Languages/en/SharedRules/general.yaml

@@ -238,12 +238,20 @@
   tag: unit
   match: "$Verbosity != 'Terse' and contains(@data-intent-property, ':unit')"
   variables:
-    # we need to look at preceding-sibling::*[2] because invisible times should have been added
-    # if in a fraction, only count if we are in the numerator
-  - IsSingular: "(parent::m:mrow and preceding-sibling::*[2][self::m:mn and . = 1]) or  
-                 (ancestor::*[2][self::m:mrow] and parent::m:fraction and
-                  (preceding-sibling::* or parent::*[preceding-sibling::*[2][self::m:mn and . = 1]])
-                 )"
+    # If the coefficient is singular, we don't add the plural ending. Finding the coefficient is tricky
+    # Normal case (A) "3m" (parents is mrow), but could also be (B) "3 m^2" (etc.) (parent is power/mrow)
+    # But it might be in a fraction as (C) "3 m/s" (parent is fraction/mrow) or (D) "3 m^2/s^2" (parent is power/fraction/mrow)
+    #   or even (E) {3 m^2}/s (parent is power/mrow)
+    # If in a fraction, only look in the numerator to find the coefficient
+    # Note: we have a special case for pseudo-scripts like "°" (degrees) which are not powers -- they are essentially "1^°"
+    # The following "IfThenElse" logic returns the mrow that potentially contains the coefficient, if it exists
+    # The tests are in the order A, B & E, C, D
+  - MRowForCoefficient: "IfThenElse(parent::m:mrow, parent::m:mrow,
+                         IfThenElse(parent::m:power, ancestor::*[2][self::m:mrow],
+                         IfThenElse(parent::m:fraction and not(preceding-sibling::*), ancestor::*[2][self::m:mrow],
+                         IfThenElse(parent::m:power[parent::m:fraction and not(preceding-sibling::*)], ancestor::*[3][self::m:mrow], false()) ) ) )"
+  - IsSingular: "(not(DEBUG($MRowForCoefficient)) and parent::*[name(.)!='skip-super' or *[1][.=1]]) or
+                 ($MRowForCoefficient and $MRowForCoefficient[(count(*) = 3 and *[1][self::m:mn and .=1] and *[2]='\u2062')])"
   - Prefix: "''"
   - Word: "''"  
   replace:

Rules/Languages/en/SimpleSpeak_Rules.yaml

@@ -102,11 +102,14 @@
   - x: "ToOrdinal(*[2], true(), $IsPlural)"   # extra args specify fractional ordinal and whether it is plural
 
 
-# Units (e.g., meters per second)
+# Units (e.g., meters per second, m^2/s^2, (3m^2)/s)
 - name: per-fraction
   tag: fraction
-  match: "BaseNode(*[1])[contains(@data-intent-property, ':unit') or (self::m:mrow and self::*[3][contains(@data-intent-property, ':unit')])] and
-          BaseNode(*[1])[contains(@data-intent-property, ':unit') or (self::m:mrow and self::*[3][contains(@data-intent-property, ':unit')])]"
+  match:
+  - "BaseNode(*[1])[contains(@data-intent-property, ':unit') or"
+  - "               ( self::m:mrow and count(*)=3 and"  # maybe a bit paranoid checking the structure...
+  - "                 *[1][self::m:mn] and *[2][.='\u2062'] and BaseNode(*[3])[contains(@data-intent-property, ':unit')] ) ] and"
+  - "BaseNode(*[2])[contains(@data-intent-property, ':unit')] "
   replace:
   - x: "*[1]"
   - t: "per"      # phrase('5 meters 'per' second)

Rules/Languages/en/definitions.yaml

@@ -17,6 +17,7 @@
 
     "absolute-value": "function= ; absolute value: the absolute value: the absolute value; end absolute value",
     "binomial": "infix=binomial; choose; end binomial",
+    "dimension-product": "infix=by",
     # "closed-interval": "other=closed-interval; from,to; end closed-interval",
     "greatest-common-divisor": "function=gcd: the gcd: the greatest common divisor",
     "imaginary-part": "function=imaginary part, the imaginary part, the imaginary part",
@@ -49,8 +50,8 @@
 
     "chemistry-concentration": "function= ; concentration: concentration of: the concentration of; end concentration",
   }
-  # Names of functions that in terse mode don't say "of" (or it's equivalent in other languages)
 
+  # Names of functions that in terse mode don't say "of" (or it's equivalent in other languages)
 - TerseFunctionNames: {
     "divergence", "gradient", "curl"
   }
@@ -81,11 +82,6 @@
     "out": "out of",
   }
 
-- OperatorIntentRenaming: {
-    # These are the intents that are renamed to something else (probably most intents for non-English languages)
-    "dimension-product": "by"
-  }
-
 - KnownWords: {
     # MathCAT will put together some runs of three or more mi's (a common mistake), but skips those in alphabetical order.
     # This is a list of exceptions so that they do get put together. Don't list words with repeated letters.

Rules/Languages/es/ClearSpeak_Rules.yaml

@@ -117,10 +117,15 @@
 # Units (e.g., meters per second)
 - name: per-fraction
   tag: fraction
-  match: "$ClearSpeak_Fractions='Per'"
+  match:
+  - "$ClearSpeak_Fractions='Per' or"
+  - "(BaseNode(*[1])[contains(@data-intent-property, ':unit') or"
+  - "                ( self::m:mrow and count(*)=3 and"  # maybe a bit paranoid checking the structure...
+  - "                 *[1][self::m:mn] and *[2][.='\u2062'] and BaseNode(*[3])[contains(@data-intent-property, ':unit')] ) ] and"
+  - " BaseNode(*[2])[contains(@data-intent-property, ':unit')] )"
   replace:
   - x: "*[1]"
-  - T: "por"
+  - t: "por"      # phrase('5 meters 'per' second)
   - x: "*[2]"
 
 - name: common-fraction

Rules/Languages/es/SharedRules/general.yaml

@@ -228,12 +228,17 @@
   tag: unit
   match: "$Verbosity != 'Terse' and contains(@data-intent-property, ':unit')"
   variables:
-    # we need to look at preceding-sibling::*[2] because invisible times should have been added
-    # if in a fraction, only count if we are in the numerator
-  - IsSingular: "(parent::m:mrow and preceding-sibling::*[2][self::m:mn and . = 1]) or  
-                 (ancestor::*[2][self::m:mrow] and parent::m:fraction and
-                  (preceding-sibling::* or parent::*[preceding-sibling::*[2][self::m:mn and . = 1]])
-                 )"
+    # If the coefficient is singular, we don't add the plural ending. Finding the coefficient is tricky
+    # Normal case (A) "3m" (parents is mrow), but could also be (B) "3 m^2" (etc.). (parent is msup/mrow)
+    # But it might be in a fraction as (C) "3 m/s" (parent is mfrac/mrow) or (D) "3 m^2/s^2" (parent is msup/mfrac/mrow)
+    #   or even (E) {3 m^2}/s (parent is msup/mrow)
+    # If in a fraction, only look in the numerator to find the coefficient
+  - MRowForCoefficient: "IfThenElse(parent::m:mrow, parent::m:mrow,
+                         IfThenElse(parent::m:power, ancestor::*[2][self::m:mrow],
+                         IfThenElse(parent::m:fraction and not(preceding-sibling::*), ancestor::*[2][self::m:mrow],
+                         IfThenElse(parent::m:power[parent::m:fraction and not(preceding-sibling::*)], ancestor::*[3][self::m:mrow], false()) ) ) )"
+  - IsSingular: "(not(DEBUG($MRowForCoefficient)) and parent::*[name(.)!='skip-super' or *[1][.=1]]) or
+                 ($MRowForCoefficient and $MRowForCoefficient[(count(*) = 3 and *[1][self::m:mn and .=1] and *[2]='\u2062')])"
   - Prefix: "''"
   - Word: "''"  
   replace:

Rules/Languages/es/SimpleSpeak_Rules.yaml

@@ -81,6 +81,20 @@
   - "*[2][self::m:mn][not(contains(., '.'))]"
   replace: [{x: ToCommonFraction(.)}]
 
+
+# Units (e.g., meters per second, m^2/s^2, (3m^2)/s)
+- name: per-fraction
+  tag: fraction
+  match:
+  - "BaseNode(*[1])[contains(@data-intent-property, ':unit') or"
+  - "               ( self::m:mrow and count(*)=3 and"  # maybe a bit paranoid checking the structure...
+  - "                 *[1][self::m:mn] and *[2][.='\u2062'] and BaseNode(*[3])[contains(@data-intent-property, ':unit')] ) ] and"
+  - "BaseNode(*[2])[contains(@data-intent-property, ':unit')] "
+  replace:
+  - x: "*[1]"
+  - t: "por"      # phrase('5 meters 'per' second)
+  - x: "*[2]"
+
 - name: simple
   # don't include nested fractions. E.g, fraction a plus b over c + 1 end fraction" is ambiguous
   # by simplistic SimpleSpeak's rules "b over c" is a fraction, but if we say nested fractions

Rules/Languages/fi/SharedRules/general.yaml

@@ -292,12 +292,20 @@
   tag: unit
   match: "$Verbosity != 'Terse' and contains(@data-intent-property, ':unit')"
   variables:
-    # we need to look at preceding-sibling::*[2] because invisible times should have been added
-    # if in a fraction, only count if we are in the numerator
-  - IsSingular: "(parent::m:mrow and preceding-sibling::*[2][self::m:mn and . = 1]) or  
-                 (ancestor::*[2][self::m:mrow] and parent::m:fraction and
-                  (preceding-sibling::* or parent::*[preceding-sibling::*[2][self::m:mn and . = 1]])
-                 )"
+    # If the coefficient is singular, we don't add the plural ending. Finding the coefficient is tricky
+    # Normal case (A) "3m" (parents is mrow), but could also be (B) "3 m^2" (etc.) (parent is power/mrow)
+    # But it might be in a fraction as (C) "3 m/s" (parent is fraction/mrow) or (D) "3 m^2/s^2" (parent is power/fraction/mrow)
+    #   or even (E) {3 m^2}/s (parent is power/mrow)
+    # If in a fraction, only look in the numerator to find the coefficient
+    # Note: we have a special case for pseudo-scripts like "°" (degrees) which are not powers -- they are essentially "1^°"
+    # The following "IfThenElse" logic returns the mrow that potentially contains the coefficient, if it exists
+    # The tests are in the order A, B & E, C, D
+  - MRowForCoefficient: "IfThenElse(parent::m:mrow, parent::m:mrow,
+                         IfThenElse(parent::m:power, ancestor::*[2][self::m:mrow],
+                         IfThenElse(parent::m:fraction and not(preceding-sibling::*), ancestor::*[2][self::m:mrow],
+                         IfThenElse(parent::m:power[parent::m:fraction and not(preceding-sibling::*)], ancestor::*[3][self::m:mrow], false()) ) ) )"
+  - IsSingular: "(not(DEBUG($MRowForCoefficient)) and parent::*[name(.)!='skip-super' or *[1][.=1]]) or
+                 ($MRowForCoefficient and $MRowForCoefficient[(count(*) = 3 and *[1][self::m:mn and .=1] and *[2]='\u2062')])"
   - Prefix: "''"
   - Word: "''"  
   replace:

Rules/Languages/fi/SimpleSpeak_Rules.yaml

@@ -92,6 +92,19 @@
   - x: "*[1]"
   - x: "ToOrdinal(*[2], true(), $IsPlural)"   # extra args specify fractional ordinal and whether it is plural
 
+# Units (e.g., meters per second, m^2/s^2, (3m^2)/s)
+- name: per-fraction
+  tag: fraction
+  match:
+  - "BaseNode(*[1])[contains(@data-intent-property, ':unit') or"
+  - "               ( self::m:mrow and count(*)=3 and"  # maybe a bit paranoid checking the structure...
+  - "                 *[1][self::m:mn] and *[2][.='\u2062'] and BaseNode(*[3])[contains(@data-intent-property, ':unit')] ) ] and"
+  - "BaseNode(*[2])[contains(@data-intent-property, ':unit')] "
+  replace:
+  - x: "*[1]"
+  - x: "*[2]"
+  - t: "kohti"      # phrase('5 meters 'per' second)
+
 - name: simple
   # don't include nested fractions. E.g, fraction a plus b over c + 1 end fraction" is ambiguous
   # by simplistic SimpleSpeak's rules "b over c" is a fraction, but if we say nested fractions