ed-mathml2tex 0.0.2 → 0.0.3

package/lib/mathml2latex.es.js

@@ -580,6 +580,39 @@ T.createMarker = function() {
   }
 };
 
+function getRender_default(template) {
+  return function(node, children) {
+    const parts = renderChildren(children);
+    return renderTemplate(template, parts);
+  };
+}
+
+function getRender_joinSeparator(template, separator = '') {
+  return function(node, children) {
+    const parts = renderChildren(children);
+    return template.replace('@content', parts.join(separator));
+  };
+}
+
+function getRender_joinSeparators(template, separators) {
+  return function(node, children) {
+    const parts = renderChildren(children);
+    let content = '';
+    if (separators.length === 0) {
+      content = parts.join('');
+    } else {
+      content = parts.reduce((accumulator, part, index) => {
+        accumulator += part;
+        if (index < parts.length - 1) {
+          accumulator += separators[index] || separators[separators.length - 1];
+        }
+        return accumulator;
+      }, '');
+    }
+    return template.replace('@content', content);
+  };
+}
+
 function convert(mathmlHtml){
   const math = NodeTool.parseMath(mathmlHtml);
   
@@ -626,6 +659,18 @@ function toLatex(result) {
   result = result.replace(/→\\limits_\{([^}]*)\}\^\{([^}]*)\}/g, "\\overset{$2}{\\underset{$1}{\\rightarrow}}");
   result = result.replace(/\\rightarrow\\limits_\{([^}]*)\}\^\{([^}]*)\}/g, "\\overset{$2}{\\underset{$1}{\\rightarrow}}");
   
+  // Case 4: mover - fix expressions with arrow superscript
+  // Simple expression with arrow superscript: expr^{\rightarrow} → \overrightarrow{expr}
+  result = result.replace(/([^{}\s]+)\^\{\\rightarrow\}/g, "\\overrightarrow{$1}");
+  result = result.replace(/\{([^{}]+)\}\^\{\\rightarrow\}/g, "\\overrightarrow{$1}");
+  
+  // Complex expressions with subscripts and arrow: expr_{sub}^{\rightarrow} → \overrightarrow{expr_{sub}}
+  result = result.replace(/([A-Za-z0-9]+)_\{([^{}]+)\}\^\{\\rightarrow\}/g, "\\overrightarrow{$1_{$2}}");
+  result = result.replace(/([A-Za-z0-9]+)_([0-9])\^\{\\rightarrow\}/g, "\\overrightarrow{$1_$2}");
+  
+  // Very complex expressions: (expr)^{\rightarrow} → \overrightarrow{(expr)}
+  result = result.replace(/(\([^()]+\))\^\{\\rightarrow\}/g, "\\overrightarrow{$1}");
+  
   // Also match if there are spaces
   result = result.replace(/→\s*\\limits\s*_\s*{\s*}/g, "\\underset{}{\\rightarrow}");
   result = result.replace(/\\rightarrow\s*\\limits\s*_\s*{\s*}/g, "\\underset{}{\\rightarrow}");
@@ -694,14 +739,27 @@ function parseOperator(node) {
 }
 
 // Math identifier
