pptxtojson 1.7.0 → 1.9.0

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "pptxtojson",
-	"version": "1.7.0",
+	"version": "1.9.0",
 	"description": "A javascript tool for parsing .pptx file",
 	"type": "module",
 	"main": "./dist/index.umd.js",

package/src/align.js

@@ -62,4 +62,38 @@ export function getVerticalAlign(node, slideLayoutSpNode, slideMasterSpNode) {
     }
   }
   return (anchor === 'ctr') ? 'mid' : ((anchor === 'b') ? 'down' : 'up')
+}
+
+export function getTextAutoFit(node, slideLayoutSpNode, slideMasterSpNode) {
+  function checkBodyPr(bodyPr) {
+    if (!bodyPr) return null
+
+    if (bodyPr['a:noAutofit']) return { result: null }
+    else if (bodyPr['a:spAutoFit']) return { result: { type: 'shape' } }
+    else if (bodyPr['a:normAutofit']) {
+      const fontScale = getTextByPathList(bodyPr['a:normAutofit'], ['attrs', 'fontScale'])
+      if (fontScale) {
+        const scalePercent = parseInt(fontScale) / 1000
+        return {
+          result: {
+            type: 'text',
+            fontScale: scalePercent,
+          }
+        }
+      }
+      return { result: { type: 'text' } }
+    }
+    return null
+  }
+
+  const nodeCheck = checkBodyPr(getTextByPathList(node, ['p:txBody', 'a:bodyPr']))
+  if (nodeCheck) return nodeCheck.result
+
+  const layoutCheck = checkBodyPr(getTextByPathList(slideLayoutSpNode, ['p:txBody', 'a:bodyPr']))
+  if (layoutCheck) return layoutCheck.result
+
+  const masterCheck = checkBodyPr(getTextByPathList(slideMasterSpNode, ['p:txBody', 'a:bodyPr']))
+  if (masterCheck) return masterCheck.result
+
+  return null
 }

package/src/fill.js

