pptxtojson 0.1.8 → 1.0.1

package/index.html

@@ -106,10 +106,7 @@
 			
 			const reader = new FileReader()
 			reader.onload = async e => {
-				const json = await pptxtojson.parse(e.target.result, {
-					// slideFactor: 75 / 914400,
-  				// fontsizeFactor: 100 / 96,
-				})
+				const json = await pptxtojson.parse(e.target.result)
 				editor.set(json)
 				console.log(json)
 			}

package/package.json

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

package/src/color.js

@@ -165,4 +165,13 @@ export function applySatMod(rgbStr, multiplier, isAlpha) {
     l: color.l,
     a: color.a
   }).toHex()
+}
+
+export function getColorName2Hex(name) {
+  let hex
+  const colorName = ['white', 'AliceBlue', 'AntiqueWhite', 'Aqua', 'Aquamarine', 'Azure', 'Beige', 'Bisque', 'black', 'BlanchedAlmond', 'Blue', 'BlueViolet', 'Brown', 'BurlyWood', 'CadetBlue', 'Chartreuse', 'Chocolate', 'Coral', 'CornflowerBlue', 'Cornsilk', 'Crimson', 'Cyan', 'DarkBlue', 'DarkCyan', 'DarkGoldenRod', 'DarkGray', 'DarkGrey', 'DarkGreen', 'DarkKhaki', 'DarkMagenta', 'DarkOliveGreen', 'DarkOrange', 'DarkOrchid', 'DarkRed', 'DarkSalmon', 'DarkSeaGreen', 'DarkSlateBlue', 'DarkSlateGray', 'DarkSlateGrey', 'DarkTurquoise', 'DarkViolet', 'DeepPink', 'DeepSkyBlue', 'DimGray', 'DimGrey', 'DodgerBlue', 'FireBrick', 'FloralWhite', 'ForestGreen', 'Fuchsia', 'Gainsboro', 'GhostWhite', 'Gold', 'GoldenRod', 'Gray', 'Grey', 'Green', 'GreenYellow', 'HoneyDew', 'HotPink', 'IndianRed', 'Indigo', 'Ivory', 'Khaki', 'Lavender', 'LavenderBlush', 'LawnGreen', 'LemonChiffon', 'LightBlue', 'LightCoral', 'LightCyan', 'LightGoldenRodYellow', 'LightGray', 'LightGrey', 'LightGreen', 'LightPink', 'LightSalmon', 'LightSeaGreen', 'LightSkyBlue', 'LightSlateGray', 'LightSlateGrey', 'LightSteelBlue', 'LightYellow', 'Lime', 'LimeGreen', 'Linen', 'Magenta', 'Maroon', 'MediumAquaMarine', 'MediumBlue', 'MediumOrchid', 'MediumPurple', 'MediumSeaGreen', 'MediumSlateBlue', 'MediumSpringGreen', 'MediumTurquoise', 'MediumVioletRed', 'MidnightBlue', 'MintCream', 'MistyRose', 'Moccasin', 'NavajoWhite', 'Navy', 'OldLace', 'Olive', 'OliveDrab', 'Orange', 'OrangeRed', 'Orchid', 'PaleGoldenRod', 'PaleGreen', 'PaleTurquoise', 'PaleVioletRed', 'PapayaWhip', 'PeachPuff', 'Peru', 'Pink', 'Plum', 'PowderBlue', 'Purple', 'RebeccaPurple', 'Red', 'RosyBrown', 'RoyalBlue', 'SaddleBrown', 'Salmon', 'SandyBrown', 'SeaGreen', 'SeaShell', 'Sienna', 'Silver', 'SkyBlue', 'SlateBlue', 'SlateGray', 'SlateGrey', 'Snow', 'SpringGreen', 'SteelBlue', 'Tan', 'Teal', 'Thistle', 'Tomato', 'Turquoise', 'Violet', 'Wheat', 'White', 'WhiteSmoke', 'Yellow', 'YellowGreen']
+  const colorHex = ['ffffff', 'f0f8ff', 'faebd7', '00ffff', '7fffd4', 'f0ffff', 'f5f5dc', 'ffe4c4', '000000', 'ffebcd', '0000ff', '8a2be2', 'a52a2a', 'deb887', '5f9ea0', '7fff00', 'd2691e', 'ff7f50', '6495ed', 'fff8dc', 'dc143c', '00ffff', '00008b', '008b8b', 'b8860b', 'a9a9a9', 'a9a9a9', '006400', 'bdb76b', '8b008b', '556b2f', 'ff8c00', '9932cc', '8b0000', 'e9967a', '8fbc8f', '483d8b', '2f4f4f', '2f4f4f', '00ced1', '9400d3', 'ff1493', '00bfff', '696969', '696969', '1e90ff', 'b22222', 'fffaf0', '228b22', 'ff00ff', 'dcdcdc', 'f8f8ff', 'ffd700', 'daa520', '808080', '808080', '008000', 'adff2f', 'f0fff0', 'ff69b4', 'cd5c5c', '4b0082', 'fffff0', 'f0e68c', 'e6e6fa', 'fff0f5', '7cfc00', 'fffacd', 'add8e6', 'f08080', 'e0ffff', 'fafad2', 'd3d3d3', 'd3d3d3', '90ee90', 'ffb6c1', 'ffa07a', '20b2aa', '87cefa', '778899', '778899', 'b0c4de', 'ffffe0', '00ff00', '32cd32', 'faf0e6', 'ff00ff', '800000', '66cdaa', '0000cd', 'ba55d3', '9370db', '3cb371', '7b68ee', '00fa9a', '48d1cc', 'c71585', '191970', 'f5fffa', 'ffe4e1', 'ffe4b5', 'ffdead', '000080', 'fdf5e6', '808000', '6b8e23', 'ffa500', 'ff4500', 'da70d6', 'eee8aa', '98fb98', 'afeeee', 'db7093', 'ffefd5', 'ffdab9', 'cd853f', 'ffc0cb', 'dda0dd', 'b0e0e6', '800080', '663399', 'ff0000', 'bc8f8f', '4169e1', '8b4513', 'fa8072', 'f4a460', '2e8b57', 'fff5ee', 'a0522d', 'c0c0c0', '87ceeb', '6a5acd', '708090', '708090', 'fffafa', '00ff7f', '4682b4', 'd2b48c', '008080', 'd8bfd8', 'ff6347', '40e0d0', 'ee82ee', 'f5deb3', 'ffffff', 'f5f5f5', 'ffff00', '9acd32']
+  const findIndx = colorName.indexOf(name)
+  if (findIndx !== -1) hex = colorHex[findIndx]
+  return hex
 }

