pptxtojson 0.1.1 → 0.1.3

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "pptxtojson",
-	"version": "0.1.1",
+	"version": "0.1.3",
 	"description": "A javascript tool for parsing .pptx file",
 	"type": "module",
 	"main": "./dist/index.umd.js",
@@ -12,7 +12,7 @@
 		"lint": "eslint src --ext .js,.jsx,.ts,.tsx"
 	},
 	"author": "",
-	"license": "AGPL-3.0",
+	"license": "MIT",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.com/"
 	},

package/src/align.js

@@ -1,26 +1,55 @@
 import { getTextByPathList } from './utils'
 
-export function getHorizontalAlign(node, slideLayoutSpNode, slideMasterSpNode, type, slideMasterTextStyles) {
+export function getHorizontalAlign(node, pNode, type, warpObj) {
   let algn = getTextByPathList(node, ['a:pPr', 'attrs', 'algn'])
+  if (!algn) algn = getTextByPathList(pNode, ['a:pPr', 'attrs', 'algn'])
 
-  if (!algn) algn = getTextByPathList(slideLayoutSpNode, ['p:txBody', 'a:p', 'a:pPr', 'attrs', 'algn'])
-  if (!algn) algn = getTextByPathList(slideMasterSpNode, ['p:txBody', 'a:p', 'a:pPr', 'attrs', 'algn'])
   if (!algn) {
-    switch (type) {
-      case 'title':
-      case 'subTitle':
-      case 'ctrTitle':
-        algn = getTextByPathList(slideMasterTextStyles, ['p:titleStyle', 'a:lvl1pPr', 'attrs', 'algn'])
+    if (type === 'title' || type === 'ctrTitle' || type === 'subTitle') {
+      let lvlIdx = 1
+      const lvlNode = getTextByPathList(pNode, ['a:pPr', 'attrs', 'lvl'])
+      if (lvlNode) {
+        lvlIdx = parseInt(lvlNode) + 1
+      }
+      const lvlStr = 'a:lvl' + lvlIdx + 'pPr'
+      algn = getTextByPathList(warpObj, ['slideLayoutTables', 'typeTable', type, 'p:txBody', 'a:lstStyle', lvlStr, 'attrs', 'algn'])
+      if (!algn) algn = getTextByPathList(warpObj, ['slideMasterTables', 'typeTable', type, 'p:txBody', 'a:lstStyle', lvlStr, 'attrs', 'algn'])
+      if (!algn) algn = getTextByPathList(warpObj, ['slideMasterTextStyles', 'p:titleStyle', lvlStr, 'attrs', 'algn'])
+      if (!algn && type === 'subTitle') {
+        algn = getTextByPathList(warpObj, ['slideMasterTextStyles', 'p:bodyStyle', lvlStr, 'attrs', 'algn'])
+      }
+    } 
+    else if (type === 'body') {
+      algn = getTextByPathList(warpObj, ['slideMasterTextStyles', 'p:bodyStyle', 'a:lvl1pPr', 'attrs', 'algn'])
+    } 
+    else {
+      algn = getTextByPathList(warpObj, ['slideMasterTables', 'typeTable', type, 'p:txBody', 'a:lstStyle', 'a:lvl1pPr', 'attrs', 'algn'])
+    }
+  }
+
+  let align = 'left'
+  if (algn) {
+    switch (algn) {
+      case 'l':
+        align = 'left'
+        break
+      case 'r':
+        align = 'right'
+        break
+      case 'ctr':
+        align = 'center'
+        break
+      case 'just':
+        align = 'justify'
+        break
+      case 'dist':
+        align = 'justify'
         break
       default:
-        algn = getTextByPathList(slideMasterTextStyles, ['p:otherStyle', 'a:lvl1pPr', 'attrs', 'algn'])
+        align = 'inherit'
     }
   }
-  if (!algn) {
-    if (type === 'title' || type === 'subTitle' || type === 'ctrTitle') return 'center'
-    else if (type === 'sldNum') return 'right'
-  }
-  return algn === 'ctr' ? 'center' : algn === 'r' ? 'right' : 'left'
+  return align
 }
 
 export function getVerticalAlign(node, slideLayoutSpNode, slideMasterSpNode) {

package/src/fill.js

@@ -244,7 +244,7 @@ export function getShapeFill(node, isSvgMode, warpObj) {
     if (isNaN(lumOff)) lumOff = 0
 
     const color = tinycolor(fillColor).toHsl()
-    const lum = color.l * (1 + lumOff)
+    const lum = color.l * lumMod + lumOff
     return tinycolor({ h: color.h, s: color.s, l: lum, a: color.a }).toHexString()
   } 
 
@@ -264,6 +264,15 @@ export function getSolidFill(solidFill, clrMap, phClr, warpObj) {
   else if (solidFill['a:schemeClr']) {
     const schemeClr = 'a:' + getTextByPathList(solidFill['a:schemeClr'], ['attrs', 'val'])
     color = getSchemeColorFromTheme(schemeClr, warpObj)
+    
+    let lumMod = parseInt(getTextByPathList(solidFill, ['a:schemeClr', 'a:lumMod', 'attrs', 'val'])) / 100000
+    let lumOff = parseInt(getTextByPathList(solidFill, ['a:schemeClr', 'a:lumOff', 'attrs', 'val'])) / 100000
+    if (isNaN(lumMod)) lumMod = 1.0
+    if (isNaN(lumOff)) lumOff = 0
+
+    color = tinycolor(color).toHsl()
+    const lum = color.l * lumMod + lumOff
+    return tinycolor({ h: color.h, s: color.s, l: lum, a: color.a }).toHex()
   }
   else if (solidFill['a:scrgbClr']) {
     clrNode = solidFill['a:scrgbClr']

package/src/fontStyle.js

@@ -58,7 +58,7 @@ export function getFontSize(node, slideLayoutSpNode, type, slideMasterTextStyles
 
   fontSize = (isNaN(fontSize) || !fontSize) ? 18 : fontSize
 
-  return fontSize * fontsizeFactor + 'px'
+  return parseFloat((fontSize * fontsizeFactor).toFixed(2)) + (fontsizeFactor === 1 ? 'pt' : 'px')
 }
 
 export function getFontBold(node) {
@@ -70,13 +70,11 @@ export function getFontItalic(node) {
 }
 
 export function getFontDecoration(node) {
-  const underline = getTextByPathList(node, ['a:rPr', 'attrs', 'u']) === 'sng' ? 'underline' : ''
-  const strike = getTextByPathList(node, ['a:rPr', 'attrs', 'strike']) === 'sngStrike' ? 'line-through' : ''
+  return getTextByPathList(node, ['a:rPr', 'attrs', 'u']) === 'sng' ? 'underline' : ''
+}
 
-  if (!underline && !strike) return ''
-  else if (underline && !strike) return underline
-  else if (!underline && strike) return strike
-  return `${underline} ${strike}`
+export function getFontDecorationLine(node) {
+  return getTextByPathList(node, ['a:rPr', 'attrs', 'strike']) === 'sngStrike' ? 'line-through' : ''
 }
 
 export function getFontSpace(node, fontsizeFactor) {
@@ -90,10 +88,10 @@ export function getFontSubscript(node) {
   return parseInt(baseline) > 0 ? 'super' : 'sub'
 }
 
-export function getFontShadow(node, warpObj, slideFactor) {
+export function getFontShadow(node, warpObj) {
   const txtShadow = getTextByPathList(node, ['a:rPr', 'a:effectLst', 'a:outerShdw'])
   if (txtShadow) {
-    const shadow = getShadow(txtShadow, warpObj, slideFactor)
+    const shadow = getShadow(txtShadow, warpObj)
     if (shadow) {
       const { h, v, blur, color } = shadow
       if (!isNaN(v) && !isNaN(h)) {

package/src/position.js

@@ -8,8 +8,8 @@ export function getPosition(slideSpNode, slideLayoutSpNode, slideMasterSpNode, f
   if (!off) return { top: 0, left: 0 }
 
   return {
-    top: parseInt(off['y']) * factor,
-    left: parseInt(off['x']) * factor,
+    top: parseFloat((parseInt(off['y']) * factor).toFixed(2)),
+    left: parseFloat((parseInt(off['x']) * factor).toFixed(2)),
   }
 }
 
@@ -23,7 +23,7 @@ export function getSize(slideSpNode, slideLayoutSpNode, slideMasterSpNode, facto
   if (!ext) return { width: 0, height: 0 }
 
   return {
-    width: parseInt(ext['cx']) * factor,
-    height: parseInt(ext['cy']) * factor,
+    width: parseFloat((parseInt(ext['cx']) * factor).toFixed(2)),
+    height: parseFloat((parseInt(ext['cy']) * factor).toFixed(2)),
   }
 }