pptxtojson 0.1.2 → 0.1.3

package/src/text.js

@@ -14,11 +14,10 @@ import {
   getFontShadow,
 } from './fontStyle'
 
-export function genTextBody(textBodyNode, slideLayoutSpNode, slideMasterSpNode, type, warpObj, fontsizeFactor, slideFactor) {
+export function genTextBody(textBodyNode, spNode, slideLayoutSpNode, type, warpObj) {
   if (!textBodyNode) return ''
 
   let text = ''
-  const slideMasterTextStyles = warpObj['slideMasterTextStyles']
 
   const pNode = textBodyNode['a:p']
   const pNodes = pNode.constructor === Array ? pNode : [pNode]
@@ -49,7 +48,7 @@ export function genTextBody(textBodyNode, slideLayoutSpNode, slideMasterSpNode,
       }
     }
 
-    const align = getHorizontalAlign(pNode, slideLayoutSpNode, slideMasterSpNode, type, slideMasterTextStyles)
+    const align = getHorizontalAlign(pNode, spNode, type, warpObj)
 
     const listType = getListType(pNode)
     if (listType) {
@@ -72,10 +71,10 @@ export function genTextBody(textBodyNode, slideLayoutSpNode, slideMasterSpNode,
       text += `<p style="text-align: ${align};">`
     }
     
-    if (!rNode) text += genSpanElement(pNode, slideLayoutSpNode, type, warpObj, fontsizeFactor, slideFactor)
+    if (!rNode) text += genSpanElement(pNode, slideLayoutSpNode, type, warpObj)
     else {
       for (const rNodeItem of rNode) {
-        text += genSpanElement(rNodeItem, slideLayoutSpNode, type, warpObj, fontsizeFactor, slideFactor)
+        text += genSpanElement(rNodeItem, slideLayoutSpNode, type, warpObj)
       }
     }
 
@@ -95,7 +94,7 @@ export function getListType(node) {
   return ''
 }
 
-export function genSpanElement(node, slideLayoutSpNode, type, warpObj, fontsizeFactor, slideFactor) {
+export function genSpanElement(node, slideLayoutSpNode, type, warpObj) {
   const slideMasterTextStyles = warpObj['slideMasterTextStyles']
 
   let text = node['a:t']
@@ -104,14 +103,14 @@ export function genSpanElement(node, slideLayoutSpNode, type, warpObj, fontsizeF
 
   let styleText = ''
   const fontColor = getFontColor(node)
-  const fontSize = getFontSize(node, slideLayoutSpNode, type, slideMasterTextStyles, fontsizeFactor)
+  const fontSize = getFontSize(node, slideLayoutSpNode, type, slideMasterTextStyles, warpObj.options.fontsizeFactor)
   const fontType = getFontType(node, type, warpObj)
   const fontBold = getFontBold(node)
   const fontItalic = getFontItalic(node)
   const fontDecoration = getFontDecoration(node)
   const fontDecorationLine = getFontDecorationLine(node)
-  const fontSpace = getFontSpace(node, fontsizeFactor)
-  const shadow = getFontShadow(node, warpObj, slideFactor)
+  const fontSpace = getFontSpace(node, warpObj.options.fontsizeFactor)
+  const shadow = getFontShadow(node, warpObj)
   const subscript = getFontSubscript(node)
 
   if (fontColor) styleText += `color: ${fontColor};`
@@ -128,7 +127,7 @@ export function genSpanElement(node, slideLayoutSpNode, type, warpObj, fontsizeF
   const linkID = getTextByPathList(node, ['a:rPr', 'a:hlinkClick', 'attrs', 'r:id'])
   if (linkID) {
     const linkURL = warpObj['slideResObj'][linkID]['target']
-    return `<span style="${styleText}"><a href="${linkURL}" target="_blank">${text.replace(/\s/i, '&nbsp;')}</a></span>`
+    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(/\s/i, '&nbsp;')}</span>`
+  return `<span style="${styleText}">${text.replace(/\t/g, '&nbsp;&nbsp;&nbsp;&nbsp;').replace(/\s/g, '&nbsp;')}</span>`
 }