package/src/constants.js

@@ -0,0 +1,3 @@
+export const RATIO_Inches_EMUs = 914400 // 1英寸 = 914400EMUs
+export const RATIO_Inches_Points = 72 // 1英寸 = 72pt
+export const RATIO_EMUs_Points = RATIO_Inches_Points / RATIO_Inches_EMUs // 1EMUs = (72 / 914400)pt

package/src/fill.js

@@ -8,6 +8,7 @@ import {
   applyHueMod,
   applySatMod,
   hslToRgb,
+  getColorName2Hex,
 } from './color'
 
 import {
@@ -94,7 +95,7 @@ export function getBgGradientFill(bgPr, phClr, slideMasterContent, warpObj) {
 
       color_ary[i] = {
         pos: pos ? (pos / 1000 + '%') : '',
-        color: `#${lo_color}`,
+        color: lo_color,
       }
     }
     const lin = grdFill['a:lin']
@@ -109,7 +110,9 @@ export function getBgGradientFill(bgPr, phClr, slideMasterContent, warpObj) {
       colors: color_ary.sort((a, b) => parseInt(a.pos) - parseInt(b.pos)),
     }
   }
-  else if (phClr) return `#${phClr}`
+  else if (phClr) {
+    return phClr.indexOf('#') === -1 ? `#${phClr}` : phClr
+  }
   return null
 }
 
@@ -138,7 +141,7 @@ export async function getSlideBackgroundFill(warpObj) {
         else clrMapOvr = getTextByPathList(slideMasterContent, ['p:sldMaster', 'p:clrMap', 'attrs'])
       }
       const sldBgClr = getSolidFill(sldFill, clrMapOvr, undefined, warpObj)
