Merge pull request #664 from Speech-Rule-Engine/2d_fractions

2d fractions
Speech-Rule-Engine · Jun 27, 2022 · c40b190 · c40b190
2 parents d3f748e + 43bb2e6
commit c40b190
Show file tree

Hide file tree

Showing 7 changed files with 44 additions and 17 deletions.
diff --git a/mathmaps/nemeth/messages/messages.json b/mathmaps/nemeth/messages/messages.json
@@ -164,7 +164,9 @@
       "DECIMAL_MARK": ".",
       "DIGIT_GROUP": ",",
       "JOINER_SUBSUPER": "",
-      "JOINER_FRAC": ""
+      "JOINER_FRAC": "",
+      "SPACE": "⠀",
+      "HYPER": "3"
     },
     "unitTimes": ""
   }

diff --git a/mathmaps/nemeth/rules/nemeth.json b/mathmaps/nemeth/rules/nemeth.json
@@ -324,6 +324,19 @@
       "@role=\"prime\"",
       "count(children/*)=4"
     ],
+    [
+      "Precondition",
+      "hyperfraction",
+      "default",
+      "self::fraction",
+      "CQFhyperFraction"
+    ],
+    [
+      "Alias",
+      "hyperfraction",
+      "self::fraction",
+      "contains(@grammar, \"hyperfraction\")"
+    ],
     [
       "Precondition",
       "fraction",

diff --git a/mathmaps/nemeth/rules/nemeth_actions.json b/mathmaps/nemeth/rules/nemeth_actions.json
@@ -204,10 +204,15 @@
       "quadruple-prime",
       "[t] \"⠄⠄⠄⠄\""
     ],
+    [
+      "Action",
+      "hyperfraction",
+      "[p] (layout:beginfraction); [t] CSFopenFraction; [n] children/*[1] (layout:numerator, grammar:hyperfraction); [t] CSFoverFraction; [n] children/*[2] (layout:denominator, grammar:hyperfraction); [t] CSFcloseFraction; [p] (layout:endfraction)"
+    ],
     [
       "Action",
       "fraction",
-      "[p] (layout:beginfraction); [t] CSFopenFraction; [n] children/*[1] (layout:numerator); [t] CSFoverFraction; [n] children/*[2] (layout:denominator); [t] CSFcloseFraction; [p] (layout:endfraction)"
+      "[t] CSFopenFraction; [n] children/*[1]; [t] CSFoverFraction; [n] children/*[2]; [t] CSFcloseFraction"
     ],
     [
       "Action",

diff --git a/mathmaps/nemeth/symbols/math_symbols.json b/mathmaps/nemeth/symbols/math_symbols.json
@@ -2339,7 +2339,7 @@
     "category": "Sm",
     "mappings": {
       "default": {
-        "default": "⠨⠨⠐"
+        "default": "⠨⠨⠂"
       }
     },
     "key": "227B"
@@ -2357,7 +2357,7 @@
     "category": "Sm",
     "mappings": {
       "default": {
-        "default": "⠨⠨⠐⠱"
+        "default": "⠨⠨⠂⠱"
       }
     },
     "key": "227D"
@@ -2375,7 +2375,7 @@
     "category": "Sm",
     "mappings": {
       "default": {
-        "default": "⠨⠨⠐⠈⠱"
+        "default": "⠨⠨⠂⠈⠱"
       }
     },
     "key": "227F"
@@ -2393,7 +2393,7 @@
     "category": "Sm",
     "mappings": {
       "default": {
-        "default": "⠌⠨⠐⠅"
+        "default": "⠌⠨⠂⠅"
       }
     },
     "key": "2281"
@@ -6227,7 +6227,7 @@
     "category": "Sm",
     "mappings": {
       "default": {
-        "default": "⠨⠨⠐⠱"
+        "default": "⠨⠨⠂⠱"
       }
     },
     "key": "2AB0"
@@ -6245,7 +6245,7 @@
     "category": "Sm",
     "mappings": {
       "default": {
-        "default": "⠨⠨⠐⠌⠱"
+        "default": "⠨⠨⠂⠌⠱"
       }
     },
     "key": "2AB2"
@@ -6263,7 +6263,7 @@
     "category": "Sm",
     "mappings": {
       "default": {
-        "default": "⠨⠨⠐⠨⠅"
+        "default": "⠨⠨⠂⠨⠅"
       }
     },
     "key": "2AB4"
@@ -6281,7 +6281,7 @@
     "category": "Sm",
     "mappings": {
       "default": {
-        "default": "⠨⠨⠐⠌⠨⠅"
+        "default": "⠨⠨⠂⠌⠨⠅"
       }
     },
     "key": "2AB6"
@@ -6299,7 +6299,7 @@
     "category": "Sm",
     "mappings": {
       "default": {
-        "default": "⠨⠨⠐⠈⠱⠈⠱"
+        "default": "⠨⠨⠂⠈⠱⠈⠱"
       }
     },
     "key": "2AB8"
@@ -6317,7 +6317,7 @@
     "category": "Sm",
     "mappings": {
       "default": {
-        "default": "⠨⠨⠐⠌⠈⠱⠈⠱"
+        "default": "⠨⠨⠂⠌⠈⠱⠈⠱"
       }
     },
     "key": "2ABA"
@@ -6335,7 +6335,7 @@
     "category": "Sm",
     "mappings": {
       "default": {
-        "default": "⠨⠨⠐⠈⠨⠨⠐⠻"
+        "default": "⠨⠨⠂⠈⠨⠨⠂⠻"
       }
     },
     "key": "2ABC"

diff --git a/sre-tests b/sre-tests
diff --git a/ts/speech_rules/nemeth_util.ts b/ts/speech_rules/nemeth_util.ts
@@ -88,6 +88,12 @@ export function overBevelledFraction(node: Element): string {
   );
 }
 
