Ru - Add braille label marks and tests

Rules/Braille/Russian/definitions.yaml

@@ -16,3 +16,30 @@
     "grad": "\uE11B", "gradient": "\uE11B", "rot": "\uE11C", "div": "\uE11D",
     "gcd": "\uE11E", "lcm": "\uE11F"
   }
+
+- RussianLabelMarks: {
+    "′": "\uE130", "″": "\uE130\uE130", "‴": "\uE130\uE130\uE130", "'": "\uE130",
+    "*": "\uE131", "∗": "\uE131", "⋆": "\uE131",
+    "×": "\uE132", "✕": "\uE132", "✖": "\uE132",
+    "∘": "\uE133", "○": "\uE133", "◦": "\uE133", "°": "\uE133",
+    "□": "\uE134", "◻": "\uE134",
+    "~": "\uE135", "∼": "\uE135", "˜": "\uE135", "̃": "\uE135",
+    "^": "\uE136", "∧": "\uE136", "ˆ": "\uE136", "̂": "\uE136",
+    "∨": "\uE137", "˅": "\uE137", "ˇ": "\uE137", "̌": "\uE137",
+    "+": "\uE138", "-": "\uE139", "−": "\uE139",
+    "?": "\uE13A", "⍰": "\uE13A",
+    "←": "\uE13B", "⟵": "\uE13B", "⃖": "\uE13B"
+  }
+
+- RussianExactOverLabelMarksWithoutIndicator: {
+    "~": "\uE135", "∼": "\uE135", "˜": "\uE135", "̃": "\uE135",
+    "^": "\uE136", "∧": "\uE136", "ˆ": "\uE136", "̂": "\uE136",
+    "∨": "\uE137", "˅": "\uE137", "ˇ": "\uE137", "̌": "\uE137"
+  }
+
+- RussianUpperRightLabelMarksWithoutIndicator: {
+    "′": "\uE130", "″": "\uE130\uE130", "‴": "\uE130\uE130\uE130", "'": "\uE130",
+    "*": "\uE131", "∗": "\uE131", "⋆": "\uE131",
+    "×": "\uE132", "✕": "\uE132", "✖": "\uE132",
+    "+": "\uE138", "-": "\uE139", "−": "\uE139"
+  }

Rules/Braille/Russian/unicode-full.yaml

@@ -107,35 +107,35 @@
 
  # bold script chars in math alphabetic block
  - "𝓐-𝓩":    # 0x1d4d0 - 0x1d4e9
-    - tc: "BTs"
+    - tc: "BTsC"
     - spell: "translate('.', '𝓐𝓑𝓒𝓓𝓔𝓕𝓖𝓗𝓘𝓙𝓚𝓛𝓜𝓝𝓞𝓟𝓠𝓡𝓢𝓣𝓤𝓥𝓦𝓧𝓨𝓩', 'abcdefghijklmnopqrstuvwxyz')"
 
  - "𝓪-𝔃":    # 0x1d4ea - 0x1d503
     - tc: "BTs"
     - spell: "translate('.', '𝓪𝓫𝓬𝓭𝓮𝓯𝓰𝓱𝓲𝓳𝓴𝓵𝓶𝓷𝓸𝓹𝓺𝓻𝓼𝓽𝓾𝓿𝔀𝔁𝔂𝔃', 'abcdefghijklmnopqrstuvwxyz')"
 
  - "𝐀-𝐙":    # 0x1d400 - 0x1d419
-    - tc: "B"
+    - tc: "BC"
     - spell: "translate('.', '𝐀𝐁𝐂𝐃𝐄𝐅𝐆𝐇𝐈𝐉𝐊𝐋𝐌𝐍𝐎𝐏𝐐𝐑𝐒𝐓𝐔𝐕𝐖𝐗𝐘𝐙', 'abcdefghijklmnopqrstuvwxyz')"
 
  - "𝐚-𝐳":    # 0x1d41a - 0x1d433
     - tc: "B"
     - spell: "translate('.', '𝐚𝐛𝐜𝐝𝐞𝐟𝐠𝐡𝐢𝐣𝐤𝐥𝐦𝐧𝐨𝐩𝐪𝐫𝐬𝐭𝐮𝐯𝐰𝐱𝐲𝐳', 'abcdefghijklmnopqrstuvwxyz')"
 
  - "𝐴-𝑍":    # 0x1d434 - 0x1d44d
