Div. changes

ClearSpeak: Minor clean-ups
Deafault: Minor clean-ups
General: Minor clean-ups.
Linear-algebra: Minor clean-ups
SimpleSpeak: Added short pause in the default-root-rule.
Unicode-full: Splitted some units with prefix for better pronunciation.
Unicode: Added condition in the rule for 0xB7. Now it doesn't speak "tom tom" for the test continued_row in multiline.

Author: MartheGjelstad

Rules/Languages/nb/ClearSpeak_Rules.yaml

@@ -61,13 +61,13 @@
         then: [T: "kvadratroten"]      # phrase(5 is the 'square root' of 25)
       - else_if: "*[2][.='3']"
         then: [T: "kubikkroten"]        # phrase(5 is the 'cube root' of 625)
-      - else_if: "*[2][not(contains(., ','))]"   # SWEDISH: Changed decimal point to comma.
+      - else_if: "*[2][not(contains(., ','))]"   # SWEDISH/NORWEGIAN: Changed decimal point to comma.
         then: [x: "ToOrdinal(*[2])", T: "roten"]      # phrase(the square 'root' of 25)
       else:
       - T: "roten av grad"      # phrase(the square 'root' of 36)
       - x: "*[2]"
       - pause: short
-  # SWEDISH: Removed verbosity settings.
+  # SWEDISH/NORWEGIAN: Removed verbosity settings.
   - T: "av"      # phrase(the square root 'of' 36)
   - x: "*[1]"
   - test:
@@ -450,7 +450,6 @@
   - EndToSay: "IfThenElse($ClearSpeak_AbsoluteValue = 'Cardinality', 'kardinalitet', 'absoluttverdi')"
   replace:
   - x: "$WordToSay"
-  #- T: "av"      # phrase(the absolute value 'of' 25)
   - x: "*[1]"
   - test:
       if: "$ClearSpeak_AbsoluteValue = 'AbsEnd'"
@@ -495,19 +494,15 @@
 #  # note that *[2] is an mrow with X, ",", Y, so getting X or Y is a double index
     # onto the [not] [including]... part
 
- # SWEDISH: rewrote the intervals function to better deal with Swedish convention of speaking intervals
- # NORWEGIAN: Removed test for verbosity, cause you should always say "det åpne"
+ # SWEDISH/NORWEGIAN: rewrote the intervals function to better deal with Swedish convention of speaking intervals
+ # NORWEGIAN: Removed test for verbosity, cause you should always say "det åpne" etc.
 - name: ClearSpeak-intervals # avoid overriding with default "intervals" name
   variables:
   - is_intervals_start_infinity: "*[1][self::m:minus and count(*)=1 and *[1][.='∞']]"
   - is_intervals_end_infinity: "*[2][.='∞'or (self::m:plus and count(*)=1 and *[1][.='∞'])]"
   tag: [open-interval, open-closed-interval, closed-interval, closed-open-interval]
   match: "."
   replace:
-  #- test:
-    #- if: "$Verbosity!='Terse'"
-      #then:
-      #- T: "det"
   - test:
     - if: "name(.)='open-interval'"
       then: [T: "det åpne"]
@@ -592,9 +587,7 @@
         - else_if: $ClearSpeak_Log = 'LnAsNaturalLog' or $Verbosity='Verbose'
           then: [T: "den naturlige logaritmen"]      # phrase(the 'natural log' of x)
           else: [spell: "'ln'"]
-      #- test:
-        #- if: "$Verbosity='Verbose'"
-          #then: [{T: "av"}]      # phrase(the natural log 'of' x)
+      #NORWEGIAN: Removed test for verbosity
       - T: "av"
       - pause: short
   - x: "*[3]"
@@ -649,7 +642,7 @@
               - if: "$LineCount > 1 and $ClearSpeak_MultiLineLabel != 'None'"
                 then: [T: "steg"]      # phrase(this is the first 'step' of three steps)
                 else: [T: "steg"]      # phrase(this is the first 'step' of three steps)
-          # SWEDISH: Every expression had to be inflected separately.
+          # SWEDISH/NORWEGIAN: Every expression had to be inflected separately.
       - pause: short
   - x: "*"
 

Rules/Languages/nb/SharedRules/default.yaml

