pptxtojson 1.9.0 → 1.10.0

package/package.json

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

package/src/align.js

@@ -96,4 +96,54 @@ export function getTextAutoFit(node, slideLayoutSpNode, slideMasterSpNode) {
   if (masterCheck) return masterCheck.result
 
   return null
+}
+
+export function getParagraphSpacing(pNode) {
+  if (!pNode) return null
+
+  const pPrNode = pNode['a:pPr']
+  if (!pPrNode) return null
+
+  const spacing = {}
+
+  const lnSpcNode = pPrNode['a:lnSpc']
+  if (lnSpcNode) {
+    const spcPct = getTextByPathList(lnSpcNode, ['a:spcPct', 'attrs', 'val'])
+    const spcPts = getTextByPathList(lnSpcNode, ['a:spcPts', 'attrs', 'val'])
+
+    if (spcPct) {
+      spacing.lineSpacing = parseInt(spcPct) / 1000 / 100
+    } 
+    else if (spcPts) {
+      spacing.lineSpacing = parseInt(spcPts) / 100 + 'pt'
+    }
+  }
+
+  const spcBefNode = pPrNode['a:spcBef']
+  if (spcBefNode) {
+    const spcPct = getTextByPathList(spcBefNode, ['a:spcPct', 'attrs', 'val'])
+    const spcPts = getTextByPathList(spcBefNode, ['a:spcPts', 'attrs', 'val'])
+
+    if (spcPct) {
+      spacing.spaceBefore = parseInt(spcPct) / 1000 + 'em'
+    } 
+    else if (spcPts) {
+      spacing.spaceBefore = parseInt(spcPts) / 100 + 'pt'
+    }
+  }
+
+  const spcAftNode = pPrNode['a:spcAft']
+  if (spcAftNode) {
+    const spcPct = getTextByPathList(spcAftNode, ['a:spcPct', 'attrs', 'val'])
+    const spcPts = getTextByPathList(spcAftNode, ['a:spcPts', 'attrs', 'val'])
+
+    if (spcPct) {
+      spacing.spaceAfter = parseInt(spcPct) / 1000 + 'em'
+    } 
+    else if (spcPts) {
+      spacing.spaceAfter = parseInt(spcPts) / 100 + 'pt'
+    }
+  }
+
+  return Object.keys(spacing).length > 0 ? spacing : null
 }

package/src/text.js

@@ -1,4 +1,4 @@
-import { getHorizontalAlign } from './align'
+import { getHorizontalAlign, getParagraphSpacing } from './align'
 import { getTextByPathList } from './utils'
 
 import {
@@ -24,7 +24,7 @@ export function genTextBody(textBodyNode, spNode, slideLayoutSpNode, type, warpO
   const pNode = textBodyNode['a:p']
   const pNodes = pNode.constructor === Array ? pNode : [pNode]
 
-  let isList = ''
+  const listTypes = []
 
   for (const pNode of pNodes) {
     let rNode = pNode['a:r']
@@ -51,26 +51,41 @@ export function genTextBody(textBodyNode, spNode, slideLayoutSpNode, type, warpO
     }
 
     const align = getHorizontalAlign(pNode, spNode, type, warpObj)
+    const spacing = getParagraphSpacing(pNode)
+
+    let styleText = `text-align: ${align};`
+    if (spacing) {
+      if (spacing.lineSpacing) styleText += `line-height: ${spacing.lineSpacing};`
+      if (spacing.spaceBefore) styleText += `margin-top: ${spacing.spaceBefore};`
+      if (spacing.spaceAfter) styleText += `margin-bottom: ${spacing.spaceAfter};`
+    }
 
     const listType = getListType(pNode)
+    const listLevel = getListLevel(pNode)
+
     if (listType) {
-      if (!isList) {
+      while (listTypes.length > listLevel + 1) {
+        const closedListType = listTypes.pop()
+        text += `</${closedListType}>`
+      }
+
+      if (listTypes[listLevel] === undefined) {
         text += `<${listType}>`
-        isList = listType
+        listTypes[listLevel] = listType
       }
-      else if (isList && isList !== listType) {
-        text += `</${isList}>`
+      else if (listTypes[listLevel] !== listType) {
+        text += `</${listTypes[listLevel]}>`
         text += `<${listType}>`
-        isList = listType
+        listTypes[listLevel] = listType
       }
-      text += `<li style="text-align: ${align};">`
+      text += `<li style="${styleText}">`
     }
     else {
-      if (isList) {
-        text += `</${isList}>`
-        isList = ''
+      while (listTypes.length > 0) {
+        const closedListType = listTypes.pop()
+        text += `</${closedListType}>`
       }
-      text += `<p style="text-align: ${align};">`
+      text += `<p style="${styleText}">`
     }
     
     if (!rNode) {
@@ -112,6 +127,10 @@ export function genTextBody(textBodyNode, spNode, slideLayoutSpNode, type, warpO
     if (listType) text += '</li>'
     else text += '</p>'
   }
+  while (listTypes.length > 0) {
+    const closedListType = listTypes.pop()
+    text += `</${closedListType}>`
+  }
   return text
 }
 
@@ -124,6 +143,15 @@ export function getListType(node) {
   
   return ''
 }
+export function getListLevel(node) {
+  const pPrNode = node['a:pPr']
+  if (!pPrNode) return -1
+
+  const lvlNode = getTextByPathList(pPrNode, ['attrs', 'lvl'])
+  if (lvlNode !== undefined) return parseInt(lvlNode)
+
+  return 0
+}
 
 export function genSpanElement(node, pNode, textBodyNode, pFontStyle, slideLayoutSpNode, type, warpObj) {
   const { styleText, text, hasLink, linkURL } = getSpanStyleInfo(node, pNode, textBodyNode, pFontStyle, slideLayoutSpNode, type, warpObj)