update to latest build

c-example/Rules/Braille/UEB/UEB_Rules.yaml

@@ -274,7 +274,7 @@
 -
    name: single-char-exceptions    # GTM 12
    tag: [mover, munder]
-   match: "*[2][string-length(.) = 1 and ( translate(., '_¯→.˙~^','')='' or (parent::m:mover and text()='⌒') )]"
+   match: "*[2][string-length(.) = 1 and ( translate(., '_¯→.˙~^','')='' or (self::m:mover and text()='⌒') )]"
    replace: 
    - test:
       # omit grouping indicators in the following cases

c-example/Rules/Braille/UEB/unicode.yaml

@@ -21,6 +21,7 @@
  - "<": [t: "⠈⠣"]               # 0x003C (Less than)
  - "≤": [t: "⠸⠈⠣"]              # 0x2264 (Less than or equal to)
  - ">": [t: "⠈⠜"]               # 0x003E (Greater than)
+ - "≣": [t: "⠸⠠⠤"]              # 0x2263
  - "≥": [t: "⠸⠈⠜"]              # 0x2265 (Greater than or equal to)
  - "≪": [t: "⠨⠈⠣"]              # 0x226A (Much less than)
  - "≫": [t: "⠨⠈⠜"]              # 0x226B (Much greater than)
@@ -51,6 +52,7 @@
  - "⊳": [t: "⠈⠸⠜"]             # 0x22B3 (Contains as normal subgroup)
  - "⊴": [t: "⠸⠸⠣"]             # 0x22B4 (Normal subgroup of or equal)
  - "⊵": [t: "⠸⠸⠜"]             # 0x22B5 (Contains as normal subgroup or equal)
+ - "⊻": [t: "⠈⠖⠠⠱."]           # 0x22bb (Xor)
  - "⋬": [t: "⠨⠸⠣"]             # 0x22EC (not normal subgroup) -- this isn't the same as what is in GTM 10, but that similar has no Unicode equiv
  - "⋭": [t: "⠨⠸⠣"]             # 0x22ED (does not contain as normal subgroup) -- this isn't the same as what is in GTM 10, but that similar has no Unicode equiv
  - "⊢": [t: "⠸⠒"]               # 0x22a2 (Right tack)

c-example/Rules/Braille/Vietnam/Vietnam_Rules.yaml

@@ -49,8 +49,13 @@
    replace: 
    - T: "#"    # signal end of previous numeric mode
    - x: "*[1]"
-   - t: "N⠌"
-   - x: "*[2]"
+   - test:
+      if: "$Vietnam_UseDropNumbers='true'"
+      then:
+      - x: "BrailleChars(translate(*[2], '0123456789', '\ue000\ue001\ue002\ue003\ue004\ue005\ue006\ue007\ue008\ue009'), 'UEB')"   # drop numbers for the denominator
+      else:
+      - T: "N⠌"
+      - x: "*[2]"
 
 -
    name: simple-number
@@ -59,8 +64,13 @@
    replace: 
    - T: "#"    # signal end of any previous numeric mode (probably not needed, but...)
    - x: "*[1]"
-   - T: "N⠌"
-   - x: "*[2]"
+   - test:
+      if: "$Vietnam_UseDropNumbers='true'"
+      then:
+      - x: "BrailleChars(translate(*[2], '0123456789', '\ue000\ue001\ue002\ue003\ue004\ue005\ue006\ue007\ue008\ue009'), 'UEB')"   # drop numbers for the denominator
+      else:
+      - T: "N⠌"
+      - x: "*[2]"
 
 -
    name: default

c-example/Rules/Braille/Vietnam/unicode.yaml

@@ -61,7 +61,7 @@
  - "÷": [T: "⠐⠲"]               # 0x00F7 (Division sign (divided by))
  - "±": [T: "⠐⠖⠤"]               # 0x00B1 (Plus or minus)
  - "∓": [T: "⠐⠤⠖"]               # 0x2213 (Minus or plus)