@@ -127,14 +127,14 @@
       then: [T: "slutt rottegn"] # phrase("root of x 'end root symbol'")
 
 # not sure what really should be said for these since we should not assume they are square roots
+# NORWEGIAN: Changed to "med grad", and changed the order of the index and the variable/number in the root.
 - name: literal-default
   tag: mroot
   match: "."
   replace:
   - T: "rottegn"
   - T: "med grad"      # phrase("the root of x 'with index' 5")
   - x: "*[2]"
-  # SWEDISH: Check if the order of base and index is correct!
   - pause: short
   - test:
       if: "$Verbosity!='Terse'"
@@ -709,7 +709,7 @@
       # - test:
       #     if: "not(contains(@data-intent-property, ':literal:'))"
       #     then: [x: "','"]
-      # 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.
+      # SWEDISH/NORWEGIAN: 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')] )"

Rules/Languages/nb/SharedRules/general.yaml

@@ -13,7 +13,7 @@
   tag: number-sets
   match: "count(*)=2 and *[2][.='+' or .='-']"
   replace:
-  # SWEDISH: This test, to see if "the" is supposed to be added or not, is removed from the Swedish translations, as it is not applicable.
+  # NORWEGIAN: Removed test for verbosity
   #- test:
       #if: "$Verbosity!='Terse'"
       #then:
@@ -100,7 +100,7 @@
       if: "$Verbosity!='Terse'"
       then: [T: "evaluert i"]      # phrase(results were 'evaluated at' a given point)
       else: [T: "i"]
-  # SWEDISH: Added a verbosity setting test to allow a shorter form.
+  # SWEDISH/NORWEGIAN: Added a verbosity setting test to allow a shorter form.
   - pause: auto
   - x: "*[2]"
 
@@ -118,13 +118,9 @@
   - x: "*[3]"
   - pause: short
   - T: "og"      # phrase(this result is 'minus the same expression evaluated at' an earlier point)
-  # SWEDISH: Removed the expansion of the expression, keeping the output closer to what is actually shown visually.
-  - test:
-      if: "$Verbosity!='Terse'"
-      then: [T: "nedre verdi"]      # phrase(results were 'evaluated at' a given point)
-      else: [T: "nedre verdi"]
+  - T: "nedre verdi"
+  # SWEDISH/NORWEGIAN: Removed the expansion of the expression, keeping the output closer to what is actually shown visually.
   - pause: short
-  # SWEDISH: Added a verbosity setting test to allow a shorter form.
   - x: "*[2]"
 
 - name: permutation
@@ -136,12 +132,12 @@
   - T: "elementer av"      # phrase(the solution  involves several 'permutations of' values)
   - x: "*[1]"
 
-# NORWEGIAN: Removed test for Verbosity
+# NORWEGIAN: Removed test for verbosity
 - name: intervals
   tag: [open-interval, open-closed-interval, closed-interval, closed-open-interval]
   match: "count(*)=2"
   replace:
-  # SWEDISH: The translate function doesn't work for non-English. Used the solution below instead.
+  # SWEDISH/NORWEGIAN: The translate function doesn't work for non-English. Used the solution below instead.
   - test:
      - if: "self::m:open-interval"
        then: [T: "det åpne intervallet"]
@@ -339,7 +335,7 @@
       if: "$Verbosity='Terse'"
       then: [T: "sin"]        # phrase('sin' is the abbreviation for sine)
       else: [T: "sinus"]      # phrase(the 'sine' of the angle)
-      # SWEDISH: Added short form.
+      # SWEDISH/NORWEGIAN: Added short form.
 
 - name: cos
   tag: mi
@@ -391,7 +387,7 @@
       then: [T: "cotan"]          # phrase(find the 'cotangent' in a right-angle triangle)
       else: [T: "cotangens"]      # phrase(the 'cotangent' is the reciprocal of the tangent)
 
-# NORWEGIAN: Removed tests for Verbosity. We don't say "sin hype" and "sinh" sounds like "sin"
+# NORWEGIAN: Removed tests for verbosity. We don't say "sin hype" etc., and "sinh" sounds like "sin"
 - name: sinh
   tag: mi
   match: ".='sinh'"
@@ -469,17 +465,13 @@
       then: [T: "exp"]      # phrase('exp' means 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.    
+# NORWEGIAN: Added this rule from English version, but removed test for verbosity.    
 - name: covariance
   tag: mi
   match: ".='Cov'"
   replace:
   - bookmark: "@id"
   - T: "kovarians"