-      background = `#${sldBgClr}`
+      background = sldBgClr
     }
     else if (bgFillTyp === 'GRADIENT_FILL') {
       const gradientFill = getBgGradientFill(bgPr, undefined, slideMasterContent, warpObj)
@@ -207,7 +210,7 @@ export async function getSlideBackgroundFill(warpObj) {
       if (bgFillTyp === 'SOLID_FILL') {
         const sldFill = bgFillLstIdx['a:solidFill']
         const sldBgClr = getSolidFill(sldFill, clrMapOvr, undefined, warpObj)
-        background = `#${sldBgClr}`
+        background = sldBgClr
       } 
       else if (bgFillTyp === 'GRADIENT_FILL') {
         const gradientFill = getBgGradientFill(bgFillLstIdx, phClr, slideMasterContent, warpObj)
@@ -235,7 +238,7 @@ export async function getSlideBackgroundFill(warpObj) {
       if (bgFillTyp === 'SOLID_FILL') {
         const sldFill = bgPr['a:solidFill']
         const sldBgClr = getSolidFill(sldFill, clrMapOvr, undefined, warpObj)
-        background = `#${sldBgClr}`
+        background = sldBgClr
       }
       else if (bgFillTyp === 'GRADIENT_FILL') {
         const gradientFill = getBgGradientFill(bgPr, undefined, slideMasterContent, warpObj)
@@ -296,7 +299,7 @@ export async function getSlideBackgroundFill(warpObj) {
         if (bgFillTyp === 'SOLID_FILL') {
           const sldFill = bgFillLstIdx['a:solidFill']
           const sldBgClr = getSolidFill(sldFill, clrMapOvr, undefined, warpObj)
-          background = `#${sldBgClr}`
+          background = sldBgClr
         } 
         else if (bgFillTyp === 'GRADIENT_FILL') {
           const gradientFill = getBgGradientFill(bgFillLstIdx, phClr, slideMasterContent, warpObj)
@@ -324,7 +327,7 @@ export async function getSlideBackgroundFill(warpObj) {
         if (bgFillTyp === 'SOLID_FILL') {
           const sldFill = bgPr['a:solidFill']
           const sldBgClr = getSolidFill(sldFill, clrMap, undefined, warpObj)
-          background = `#${sldBgClr}`
+          background = sldBgClr
         }
         else if (bgFillTyp === 'GRADIENT_FILL') {
           const gradientFill = getBgGradientFill(bgPr, undefined, slideMasterContent, warpObj)
@@ -385,7 +388,7 @@ export async function getSlideBackgroundFill(warpObj) {
           if (bgFillTyp === 'SOLID_FILL') {
             const sldFill = bgFillLstIdx['a:solidFill']
             const sldBgClr = getSolidFill(sldFill, clrMapOvr, undefined, warpObj)
-            background = `#${sldBgClr}`
+            background = sldBgClr
           } 
           else if (bgFillTyp === 'GRADIENT_FILL') {
             const gradientFill = getBgGradientFill(bgFillLstIdx, phClr, slideMasterContent, warpObj)
@@ -451,24 +454,17 @@ export function getShapeFill(node, isSvgMode, warpObj) {
 export function getSolidFill(solidFill, clrMap, phClr, warpObj) {
   if (!solidFill) return solidFill
 
-  let color = 'fff'
+  let color = '#ffffff'
   let clrNode
 
   if (solidFill['a:srgbClr']) {
-    color = getTextByPathList(solidFill['a:srgbClr'], ['attrs', 'val'])
+    clrNode = solidFill['a:srgbClr']
+    color = getTextByPathList(clrNode, ['attrs', 'val'])
   } 
   else if (solidFill['a:schemeClr']) {
-    const schemeClr = 'a:' + getTextByPathList(solidFill['a:schemeClr'], ['attrs', 'val'])
-    color = getSchemeColorFromTheme(schemeClr, warpObj, clrMap, phClr) || '#ffffffff'
-    
-    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()
+    clrNode = solidFill['a:schemeClr']
+    const schemeClr = 'a:' + getTextByPathList(clrNode, ['attrs', 'val'])
+    color = getSchemeColorFromTheme(schemeClr, warpObj, clrMap, phClr) || '#ffffff'
   }
   else if (solidFill['a:scrgbClr']) {
     clrNode = solidFill['a:scrgbClr']
@@ -480,7 +476,8 @@ export function getSolidFill(solidFill, clrMap, phClr, warpObj) {
   } 
   else if (solidFill['a:prstClr']) {
     clrNode = solidFill['a:prstClr']
-    color = getTextByPathList(clrNode, ['attrs', 'val'])
+    const prstClr = getTextByPathList(clrNode, ['attrs', 'val'])
+    color = getColorName2Hex(prstClr)
   } 
   else if (solidFill['a:hslClr']) {
     clrNode = solidFill['a:hslClr']
@@ -531,5 +528,7 @@ export function getSolidFill(solidFill, clrMap, phClr, warpObj) {
     color = applyTint(color, tint, isAlpha)
   }
 
+  if (color && color.indexOf('#') === -1) color = '#' + color
+
   return color
 }

package/src/fontStyle.js

@@ -26,7 +26,7 @@ export function getFontColor(node) {
   return color ? `#${color}` : ''
 }
 
-export function getFontSize(node, slideLayoutSpNode, type, slideMasterTextStyles, fontsizeFactor) {
+export function getFontSize(node, slideLayoutSpNode, type, slideMasterTextStyles) {
   let fontSize
 
   if (getTextByPathList(node, ['a:rPr', 'attrs', 'sz'])) fontSize = getTextByPathList(node, ['a:rPr', 'attrs', 'sz']) / 100
@@ -58,7 +58,7 @@ export function getFontSize(node, slideLayoutSpNode, type, slideMasterTextStyles
 
   fontSize = (isNaN(fontSize) || !fontSize) ? 18 : fontSize
 
-  return parseFloat((fontSize * fontsizeFactor).toFixed(2)) + (fontsizeFactor === 1 ? 'pt' : 'px')
+  return fontSize + 'pt'
 }
 
 export function getFontBold(node) {
@@ -77,9 +77,9 @@ export function getFontDecorationLine(node) {
   return getTextByPathList(node, ['a:rPr', 'attrs', 'strike']) === 'sngStrike' ? 'line-through' : ''
 }
 
-export function getFontSpace(node, fontsizeFactor) {
+export function getFontSpace(node) {
   const spc = getTextByPathList(node, ['a:rPr', 'attrs', 'spc'])
-  return spc ? (parseInt(spc) / 100 * fontsizeFactor + 'px') : ''
+  return spc ? (parseInt(spc) / 100 + 'pt') : ''
 }
 
 export function getFontSubscript(node) {

package/src/position.js

@@ -1,4 +1,6 @@
-export function getPosition(slideSpNode, slideLayoutSpNode, slideMasterSpNode, factor) {
+import { RATIO_EMUs_Points } from './constants'
+
+export function getPosition(slideSpNode, slideLayoutSpNode, slideMasterSpNode) {
   let off
 
   if (slideSpNode) off = slideSpNode['a:off']['attrs']
@@ -8,12 +10,12 @@ export function getPosition(slideSpNode, slideLayoutSpNode, slideMasterSpNode, f
   if (!off) return { top: 0, left: 0 }
 
   return {
-    top: parseFloat((parseInt(off['y']) * factor).toFixed(2)),
-    left: parseFloat((parseInt(off['x']) * factor).toFixed(2)),
+    top: parseInt(off['y']) * RATIO_EMUs_Points,
+    left: parseInt(off['x']) * RATIO_EMUs_Points,
   }
 }
 
-export function getSize(slideSpNode, slideLayoutSpNode, slideMasterSpNode, factor) {
+export function getSize(slideSpNode, slideLayoutSpNode, slideMasterSpNode) {
   let ext
 
   if (slideSpNode) ext = slideSpNode['a:ext']['attrs']
@@ -23,7 +25,7 @@ export function getSize(slideSpNode, slideLayoutSpNode, slideMasterSpNode, facto
   if (!ext) return { width: 0, height: 0 }
 
   return {
-    width: parseFloat((parseInt(ext['cx']) * factor).toFixed(2)),
-    height: parseFloat((parseInt(ext['cy']) * factor).toFixed(2)),
+    width: parseInt(ext['cx']) * RATIO_EMUs_Points,
+    height: parseInt(ext['cy']) * RATIO_EMUs_Points,
   }
 }

package/src/pptxtojson.js

@@ -9,25 +9,20 @@ import { genTextBody } from './text'
 import { getCustomShapePath } from './shape'
 import { extractFileExtension, base64ArrayBuffer, getTextByPathList, angleToDegrees, getMimeType, isVideoLink, escapeHtml } from './utils'
 import { getShadow } from './shadow'
+import { getTableCellParams, getTableRowParams } from './table'
+import { RATIO_EMUs_Points } from './constants'
 
-export async function parse(file, options = {}) {
-  const defaultOptions = {
-    slideFactor: 96 / 914400,
-    fontsizeFactor: 100 / 75,
-  }
-
-  options = { ...defaultOptions, ...options }
-
+export async function parse(file) {
   const slides = []
   
   const zip = await JSZip.loadAsync(file)
 
   const filesInfo = await getContentTypes(zip)
-  const { width, height, defaultTextStyle } = await getSlideInfo(zip, options)
+  const { width, height, defaultTextStyle } = await getSlideInfo(zip)
   const themeContent = await loadTheme(zip)
 
   for (const filename of filesInfo.slides) {
-    const singleSlide = await processSingleSlide(zip, filename, themeContent, defaultTextStyle, options)
+    const singleSlide = await processSingleSlide(zip, filename, themeContent, defaultTextStyle)
     slides.push(singleSlide)
   }
 
@@ -72,13 +67,13 @@ async function getContentTypes(zip) {
   }
 }
 
-async function getSlideInfo(zip, options) {
+async function getSlideInfo(zip) {
   const content = await readXmlFile(zip, 'ppt/presentation.xml')
   const sldSzAttrs = content['p:presentation']['p:sldSz']['attrs']
   const defaultTextStyle = content['p:presentation']['p:defaultTextStyle']
   return {
-    width: parseInt(sldSzAttrs['cx']) * options.slideFactor,
-    height: parseInt(sldSzAttrs['cy']) * options.slideFactor,
+    width: parseInt(sldSzAttrs['cx']) * RATIO_EMUs_Points,
+    height: parseInt(sldSzAttrs['cy']) * RATIO_EMUs_Points,
     defaultTextStyle,
   }
 }
@@ -104,7 +99,7 @@ async function loadTheme(zip) {
   return await readXmlFile(zip, 'ppt/' + themeURI)
 }
 
-async function processSingleSlide(zip, sldFileName, themeContent, defaultTextStyle, options) {
+async function processSingleSlide(zip, sldFileName, themeContent, defaultTextStyle) {
   const resName = sldFileName.replace('slides/slide', 'slides/_rels/slide') + '.rels'
   const resContent = await readXmlFile(zip, resName)
   let relationshipArray = resContent['Relationships']['Relationship']
@@ -267,7 +262,6 @@ async function processSingleSlide(zip, sldFileName, themeContent, defaultTextSty
     digramFileContent,
     diagramResObj,
     defaultTextStyle,
-    options,
   }
   // const bgElements = await getBackground(warpObj)
   const bgColor = await getSlideBackgroundFill(warpObj)
@@ -408,16 +402,14 @@ async function processGroupSpNode(node, warpObj, source) {
   const xfrmNode = getTextByPathList(node, ['p:grpSpPr', 'a:xfrm'])
   if (!xfrmNode) return null
 
-  const x = parseInt(xfrmNode['a:off']['attrs']['x']) * warpObj.options.slideFactor
-  const y = parseInt(xfrmNode['a:off']['attrs']['y']) * warpObj.options.slideFactor
-  // https://learn.microsoft.com/en-us/dotnet/api/documentformat.openxml.drawing.childoffset?view=openxml-2.8.1
-  const chx = parseInt(xfrmNode['a:chOff']['attrs']['x']) * warpObj.options.slideFactor
-  const chy = parseInt(xfrmNode['a:chOff']['attrs']['y']) * warpObj.options.slideFactor
-  const cx = parseInt(xfrmNode['a:ext']['attrs']['cx']) * warpObj.options.slideFactor
-  const cy = parseInt(xfrmNode['a:ext']['attrs']['cy']) * warpObj.options.slideFactor
-  // https://learn.microsoft.com/en-us/dotnet/api/documentformat.openxml.drawing.childextents?view=openxml-2.8.1
-  const chcx = parseInt(xfrmNode['a:chExt']['attrs']['cx']) * warpObj.options.slideFactor
-  const chcy = parseInt(xfrmNode['a:chExt']['attrs']['cy']) * warpObj.options.slideFactor
+  const x = parseInt(xfrmNode['a:off']['attrs']['x']) * RATIO_EMUs_Points
+  const y = parseInt(xfrmNode['a:off']['attrs']['y']) * RATIO_EMUs_Points
+  const chx = parseInt(xfrmNode['a:chOff']['attrs']['x']) * RATIO_EMUs_Points
+  const chy = parseInt(xfrmNode['a:chOff']['attrs']['y']) * RATIO_EMUs_Points
+  const cx = parseInt(xfrmNode['a:ext']['attrs']['cx']) * RATIO_EMUs_Points
+  const cy = parseInt(xfrmNode['a:ext']['attrs']['cy']) * RATIO_EMUs_Points
+  const chcx = parseInt(xfrmNode['a:chExt']['attrs']['cx']) * RATIO_EMUs_Points
+  const chcy = parseInt(xfrmNode['a:chExt']['attrs']['cy']) * RATIO_EMUs_Points
   // children coordinate
   const ws = cx / chcx
   const hs = cy / chcy
@@ -438,16 +430,16 @@ async function processGroupSpNode(node, warpObj, source) {
 
   return {
     type: 'group',
-    top: parseFloat(y.toFixed(2)),
-    left: parseFloat(x.toFixed(2)),
-    width: parseFloat(cx.toFixed(2)),
-    height: parseFloat(cy.toFixed(2)),
+    top: y,
+    left: x,
+    width: cx,
+    height: cy,
     elements: elements.map(element => ({
       ...element,
-      left: parseFloat(((element.left - chx) * ws).toFixed(2)),
-      top: parseFloat(((element.top - chy) * hs).toFixed(2)),
-      width: parseFloat((element.width * ws).toFixed(2)),
-      height: parseFloat((element.height * hs).toFixed(2)),
+      left: (element.left - chx) * ws,
+      top: (element.top - chy) * hs,
+      width: element.width * ws,
+      height: element.height * hs,
     }))
   }
 }
@@ -505,8 +497,8 @@ function genShape(node, slideLayoutSpNode, slideMasterSpNode, name, type, warpOb
   const shapType = getTextByPathList(node, ['p:spPr', 'a:prstGeom', 'attrs', 'prst'])
   const custShapType = getTextByPathList(node, ['p:spPr', 'a:custGeom'])
 
-  const { top, left } = getPosition(slideXfrmNode, slideLayoutXfrmNode, slideMasterXfrmNode, warpObj.options.slideFactor)
-  const { width, height } = getSize(slideXfrmNode, slideLayoutXfrmNode, slideMasterXfrmNode, warpObj.options.slideFactor)
+  const { top, left } = getPosition(slideXfrmNode, slideLayoutXfrmNode, slideMasterXfrmNode)
+  const { width, height } = getSize(slideXfrmNode, slideLayoutXfrmNode, slideMasterXfrmNode)
 
   const isFlipV = getTextByPathList(slideXfrmNode, ['attrs', 'flipV']) === '1'
   const isFlipH = getTextByPathList(slideXfrmNode, ['attrs', 'flipH']) === '1'
@@ -556,8 +548,8 @@ function genShape(node, slideLayoutSpNode, slideMasterSpNode, name, type, warpOb
 
   if (custShapType && type !== 'diagram') {
     const ext = getTextByPathList(slideXfrmNode, ['a:ext', 'attrs'])
-    const w = parseInt(ext['cx']) * warpObj.options.slideFactor
-    const h = parseInt(ext['cy']) * warpObj.options.slideFactor
+    const w = parseInt(ext['cx']) * RATIO_EMUs_Points
+    const h = parseInt(ext['cy']) * RATIO_EMUs_Points
     const d = getCustomShapePath(custShapType, w, h)
 
     return {
@@ -596,8 +588,8 @@ async function processPicNode(node, warpObj, source) {
   const xfrmNode = node['p:spPr']['a:xfrm']
 
   const mimeType = getMimeType(imgFileExt)
-  const { top, left } = getPosition(xfrmNode, undefined, undefined, warpObj.options.slideFactor)
-  const { width, height } = getSize(xfrmNode, undefined, undefined, warpObj.options.slideFactor)
+  const { top, left } = getPosition(xfrmNode, undefined, undefined)
+  const { width, height } = getSize(xfrmNode, undefined, undefined)
   const src = `data:${mimeType};base64,${base64ArrayBuffer(imgArrayBuffer)}`
 
   const isFlipV = getTextByPathList(xfrmNode, ['attrs', 'flipV']) === '1'
@@ -715,11 +707,26 @@ async function processGraphicFrameNode(node, warpObj, source) {
 function genTable(node, warpObj) {
   const tableNode = getTextByPathList(node, ['a:graphic', 'a:graphicData', 'a:tbl'])
   const xfrmNode = getTextByPathList(node, ['p:xfrm'])
-  const { top, left } = getPosition(xfrmNode, undefined, undefined, warpObj.options.slideFactor)
-  const { width, height } = getSize(xfrmNode, undefined, undefined, warpObj.options.slideFactor)
+  const { top, left } = getPosition(xfrmNode, undefined, undefined)
+  const { width, height } = getSize(xfrmNode, undefined, undefined)
 
   const getTblPr = getTextByPathList(node, ['a:graphic', 'a:graphicData', 'a:tbl', 'a:tblPr'])
 
+  const firstRowAttr = getTblPr['attrs'] ? getTblPr['attrs']['firstRow'] : undefined
+  const firstColAttr = getTblPr['attrs'] ? getTblPr['attrs']['firstCol'] : undefined
+  const lastRowAttr = getTblPr['attrs'] ? getTblPr['attrs']['lastRow'] : undefined
+  const lastColAttr = getTblPr['attrs'] ? getTblPr['attrs']['lastCol'] : undefined
+  const bandRowAttr = getTblPr['attrs'] ? getTblPr['attrs']['bandRow'] : undefined
+  const bandColAttr = getTblPr['attrs'] ? getTblPr['attrs']['bandCol'] : undefined
+  const tblStylAttrObj = {
+    isFrstRowAttr: (firstRowAttr && firstRowAttr === '1') ? 1 : 0,
+    isFrstColAttr: (firstColAttr && firstColAttr === '1') ? 1 : 0,
+    isLstRowAttr: (lastRowAttr && lastRowAttr === '1') ? 1 : 0,
+    isLstColAttr: (lastColAttr && lastColAttr === '1') ? 1 : 0,
+    isBandRowAttr: (bandRowAttr && bandRowAttr === '1') ? 1 : 0,
+    isBandColAttr: (bandColAttr && bandColAttr === '1') ? 1 : 0,
+  }
+
   let thisTblStyle
   const tbleStyleId = getTblPr['a:tableStyleId']
   if (tbleStyleId) {
@@ -739,57 +746,115 @@ function genTable(node, warpObj) {
       }
     }
   }
+  if (thisTblStyle) thisTblStyle['tblStylAttrObj'] = tblStylAttrObj
 
-  let themeColor = ''
+  let tbl_bgcolor = ''
   let tbl_bgFillschemeClr = getTextByPathList(thisTblStyle, ['a:tblBg', 'a:fillRef'])
   if (tbl_bgFillschemeClr) {
-    themeColor = getSolidFill(tbl_bgFillschemeClr, undefined, undefined, warpObj)
+    tbl_bgcolor = getSolidFill(tbl_bgFillschemeClr, undefined, undefined, warpObj)
   }
   if (tbl_bgFillschemeClr === undefined) {
     tbl_bgFillschemeClr = getTextByPathList(thisTblStyle, ['a:wholeTbl', 'a:tcStyle', 'a:fill', 'a:solidFill'])
-    themeColor = getSolidFill(tbl_bgFillschemeClr, undefined, undefined, warpObj)
+    tbl_bgcolor = getSolidFill(tbl_bgFillschemeClr, undefined, undefined, warpObj)
   }
-  if (themeColor !== '') themeColor = '#' + themeColor
 
-  const trNodes = tableNode['a:tr']
+  let trNodes = tableNode['a:tr']
+  if (trNodes.constructor !== Array) trNodes = [trNodes]
   
   const data = []
-  if (trNodes.constructor === Array) {
-    for (const trNode of trNodes) {
-      const tcNodes = trNode['a:tc']
-      const tr = []
-
-      if (tcNodes.constructor === Array) {
-        for (const tcNode of tcNodes) {
-          const text = genTextBody(tcNode['a:txBody'], tcNode, undefined, undefined, warpObj)
-          const rowSpan = getTextByPathList(tcNode, ['attrs', 'rowSpan'])
-          const colSpan = getTextByPathList(tcNode, ['attrs', 'gridSpan'])
-          const vMerge = getTextByPathList(tcNode, ['attrs', 'vMerge'])
-          const hMerge = getTextByPathList(tcNode, ['attrs', 'hMerge'])
-
-          tr.push({ text, rowSpan, colSpan, vMerge, hMerge })
-        }
-      } 
-      else {
-        const text = genTextBody(tcNodes['a:txBody'], tcNodes, undefined, undefined, warpObj)
-        tr.push({ text })
-      }
-      data.push(tr)
-    }
-  } 
-  else {
-    const tcNodes = trNodes['a:tc']
+  for (let i = 0; i < trNodes.length; i++) {
+    const trNode = trNodes[i]
+
+    const {
+      fillColor,
+      fontColor,
+      fontBold,
+    } = getTableRowParams(trNodes, i, tblStylAttrObj, thisTblStyle, warpObj)
+
+    const tcNodes = trNode['a:tc']
     const tr = []
 
     if (tcNodes.constructor === Array) {
-      for (const tcNode of tcNodes) {
+      for (let j = 0; j < tcNodes.length; j++) {
+        const tcNode = tcNodes[j]
+        let a_sorce
+        if (j === 0 && tblStylAttrObj['isFrstColAttr'] === 1) {
+          a_sorce = 'a:firstCol'
+          if (tblStylAttrObj['isLstRowAttr'] === 1 && i === (trNodes.length - 1) && getTextByPathList(thisTblStyle, ['a:seCell'])) {
+            a_sorce = 'a:seCell'
+          } 
+          else if (tblStylAttrObj['isFrstRowAttr'] === 1 && i === 0 &&
+            getTextByPathList(thisTblStyle, ['a:neCell'])) {
+            a_sorce = 'a:neCell'
+          }
+        } 
+        else if (
+          (j > 0 && tblStylAttrObj['isBandColAttr'] === 1) &&
+          !(tblStylAttrObj['isFrstColAttr'] === 1 && i === 0) &&
+          !(tblStylAttrObj['isLstRowAttr'] === 1 && i === (trNodes.length - 1)) &&
+          j !== (tcNodes.length - 1)
+        ) {
+          if ((j % 2) !== 0) {
+            let aBandNode = getTextByPathList(thisTblStyle, ['a:band2V'])
+            if (aBandNode === undefined) {
+              aBandNode = getTextByPathList(thisTblStyle, ['a:band1V'])
+              if (aBandNode) a_sorce = 'a:band2V'
+            } 
+            else a_sorce = 'a:band2V'
+          }
+        }
+        if (j === (tcNodes.length - 1) && tblStylAttrObj['isLstColAttr'] === 1) {
+          a_sorce = 'a:lastCol'
+          if (tblStylAttrObj['isLstRowAttr'] === 1 && i === (trNodes.length - 1) && getTextByPathList(thisTblStyle, ['a:swCell'])) {
+            a_sorce = 'a:swCell'
+          } 
+          else if (tblStylAttrObj['isFrstRowAttr'] === 1 && i === 0 && getTextByPathList(thisTblStyle, ['a:nwCell'])) {
+            a_sorce = 'a:nwCell'
+          }
+        }
         const text = genTextBody(tcNode['a:txBody'], tcNode, undefined, undefined, warpObj)
-        tr.push({ text })
+        const cell = getTableCellParams(tcNode, thisTblStyle, a_sorce, warpObj)
+        const td = { text }
+        if (cell.rowSpan) td.rowSpan = cell.rowSpan
+        if (cell.colSpan) td.colSpan = cell.colSpan
+        if (cell.vMerge) td.vMerge = cell.vMerge
+        if (cell.hMerge) td.hMerge = cell.hMerge
+        if (cell.fontBold || fontBold) td.fontBold = cell.fontBold || fontBold
+        if (cell.fontColor || fontColor) td.fontColor = cell.fontColor || fontColor
+        if (cell.fillColor || fillColor || tbl_bgcolor) td.fill = cell.fillColor || fillColor || tbl_bgcolor
+
+        tr.push(td)
       }
     } 
     else {
+      let a_sorce
+      if (tblStylAttrObj['isFrstColAttr'] === 1 && tblStylAttrObj['isLstRowAttr'] !== 1) {
+        a_sorce = 'a:firstCol'
+      } 
+      else if (tblStylAttrObj['isBandColAttr'] === 1 && tblStylAttrObj['isLstRowAttr'] !== 1) {
+        let aBandNode = getTextByPathList(thisTblStyle, ['a:band2V'])
+        if (!aBandNode) {
+          aBandNode = getTextByPathList(thisTblStyle, ['a:band1V'])
+          if (aBandNode) a_sorce = 'a:band2V'
+        } 
+        else a_sorce = 'a:band2V'
+      }
+      if (tblStylAttrObj['isLstColAttr'] === 1 && tblStylAttrObj['isLstRowAttr'] !== 1) {
+        a_sorce = 'a:lastCol'
+      }
+
       const text = genTextBody(tcNodes['a:txBody'], tcNodes, undefined, undefined, warpObj)
-      tr.push({ text })
+      const cell = getTableCellParams(tcNodes, thisTblStyle, a_sorce, warpObj)
+      const td = { text }
+      if (cell.rowSpan) td.rowSpan = cell.rowSpan
+      if (cell.colSpan) td.colSpan = cell.colSpan
+      if (cell.vMerge) td.vMerge = cell.vMerge
+      if (cell.hMerge) td.hMerge = cell.hMerge
+      if (cell.fontBold || fontBold) td.fontBold = cell.fontBold || fontBold
+      if (cell.fontColor || fontColor) td.fontColor = cell.fontColor || fontColor
+      if (cell.fillColor || fillColor || tbl_bgcolor) td.fill = cell.fillColor || fillColor || tbl_bgcolor
+
+      tr.push(td)
     }
     data.push(tr)
   }
@@ -801,14 +866,13 @@ function genTable(node, warpObj) {
     width,
     height,
     data,
-    themeColor,
   }
 }
 
 async function genChart(node, warpObj) {
   const xfrmNode = getTextByPathList(node, ['p:xfrm'])
-  const { top, left } = getPosition(xfrmNode, undefined, undefined, warpObj.options.slideFactor)
-  const { width, height } = getSize(xfrmNode, undefined, undefined, warpObj.options.slideFactor)
+  const { top, left } = getPosition(xfrmNode, undefined, undefined)
+  const { width, height } = getSize(xfrmNode, undefined, undefined)
 
   const rid = node['a:graphic']['a:graphicData']['c:chart']['attrs']['r:id']
   const refName = warpObj['slideResObj'][rid]['target']
@@ -839,8 +903,8 @@ async function genChart(node, warpObj) {
 
 function genDiagram(node, warpObj) {
   const xfrmNode = getTextByPathList(node, ['p:xfrm'])
-  const { left, top } = getPosition(xfrmNode, undefined, undefined, warpObj.options.slideFactor)
-  const { width, height } = getSize(xfrmNode, undefined, undefined, warpObj.options.slideFactor)
+  const { left, top } = getPosition(xfrmNode, undefined, undefined)
+  const { width, height } = getSize(xfrmNode, undefined, undefined)
   
   const dgmDrwSpArray = getTextByPathList(warpObj['digramFileContent'], ['p:drawing', 'p:spTree', 'p:sp'])
   const elements = []

package/src/shadow.js

@@ -1,19 +1,19 @@
 import { getSolidFill } from './fill'
+import { RATIO_EMUs_Points } from './constants'
 
 export function getShadow(node, warpObj) {
-  const slideFactor = warpObj.options.slideFactor
   const chdwClrNode = getSolidFill(node, undefined, undefined, warpObj)
   const outerShdwAttrs = node['attrs']
-  const dir = (outerShdwAttrs['dir']) ? (parseInt(outerShdwAttrs['dir']) / 60000) : 0
-  const dist = parseInt(outerShdwAttrs['dist']) * slideFactor
-  const blurRad = outerShdwAttrs['blurRad'] ? parseFloat((parseInt(outerShdwAttrs['blurRad']) * slideFactor).toFixed(2)) : ''
+  const dir = outerShdwAttrs['dir'] ? (parseInt(outerShdwAttrs['dir']) / 60000) : 0
+  const dist = parseInt(outerShdwAttrs['dist']) * RATIO_EMUs_Points
+  const blurRad = outerShdwAttrs['blurRad'] ? parseInt(outerShdwAttrs['blurRad']) * RATIO_EMUs_Points : ''
   const vx = dist * Math.sin(dir * Math.PI / 180)
   const hx = dist * Math.cos(dir * Math.PI / 180)
 
   return {
-    h: parseFloat(hx.toFixed(2)),
-    v: parseFloat(vx.toFixed(2)),
+    h: hx,
+    v: vx,
     blur: blurRad,
-    color: '#' + chdwClrNode,
+    color: chdwClrNode,
   }
 }