-    # don't include italics
-    - tc: "C"
+    - tc: "IC"
     - spell: "translate('.', '𝐴𝐵𝐶𝐷𝐸𝐹𝐺𝐻𝐼𝐽𝐾𝐿𝑀𝑁𝑂𝑃𝑄𝑅𝑆𝑇𝑈𝑉𝑊𝑋𝑌𝑍', 'abcdefghijklmnopqrstuvwxyz')"
 
  - "𝑎-𝑧":    # 0x1d44e - 0x1d467
-    # don't include italics
+    - tc: "I"
     - spell: "translate('.', '𝑎𝑏𝑐𝑑𝑒𝑓𝑔𝑕𝑖𝑗𝑘𝑙𝑚𝑛𝑜𝑝𝑞𝑟𝑠𝑡𝑢𝑣𝑤𝑥𝑦𝑧', 'abcdefghijklmnopqrstuvwxyz')"
 
  - "𝑨-𝒁":    # 0x1d468 - 0x1d481 
     - tc: "BIC"
     - spell: "translate('.', '𝑨𝑩𝑪𝑫𝑬𝑭𝑮𝑯𝑰𝑱𝑲𝑳𝑴𝑵𝑶𝑷𝑸𝑹𝑺𝑻𝑼𝑽𝑾𝑿𝒀𝒁', 'abcdefghijklmnopqrstuvwxyz')"
 
  - "𝒂-𝒛":    # 0x1d482 - 0x1d49b
+    - tc: "BI"
     - spell: "translate('.', '𝒂𝒃𝒄𝒅𝒆𝒇𝒈𝒉𝒊𝒋𝒌𝒍𝒎𝒏𝒐𝒑𝒒𝒓𝒔𝒕𝒖𝒗𝒘𝒙𝒚𝒛', 'abcdefghijklmnopqrstuvwxyz')"
 
  - "𝖠-𝖹":    # 0x1d5a0 - 0x1d5b9
@@ -157,11 +157,11 @@
     - spell: "translate('.', '𝗮𝗯𝗰𝗱𝗲𝗳𝗴𝗵𝗶𝗷𝗸𝗹𝗺𝗻𝗼𝗽𝗾𝗿𝘀𝘁𝘂𝘃𝘄𝘅𝘆𝘇', 'abcdefghijklmnopqrstuvwxyz')"
 
  - "𝘈-𝘡":    # 0x1d608 - 0x1d621
-    # - tc: "italic"
+    - tc: "IC"
     - spell: "translate('.', '𝘈𝘉𝘊𝘋𝘌𝘍𝘎𝘏𝘐𝘑𝘒𝘓𝘔𝘕𝘖𝘗𝘘𝘙𝘚𝘛𝘜𝘝𝘞𝘟𝘠𝘡', 'ABCDEFGHIJKLMNOPQRSTUVWXYZ')"
 
  - "𝘢-𝘻":    # 0x1d622 - 0x1d63b
-      # - tc: "italic"
+    - tc: "I"
     - spell: "translate('.', '𝘢𝘣𝘤𝘥𝘦𝘧𝘨𝘩𝘪𝘫𝘬𝘭𝘮𝘯𝘰𝘱𝘲𝘳𝘴𝘵𝘶𝘷𝘸𝘹𝘺𝘻', 'abcdefghijklmnopqrstuvwxyz')"
 
  - "𝘼-𝙕":    # 0x1d63c - 0x1d655

Rules/Braille/Russian/unicode.yaml

@@ -6,6 +6,12 @@
 - "?": [t: "⠠⠢"]
 - ":": [t: "⠀⠲"]
 - ";": [t: "⠠⠆"]
+- "№": [t: "⠝"]
+- "§": [t: "⠬"]
+- "…": [t: "⠠⠄"]
+- "↵": [t: "⠐"]
+- "⏎": [t: "⠠"]
+- "⍰": [t: "⠐"]
 - "[": [t: "⠷"]
 - "]": [t: "⠾"]
 - "{": [t: "⠪"]
@@ -20,7 +26,7 @@
 - ")": [t: "⠜"]
 - ">": [t: "⠀⠕⠀"]
 - "<": [t: "⠀⠪⠀"]
-- "%": [t: "⠼⠴"]
+- "%": [t: "⠼⠍⠴"]
 - "±": [t: "⠀⠖⠤"]
 - ";": [t: "⠠⠢"]
 - "Ϳ": [t: "⠰⠊"]
