Div. changes

GetBracketingIntentName to SpeakBracketingIntentName in default. Then NVDA works, but some tests fail.

Smaller changes in unicode-full.

Some changes for speaking log and ln in ClearSpeak.

Author: MartheGjelstad

Rules/Languages/nb/ClearSpeak_Rules.yaml

@@ -205,7 +205,7 @@
   - pause: medium
   - T: "og nevner"      # phrase(the fraction with numerator 5 'and denominator' 8)
   - x: "*[2]"
-  - pause: long
+  - pause: medium
   - test:
       if: "$ClearSpeak_Fractions='EndFrac' or $ClearSpeak_Fractions='GeneralEndFrac'"
       then:
@@ -567,12 +567,12 @@
       if: "$log_is_simple"
       then_test:
       - if: "*[1][.='log']"
-        then: [{T: "log"}]      # phrase(the 'log' of x)
+        then: [{T: "log av"}]      # phrase(the 'log' of x)
       - else_if: "*[1][.='lg']"
-        then: [{spell: "'lg'"}]      # phrase(the 'lg' of x)
-      - else_if: $ClearSpeak_Log = 'LnAsNaturalLog'
-        then: [{T: "den naturlige logaritmen"}]      # phrase(the 'natural log' of the product of 2 numbers)
-        else: [{spell: "'ln'"}]
+        then: [{spell: "'lg'"}, {T: "av"}]      # phrase(the 'lg' of x)
+      - else_if: $ClearSpeak_Log = 'LnAsNaturalLog' or $Verbosity='Verbose'
+        then: [{T: "den naturlige logaritmen av"}]      # phrase(the 'natural log' of the product of 2 numbers)
+        else: [{spell: "'ln'"}, {T: "av"}]
       else:
       - test:
         - if: "*[1][.='log']"

Rules/Languages/nb/SharedRules/default.yaml

@@ -648,7 +648,7 @@
   - x: "*"
   - test:
       if: "not( IsBracketed(., '', '') or IsNode(*[last()], 'simple') )"
-      then: [x: "GetBracketingIntentName(name(.), $Verbosity, 'prefix', 'end')"]
+      then: [x: "SpeakBracketingIntentName(name(.), $Verbosity, 'prefix', 'end')"]
   - test:
       if: "IsNode(., '2D')"
       then: [pause: short]
@@ -661,19 +661,18 @@
   replace:
   - test:
       if: "$Impairment = 'Blindness' and not( IsBracketed(., '', '') or IsNode(*[1], 'simple') )"
-      then: [x: "GetBracketingIntentName(name(.), $Verbosity, 'postfix', 'start')"]
+      then: [x: "SpeakBracketingIntentName(name(.), $Verbosity, 'postfix', 'start')"]
   - x: "*"
   - x: "SpeakIntentName(name(.), $Verbosity, 'postfix')"
 
-
 - name: infix-intent
   # uncaught intent -- the args have been inserted in the order of speech 
   tag: "*"
   match: "count(*)>0 and contains(@data-intent-property, ':infix:')"
   replace:
   - test:
       if: "$Impairment = 'Blindness' and not( IsBracketed(., '', '') or IsNode(*[1], 'simple') )"
-      then: [x: "GetBracketingIntentName(name(.), $Verbosity, 'infix', 'start')"]
+      then: [x: "SpeakBracketingIntentName(name(.), $Verbosity, 'infix', 'start')"]
   - test:
       if: "count(*) = 1"  # in cases such as continued-row, plus/minus might have just one child
       then:
@@ -686,13 +685,12 @@
           replace: [x: "SpeakIntentName(name(.), $Verbosity, 'infix')", pause: auto]
   - test:
       if: "$Impairment = 'Blindness' and not( IsBracketed(., '', '') or IsNode(*[last()], 'simple') )"
-      then: [x: "GetBracketingIntentName(name(.), $Verbosity, 'infix', 'end')"]
+      then: [x: "SpeakBracketingIntentName(name(.), $Verbosity, 'infix', 'end')"]
   - test:
       if: "IsNode(., '2D')"   # add (probably) a slightly longer pause if this came from a 2D node
       then: [pause: short]
       else: [pause: auto]
 
-
 - name: function-intent
   # uncaught intent -- speak as foo of arg1 comma arg2 .... The MathML spec requires arguments to functions
   tag: "*"
@@ -712,7 +710,7 @@
       # SWEDISH: After correspondence with a mathematician we have decided to not have any punctuation between variables, but a short pause. Length of pause needs to be tested.
   - test:
       if: "$Impairment = 'Blindness' and not(*[last()][IsBracketed(., '', '') or IsNode(., 'simple')] )"
-      then: [x: "GetBracketingIntentName(name(.), $Verbosity, 'function', 'end')"]
+      then: [x: "SpeakBracketingIntentName(name(.), $Verbosity, 'function', 'end')"]
   - test:
       if: "IsNode(., '2D')"
       then: [pause: short]

Rules/Languages/nb/SharedRules/general.yaml

@@ -462,7 +462,7 @@
   - test:
       if: "$Verbosity='Terse'"
       then: [T: "exp"]      # phrase('exp' means exponential function)
-      else: [T: "eksponentialfunksjonen"]      # phrase('exponential' function)
+      else: [T: "eksponensialfunksjonen"]      # phrase('exponential' function)  #Norwegian: Spelled wrong for correct pronunciation
 
 # NORWEGIAN: Added this rule from English version, but removed test for Verbosity.    
 - name: covariance

Rules/Languages/nb/SimpleSpeak_Rules.yaml

@@ -268,13 +268,12 @@
   - "    self::m:square-root or self::m:msqrt or self::m:root or self::m:mroot or"
   - "    (self::m:msub or self::m:msubsup or"
   - "    ((self::m:msup or self::m:power) and not(IsNode(*[1], 'leaf') and *[2][self::m:mn and (.=2 or '.=3')]))) and " # followed by msup, etc.
-  - "       (*[1][self::m:mrow[IsBracketed(., '(', ')') or IsBracketed(., '[', ']') or IsBracketed(., '|', '|')] or "
-  - "            self::m:matrix or self::m:determinant] or" # base has parens
-  - "        not(IsNode(*[2], 'simple')) or "
-  - "        (self::m:msubsup and not(IsNode(*[3], 'simple')))"
-  - "    )"
-  - "  ]"
-  # other possibility is the preceding element has parens (but not the following)
+  - "     (*[1][self::m:mrow[IsBracketed(., '(', ')') or IsBracketed(., '[', ']') or IsBracketed(., '|', '|')] or "
+  - "           self::m:matrix or self::m:determinant] or" # base has parens
+  - "      not(IsNode(*[2], 'simple')) or "
+  - "      (self::m:msubsup and not(IsNode(*[3], 'simple')))"
+  - "     )"
+  - "  ]"  # other possibility is the preceding element has parens (but not the following)
   - " or "
   - "  preceding-sibling::*[1]["
   - "    IsBracketed(., '(', ')') or IsBracketed(., '[', ']') or IsBracketed(., '|', '|')]" # followed by parens