- - "∗": [t: "⠐⠔"]               # 0x2217 (Asterisk operator)
+ - "∗": [t: "⠐⠦"]               # 0x2217 (Asterisk operator)
  - "∘": [t: "⠐⠴"]               # 0x2218 (Ring operator)
  - "◦": [t: "⠐⠴"]               # 0x25E6 (White bullet)
  - "∼": [t: "⠈⠔"]               # 0x223C (Tilde operator)
@@ -88,8 +88,8 @@
  - "#": [T: "⠼"]               # 0x23 (Number sign (hash))
  - "%": [T: "⠼⠚⠴"]                # 0x25 (Percent sign) No dots 46 before as in UEB
  - "&": [t: "⠈⠯"]               # 0x26 (Ampersand)
- - "*": [T: "⠐⠔"]               # 0x002A (Asterisk)
- - "/": [T: "⠌"]               # 0x002F (Solidus (slash))
+ - "*": [T: "⠐⠦"]               # 0x002A (Asterisk)
+ - "/": [T: "⠐⠌"]               # 0x002F (Solidus (slash))
  - ";": [t: "c⠆"]               # 0x003B (Semicolon)
  - "?": [T: "c⠢"]               # 0x003F (Question mark)
  - "@": [T: "⠈⠁"]               # 0x0040 (Commercial at sign)
@@ -222,8 +222,8 @@
  - "≝": [t: "⠣⠙⠑⠋⠜⠻⠐⠶"]        # 0x225D (Equal to by definition)
  - "⊕": [t: "⠫⠿⠪⠐⠖t"]          # 0x2295 (Circled plus)
  - "⊖": [t: "⠫⠿⠪⠐⠤t"]          # 0x2296 (Circled minus)
- - "⊗": [t: "⠫⠿⠪⠐⠦t"]          # 0x2297 (Circled times)
- - "⊛": [t: "⠫⠿⠪⠐⠔t"]          # 0x229B (Circled asterisk operator)
+ - "⊗": [t: "⠐⠦t"]          # 0x2297 (Circled times)
+ - "⊛": [t: "⠐⠦t"]          # 0x229B (Circled asterisk operator)
  - "⊞": [t: "⠫⠼⠙⠪⠐⠖t"]         # 0x229E (Squared plus)
  - "⊟": [t: "⠫⠼⠙⠪⠐⠤t"]         # 0x229F (Squared minus)
  - "⊠": [t: "⠫⠼⠙⠪⠐⠦t"]         # 0x22A0 (Squared times)
@@ -323,6 +323,18 @@
  - "8": [t: "N⠓"]               # 0x38 
  - "9": [t: "N⠊"]               # 0x39 
 
+ # we stick the drop numbers into the private use area for consistency
+ - "\ue000": [t: "N⠴"]               # 0 
+ - "\ue001": [t: "N⠂"]               # 1 
+ - "\ue002": [t: "N⠆"]               # 2 
+ - "\ue003": [t: "N⠒"]               # 3 
+ - "\ue004": [t: "N⠲"]               # 4 
+ - "\ue005": [t: "N⠢"]               # 5 
+ - "\ue006": [t: "N⠖"]               # 6 
+ - "\ue007": [t: "N⠶"]               # 7 
+ - "\ue008": [t: "N⠦"]               # 8 
+ - "\ue009": [t: "N⠔"]               # 9 
+
  - "a": [t: "L⠁"]               # 0x61 
  - "b": [t: "L⠃"]               # 0x62 
  - "c": [t: "L⠉"]               # 0x63 
@@ -1533,4 +1545,6 @@
 # Not yet defined symbols
  - "⋮": [T: "⠣⠴⠜"]          # 0x22ee (vertical ellipsis used to indicate dividable)
  #- "⧸⋮": [T: "⠣⠼⠜"]          # 0x29f8\x22ee (for not dividable sign, not sure if MathCAT supporting multiple-char definition or not