@@ -180,7 +180,7 @@ export function getGradientFill(node, warpObj) {
   for (let i = 0; i < gsLst.length; i++) {
     const lo_color = getSolidFill(gsLst[i], undefined, undefined, warpObj)
     const pos = getTextByPathList(gsLst[i], ['attrs', 'pos'])
-    
+
     colors[i] = {
       pos: pos ? (pos / 1000 + '%') : '',
       color: lo_color,
@@ -192,7 +192,7 @@ export function getGradientFill(node, warpObj) {
   if (lin) rot = angleToDegrees(lin['attrs']['ang'])
   else {
     const path = node['a:path']
-    if (path && path['attrs'] && path['attrs']['path']) pathType = path['attrs']['path'] 
+    if (path && path['attrs'] && path['attrs']['path']) pathType = path['attrs']['path']
   }
   return {
     rot,
@@ -201,6 +201,35 @@ export function getGradientFill(node, warpObj) {
   }
 }
 
+export function getPatternFill(node, warpObj) {
+  if (!node) return null
+
+  const pattFill = node['a:pattFill']
+  if (!pattFill) return null
+
+  const type = getTextByPathList(pattFill, ['attrs', 'prst'])
+
+  const fgColorNode = pattFill['a:fgClr']
+  const bgColorNode = pattFill['a:bgClr']
+
+  let foregroundColor = '#000000'
+  let backgroundColor = '#FFFFFF'
+
+  if (fgColorNode) {
+    foregroundColor = getSolidFill(fgColorNode, undefined, undefined, warpObj)
+  }
+
+  if (bgColorNode) {
+    backgroundColor = getSolidFill(bgColorNode, undefined, undefined, warpObj)
+  }
+
+  return {
+    type,
+    foregroundColor,
+    backgroundColor,
+  }
+}
+
 export function getBgGradientFill(bgPr, phClr, slideMasterContent, warpObj) {
   if (bgPr) {
     const grdFill = bgPr['a:gradFill']
@@ -277,6 +306,13 @@ export async function getSlideBackgroundFill(warpObj) {
       background = await getBgPicFill(bgPr, 'slideBg', warpObj)
       backgroundType = 'image'
     }
+    else if (bgFillTyp === 'PATTERN_FILL') {
+      const patternFill = getPatternFill(bgPr, warpObj)
+      if (patternFill) {
+        background = patternFill
+        backgroundType = 'pattern'
+      }
+    }
   }
   else if (bgRef) {
     let clrMapOvr
@@ -374,6 +410,13 @@ export async function getSlideBackgroundFill(warpObj) {
         background = await getBgPicFill(bgPr, 'slideLayoutBg', warpObj)
         backgroundType = 'image'
       }
+      else if (bgFillTyp === 'PATTERN_FILL') {
+        const patternFill = getPatternFill(bgPr, warpObj)
+        if (patternFill) {
+          background = patternFill
+          backgroundType = 'pattern'
+        }
+      }
     }
     else if (bgRef) {
       const phClr = getSolidFill(bgRef, clrMapOvr, undefined, warpObj)
@@ -420,7 +463,7 @@ export async function getSlideBackgroundFill(warpObj) {
           const sldFill = bgFillLstIdx['a:solidFill']
           const sldBgClr = getSolidFill(sldFill, clrMapOvr, undefined, warpObj)
           background = sldBgClr
-        } 
+        }
         else if (bgFillTyp === 'GRADIENT_FILL') {
           const gradientFill = getBgGradientFill(bgFillLstIdx, phClr, slideMasterContent, warpObj)
           if (typeof gradientFill === 'string') {
@@ -435,6 +478,13 @@ export async function getSlideBackgroundFill(warpObj) {
           background = await getBgPicFill(bgFillLstIdx, 'themeBg', warpObj)
           backgroundType = 'image'
         }
+        else if (bgFillTyp === 'PATTERN_FILL') {
+          const patternFill = getPatternFill(bgFillLstIdx, warpObj)
+          if (patternFill) {
+            background = patternFill
+            backgroundType = 'pattern'
+          }
+        }
       }
     }
     else {
@@ -463,6 +513,13 @@ export async function getSlideBackgroundFill(warpObj) {
           background = await getBgPicFill(bgPr, 'slideMasterBg', warpObj)
           backgroundType = 'image'
         }
+        else if (bgFillTyp === 'PATTERN_FILL') {
+          const patternFill = getPatternFill(bgPr, warpObj)
+          if (patternFill) {
+            background = patternFill
+            backgroundType = 'pattern'
+          }
+        }
       }
       else if (bgRef) {
         const phClr = getSolidFill(bgRef, clrMap, undefined, warpObj)
@@ -509,7 +566,7 @@ export async function getSlideBackgroundFill(warpObj) {
             const sldFill = bgFillLstIdx['a:solidFill']
             const sldBgClr = getSolidFill(sldFill, clrMapOvr, undefined, warpObj)
             background = sldBgClr
-          } 
+          }
           else if (bgFillTyp === 'GRADIENT_FILL') {
             const gradientFill = getBgGradientFill(bgFillLstIdx, phClr, slideMasterContent, warpObj)
             if (typeof gradientFill === 'string') {
@@ -524,6 +581,13 @@ export async function getSlideBackgroundFill(warpObj) {
             background = await getBgPicFill(bgFillLstIdx, 'themeBg', warpObj)
             backgroundType = 'image'
           }
+          else if (bgFillTyp === 'PATTERN_FILL') {
+            const patternFill = getPatternFill(bgFillLstIdx, warpObj)
+            if (patternFill) {
+              background = patternFill
+              backgroundType = 'pattern'
+            }
+          }
         }
       }
     }
@@ -561,6 +625,11 @@ export async function getShapeFill(node, pNode, isSvgMode, warpObj, source, grou
     }
     type = 'image'
   }
+  else if (fillType === 'PATTERN_FILL') {
+    const shpFill = node['p:spPr']['a:pattFill']
+    fillValue = getPatternFill({ 'a:pattFill': shpFill }, warpObj)
+    type = 'pattern'
+  }
   else if (fillType === 'GROUP_FILL') {
     return findFillInGroupHierarchy(groupHierarchy, warpObj, source)
   }
@@ -620,6 +689,16 @@ async function findFillInGroupHierarchy(groupHierarchy, warpObj, source) {
         }
       }
     }
+    else if (fillType === 'PATTERN_FILL') {
+      const shpFill = grpSpPr['a:pattFill']
+      const fillValue = getPatternFill({ 'a:pattFill': shpFill }, warpObj)
+      if (fillValue) {
+        return {
+          type: 'pattern',
+          value: fillValue,
+        }
+      }
+    }
   }
 
   return null