@@ -148,6 +154,18 @@
 - "\uE11D": [t: "⠫⠙⠊⠧#"]
 - "\uE11E": [t: "⠫⠛⠉⠙#"]
 - "\uE11F": [t: "⠫⠇⠉⠍#"]
+- "\uE130": [t: "⠔"]
+- "\uE131": [t: "⠆"]
+- "\uE132": [t: "⠦"]
+- "\uE133": [t: "⠴"]
+- "\uE134": [t: "⠶"]
+- "\uE135": [t: "⠢"]
+- "\uE136": [t: "⠲"]
+- "\uE137": [t: "⠰⠔"]
+- "\uE138": [t: "⠖"]
+- "\uE139": [t: "⠤"]
+- "\uE13A": [t: "⠠⠢"]
+- "\uE13B": [t: "⠦⠶"]
 - "\ue020": [t: "⠚"]
 - "\ue021": [t: "⠁"]
 - "\ue022": [t: "⠃"]
@@ -170,11 +188,7 @@
 - "∧": [t: "⠀⠰⠢"]
 - "∨": [t: "⠀⠰⠔"]
 - "∩": [t: "⠀⠰⠲"]
-- "∪":
-  - test:
-      if: "following-sibling::*[1][self::m:mi]"
-      then: [t: "⠸⠜"]
-      else: [t: "⠀⠰⠴"]
+- "∪": [t: "⠀⠰⠴"]
 - "∫": [t: "⠮"]
 - "∬": [t: "⠮⠮"]
 - "∭": [t: "⠮⠮⠮"]

Rules/Languages/ru/SharedRules/calculus.yaml

@@ -4,13 +4,13 @@
   tag: laplacian
   match: "count(*) <= 1"   # can be on ∇^2 or on enclosing mrow
   replace:
-  - t: "лапласиан"      # phrase('laplacian' of x)  -- "LahPlahsian" sounds better with speech engines tested
+  - T: "лапласиан"      # phrase('laplacian' of x)  -- "LahPlahsian" sounds better with speech engines tested
   - test:
       if: "count(*) = 1"
       then:
       - test:
           if: "$Verbosity!='Terse'"
-          then: [t: "от"]             # phrase(function 'of' one variable) -- note OneCore voices spell out "div"
+          then: [T: "от"]             # phrase(function 'of' one variable) -- note OneCore voices spell out "div"
       - test:
           if: "not(IsNode(*[1], 'leaf'))"
           then: [pause: short]
@@ -22,11 +22,11 @@
   replace:
   - test:
       if: "$Verbosity='Terse'"
-      then: [t: "див"]             # phrase('div' is short for divergence)
-      else: [t: "дивергенция"]      # phrase('divergence of' this function from the mean)
+      then: [T: "див"]             # phrase('div' is short for divergence)
+      else: [T: "дивергенция"]      # phrase('divergence of' this function from the mean)
   - test:
       if: "$Verbosity!='Terse' and *[1][self::m:mi[contains('ABCDEFGHIJKLMNOPQRSTUVWXYZ', text())]]"
-      then: [t: "заглавной"]
+      then: [T: "заглавной"]
   - test:
       if: "not(IsNode(*[1], 'leaf'))"
       then: [pause: short]
@@ -39,10 +39,10 @@
   tag: curl
   match: "count(*) = 1"
   replace:
-  - t: "ротор"      # phrase(the 'curl of' a field)
+  - T: "ротор"      # phrase(the 'curl of' a field)
   - test:
       if: "$Verbosity!='Terse' and *[1][self::m:mi[contains('ABCDEFGHIJKLMNOPQRSTUVWXYZ', text())]]"
-      then: [t: "заглавной"]
+      then: [T: "заглавной"]
   - test:
       if: "not(IsNode(*[1], 'leaf'))"
       then: [pause: short]
@@ -57,11 +57,11 @@
   replace:
   - test:
       if: "$Verbosity!='Terse'"
-      then: [t: "градиент"]      # phrase(the hill has a 'gradient of' five percent)
-      else: [t: "набла"]      # phrase(the delete key is labeled 'del')
+      then: [T: "градиент"]      # phrase(the hill has a 'gradient of' five percent)
+      else: [T: "набла"]      # phrase(the delete key is labeled 'del')
   - test:
       if: "$Verbosity!='Terse' and *[1][self::m:mi[contains('ABCDEFGHIJKLMNOPQRSTUVWXYZ', text())]]"
