@lofcz/pptxtojson 2.2.5 → 2.2.7

package/dist/index.cjs

@@ -2732,10 +2732,25 @@ function findOMath(obj) {
     });
     return results;
 }
+function localName(tag) {
+    if (!tag) return '';
+    const i = tag.indexOf(':');
+    return i >= 0 ? tag.slice(i + 1) : tag;
+}
+function firstRawOMath(node) {
+    if (!node || 'object' != typeof node) return null;
+    if ('oMath' === localName(node.tagName)) return node;
+    for (const child of node.children || [])if ('object' == typeof child) {
+        const found = firstRawOMath(child);
+        if (found) return found;
+    }
+    return null;
+}
 function oMathToLatex(simplifiedNode) {
     const rawNode = simplifiedNode && simplifiedNode.__rawNode;
     if (!rawNode) return '';
-    return latexFormart((0, external_dwml_ts_namespaceObject.ommlNodeToLatex)(rawNode)).trim();
+    const math = firstRawOMath(rawNode) || rawNode;
+    return latexFormart((0, external_dwml_ts_namespaceObject.ommlNodeToLatex)(math)).trim();
 }
 const toArray = (value)=>{
     if (!value) return [];
@@ -2743,6 +2758,17 @@ const toArray = (value)=>{
         value
     ];
 };
+function mathPayloads(container) {
+    const direct = toArray(container && container['m:oMath']);
+    if (direct.length) return direct;
+    const out = [];
+    for (const para of toArray(container && container['m:oMathPara'])){
+        const inner = toArray(para['m:oMath']);
+        if (inner.length) out.push(...inner);
+        else out.push(para);
+    }
+    return out;
+}
 function getInlineMathRuns(pNode) {
     const runs = [];
     const push = (node, order)=>{
@@ -2758,15 +2784,9 @@ function getInlineMathRuns(pNode) {
     };
     for (const wrapper of toArray(pNode['a14:m'])){
         const order = wrapper && wrapper.attrs && wrapper.attrs.order || 0;
-        for (const key of [
-            'm:oMath',
-            'm:oMathPara'
-        ])for (const node of toArray(wrapper[key]))push(node, order);
-    }
-    for (const key of [
-        'm:oMath',
-        'm:oMathPara'
-    ])for (const node of toArray(pNode[key]))push(node, node && node.attrs && node.attrs.order || 0);
+        for (const node of mathPayloads(wrapper))push(node, order);
+    }
+    for (const node of mathPayloads(pNode))push(node, node && node.attrs && node.attrs.order || 0);
     return runs;
 }
 const findMathRunPr = (node, skipCtrlPr)=>{