-  #- test:
-      #if: "$Verbosity='Terse'"
-      #then: [t: "Cov"]      # phrase('Cov' is shorthand for the covariance function)
-      #else: [t: "covariance"]      # phrase('covariance' function)
 
 - # handle both log and ln
   name: log
@@ -501,7 +493,7 @@
         - if: "$Verbosity!='Verbose'"
           then: [spell: "'lg'"]      # phrase(the 'lg' of x)
           else: [T: "tier-logaritmen"]
-      # SWEDISH: We have added the term "lg" for the logarithm with base 10. Also added a verbosity test for long and short form.
+      # SWEDISH/NORWEGIAN: We have added the term "lg" for the logarithm with base 10. Also added a verbosity test for long and short form.
       - else_if: "$Verbosity!='Verbose'"
         then: [spell: "'ln'"]
         else: [T: "den naturlige logaritmen"]      # phrase(the 'natural log' function is used in mathematics)
@@ -632,7 +624,7 @@
 
 
 # simpler reading methods for special case matrices
-# NORWEGIAN: Added these tests from the English version.
+# NORWEGIAN: Added these rules from the English.
 - name: zero-matrix
   tag: matrix
   # select all the non-zero entries -- if there are none of them, then it is a zero matrix
@@ -846,6 +838,7 @@
       if: "$Verbosity='Terse'"
       then: [pause: short]
 
+#NORWEGIAN: Added from English. Not tested
 - name: dimension-by
   tag: mrow
   match: dimension-product

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

@@ -1,29 +1,23 @@
 ---
-# NORWEGIAN: Removed test for Verbosity
 - name: scalar-determinant
   tag: determinant
   match: "count(*)=1 and not(*[1][self::m:mtr])"
   replace:
   - T: "determinanten"      # phrase(the 'determinant' of a matrix)
-  #- test:
-      #if: "$Verbosity!='Terse'"
-      #then:
+  # NORWEGIAN: Removed test for Verbosity
   - T: "til"      # phrase(systems 'of' linear equations)
   - x: "*[1]"
   - test:
       if: "not(IsNode(*[1], 'simple'))"
       then: [T: "slutt determinant"]      # phrase('end determinant' of a matrix)
 
-# NORWEGIAN: Removed test for Verbosity
 - name: subscripted-norm
   tag: subscripted-norm
   match: "count(*)=2"
   replace:
   - x: "*[2]"
   - T: "normen"      # phrase(the 'norm' can be a measure of distance)
-  #- test:
-      #if: "$Verbosity!='Terse'"
-      #then:
+  # NORWEGIAN: Removed test for Verbosity
   - T: "til"      # phrase(systems 'of' linear equations)
   - x: "*[1]"
 

Rules/Languages/nb/SimpleSpeak_Rules.yaml

@@ -14,22 +14,17 @@
   - T: "minus"        # phrase(x 'minus' y)
   - x: "translate(text(), '-_', '')"
 
-# NORWEGIAN: Removed test for Verbosity
 - name: default
   tag: square-root
   match: "."
   replace:
   - T: "kvadratroten av"      # phrase(the 'square root' of x)
-  #- test:
-      #if: "$Verbosity!='Terse'"
-      #then: {T: "av"}   # phrase(the square root 'of' x)
-      #else: {pause: short}
-  #- pause: short
+  # NORWEGIAN: Removed test for Verbosity
   - x: "*[1]"
   - test:
       if: IsNode(*[1], 'leaf')
       then: [pause: short]
-      else: [{pause: short}, {T: "slutt rot"}, {pause: short}]  # phrase(start the square root of x 'end of root')
+      else: [pause: short, T: "slutt rot", pause: short]  # phrase(start the square root of x 'end of root')
 
 - name: default
   tag: root
@@ -53,7 +48,7 @@
   - test:
       if: IsNode(*[1], 'leaf')
       then: [pause: short]
-      else: [T: "slutt rot", pause: short]      # phrase(start the fifth root of x 'end of root')
+      else: [pause: short, T: "slutt rot", pause: short]      # phrase(start the fifth root of x 'end of root')
 
 # Fraction rules
 # Mixed numbers mostly "just work" because the invisible char reads as "and" and other parts read properly on their own