-      then: [t: "заглавной"]
+      then: [T: "заглавной"]
   - test:
       if: "not(IsNode(*[1], 'leaf'))"
       then: [pause: short]

Rules/Languages/ru/SharedRules/default.yaml

@@ -680,6 +680,15 @@
   - x: "*[2]"
   - pause: short
 
+- name: power-indexed-by
+  tag: power-indexed-by
+  match: "."
+  replace:
+  - x: "*[1]"
+  - T: "нижний индекс"
+  - x: "*[2]"
+  - pause: short
+
 # otherwise let definitions/default infix handle it
 
 - name: literal

Rules/Languages/ru/SharedRules/general.yaml

@@ -343,6 +343,15 @@
   - pause: short
 
 
+# in terse mode, we just say "m" or "s", etc., not meters or seconds
+- name: unit-terse
+  tag: unit
+  # audit-ignore: spell text() is an operation, not untranslated speech text.
+  match: "$Verbosity = 'Terse' and string-length(.)=1"
+  replace:
+  - bookmark: "@id"
+  - spell: "text()"
+
 # the order of matching is
 # 1. does it match the base of an SI unit
 # 2. does it match an English unit (if in an English language)
@@ -421,6 +430,26 @@
           then: [x: "concat('\uF8FE', DefinitionValue($Word, 'Speech', 'PluralForms'))"]
           else: [x: "concat('\uF8FE', $Word)", ct: "с"]
 
+# need to reverse the order of speech: $ 3 -> 3 dollars
+- name: currency
+  tag: mrow
+  # audit-ignore: parity placeholder; ru definitions.yaml does not define
+  # CurrencySymbols yet, so enabling this would change runtime behavior.
+  match: "false()"
+  variables:
+    # If the amount is singular, we don't add the plural ending.
+  - IsSingular: "*[3][self::m:mn and .=1] and *[2]='\u2062'"
+  - CurrencyWord: "DefinitionValue(*[1], 'Speech', 'CurrencySymbols')"
+  replace:
+  - bookmark: "*[3]/@id"
+  - x: "*[3]"
+  - test:
+    - if: "$IsSingular"
+      then: [x: "$CurrencyWord"]
+    - else_if: "DefinitionValue($CurrencyWord, 'Speech', 'PluralForms') != ''"
+      then: [x: "DefinitionValue($CurrencyWord, 'Speech', 'PluralForms')"]
+      else: [x: "DefinitionValue(*[1], 'Speech', 'CurrencySymbols')"]
+
 - name: sin
   tag: mi
   match: ".='sin'"

Rules/Languages/ru/SharedRules/geometry.yaml

@@ -7,16 +7,16 @@
   - test:
       if: "$Verbosity='Verbose'"
       then:
-      - t: "линейный сегмент от"      # phrase('the line segment from' A to B)
+      - T: "линейный сегмент от"      # phrase('the line segment from' A to B)
       - x: "*[1]"
-      - t: "до"                         # phrase(the line segment from A 'to' B)
+      - T: "до"                         # phrase(the line segment from A 'to' B)
       - x: "*[2]"
       else:
-      - t: "отрезок"               # phrase(the 'line segment' A  B)
+      - T: "отрезок"               # phrase(the 'line segment' A  B)
       - x: "translate(*[1], 'ABCDEFGHIJKLMNOPQRSTUVWXYZ', 'abcdefghijklmnopqrstuvwxyz')"
-      - t: "большое"
+      - T: "большое"
       - x: "translate(*[2], 'ABCDEFGHIJKLMNOPQRSTUVWXYZ', 'abcdefghijklmnopqrstuvwxyz')"
-      - t: "большое"
+      - T: "большое"
 
 - name: geometry-ray
   tag: ray
@@ -25,29 +25,29 @@
   - test:
       if: "$Verbosity='Verbose'"
       then:
-      - t: "луч от "             # phrase('the ray from' A to B)
+      - T: "луч от "             # phrase('the ray from' A to B)
       - x: "*[1]"
-      - t: "до"                       # phrase(the ray from A 'to' B)
+      - T: "до"                       # phrase(the ray from A 'to' B)
       - x: "*[2]"
       else:
-      - t: "луч"                      # phrase(the 'ray'A  B)
+      - T: "луч"                      # phrase(the 'ray'A  B)
       - x: "translate(*[1], 'ABCDEFGHIJKLMNOPQRSTUVWXYZ', 'abcdefghijklmnopqrstuvwxyz')"