+ - "∕": [T: "⠐⠌"]
+ - "⊘": [T: "⠐⠌"]
 

c-example/Rules/Intent/general.yaml

@@ -268,7 +268,7 @@
 -
   name: bigop
   tag: [msub, munder]
-  match: "IsInDefinition(*[1], 'LargeOperators') or contains(@data-intent-property, ':largeop:')"
+  match: "IsLargeOp(*[1]) or contains(@data-intent-property, ':largeop:')"
   replace: 
   - intent:
       name: "large-op"    # Fix: the name in the spreadsheet needs updating/fixing
@@ -494,7 +494,7 @@
   - "*[2][self::m:mrow][count(*)=2] and"                        # exponent is an mrow with children...
   - "*[2]/*[1][self::m:mo][text()='-'] and"                     #   '-'
   - "*[2]/*[2][self::m:mn][text()=1] and"                       #  and '1'
-  - "*[1][self::m:mi] and IsInDefinition(*[1], 'TrigFunctionNames') and"        # base is a trig function name (e.g, sin, sinh)
+  - "*[1][self::m:mi] and IsNode(*[1], 'trig_name') and"        # base is a trig function name (e.g, sin, sinh)
   - "following-sibling::*[1][self::m:mo][text()='\u2061']"      # and msup is followed by invisible function apply
   replace:
   - intent:
@@ -506,7 +506,7 @@
 -
   name: bigop
   tag: [msubsup, munderover]
-  match: "IsInDefinition(*[1], 'LargeOperators') or contains(@data-intent-property, ':largeop:')"
+  match: "IsLargeOp(*[1]) or contains(@data-intent-property, ':largeop:')"
   replace: 
   - intent:
       name: "large-op"    # Fix: the name in the spreadsheet needs updating/fixing

c-example/Rules/Languages/en/ClearSpeak_Rules.yaml

@@ -686,7 +686,7 @@
   tag: mo
   match:
   - "text()='⁡' and $ClearSpeak_Functions = 'None' and"
-  - "not(preceding-sibling::*[1][IsInDefinition(., 'TrigFunctionNames')])" # Functions=None does not apply to "trig" functions
+  - not(preceding-sibling::*[1][IsNode(., 'trig_name')]) # Functions=None does not apply to "trig" functions
   replace:
     test:
       if: "$ClearSpeak_ImpliedTimes = 'None'"

c-example/Rules/Languages/en/SharedRules/general.yaml

@@ -236,7 +236,7 @@
 
 - name: largeop
   tag: mrow
-  match: "count(*)=2 and IsInDefinition(*[1], 'LargeOperators')"
+  match: "count(*)=2 and IsLargeOp(*[1])"
   replace:
   - test:
       if: "$Verbosity!='Terse'"

c-example/Rules/Languages/id/ClearSpeak_Rules.yaml

@@ -704,7 +704,7 @@
   tag: mo
   match:
   - "text()='⁡' and $ClearSpeak_Functions = 'None' and"
-  - "not(preceding-sibling::*[1][IsInDefinition(., 'TrigFunctionNames')])" # Functions=None does not apply to "trig" functions
+  - not(preceding-sibling::*[1][IsNode(., 'trig_name')]) # Functions=None does not apply to "trig" functions
   replace:
     test:
       if: "$ClearSpeak_ImpliedTimes = 'None'"

c-example/Rules/Languages/id/SharedRules/general.yaml

@@ -233,7 +233,7 @@
 
 - name: largeop
   tag: mrow
-  match: "count(*)=2 and IsInDefinition(*[1], 'LargeOperators')"
+  match: "count(*)=2 and IsLargeOp(*[1])"
   replace:
   - test:
       if: "$Verbosity!='Terse'"

c-example/Rules/Languages/vi/ClearSpeak_Rules.yaml

@@ -618,19 +618,19 @@
       if: "$log_is_simple"
       then_test:
       - if: "*[1][text()='log']"
