Merge pull request #496 from zorkow/issue_447

Resolves issue #447.
Speech-Rule-Engine · Apr 9, 2021 · 613e37c · 613e37c
2 parents 86feb46 + cfe7e12
commit 613e37c
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 23 deletions.
diff --git a/src/l10n/locale_nemeth.js b/src/l10n/locale_nemeth.js
@@ -201,9 +201,9 @@ sre.Locale.nemeth = {
     'longdiv': 'long division',
     'actuarial': 'actuarial symbol',
     'radical': 'square root',
-    'box': 'box',
+    'box': '⠗',
     'roundedbox': 'rounded box',
-    'circle': 'circle',
+    'circle': '⠉',
     'left': 'left vertical-line',
     'right': 'right vertical-line',
     'top': 'overbar',
@@ -214,7 +214,7 @@ sre.Locale.nemeth = {
     'horizontalstrike': 'crossout',
     'madruwb': 'Arabic factorial symbol',
     'updiagonalarrow': 'diagonal arrow',
-    'phasorangle': 'phasor angle',
+    'phasorangle': '⠪',
     // Unknown
     'unknown': 'long division'
   },

diff --git a/src/mathmaps/nemeth/rules/nemeth_rules.js b/src/mathmaps/nemeth/rules/nemeth_rules.js
@@ -806,14 +806,6 @@
       "self::line",
       "@role=\"binomial\""
     ],
-    [
-      "Rule",
-      "row-with-label",
-      "default",
-      "[t] \"with Label\"; [n] content/*[1]; [t] \"EndLabel\"(pause: 200); [m] children/* (ctxtFunc:CTFordinalCounter,context:\"Column\")",
-      "self::row",
-      "content"
-    ],
     [
       "Rule",
       "empty-row",
@@ -863,14 +855,6 @@
       "[m] children/*",
       "self::line"
     ],
-    [
-      "Rule",
-      "line-with-label",
-      "default",
-      "[t] \"with Label\"; [n] content/*[1]; [t] \"EndLabel\" (pause: 200); [m] children/*",
-      "self::line",
-      "content"
-    ],
     [
       "Rule",
       "empty-line",
@@ -882,11 +866,16 @@
     ],
     [
       "Rule",
-      "empty-line-with-label",
+      "row-with-label",
       "default",
-      "[t] \"with Label\"; [n] content/*[1]; [t] \"EndLabel\"(pause: 200); [t] \"Blank\"",
+      "[m] children/* (separator:\"⠀\"); [t] \"⠀⠀⠀\"; [m] content/*",
+      "self::row",
+      "content"
+    ],
+    [
+      "Aliases",
+      "row-with-label",
       "self::line",
-      "count(children/*)=0",
       "content"
     ],
     [
@@ -900,7 +889,7 @@
       "Rule",
       "enclose",
       "default",
-      "[t] \"StartEnclose\"; [t] @role (grammar:localEnclose); [n] children/*[1]; [t] \"EndEnclose\"",
+      "[t] \"⠫\"; [t] @role (grammar:localEnclose); [t] \"⠸⠫\"; [n] children/*[1]; [t] \"⠻\"",
       "self::enclose"
     ],
     [