-      - t: "большое"
+      - T: "большое"
       - x: "translate(*[2], 'ABCDEFGHIJKLMNOPQRSTUVWXYZ', 'abcdefghijklmnopqrstuvwxyz')"
-      - t: "большое"
+      - T: "большое"
 
 - name: geometry-arc
   tag: arc
   match: "count(*)=2"
   replace:
   - test:
       if: "$Verbosity='Verbose'"
-      then: [t: "а"]            # phrase('the' arc A B C)
-  - t: "дуга"                        # phrase(the 'arc' A B C)
+      then: [T: "а"]            # phrase('the' arc A B C)
+  - T: "дуга"                        # phrase(the 'arc' A B C)
   - x: "translate(*[1], 'ABCDEFGHIJKLMNOPQRSTUVWXYZ', 'abcdefghijklmnopqrstuvwxyz')"
-  - t: "большое"
+  - T: "большое"
   - x: "translate(*[2], 'ABCDEFGHIJKLMNOPQRSTUVWXYZ', 'abcdefghijklmnopqrstuvwxyz')"
-  - t: "большое"
+  - T: "большое"
 
 - name: measure-of-angle
   tag: measure-of-angle
@@ -56,9 +56,9 @@
   - test:
       if: "$Verbosity='Verbose'"
       then:
-      - t: "мера угла"      # phrase('the measure of the angle' ABC)
+      - T: "мера угла"      # phrase('the measure of the angle' ABC)
       else:
-      - t: "мера угла"      # phrase('measure of angle' ABC)
+      - T: "мера угла"      # phrase('measure of angle' ABC)
   - x: "*[1]"
   - x: "*[2]"
   - x: "*[3]"
@@ -70,16 +70,16 @@
   replace:
   - test:
       if: "$Verbosity='Verbose'"
-      then: [t: "а"]      # phrase('the' point at 1, 2)
-  - t: "точка"      # phrase(the 'point' at 1, 2)
+      then: [T: "а"]      # phrase('the' point at 1, 2)
+  - T: "точка"      # phrase(the 'point' at 1, 2)
   - test:
       if: "$Verbosity='Verbose'"
-      then: [t: "в"]      # phrase('the' point at 1, 2)
+      then: [T: "в"]      # phrase('the' point at 1, 2)
   - pause: short
   - insert:
       nodes: "*"
-      replace: [t: "запятая", pause: auto]      # phrase(f of x 'comma' y)
+      replace: [T: "запятая", pause: auto]      # phrase(f of x 'comma' y)
   - pause: short
   - test:
       if: "($SpeechStyle='ClearSpeak' and $Verbosity='Verbose') or not(IsNode(*[last()],'leaf'))"
-      then: [t: "конечная точка"]      # phrase(start point, 'end point')
+      then: [T: "конечная точка"]      # phrase(start point, 'end point')

Rules/Languages/ru/SharedRules/linear-algebra.yaml

@@ -7,16 +7,16 @@
   - test:
       if: "$Verbosity='Verbose'"
       then:
-      - t: "а"      # phrase('the' square root of 25 equals 5)
-  - t: "определяющий"      # phrase(the 'determinant' of a matrix)
+      - T: "а"      # phrase('the' square root of 25 equals 5)
+  - T: "определяющий"      # phrase(the 'determinant' of a matrix)
   - test:
       if: "$Verbosity!='Terse'"
       then:
-      - t: "из"      # phrase(systems 'of' linear equations)
+      - T: "из"      # phrase(systems 'of' linear equations)
   - x: "*[1]"
   - test:
       if: "not(IsNode(*[1], 'simple')) and $Impairment = 'Blindness'"
-      then: [t: "конец определителя"]      # phrase('end determinant' of a matrix)
+      then: [T: "конец определителя"]      # phrase('end determinant' of a matrix)
 
 
 - name: subscripted-norm
@@ -26,11 +26,11 @@
   - test:
       if: "$Verbosity='Verbose'"
       then:
-      - t: "а"      # phrase('the' square root of 25 equals 5)
+      - T: "а"      # phrase('the' square root of 25 equals 5)
   - x: "*[2]"
-  - t: "норма"      # phrase(the 'norm' can be a measure of distance)
+  - T: "норма"      # phrase(the 'norm' can be a measure of distance)
   - test:
       if: "$Verbosity!='Terse'"
       then:
-      - t: "из"      # phrase(systems 'of' linear equations)
+      - T: "из"      # phrase(systems 'of' linear equations)
   - x: "*[1]"