+export function hyperFractionBoundary(node: Element): Element[] {
+  return LOCALE.MESSAGES.regexp.HYPER ===
+    MathspeakUtil.fractionNestingDepth(node).toString() ? [node] : [];
+}
+
+
 /**
  * Nested Braille radicals in Nemeth putting together the nesting counter with
  * the correct indicator string as postfix.
@@ -321,14 +327,14 @@ export function relationIterator(
       (first &&
         content.parentNode.parentNode &&
         content.parentNode.parentNode.previousSibling)
-        ? [AuditoryDescription.create({ text: '⠀' + base }, {})]
+        ? [AuditoryDescription.create({ text: LOCALE.MESSAGES.regexp.SPACE + base }, {})]
         : [];
     const right =
       (rightChild && DomUtil.tagName(rightChild) !== 'EMPTY') ||
       (!contentNodes.length &&
         content.parentNode.parentNode &&
         content.parentNode.parentNode.nextSibling)
-        ? [AuditoryDescription.create({ text: '⠀' }, {})]
+        ? [AuditoryDescription.create({ text: LOCALE.MESSAGES.regexp.SPACE }, {})]
         : [];
     const descrs = Engine.evaluateNode(content);
     first = false;
@@ -373,7 +379,7 @@ export function implicitIterator(
     const right = rightChild && DomUtil.tagName(rightChild) === 'NUMBER';
     return contextDescr.concat(
       left && right && content.getAttribute('role') === SemanticRole.SPACE
-        ? [AuditoryDescription.create({ text: '⠀' }, {})]
+        ? [AuditoryDescription.create({ text: LOCALE.MESSAGES.regexp.SPACE }, {})]
         : []
     );
   };

diff --git a/ts/speech_rules/other_rules.ts b/ts/speech_rules/other_rules.ts
@@ -66,6 +66,7 @@ export function BrailleRules() {
       CSFoverFraction: NemethUtil.overFraction,
 
       CSFoverBevFraction: NemethUtil.overBevelledFraction,
+      CQFhyperFraction: NemethUtil.hyperFractionBoundary,
       // Radical function.
       CSFopenRadical: NemethUtil.openingRadical,
       CSFcloseRadical: NemethUtil.closingRadical,