-function parseElementMi(node){
+function parseElementMi(node) {
   let it = NodeTool.getNodeText(node).trim();
+  
+  // Handle vectors (e.g. AB', AI)
+  if (it.includes("'")) {
+    return it;  // Return as is to handle in mrow
+  }
+  
+  // Handle subscripts (e.g. n₂)
+  if (it.match(/[a-zA-Z]\d/)) {
+    const base = it[0];
+    const sub = it[1];
+    return `${base}_{${sub}}`;
+  }
+  
   it = MathSymbol.parseIdentifier(it);
   return escapeSpecialChars(it);
 }
 
 // Math Number
-function parseElementMn(node){
+function parseElementMn(node) {
   let it = NodeTool.getNodeText(node).trim();
   return escapeSpecialChars(it);
 }
@@ -901,12 +959,29 @@ function renderMfrac(node, children){
   return render(node, children);
 }
 
-function renderMfenced(node, children){
+function renderMfenced(node, children) {
   const [open, close, separatorsStr] = [
     NodeTool.getAttr(node, 'open', '('),
     NodeTool.getAttr(node, 'close', ')'),
     NodeTool.getAttr(node, 'separators', ',')
   ];
+  
+  // Handle special case for vectors inside brackets
+  if (open === '[' && close === ']') {
+    const parts = renderChildren(children);
+    // Join parts with comma and space, preserving vector notation
+    const content = parts.join(', ');
+    return `\\left[${content}\\right]`;
+  }
+  
+  // Handle special case for coordinates
+  if (open === '(' && close === ')') {
+    const parts = renderChildren(children);
+    // Join parts with semicolon
+    const content = parts.join(';');
+    return `\\left(${content}\\right)`;
+  }
+
   const [left, right] = [
     Brackets.parseLeft(open),
     Brackets.parseRight(close)
@@ -966,19 +1041,49 @@ function renderMmultiscripts(node, children) {
   return [renderScripts(prevScripts), base, renderScripts(backScripts)].join('');
 }
 
-function renderMover(node, children){
+function renderMover(node, children) {
   const nodes = flattenNodeTreeByNodeName(node, 'mover');
   let result = undefined;
+  
+  // Get the base node and check if it's a subscript or mrow
+  const baseNode = children[0];
+  const nodeName = NodeTool.getNodeName(baseNode);
+  const isSubscript = nodeName === 'msub';
+  const isMrow = nodeName === 'mrow';
+  
+  if (isSubscript) {
+    // Handle case like n₂ with arrow
+    const base = parse(baseNode);
+    return `\\overrightarrow{${base}}`;
+  }
+  
+  if (isMrow) {
+    // Handle case like AB or AI
+    const base = parse(baseNode);
+    const overNode = children[1];
+    const overText = NodeTool.getNodeText(overNode).trim();
+    const isAccent = NodeTool.getAttr(node, "accent", "false") === "true";
+    
+    if (overText === "→" && isAccent) {
+      return `\\overrightarrow{${base}}`;
+    }
+  }
+  
   for(let i = 0; i < nodes.length - 1; i++) {
-    if(!result){ result = parse(nodes[i]); }
-    const over = parse(nodes[i + 1]);
-    const template = getMatchValueByChar({
-      decimals: MathSymbol.overScript.decimals,
-      values: MathSymbol.overScript.templates,
-      judgeChar: over,
-      defaultValue: "@1^{@2}"
-    });
-    result = renderTemplate(template.replace("@v", "@1"), [result, over]);
+    if(!result) { 
+      result = parse(nodes[i]); 
+    }
+    
+    const overNode = nodes[i + 1];
+    const overText = NodeTool.getNodeText(overNode).trim();
+    const isAccent = NodeTool.getAttr(node, "accent", "false") === "true";
+    
+    if (overText === "→" && isAccent) {
+      return `\\overrightarrow{${result}}`;
+    }
+    
+    const over = parse(overNode);
+    result = `${result}^{${over}}`;
   }
   return result;
 }
@@ -986,162 +1091,119 @@ function renderMover(node, children){
 function renderMunder(node, children){
   const nodes = flattenNodeTreeByNodeName(node, 'munder');
   let result = undefined;
-  
-  // Early processing for arrow case
-  const baseNode = children[0];
-  if (baseNode && NodeTool.getNodeName(baseNode) === "mo") {
-    const baseText = NodeTool.getNodeText(baseNode).trim();
-    if (baseText === "→") {
-      // This is an arrow with under script
-      const underNode = children[1];
-      if (!underNode || NodeTool.getNodeName(underNode) === "mrow" && NodeTool.getNodeText(underNode).trim() === "") {
-        // Empty under script or mrow
-        console.log("Arrow with empty underscript, using \\underset{}");
-        return "\\underset{}{\\rightarrow}";
-      } else {
-        // Non-empty under script
-        const under = parse(underNode);
-        console.log("Arrow with underscript:", under);
-        return `\\underset{${under}}{\\rightarrow}`;
-      }
-    }
-  }
-  
   for(let i = 0; i < nodes.length - 1; i++) {
     if(!result){ result = parse(nodes[i]); }
     
     const underNode = nodes[i + 1];
     const underText = NodeTool.getNodeText(underNode).trim();
-    const baseText = NodeTool.getNodeText(nodes[i]).trim();
+    const isAccent = NodeTool.getAttr(node, "accent", "false") === "true";
     
-    // Skip processing for already processed cases
-    if (baseText === "→") {
-      continue;
+    // Special handling for arrow accent
+    if (underText === "→" && isAccent) {
+      return `\\underset{${result}}{\\rightarrow}`;
     }
     
-    // Always use underset for operators to avoid \\limits errors
-    if (NodeTool.getNodeName(nodes[i]) === "mo") {
-      const under = parse(underNode);
-      result = `\\underset{${under}}{${result}}`;
-    } else {
-      const template = getMatchValueByChar({
-        decimals: MathSymbol.underScript.decimals,
-        values: MathSymbol.underScript.templates,
-        judgeChar: underText,
-        defaultValue: "@1_{@2}"  // Use simple subscript instead of \limits
-      });
-      
-      const under = parse(underNode);
-      result = renderTemplate(template.replace("@v", "@1"), [result, under]);
-    }
+    const under = parse(underNode);
+    const template = getMatchValueByChar({
+      decimals: MathSymbol.underScript.decimals,
+      values: MathSymbol.underScript.templates,
+      judgeChar: underText,
+      defaultValue: "@1_{@2}"
+    });
+    result = renderTemplate(template.replace("@v", "@1"), [result, under]);
   }
   return result;
 }
 
-function renderMunderover(node, children) {
+function renderMunderover(node, children){
   const nodes = flattenNodeTreeByNodeName(node, 'munderover');
   let result = undefined;
-  
-  if(nodes.length === 3) {
-    const baseNode = nodes[0];
-    const baseText = NodeTool.getNodeText(baseNode).trim();
+  for(let i = 0; i < nodes.length - 1; i++) {
+    if(!result){ result = parse(nodes[i]); }
     
-    // Special handling for arrow
-    if (baseText === "→") {
-      const under = parse(nodes[1]);
-      const over = parse(nodes[2]);
-      return `\\overset{${over}}{\\underset{${under}}{\\rightarrow}}`;
-    } else {
-      const base = parse(baseNode);
-      const under = parse(nodes[1]);
-      const over = parse(nodes[2]);
-      return `${base}\\limits_{${under}}^{${over}}`;
+    const overNode = nodes[i + 1];
+    const overText = NodeTool.getNodeText(overNode).trim();
+    const underNode = nodes[i + 2];
+    const underText = NodeTool.getNodeText(underNode).trim();
+    const isAccent = NodeTool.getAttr(node, "accent", "false") === "true";
+    
+    // Special handling for arrow accent
+    if (overText === "→" && isAccent) {
+      return `\\overset{${result}}{\\underset{${underText}}{\\rightarrow}}`;
     }
+    
+    const over = parse(overNode);
+    const under = parse(underNode);
+    const template = getMatchValueByChar({
+      decimals: MathSymbol.underoverScript.decimals,
+      values: MathSymbol.underoverScript.templates,
+      judgeChar: overText,
+      defaultValue: "@1_{@2}^{@3}"
+    });
+    result = renderTemplate(template.replace("@v", "@1"), [over, under]);
   }
-  
-  for(let i = 0; i < nodes.length - 2; i++) {
-    if(!result){ result = parse(nodes[i]); }
-    const under = parse(nodes[i + 1]);
-    const over = parse(nodes[i + 2]);
-    result =  renderTemplate("@1\\limits_{@2}^{@3}", [result, under, over]);
-  }
-  return result;
-}
-
-function flattenNodeTreeByNodeName(root, nodeName) {
-  let result = [];
-  const children = NodeTool.getChildren(root);
-  Array.prototype.forEach.call(children, (node) => {
-    if (NodeTool.getNodeName(node) === nodeName) {
-      result = result.concat(flattenNodeTreeByNodeName(node, nodeName));
-    } else {
-      result.push(node);
-    }
-  });
   return result;
 }
 
-
-function getMatchValueByChar(params) {
-  const {decimals, values, judgeChar, defaultValue=null} = params;
-  if (judgeChar && judgeChar.length === 1) {
-    const index = decimals.indexOf(judgeChar.charCodeAt(0));
-    if (index > -1) {
-      return values[index];
+function renderMphantom(node, children){
+  const nodes = flattenNodeTreeByNodeName(node, 'mphantom');
+  let result = undefined;
+  for(let i = 0; i < nodes.length - 1; i++) {
+    if(!result){ result = parse(nodes[i]); }
+    
+    const phantomNode = nodes[i + 1];
+    const phantomText = NodeTool.getNodeText(phantomNode).trim();
+    const isAccent = NodeTool.getAttr(node, "accent", "false") === "true";
+    
+    // Special handling for arrow accent
+    if (phantomText === "→" && isAccent) {
+      return `\\overrightarrow{${result}}`;
     }
+    
+    const phantom = parse(phantomNode);
+    const template = getMatchValueByChar({
+      decimals: MathSymbol.phantomScript.decimals,
+      values: MathSymbol.phantomScript.templates,
+      judgeChar: phantomText,
+      defaultValue: "@1^{@2}"
+    });
+    result = renderTemplate(template.replace("@v", "@1"), [result, phantom]);
   }
-  return defaultValue;
-}
-
-// https://developer.mozilla.org/en-US/docs/Web/MathML/Element/mphantom
-// FIXME :)
-function renderMphantom(node, children) {
-    return '';
-}
-
-
-
-function getRender_default(template) {
-  return function(node, children) {
-    const parts = renderChildren(children);
-    return renderTemplate(template, parts)
-  }
+  return result;
 }
 
-function renderTemplate(template, values) {
-  return template.replace(/\@\d+/g, (m) => {
-    const idx = parseInt(m.substring(1, m.length)) - 1;
-    return values[idx];
+function renderTemplate(template, args) {
+  return template.replace(/@(\d+)/g, (match, index) => {
+    const arg = args[index - 1];
+    return arg || match;
   });
 }
 
-function getRender_joinSeparator(template, separator = '') {
-  return function(node, children) {
-    const parts = renderChildren(children);
-    return template.replace("@content", parts.join(separator));
-  }
+function getMatchValueByChar(options) {
+  const { decimals, values, judgeChar, defaultValue } = options;
+  const match = values.find(value => value.judgeChar === judgeChar);
+  return match || defaultValue;
 }
 
-function getRender_joinSeparators(template, separators) {
-  return function(node, children) {
-    const parts = renderChildren(children);
-    let content = '';
-    if(separators.length === 0){
-      content = parts.join('');
-    } else {
-      content =  parts.reduce((accumulator, part, index) => {
-        accumulator += part;
-        if(index < parts.length - 1){
-          accumulator += (separators[index] || separators[separators.length - 1]);
-        }
-        return accumulator;
-      }, '');
-    }
-    return template.replace("@content", content);
+function flattenNodeTreeByNodeName(node, nodeName) {
+  const nodes = [];
+  const children = NodeTool.getChildren(node);
+  if (children && children.length > 0) {
+    // Convert HTMLCollection to Array before using forEach
+    Array.from(children).forEach(child => {
+      if (NodeTool.getNodeName(child) === nodeName) {
+        nodes.push(child);
+      } else {
+        // Recursively search in child nodes
+        const childNodes = flattenNodeTreeByNodeName(child, nodeName);
+        nodes.push(...childNodes);
+      }
+    });
   }
+  return nodes;
 }
 
-// Add exports at the end of file
+// Export the convert function
 var mathml2latex = {
   convert: convert
 };