Fix/limit issue

ts/semantic_tree/semantic_annotator.ts

@@ -44,6 +44,7 @@ export class SemanticAnnotator {
    */
   public annotate(node: SemanticNode) {
     node.childNodes.forEach(this.annotate.bind(this));
+    node.contentNodes.forEach(this.annotate.bind(this));
     node.addAnnotation(this.domain, this.func(node));
   }
 }
@@ -81,6 +82,9 @@ export class SemanticVisitor {
     for (let i = 0, child; (child = node.childNodes[i]); i++) {
       result = this.visit(child, result[1] as { [key: string]: any });
     }
+    for (let i = 0, content; (content = node.contentNodes[i]); i++) {
+      result = this.visit(content, result[1] as { [key: string]: any });
+    }
     return result;
   }
 }

ts/semantic_tree/semantic_mathml.ts

@@ -326,6 +326,9 @@ export class SemanticMathml extends SemanticAbstractParser<Element> {
     }
     const label = this.parse(children[0]);
     label.role = SemanticRole.LABEL;
+    if (label.childNodes[0]?.type === SemanticType.TEXT) {
+      label.childNodes[0].role = SemanticRole.LABEL;
+    }
     const newNode = this.getFactory().makeBranchNode(
       SemanticType.ROW,
       this.parseList(children.slice(1)),

ts/semantic_tree/semantic_node.ts

@@ -367,7 +367,7 @@ export class SemanticNode {
     if (this.textContent === content) {
       return;
     }
-    const meaning = SemanticMap.Meaning.get(content);
+    const meaning = SemanticMap.Meaning.get(content.replace(/\s/g, ' '));
     this.textContent = content;
     this.role = meaning.role;
     this.type = meaning.type;
@@ -667,7 +667,7 @@ export class SemanticNode {
    */
   private addAnnotation_(domain: string, annotation: string) {
     const content = this.annotation[domain];
-    if (content) {
+    if (content && !content.includes(annotation)) {
       content.push(annotation);
     } else {
       this.annotation[domain] = [annotation];

ts/speech_rules/clearspeak_util.ts

@@ -405,7 +405,8 @@ export function isSmallVulgarFraction(node: Element): Element[] {
  */
 function isUnitExpression(node: SemanticNode): boolean {
   return (
-    node.type === SemanticType.TEXT ||
+    (node.type === SemanticType.TEXT &&
+      node.role !== SemanticRole.LABEL) ||
     (node.type === SemanticType.PUNCTUATED &&
       node.role === SemanticRole.TEXT &&
       isNumber_(node.childNodes[0]) &&

ts/speech_rules/nemeth_util.ts

@@ -331,7 +331,7 @@ export function relationIterator(
   const childNodes = nodes.slice(0);
   let first = true;
   let parentNode = nodes[0].parentNode.parentNode as Element;
-  let match = parentNode.getAttribute('annotation').match(/depth:(\d+)/);
+  let match = parentNode.getAttribute('annotation')?.match(/depth:(\d+)/);
   let depth = match ? match[1] : '';
   let contentNodes: Element[];
   if (nodes.length > 0) {
@@ -454,7 +454,7 @@ export function contentIterator(
 ) {
   let func = suCI(nodes, context);
   let parentNode = nodes[0].parentNode.parentNode as Element;
-  let match = parentNode.getAttribute('annotation').match(/depth:(\d+)/);
+  let match = parentNode.getAttribute('annotation')?.match(/depth:(\d+)/);
   let depth = match ? match[1] : '';
   return function() {
     const descrs = func();