package/src/fontStyle.js

@@ -1,6 +1,6 @@
 import { getTextByPathList } from './utils'
 import { getShadow } from './shadow'
-import { getFillType, getSolidFill } from './fill'
+import { getFillType, getGradientFill, getSolidFill } from './fill'
 
 export function getFontType(node, type, warpObj) {
   let typeface = getTextByPathList(node, ['a:rPr', 'a:latin', 'attrs', 'typeface'])
@@ -31,6 +31,11 @@ export function getFontColor(node, pNode, lstStyle, pFontStyle, lvl, warpObj) {
       const solidFillNode = rPrNode['a:solidFill']
       color = getSolidFill(solidFillNode, undefined, undefined, warpObj)
     }
+    if (filTyp === 'GRADIENT_FILL') {
+      const gradientFillNode = rPrNode['a:gradFill']
+      const gradient = getGradientFill(gradientFillNode, warpObj)
+      return gradient
+    }
   }
   if (!color && getTextByPathList(lstStyle, ['a:lvl' + lvl + 'pPr', 'a:defRPr'])) {
     const lstStyledefRPr = getTextByPathList(lstStyle, ['a:lvl' + lvl + 'pPr', 'a:defRPr'])

package/src/position.js

@@ -1,4 +1,5 @@
 import { RATIO_EMUs_Points } from './constants'
+import { numberToFixed } from './utils'
 
 export function getPosition(slideSpNode, slideLayoutSpNode, slideMasterSpNode) {
   let off
@@ -10,8 +11,8 @@ export function getPosition(slideSpNode, slideLayoutSpNode, slideMasterSpNode) {
   if (!off) return { top: 0, left: 0 }
 
   return {
-    top: parseInt(off['y']) * RATIO_EMUs_Points,
-    left: parseInt(off['x']) * RATIO_EMUs_Points,
+    top: numberToFixed(parseInt(off['y']) * RATIO_EMUs_Points),
+    left: numberToFixed(parseInt(off['x']) * RATIO_EMUs_Points),
   }
 }
 
@@ -25,7 +26,7 @@ export function getSize(slideSpNode, slideLayoutSpNode, slideMasterSpNode) {
   if (!ext) return { width: 0, height: 0 }
 
   return {
-    width: parseInt(ext['cx']) * RATIO_EMUs_Points,
-    height: parseInt(ext['cy']) * RATIO_EMUs_Points,
+    width: numberToFixed(parseInt(ext['cx']) * RATIO_EMUs_Points),
+    height: numberToFixed(parseInt(ext['cy']) * RATIO_EMUs_Points),
   }
 }

package/src/pptxtojson.js

@@ -3,11 +3,11 @@ import { readXmlFile } from './readXmlFile'
 import { getBorder } from './border'
 import { getSlideBackgroundFill, getShapeFill, getSolidFill, getPicFill, getPicFilters } from './fill'
 import { getChartInfo } from './chart'
-import { getVerticalAlign } from './align'
+import { getVerticalAlign, getTextAutoFit } from './align'
 import { getPosition, getSize } from './position'
 import { genTextBody } from './text'
 import { getCustomShapePath } from './shape'
-import { extractFileExtension, base64ArrayBuffer, getTextByPathList, angleToDegrees, getMimeType, isVideoLink, escapeHtml, hasValidText } from './utils'
+import { extractFileExtension, base64ArrayBuffer, getTextByPathList, angleToDegrees, getMimeType, isVideoLink, escapeHtml, hasValidText, numberToFixed } from './utils'
 import { getShadow } from './shadow'
 import { getTableBorders, getTableCellParams, getTableRowParams } from './table'
 import { RATIO_EMUs_Points } from './constants'
@@ -516,20 +516,20 @@ async function processGroupSpNode(node, warpObj, source, parentGroupHierarchy =
 
   return {
     type: 'group',
-    top: y,
-    left: x,
-    width: cx,
-    height: cy,
+    top: numberToFixed(y),
+    left: numberToFixed(x),
+    width: numberToFixed(cx),
+    height: numberToFixed(cy),
     rotate,
     order,
     isFlipV,
     isFlipH,
     elements: elements.map(element => ({
       ...element,
-      left: (element.left - chx) * ws,
-      top: (element.top - chy) * hs,
-      width: element.width * ws,
-      height: element.height * hs,
+      left: numberToFixed((element.left - chx) * ws),
+      top: numberToFixed((element.top - chy) * hs),
+      width: numberToFixed(element.width * ws),
+      height: numberToFixed(element.height * hs),
     }))
   }
 }
@@ -617,6 +617,7 @@ async function genShape(node, pNode, slideLayoutSpNode, slideMasterSpNode, name,
 
   const vAlign = getVerticalAlign(node, slideLayoutSpNode, slideMasterSpNode, type)
   const isVertical = getTextByPathList(node, ['p:txBody', 'a:bodyPr', 'attrs', 'vert']) === 'eaVert'
+  const autoFit = getTextAutoFit(node, slideLayoutSpNode, slideMasterSpNode)
 
   const data = {
     left,
@@ -638,6 +639,7 @@ async function genShape(node, pNode, slideLayoutSpNode, slideMasterSpNode, name,
   }
 
   if (shadow) data.shadow = shadow
+  if (autoFit) data.autoFit = autoFit
 
   const isHasValidText = data.content && hasValidText(data.content)
 

package/src/text.js

@@ -73,10 +73,39 @@ export function genTextBody(textBodyNode, spNode, slideLayoutSpNode, type, warpO
       text += `<p style="text-align: ${align};">`
     }
     
-    if (!rNode) text += genSpanElement(pNode, spNode, textBodyNode, pFontStyle, slideLayoutSpNode, type, warpObj)
+    if (!rNode) {
+      text += genSpanElement(pNode, spNode, textBodyNode, pFontStyle, slideLayoutSpNode, type, warpObj)
+    } 
     else {
+      let prevStyleInfo = null
+      let accumulatedText = ''
+
       for (const rNodeItem of rNode) {
-        text += genSpanElement(rNodeItem, pNode, textBodyNode, pFontStyle, slideLayoutSpNode, type, warpObj)
+        const styleInfo = getSpanStyleInfo(rNodeItem, pNode, textBodyNode, pFontStyle, slideLayoutSpNode, type, warpObj)
+
+        if (!prevStyleInfo || prevStyleInfo.styleText !== styleInfo.styleText || prevStyleInfo.hasLink !== styleInfo.hasLink || styleInfo.hasLink) {
+          if (accumulatedText) {
+            const processedText = accumulatedText.replace(/\t/g, '&nbsp;&nbsp;&nbsp;&nbsp;').replace(/\s/g, '&nbsp;')
+            text += `<span style="${prevStyleInfo.styleText}">${processedText}</span>`
+            accumulatedText = ''
+          }
+
+          if (styleInfo.hasLink) {
+            const processedText = styleInfo.text.replace(/\t/g, '&nbsp;&nbsp;&nbsp;&nbsp;').replace(/\s/g, '&nbsp;')
+            text += `<span style="${styleInfo.styleText}"><a href="${styleInfo.linkURL}" target="_blank">${processedText}</a></span>`
+            prevStyleInfo = null
+          } 
+          else {
+            prevStyleInfo = styleInfo
+            accumulatedText = styleInfo.text
+          }
+        } 
+        else accumulatedText += styleInfo.text
+      }
+
+      if (accumulatedText && prevStyleInfo) {
+        const processedText = accumulatedText.replace(/\t/g, '&nbsp;&nbsp;&nbsp;&nbsp;').replace(/\s/g, '&nbsp;')
+        text += `<span style="${prevStyleInfo.styleText}">${processedText}</span>`
       }
     }
 
@@ -97,6 +126,16 @@ export function getListType(node) {
 }
 
 export function genSpanElement(node, pNode, textBodyNode, pFontStyle, slideLayoutSpNode, type, warpObj) {
+  const { styleText, text, hasLink, linkURL } = getSpanStyleInfo(node, pNode, textBodyNode, pFontStyle, slideLayoutSpNode, type, warpObj)
+  const processedText = text.replace(/\t/g, '&nbsp;&nbsp;&nbsp;&nbsp;').replace(/\s/g, '&nbsp;')
+
+  if (hasLink) {
+    return `<span style="${styleText}"><a href="${linkURL}" target="_blank">${processedText}</a></span>`
+  }
+  return `<span style="${styleText}">${processedText}</span>`
+}
+
+export function getSpanStyleInfo(node, pNode, textBodyNode, pFontStyle, slideLayoutSpNode, type, warpObj) {
   const lstStyle = textBodyNode['a:lstStyle']
   const slideMasterTextStyles = warpObj['slideMasterTextStyles']
 
@@ -121,7 +160,15 @@ export function genSpanElement(node, pNode, textBodyNode, pFontStyle, slideLayou
   const shadow = getFontShadow(node, warpObj)
   const subscript = getFontSubscript(node)
 
-  if (fontColor) styleText += `color: ${fontColor};`
+  if (fontColor) {
+    if (typeof fontColor === 'string') styleText += `color: ${fontColor};`
+    else if (fontColor.colors) {
+      const { colors, rot } = fontColor
+      const stops = colors.map(item => `${item.color} ${item.pos}`).join(', ')
+      const gradientStyle = `linear-gradient(${rot + 90}deg, ${stops})`
+      styleText += `background: ${gradientStyle}; background-clip: text; color: transparent;`
+    }
+  }
   if (fontSize) styleText += `font-size: ${fontSize};`
   if (fontType) styleText += `font-family: ${fontType};`
   if (fontBold) styleText += `font-weight: ${fontBold};`
@@ -133,9 +180,12 @@ export function genSpanElement(node, pNode, textBodyNode, pFontStyle, slideLayou
   if (shadow) styleText += `text-shadow: ${shadow};`
 
   const linkID = getTextByPathList(node, ['a:rPr', 'a:hlinkClick', 'attrs', 'r:id'])
-  if (linkID && warpObj['slideResObj'][linkID]) {
-    const linkURL = warpObj['slideResObj'][linkID]['target']
-    return `<span style="${styleText}"><a href="${linkURL}" target="_blank">${text.replace(/\t/g, '&nbsp;&nbsp;&nbsp;&nbsp;').replace(/\s/g, '&nbsp;')}</a></span>`
-  } 
-  return `<span style="${styleText}">${text.replace(/\t/g, '&nbsp;&nbsp;&nbsp;&nbsp;').replace(/\s/g, '&nbsp;')}</span>`
+  const hasLink = linkID && warpObj['slideResObj'][linkID]
+
+  return {
+    styleText,
+    text,
+    hasLink,
+    linkURL: hasLink ? warpObj['slideResObj'][linkID]['target'] : null
+  }
 }

package/src/utils.js

@@ -160,4 +160,8 @@ export function hasValidText(htmlString) {
   const doc = parser.parseFromString(htmlString, 'text/html')
   const text = doc.body.textContent || doc.body.innerText
   return text.trim() !== ''
+}
+
+export function numberToFixed(num, fractionDigits = 4) {
+  return parseFloat(num.toFixed(fractionDigits))
 }