pdfmake 0.3.1 → 0.3.3

package/js/3rd-party/svg-to-pdfkit/source.js

@@ -1542,7 +1542,7 @@ var SVGtoPDF = function (doc, svg, x, y, options) {
       }
     }
     for (let i = 0; i < selector.classes.length; i++) {
-      if (!elem.classList.contains(selector.classes[i])) {
+      if (elem.classList.indexOf(selector.classes[i]) === -1) {
         return false;
       }
     }

package/js/DocMeasure.js

@@ -86,8 +86,9 @@ class DocMeasure {
       node._width = node._minWidth = node._maxWidth = node.cover.width;
       node._height = node._minHeight = node._maxHeight = node.cover.height;
     } else {
-      node._width = node._minWidth = node._maxWidth = node.width || dimensions.width;
-      node._height = node.height || dimensions.height * node._width / dimensions.width;
+      let ratio = dimensions.width / dimensions.height;
+      node._width = node._minWidth = node._maxWidth = node.width || (node.height ? node.height * ratio : dimensions.width);
+      node._height = node.height || (node.width ? node.width / ratio : dimensions.height);
       if ((0, _variableType.isNumber)(node.maxWidth) && node.maxWidth < node._width) {
         node._width = node._minWidth = node._maxWidth = node.maxWidth;
         node._height = node._width * dimensions.height / dimensions.width;
@@ -138,6 +139,15 @@ class DocMeasure {
     this.measureImageWithDimensions(node, dimensions);
     node.font = this.styleStack.getProperty('font');
 
+    // SVG requires a defined width and height
+    if (!(0, _variableType.isNumber)(node._width) && !(0, _variableType.isNumber)(node._height)) {
+      throw new Error('SVG is missing defined width and height.');
+    } else if (!(0, _variableType.isNumber)(node._width)) {
+      throw new Error('SVG is missing defined width.');
+    } else if (!(0, _variableType.isNumber)(node._height)) {
+      throw new Error('SVG is missing defined height.');
+    }
+
     // scale SVG based on final dimension
     node.svg = this.svgMeasure.writeDimensions(node.svg, {
       width: node._width,
@@ -169,6 +179,11 @@ class DocMeasure {
       let textStyle = node.toc.textStyle || {};
       let numberStyle = node.toc.numberStyle || textStyle;
       let textMargin = node.toc.textMargin || [0, 0, 0, 0];
+      if (node.toc.sortBy === 'title') {
+        node.toc._items.sort((a, b) => {
+          return a._textNodeRef.text.localeCompare(b._textNodeRef.text, node.toc.sortLocale);
+        });
+      }
       for (let i = 0, l = node.toc._items.length; i < l; i++) {
         let item = node.toc._items[i];
         let lineStyle = item._textNodeRef.tocStyle || textStyle;
@@ -216,7 +231,7 @@ class DocMeasure {
   gapSizeForList() {
     return this.textInlines.sizeOfText('9. ', this.styleStack);
   }
-  buildUnorderedMarker(styleStack, gapSize, type) {
+  buildUnorderedMarker(item, styleStack, gapSize, type) {
     function buildDisc(gapSize, color) {
       // TODO: ascender-based calculations
       let radius = gapSize.fontSize / 6;
@@ -260,7 +275,7 @@ class DocMeasure {
       };
     }
     let marker;
-    let color = styleStack.getProperty('markerColor') || styleStack.getProperty('color') || 'black';
+    let color = _StyleContextStack.default.getStyleProperty(item, styleStack, 'markerColor', undefined) || styleStack.getProperty('color') || 'black';
     switch (type) {
       case 'circle':
         marker = buildCircle(gapSize, color);
@@ -280,7 +295,7 @@ class DocMeasure {
     marker._minHeight = marker._maxHeight = gapSize.height;
     return marker;
   }
-  buildOrderedMarker(counter, styleStack, type, separator) {
+  buildOrderedMarker(item, counter, styleStack, type, separator) {
     function prepareAlpha(counter) {
       function toAlpha(num) {
         return (num >= 26 ? toAlpha((num / 26 >> 0) - 1) : '') + 'abcdefghijklmnopqrstuvwxyz'[num % 26 >> 0];
@@ -360,13 +375,11 @@ class DocMeasure {
         counterText += `${separator} `;
       }
     }
+    let markerColor = _StyleContextStack.default.getStyleProperty(item, styleStack, 'markerColor', undefined) || styleStack.getProperty('color') || 'black';
     let textArray = {
-      text: counterText
+      text: counterText,
+      color: markerColor
     };
-    let markerColor = styleStack.getProperty('markerColor');
-    if (markerColor) {
-      textArray.color = markerColor;
-    }
     return {
       _inlines: this.textInlines.buildInlines(textArray, styleStack).items
     };
@@ -381,7 +394,7 @@ class DocMeasure {
     for (let i = 0, l = items.length; i < l; i++) {
       let item = items[i] = this.measureNode(items[i]);
       if (!item.ol && !item.ul) {
-        item.listMarker = this.buildUnorderedMarker(style, node._gapSize, item.listType || node.type);
+        item.listMarker = this.buildUnorderedMarker(item, style, node._gapSize, item.listType || node.type);
       }
       node._minWidth = Math.max(node._minWidth, items[i]._minWidth + node._gapSize.width);
       node._maxWidth = Math.max(node._maxWidth, items[i]._maxWidth + node._gapSize.width);
@@ -405,7 +418,7 @@ class DocMeasure {
       let item = items[i] = this.measureNode(items[i]);
       if (!item.ol && !item.ul) {
         let counterValue = (0, _variableType.isNumber)(item.counter) ? item.counter : counter;
-        item.listMarker = this.buildOrderedMarker(counterValue, style, item.listType || node.type, node.separator);
+        item.listMarker = this.buildOrderedMarker(item, counterValue, style, item.listType || node.type, node.separator);
         if (item.listMarker._inlines) {
           node._gapSize.width = Math.max(node._gapSize.width, item.listMarker._inlines[0].width);
         }

package/js/LayoutBuilder.js

@@ -987,6 +987,9 @@ class LayoutBuilder {
     }
   }
   processToc(node) {
+    if (!node.toc._table && node.toc.hideEmpty === true) {
+      return;
+    }
     if (node.toc.title) {
       this.processNode(node.toc.title);
     }

package/js/StyleContextStack.js

@@ -109,14 +109,37 @@ class StyleContextStack {
    * @returns {?any} property value or null if not found
    */
   getProperty(property) {
+    const getStylePropertyFromStyle = (styleName, property, visited = new Set()) => {
+      if (visited.has(styleName)) {
+        return undefined;
+      }
+      visited.add(styleName);
+      const style = this.styleDictionary[styleName];
+      if (!style) {
+        return undefined;
+      }
+      if ((0, _variableType.isValue)(style[property])) {
+        return style[property];
+      }
+      if (style.extends) {
+        let parents = Array.isArray(style.extends) ? style.extends : [style.extends];
+        for (let i = parents.length - 1; i >= 0; i--) {
+          let value = getStylePropertyFromStyle(parents[i], property, visited);
+          if ((0, _variableType.isValue)(value)) {
+            return value;
+          }
+        }
+      }
+      return undefined;
+    };
     if (this.styleOverrides) {
       for (let i = this.styleOverrides.length - 1; i >= 0; i--) {
         let item = this.styleOverrides[i];
         if ((0, _variableType.isString)(item)) {
           // named-style-override
-          let style = this.styleDictionary[item];
-          if (style && (0, _variableType.isValue)(style[property])) {
-            return style[property];
+          let value = getStylePropertyFromStyle(item, property);
+          if ((0, _variableType.isValue)(value)) {
+            return value;
           }
         } else if ((0, _variableType.isValue)(item[property])) {
           // style-overrides-object

package/js/TextDecorator.js

@@ -2,6 +2,7 @@
 
 exports.__esModule = true;
 exports.default = void 0;
+var _variableType = require("./helpers/variableType");
 const groupDecorations = line => {
   let groups = [];
   let currentGroup = null;
@@ -17,6 +18,7 @@ const groupDecorations = line => {
     }
     let color = inline.decorationColor || inline.color || 'black';
     let style = inline.decorationStyle || 'solid';
+    let thickness = (0, _variableType.isNumber)(inline.decorationThickness) ? inline.decorationThickness : null;
     for (let ii = 0, ll = decoration.length; ii < ll; ii++) {
       let decorationItem = decoration[ii];
       if (!currentGroup || decorationItem !== currentGroup.decoration || style !== currentGroup.decorationStyle || color !== currentGroup.decorationColor) {
@@ -25,6 +27,7 @@ const groupDecorations = line => {
           decoration: decorationItem,
           decorationColor: color,
           decorationStyle: style,
+          decorationThickness: thickness,
           inlines: [inline]
         };
         groups.push(currentGroup);
@@ -85,7 +88,7 @@ class TextDecorator {
     let ascent = biggerInline.font.ascender / 1000 * biggerInline.fontSize;
     let height = biggerInline.height;
     let descent = height - ascent;
-    let lw = 0.5 + Math.floor(Math.max(biggerInline.fontSize - 8, 0) / 2) * 0.12;
+    let lw = (0, _variableType.isNumber)(group.decorationThickness) ? group.decorationThickness : 0.5 + Math.floor(Math.max(biggerInline.fontSize - 8, 0) / 2) * 0.12;
     switch (group.decoration) {
       case 'underline':
         y += lineAscent + descent * 0.45;
@@ -99,9 +102,15 @@ class TextDecorator {
       default:
         throw new Error(`Unknown decoration : ${group.decoration}`);
     }
+    if (group.inlines[0].sup) {
+      y -= group.inlines[0].fontSize * 0.75;
+    }
+    if (group.inlines[0].sub) {
+      y += group.inlines[0].fontSize * 0.35;
+    }
     this.pdfDocument.save();
     if (group.decorationStyle === 'double') {
-      let gap = Math.max(0.5, lw * 2);
+      let gap = Math.max(0.5, lw, biggerInline.fontSize * 0.15);
       this.pdfDocument.fillColor(group.decorationColor).rect(x + firstInline.x, y - lw / 2, totalWidth, lw / 2).fill().rect(x + firstInline.x, y + gap - lw / 2, totalWidth, lw / 2).fill();
     } else if (group.decorationStyle === 'dashed') {
       let nbDashes = Math.ceil(totalWidth / (3.96 + 2.84));
@@ -127,7 +136,7 @@ class TextDecorator {
       let nbWaves = Math.ceil(totalWidth / (sh * 2)) + 1;
       let rwx = x + firstInline.x - 1;
       this.pdfDocument.rect(x + firstInline.x, y - sv, totalWidth, y + sv).clip();
-      this.pdfDocument.lineWidth(0.24);
+      this.pdfDocument.lineWidth(lw / 3);
       this.pdfDocument.moveTo(rwx, y);
       for (let i = 0; i < nbWaves; i++) {
         this.pdfDocument.bezierCurveTo(rwx + sh, y - sv, rwx + sh * 2, y - sv, rwx + sh * 3, y).bezierCurveTo(rwx + sh * 4, y + sv, rwx + sh * 5, y + sv, rwx + sh * 6, y);

package/js/TextInlines.js

@@ -106,6 +106,7 @@ class TextInlines {
       item.decoration = _StyleContextStack.default.getStyleProperty(item, styleContextStack, 'decoration', null);
       item.decorationColor = _StyleContextStack.default.getStyleProperty(item, styleContextStack, 'decorationColor', null);
       item.decorationStyle = _StyleContextStack.default.getStyleProperty(item, styleContextStack, 'decorationStyle', null);
+      item.decorationThickness = _StyleContextStack.default.getStyleProperty(item, styleContextStack, 'decorationThickness', null);
       item.background = _StyleContextStack.default.getStyleProperty(item, styleContextStack, 'background', null);
       item.link = _StyleContextStack.default.getStyleProperty(item, styleContextStack, 'link', null);
       item.linkToPage = _StyleContextStack.default.getStyleProperty(item, styleContextStack, 'linkToPage', null);

package/js/browser-extensions/OutputDocumentBrowser.js

@@ -63,8 +63,9 @@ class OutputDocumentBrowser extends _OutputDocument.default {
       	}, 500);
       }
       */
-    } finally {
+    } catch (e) {
       win.close();
+      throw e;
     }
   }
 

package/js/helpers/node.js

@@ -47,22 +47,47 @@ function getNodeId(node) {
  * @returns {?Array}
  */
 function getNodeMargin(node, styleStack) {
-  function processSingleMargins(node, currentMargin) {
-    if (node.marginLeft || node.marginTop || node.marginRight || node.marginBottom) {
-      return [node.marginLeft || currentMargin[0] || 0, node.marginTop || currentMargin[1] || 0, node.marginRight || currentMargin[2] || 0, node.marginBottom || currentMargin[3] || 0];
+  function processSingleMargins(node, currentMargin, defaultMargin = 0) {
+    if (node.marginLeft !== undefined || node.marginTop !== undefined || node.marginRight !== undefined || node.marginBottom !== undefined) {
+      return [node.marginLeft ?? currentMargin[0] ?? defaultMargin, node.marginTop ?? currentMargin[1] ?? defaultMargin, node.marginRight ?? currentMargin[2] ?? defaultMargin, node.marginBottom ?? currentMargin[3] ?? defaultMargin];
     }
     return currentMargin;
   }
-  function flattenStyleArray(styleArray, styleStack) {
+  function flattenStyleArray(styleArray, styleStack, visited = new Set()) {
+    styleArray = Array.isArray(styleArray) ? styleArray : [styleArray];
+
+    // style is not valid array of strings
+    if (!styleArray.every(item => (0, _variableType.isString)(item))) {
+      return {};
+    }
     let flattenedStyles = {};
-    for (let i = styleArray.length - 1; i >= 0; i--) {
-      let styleName = styleArray[i];
+    for (let index = 0; index < styleArray.length; index++) {
+      let styleName = styleArray[index];
       let style = styleStack.styleDictionary[styleName];
-      for (let key in style) {
-        if (style.hasOwnProperty(key)) {
-          flattenedStyles[key] = style[key];
-        }
+
+      // style not found
+      if (style === undefined) {
+        continue;
+      }
+      if (visited.has(styleName)) {
+        continue;
+      }
+      visited.add(styleName);
+      if (style.extends !== undefined) {
+        flattenedStyles = {
+          ...flattenStyleArray(style.extends, styleStack, visited),
+          ...flattenedStyles
+        };
+      }
+      if (style.margin !== undefined) {
+        flattenedStyles = {
+          margin: convertMargin(style.margin)
+        };
+        continue;
       }
+      flattenedStyles = {
+        margin: processSingleMargins(style, flattenedStyles.margin ?? {}, undefined)
+      };
     }
     return flattenedStyles;
   }
@@ -88,7 +113,7 @@ function getNodeMargin(node, styleStack) {
     }
   }
   margin = processSingleMargins(node, margin);
-  if (node.margin) {
+  if (node.margin !== undefined) {
     margin = convertMargin(node.margin);
   }
   if (margin[0] === undefined && margin[1] === undefined && margin[2] === undefined && margin[3] === undefined) {

package/js/helpers/variableType.js

@@ -20,7 +20,7 @@ function isString(variable) {
  * @returns {boolean}
  */
 function isNumber(variable) {
-  return typeof variable === 'number' || variable instanceof Number;
+  return (typeof variable === 'number' || variable instanceof Number) && !Number.isNaN(variable);
 }
 
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pdfmake",
-  "version": "0.3.1",
+  "version": "0.3.3",
   "description": "Client/server side PDF printing in pure JavaScript",
   "main": "js/index.js",
   "esnext": "src/index.js",
@@ -14,10 +14,10 @@
     "xmldoc": "^2.0.3"
   },
   "devDependencies": {
-    "@babel/cli": "^7.28.3",
-    "@babel/core": "^7.28.5",
-    "@babel/plugin-transform-modules-commonjs": "^7.27.1",
-    "@babel/preset-env": "^7.28.5",
+    "@babel/cli": "^7.28.6",
+    "@babel/core": "^7.28.6",
+    "@babel/plugin-transform-modules-commonjs": "^7.28.6",
+    "@babel/preset-env": "^7.28.6",
     "@eslint/js": "^9.39.2",
     "assert": "^2.1.0",
     "babel-loader": "^10.0.0",
@@ -26,10 +26,10 @@
     "buffer": "^6.0.3",
     "core-js": "^3.47.0",
     "eslint": "^9.39.2",
-    "eslint-plugin-jsdoc": "^61.5.0",
+    "eslint-plugin-jsdoc": "^62.1.0",
     "expose-loader": "^5.0.1",
     "file-saver": "^2.0.5",
-    "globals": "^16.5.0",
+    "globals": "^17.0.0",
     "mocha": "^11.7.5",
     "npm-run-all": "^4.1.5",
     "process": "^0.11.10",
@@ -51,9 +51,9 @@
   },
   "scripts": {
     "test": "run-s build mocha lint",
-    "build": "run-s build:clean build:3rdparty build:node build:browser build:standard-fonts build:fonts build:vfs",
+    "build": "run-s build:clean build:node build:browser build:standard-fonts build:fonts build:vfs",
     "build:clean": "shx rm -rf js build",
-    "build:3rdparty": "shx cp node_modules/svg-to-pdfkit/source.js src/3rd-party/svg-to-pdfkit/source.js && shx cp node_modules/svg-to-pdfkit/LICENSE src/3rd-party/svg-to-pdfkit/LICENSE",
+    "build:3rdparty": "shx cp node_modules/svg-to-pdfkit/source.js src/3rd-party/svg-to-pdfkit/source.js && shx cp node_modules/svg-to-pdfkit/LICENSE src/3rd-party/svg-to-pdfkit/LICENSE && git apply src/3rd-party/svg-to-pdfkit/0001-fix-contains.patch",
     "build:node": "babel src --out-dir js",
     "build:browser": "webpack",
     "build:vfs": "node build-vfs.js \"./examples/fonts\"",

package/src/3rd-party/svg-to-pdfkit/source.js

@@ -731,7 +731,7 @@ var SVGtoPDF = function(doc, svg, x, y, options) {
         if (selector.ids[i] !== elem.id) {return false;}
       }
       for (let i = 0; i < selector.classes.length; i++) {
-        if (!elem.classList.contains(selector.classes[i])) {return false;}
+        if (elem.classList.indexOf(selector.classes[i]) === -1) {return false;}
       }
       return true;
     }

package/src/DocMeasure.js

@@ -95,8 +95,10 @@ class DocMeasure {
 			node._width = node._minWidth = node._maxWidth = node.cover.width;
 			node._height = node._minHeight = node._maxHeight = node.cover.height;
 		} else {
-			node._width = node._minWidth = node._maxWidth = node.width || dimensions.width;
-			node._height = node.height || (dimensions.height * node._width / dimensions.width);
+			let ratio = dimensions.width / dimensions.height;
+
+			node._width = node._minWidth = node._maxWidth = node.width || (node.height ? (node.height * ratio) : dimensions.width);
+			node._height = node.height || (node.width ? node.width / ratio : dimensions.height);
 
 			if (isNumber(node.maxWidth) && node.maxWidth < node._width) {
 				node._width = node._minWidth = node._maxWidth = node.maxWidth;
@@ -154,6 +156,15 @@ class DocMeasure {
 
 		node.font = this.styleStack.getProperty('font');
 
+		// SVG requires a defined width and height
+		if (!isNumber(node._width) && !isNumber(node._height)) {
+			throw new Error('SVG is missing defined width and height.');
+		} else if (!isNumber(node._width)) {
+			throw new Error('SVG is missing defined width.');
+		} else if (!isNumber(node._height)) {
+			throw new Error('SVG is missing defined height.');
+		}
+
 		// scale SVG based on final dimension
 		node.svg = this.svgMeasure.writeDimensions(node.svg, { width: node._width, height: node._height });
 
@@ -190,6 +201,13 @@ class DocMeasure {
 			let textStyle = node.toc.textStyle || {};
 			let numberStyle = node.toc.numberStyle || textStyle;
 			let textMargin = node.toc.textMargin || [0, 0, 0, 0];
+
+			if (node.toc.sortBy === 'title') {
+				node.toc._items.sort((a, b) => {
+					return a._textNodeRef.text.localeCompare(b._textNodeRef.text, node.toc.sortLocale);
+				});
+			}
+
 			for (let i = 0, l = node.toc._items.length; i < l; i++) {
 				let item = node.toc._items[i];
 				let lineStyle = item._textNodeRef.tocStyle || textStyle;
@@ -237,7 +255,7 @@ class DocMeasure {
 		return this.textInlines.sizeOfText('9. ', this.styleStack);
 	}
 
-	buildUnorderedMarker(styleStack, gapSize, type) {
+	buildUnorderedMarker(item, styleStack, gapSize, type) {
 		function buildDisc(gapSize, color) {
 			// TODO: ascender-based calculations
 			let radius = gapSize.fontSize / 6;
@@ -284,7 +302,7 @@ class DocMeasure {
 		}
 
 		let marker;
-		let color = styleStack.getProperty('markerColor') || styleStack.getProperty('color') || 'black';
+		let color = StyleContextStack.getStyleProperty(item, styleStack, 'markerColor', undefined) || styleStack.getProperty('color') || 'black';
 
 		switch (type) {
 			case 'circle':
@@ -311,7 +329,7 @@ class DocMeasure {
 		return marker;
 	}
 
-	buildOrderedMarker(counter, styleStack, type, separator) {
+	buildOrderedMarker(item, counter, styleStack, type, separator) {
 		function prepareAlpha(counter) {
 			function toAlpha(num) {
 				return (num >= 26 ? toAlpha((num / 26 >> 0) - 1) : '') + 'abcdefghijklmnopqrstuvwxyz'[num % 26 >> 0];
@@ -391,11 +409,11 @@ class DocMeasure {
 			}
 		}
 
-		let textArray = { text: counterText };
-		let markerColor = styleStack.getProperty('markerColor');
-		if (markerColor) {
-			textArray.color = markerColor;
-		}
+		let markerColor = StyleContextStack.getStyleProperty(item, styleStack, 'markerColor', undefined) || styleStack.getProperty('color') || 'black';
+		let textArray = {
+			text: counterText,
+			color: markerColor
+		};
 
 		return { _inlines: this.textInlines.buildInlines(textArray, styleStack).items };
 	}
@@ -412,7 +430,7 @@ class DocMeasure {
 			let item = items[i] = this.measureNode(items[i]);
 
 			if (!item.ol && !item.ul) {
-				item.listMarker = this.buildUnorderedMarker(style, node._gapSize, item.listType || node.type);
+				item.listMarker = this.buildUnorderedMarker(item, style, node._gapSize, item.listType || node.type);
 			}
 
 			node._minWidth = Math.max(node._minWidth, items[i]._minWidth + node._gapSize.width);
@@ -441,7 +459,7 @@ class DocMeasure {
 
 			if (!item.ol && !item.ul) {
 				let counterValue = isNumber(item.counter) ? item.counter : counter;
-				item.listMarker = this.buildOrderedMarker(counterValue, style, item.listType || node.type, node.separator);
+				item.listMarker = this.buildOrderedMarker(item, counterValue, style, item.listType || node.type, node.separator);
 				if (item.listMarker._inlines) {
 					node._gapSize.width = Math.max(node._gapSize.width, item.listMarker._inlines[0].width);
 				}

package/src/LayoutBuilder.js

@@ -1112,6 +1112,10 @@ class LayoutBuilder {
 	}
 
 	processToc(node) {
+		if (!node.toc._table && node.toc.hideEmpty === true) {
+			return;
+		}
+
 		if (node.toc.title) {
 			this.processNode(node.toc.title);
 		}

package/src/StyleContextStack.js

@@ -114,14 +114,43 @@ class StyleContextStack {
 	 * @returns {?any} property value or null if not found
 	 */
 	getProperty(property) {
+
+		const getStylePropertyFromStyle = (styleName, property, visited = new Set()) => {
+			if (visited.has(styleName)) {
+				return undefined;
+			}
+			visited.add(styleName);
+
+			const style = this.styleDictionary[styleName];
+			if (!style) {
+				return undefined;
+			}
+
+			if (isValue(style[property])) {
+				return style[property];
+			}
+
+			if (style.extends) {
+				let parents = Array.isArray(style.extends) ? style.extends : [style.extends];
+				for (let i = parents.length - 1; i >= 0; i--) {
+					let value = getStylePropertyFromStyle(parents[i], property, visited);
+					if (isValue(value)) {
+						return value;
+					}
+				}
+			}
+
+			return undefined;
+		};
+
 		if (this.styleOverrides) {
 			for (let i = this.styleOverrides.length - 1; i >= 0; i--) {
 				let item = this.styleOverrides[i];
 
 				if (isString(item)) { // named-style-override
-					let style = this.styleDictionary[item];
-					if (style && isValue(style[property])) {
-						return style[property];
+					let value = getStylePropertyFromStyle(item, property);
+					if (isValue(value)) {
+						return value;
 					}
 				} else if (isValue(item[property])) { // style-overrides-object
 					return item[property];

package/src/TextDecorator.js

@@ -1,3 +1,5 @@
+import { isNumber } from './helpers/variableType';
+
 const groupDecorations = line => {
 	let groups = [];
 	let currentGroup = null;
@@ -13,6 +15,7 @@ const groupDecorations = line => {
 		}
 		let color = inline.decorationColor || inline.color || 'black';
 		let style = inline.decorationStyle || 'solid';
+		let thickness = isNumber(inline.decorationThickness) ? inline.decorationThickness : null;
 		for (let ii = 0, ll = decoration.length; ii < ll; ii++) {
 			let decorationItem = decoration[ii];
 			if (!currentGroup || decorationItem !== currentGroup.decoration ||
@@ -23,6 +26,7 @@ const groupDecorations = line => {
 					decoration: decorationItem,
 					decorationColor: color,
 					decorationStyle: style,
+					decorationThickness: thickness,
 					inlines: [inline]
 				};
 				groups.push(currentGroup);
@@ -96,7 +100,9 @@ class TextDecorator {
 		let height = biggerInline.height;
 		let descent = height - ascent;
 
-		let lw = 0.5 + Math.floor(Math.max(biggerInline.fontSize - 8, 0) / 2) * 0.12;
+		let lw = isNumber(group.decorationThickness)
+			? group.decorationThickness
+			: 0.5 + Math.floor(Math.max(biggerInline.fontSize - 8, 0) / 2) * 0.12;
 
 		switch (group.decoration) {
 			case 'underline':
@@ -111,10 +117,18 @@ class TextDecorator {
 			default:
 				throw new Error(`Unknown decoration : ${group.decoration}`);
 		}
+
+		if (group.inlines[0].sup) {
+			y -= group.inlines[0].fontSize * 0.75;
+		}
+		if (group.inlines[0].sub) {
+			y += group.inlines[0].fontSize * 0.35;
+		}
+
 		this.pdfDocument.save();
 
 		if (group.decorationStyle === 'double') {
-			let gap = Math.max(0.5, lw * 2);
+			let gap = Math.max(0.5, lw, biggerInline.fontSize * 0.15);
 			this.pdfDocument.fillColor(group.decorationColor)
 				.rect(x + firstInline.x, y - lw / 2, totalWidth, lw / 2).fill()
 				.rect(x + firstInline.x, y + gap - lw / 2, totalWidth, lw / 2).fill();
@@ -141,7 +155,7 @@ class TextDecorator {
 			let nbWaves = Math.ceil(totalWidth / (sh * 2)) + 1;
 			let rwx = x + firstInline.x - 1;
 			this.pdfDocument.rect(x + firstInline.x, y - sv, totalWidth, y + sv).clip();
-			this.pdfDocument.lineWidth(0.24);
+			this.pdfDocument.lineWidth(lw / 3);
 			this.pdfDocument.moveTo(rwx, y);
 			for (let i = 0; i < nbWaves; i++) {
 				this.pdfDocument.bezierCurveTo(rwx + sh, y - sv, rwx + sh * 2, y - sv, rwx + sh * 3, y)

package/src/TextInlines.js

@@ -117,6 +117,7 @@ class TextInlines {
 			item.decoration = StyleContextStack.getStyleProperty(item, styleContextStack, 'decoration', null);
 			item.decorationColor = StyleContextStack.getStyleProperty(item, styleContextStack, 'decorationColor', null);
 			item.decorationStyle = StyleContextStack.getStyleProperty(item, styleContextStack, 'decorationStyle', null);
+			item.decorationThickness = StyleContextStack.getStyleProperty(item, styleContextStack, 'decorationThickness', null);
 			item.background = StyleContextStack.getStyleProperty(item, styleContextStack, 'background', null);
 			item.link = StyleContextStack.getStyleProperty(item, styleContextStack, 'link', null);
 			item.linkToPage = StyleContextStack.getStyleProperty(item, styleContextStack, 'linkToPage', null);

package/src/browser-extensions/OutputDocumentBrowser.js

@@ -60,8 +60,9 @@ class OutputDocumentBrowser extends OutputDocument {
 				}, 500);
 			}
 			*/
-		} finally {
+		} catch (e) {
 			win.close();
+			throw e;
 		}
 	}