@lofcz/pptxtojson 2.2.0 → 2.2.2

package/dist/index.d.ts

@@ -43,8 +43,12 @@ export interface PatternFill {
 
 export type Fill = ColorFill | ImageFill | GradientFill | PatternFill
 
+export type BorderColor =
+  | { type: 'color', value: string }
+  | { type: 'gradient', value: GradientFill['value'] }
+
 export interface Border {
-  borderColor: string
+  borderColor: BorderColor
   borderWidth: number
   borderType:'solid' | 'dashed' | 'dotted'
 }
@@ -81,7 +85,7 @@ export interface Shape {
   top: number
   width: number
   height: number
-  borderColor: string
+  borderColor: BorderColor
   borderWidth: number
   borderType: 'solid' | 'dashed' | 'dotted'
   borderStrokeDasharray: string
@@ -114,7 +118,7 @@ export interface Text {
   top: number
   width: number
   height: number
-  borderColor: string
+  borderColor: BorderColor
   borderWidth: number
   borderType: 'solid' | 'dashed' | 'dotted'
   borderStrokeDasharray: string
@@ -155,7 +159,7 @@ export interface Image {
     r?: number
   }
   geom: string
-  borderColor: string
+  borderColor: BorderColor
   borderWidth: number
   borderType: 'solid' | 'dashed' | 'dotted'
   borderStrokeDasharray: string

package/dist/index.js

@@ -2718,6 +2718,7 @@ function getInlineMathRuns(pNode) {
         if (latex) runs.push({
             type: 'math',
             latex,
+            node,
             attrs: {
                 order
             }
@@ -2736,6 +2737,33 @@ function getInlineMathRuns(pNode) {
     ])for (const node of toArray(pNode[key]))push(node, node && node.attrs && node.attrs.order || 0);
     return runs;
 }
+const findMathRunPr = (node, skipCtrlPr)=>{
+    if (!node || 'object' != typeof node) return null;
+    if (node['a:rPr']) {
+        const rPr = node['a:rPr'];
+        return Array.isArray(rPr) ? rPr[0] : rPr;
+    }
+    for (const [key, value] of Object.entries(node))if ('attrs' !== key && (!skipCtrlPr || 'm:ctrlPr' !== key)) for (const child of toArray(value)){
+        const found = findMathRunPr(child, skipCtrlPr);
+        if (found) return found;
+    }
+    return null;
+};
+function getMathRunStyleNode(mathRun) {
+    const mathNode = mathRun && mathRun.node;
+    const rPr = findMathRunPr(mathNode, true) || findMathRunPr(mathNode, false);
+    return rPr ? {
+        'a:rPr': rPr
+    } : {};
+}
+function mathRunHasOwnSize(styleNode) {
+    const rPr = styleNode && styleNode['a:rPr'];
+    return !!(rPr && rPr.attrs && rPr.attrs.sz);
+}
+function mathRunHasOwnColor(styleNode) {
+    const rPr = styleNode && styleNode['a:rPr'];
+    return !!(rPr && (rPr['a:solidFill'] || rPr['a:gradFill'] || rPr['a:pattFill']));
+}
 function latexFormart(latex) {
     return latex.replaceAll(/&lt;/g, '<').replaceAll(/&gt;/g, '>').replaceAll(/&amp;/g, '&').replaceAll(/&apos;/g, "'").replaceAll(/&quot;/g, '"');
 }
@@ -3173,6 +3201,8 @@ function genTextBody(textBodyNode, spNode, slideLayoutSpNode, slideMasterSpNode,
         if (rNode) {
             let prevStyleInfo = null;
             let accumulatedText = '';
+            const firstTextRun = rNode.find((item)=>!item.type);
+            let lastTextRun = null;
             for (const rNodeItem of rNode){
                 if ('math' === rNodeItem.type) {
                     if (accumulatedText && prevStyleInfo) {
@@ -3182,9 +3212,12 @@ function genTextBody(textBodyNode, spNode, slideLayoutSpNode, slideMasterSpNode,
                     accumulatedText = '';
                     prevStyleInfo = null;
                     const latex = escapeHtml(rNodeItem.latex);
-                    text += `<span class="omml-math" data-latex="${latex}">${latex}</span>`;
+                    const siblingRun = lastTextRun || firstTextRun;
+                    const mathStyle = getMathRunStyleText(rNodeItem, siblingRun, pNode, textBodyNode, pFontStyle, slideLayoutSpNode, slideMasterSpNode, type, slideMasterTextStyles, defaultTextStyle, warpObj);
+                    text += `<span class="omml-math" data-latex="${latex}"${mathStyle ? ` style="${mathStyle}"` : ''}>${latex}</span>`;
                     continue;
                 }
+                if (!rNodeItem.type) lastTextRun = rNodeItem;
                 const styleInfo = getSpanStyleInfo(rNodeItem, pNode, textBodyNode, pFontStyle, slideLayoutSpNode, slideMasterSpNode, type, slideMasterTextStyles, defaultTextStyle, warpObj);
                 if (!prevStyleInfo || prevStyleInfo.styleText !== styleInfo.styleText || prevStyleInfo.hasLink !== styleInfo.hasLink || styleInfo.hasLink) {
                     if (accumulatedText) {
@@ -3216,6 +3249,24 @@ function genTextBody(textBodyNode, spNode, slideLayoutSpNode, slideMasterSpNode,
     }
     return text;
 }
+function getMathRunStyleText(mathRun, siblingRun, pNode, textBodyNode, pFontStyle, slideLayoutSpNode, slideMasterSpNode, type, slideMasterTextStyles, defaultTextStyle, warpObj) {
+    let lvl = 1;
+    const lvlNode = getTextByPathList(pNode, [
+        'a:pPr',
+        'attrs',
+        'lvl'
+    ]);
+    if (void 0 !== lvlNode) lvl = parseInt(lvlNode) + 1;
+    const styleNode = getMathRunStyleNode(mathRun);
+    const sizeNode = mathRunHasOwnSize(styleNode) || !siblingRun ? styleNode : siblingRun;
+    const colorNode = mathRunHasOwnColor(styleNode) || !siblingRun ? styleNode : siblingRun;
+    const fontSize = getFontSize(sizeNode, pNode, textBodyNode, slideLayoutSpNode, slideMasterSpNode, type, slideMasterTextStyles, lvl, defaultTextStyle);
+    const fontColor = getFontColor(colorNode, pNode, textBodyNode, slideLayoutSpNode, slideMasterSpNode, type, slideMasterTextStyles, lvl, pFontStyle, warpObj);
+    let styleText = '';
+    if (fontSize) styleText += `font-size: ${fontSize};`;
+    if (fontColor && 'string' == typeof fontColor) styleText += `color: ${fontColor};`;
+    return styleText;
+}
 function getListType(node) {
     const pPrNode = node['a:pPr'];
     if (!pPrNode) return '';