-        then: [{T: logarit}]
+        then: [{T: lóc}]
       - else_if: $ClearSpeak_Log = 'LnAsNaturalLog'
-        then: [{T: logarit tự nhiên}]
-        else: [{SPELL: "'ln'"}] # t:  -- needs translation?
+        then: [{T: lóc nơ be}]
+        else: [{T: "lóc nơ be"}] # t:  -- needs translation?
       else:
       #    if: "$Verbosity!='Terse' and not(log_is_simple)"
       #   then: {T: the}
       - test:
         - if: "*[1][text()='log']"
-          then: [{T: logarit}]
+          then: [{T: lóc}]
         - else_if: $ClearSpeak_Log = 'LnAsNaturalLog'
-          then: [{T: logarit tự nhiên}]
-          else: [{SPELL: "'ln'"}] # t:  -- needs translation?
+          then: [{T: lóc nơ be}]
+          else: [{T: "lóc nơ be"}] # t:  -- needs translation?
       - T: của
       - pause: short
   - x: "*[3]"
@@ -700,7 +700,7 @@
   tag: mo
   match:
   - "text()='⁡' and $ClearSpeak_Functions = 'None' and"
-  - "not(preceding-sibling::*[1][IsInDefinition(., 'TrigFunctionNames')])" # Functions=None does not apply to "trig" functions
+  - not(preceding-sibling::*[1][IsNode(., 'trig_name')]) # Functions=None does not apply to "trig" functions
   replace:
     test:
       if: "$ClearSpeak_ImpliedTimes = 'None'"
@@ -736,7 +736,7 @@
   - "    IsBracketed(., '(', ')') or IsBracketed(., '[(]', ']') or IsBracketed(., '|', '|')]" # followed by parens
   - " )"
   replace:
-  - T: lần
+  - T: nhân
 
 - name: no-say-parens
   tag: mrow

c-example/Rules/Languages/vi/SharedRules/default.yaml

@@ -79,7 +79,7 @@
   - x: "*[2]"
   - test:
       if: "$Verbosity!='Terse' or not(*[2][self::m:mn])" # just say "x 1" for terse vs "x sub 1"
-      then: [{T: "dưới"}]
+      then: [{T: " "}]
 
 - name: default
   tag: particular-value-of
@@ -96,7 +96,7 @@
   match: "."
   replace:
   - x: "*[1]"
-  - T: chỉ số dưới là
+  #- T: chỉ số dưới là
   - x: "*[2]"
   - T: "mũ"
   - x: "*[3]"
@@ -108,37 +108,37 @@
   replace:
   - test:
       if: "not(IsNode(*[1], 'leaf'))"
-      then: [{T: "cho"}]
+      then: [{T: " "}]
   - x: "*[1]"
-  - T: "với"
-  - x: "*[2]"
-  - T: bên dưới
+  #- T: "với"
+  #- x: "*[2]"
+  - T: đáy
 
 - name: default
   tag: mover
   match: "."
   replace:
   - test:
       if: "not(IsNode(*[1], 'leaf'))"
-      then: [{T: "cho"}]
+      then: [{T: " "}]
   - x: "*[1]"
-  - T: "với"
-  - x: "*[2]"
-  - T: "bên trên"
+  #- T: "với"
+  #- x: "*[2]"
+  - T: "ngang"
 
 - name: default
   tag: munderover
   match: "."
   replace:
   - test:
       if: "not(IsNode(*[1], 'leaf'))"
-      then: [{T: "cho"}]
+      then: [{T: " "}]
   - x: "*[1]"
-  - T: "với"
-  - x: "*[2]"
-  - T: "bên dưới và"
+  #- T: "với"
+  #- x: "*[2]"
+  - T: "đáy và"
   - x: "*[3]"
-  - T: "bên trên"
+  - T: "ngang"
 - name: default
   #   Here we support up to 2 prescripts and up to 4 postscripts -- that should cover all reasonable cases
   #   If there are more, we just dump them out without regard to sup/super :-(