Restrict skipping of saying "of" when NavVerbosity is 'terse' to just…

… trig-like functions. This means "f x" -> "f of x" in terse mode. It would say "of" in other modes before this. Fixes #336.
NSoiffer · Jan 17, 2025 · ba62dae · ba62dae
1 parent 34886d4
commit ba62dae
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 9 deletions.
diff --git a/PythonScripts/BrailleMathCodes Repository.xlsx b/PythonScripts/BrailleMathCodes Repository.xlsx
diff --git a/Rules/Languages/en/unicode.yaml b/Rules/Languages/en/unicode.yaml
@@ -300,7 +300,8 @@
 
  - "⁡":                                          # 0x2061
     - test:
-        if: "$Verbosity!='Terse' and not(preceding-sibling::*[1][IsInDefinition(., 'GeometryShapes')]) and
+        # skip saying "of" when Terse and a trig function, when it is a shape (does this happen?), or we are in :literal mode
+        if: "not($Verbosity='Terse' and preceding-sibling::*[1][IsInDefinition(., 'TrigFunctionNames')]) and not(preceding-sibling::*[1][IsInDefinition(., 'GeometryShapes')]) and
              not(@data-changed='added' and ancestor-or-self::*[contains(@data-intent-property, ':literal:')])"
         then: [t: "of"]
  - "⁢": [t: ""]                                   # 0x2062

diff --git a/Rules/Languages/fi/unicode.yaml b/Rules/Languages/fi/unicode.yaml
@@ -255,8 +255,9 @@
 
  - "⁡":                                         	#  0x2061, function application
     - test:
-        if: "$Verbosity!='Terse' and not(preceding-sibling::*[1][IsInDefinition(., 'GeometryShapes')]) and
-             not(@data-changed='added' and ancestor-or-self::*[contains(@data-intent-property, ':structure:')])"
+        # skip saying "of" when Terse and a trig function, when it is a shape (does this happen?), or we are in :literal mode
+        if: "not($Verbosity='Terse' and preceding-sibling::*[1][IsInDefinition(., 'TrigFunctionNames')]) and not(preceding-sibling::*[1][IsInDefinition(., 'GeometryShapes')]) and
+             not(@data-changed='added' and ancestor-or-self::*[contains(@data-intent-property, ':literal:')])"
         then: [T: "arvolla"]                     
  - "⁢": [T: ""]                                 	#  0x2062 # invisible 'times', fi: should this have a value?
  - "⁣": [T: ""]                                 	#  0x2063 # invisible 'separator', fi: should this have a value?

diff --git a/Rules/Languages/zh/tw/unicode.yaml b/Rules/Languages/zh/tw/unicode.yaml
@@ -279,11 +279,7 @@
             then: [T: "等等"]                     	# 	(en: 'and so on', google translation)
             else: [T: "等等"]                     	# 	(en: 'and so on up to', google translation)
 
- - "⁡":                                         	#  0x2061
-    - test:
-        if: "$Verbosity!='Terse' and not(preceding-sibling::*[1][IsInDefinition(., 'GeometryShapes')]) and
-             not(@data-changed='added' and ancestor-or-self::*[contains(@data-intent-property, ':literal:')])"
-        then: [T: ""]                          	# 	(en: 'of', google translation)
+ - "⁡": [T: ""]                                  	# 	(en: 'of', google translation)
  - "⁢": [t: ""]                                 	#  0x2062
  - "⁣": [t: ""]                                 	#  0x2063
  - "⁤": [T: "又"]                                	#  0x2064	(en: 'and', google translation)(3 又 1/2)

diff --git a/tests/Languages/en/SimpleSpeak/functions.rs b/tests/Languages/en/SimpleSpeak/functions.rs
@@ -127,7 +127,7 @@ fn other_names() {
                 expr, "covariance x");
     let expr = "<math> <mrow><mi>exp</mi><mo>(</mo><mi>x</mi><mo>)</mo></mrow> </math>";
     test_prefs("en", "SimpleSpeak", vec![("Verbosity", "Terse")],
-                expr, "exp x");
+                expr, "exp of x");
     test_prefs("en", "SimpleSpeak", vec![("Verbosity", "Medium")],
                 expr, "exponential of x");
 }