vobi_document 1.1.6 → 1.1.7

package/dist/print.js

@@ -155,6 +155,36 @@ var REPEAT_TABLE_HEADERS = `(function () {
     return ancestors;
   }
 
+  function isIgnorable(node) {
+    return node.nodeType === 8 || (node.nodeType === 3 && !node.textContent.trim());
+  }
+
+  function nextSignificantNode(node) {
+    var sibling = node.nextSibling;
+    while (sibling) {
+      if (!isIgnorable(sibling)) return sibling;
+      sibling = sibling.nextSibling;
+    }
+    return null;
+  }
+
+  function nodeAfter(node, limiter) {
+    if (limiter && node === limiter) return null;
+    var significant = nextSignificantNode(node);
+    if (significant) return significant;
+    var current = node;
+    while ((current = current.parentNode)) {
+      if (limiter && current === limiter) return null;
+      significant = nextSignificantNode(current);
+      if (significant) return significant;
+    }
+    return null;
+  }
+
+  function hasChildTag(el, tag) {
+    return Array.prototype.slice.call(el.children).some(function (child) { return child.tagName === tag; });
+  }
+
   class RepeatingTableHeaders extends window.Paged.Handler {
     constructor(chunker, polisher, caller) {
       super(chunker, polisher, caller);
@@ -176,7 +206,8 @@ var REPEAT_TABLE_HEADERS = `(function () {
       var thead = node.tagName === 'THEAD' ? node : findFirstAncestor(node, 'thead');
       if (thead) {
         var lastTheadNode = thead.hasChildNodes() ? thead.lastChild : thead;
-        breakToken.node = this.nodeAfter(lastTheadNode, chunker.source);
+        var next = nodeAfter(lastTheadNode, chunker.source);
+        if (next) breakToken.node = next;
       }
     }
 
@@ -187,12 +218,16 @@ var REPEAT_TABLE_HEADERS = `(function () {
         if (!renderedTable || renderedTable.getAttribute('data-repeated-headers')) return;
         var sourceTable = self.chunker.source.querySelector("[data-ref='" + ref + "']");
         if (!sourceTable) return;
-        var firstChild = renderedTable.firstChild;
-        sourceTable.querySelectorAll('colgroup').forEach(function (colgroup) {
-          renderedTable.insertBefore(colgroup.cloneNode(true), firstChild);
-        });
+        if (!hasChildTag(renderedTable, 'COLGROUP')) {
+          var firstChild = renderedTable.firstChild;
+          sourceTable.querySelectorAll('colgroup').forEach(function (colgroup) {
+            renderedTable.insertBefore(colgroup.cloneNode(true), firstChild);
+          });
+        }
         var thead = sourceTable.querySelector('thead');
-        if (thead) renderedTable.insertBefore(thead.cloneNode(true), renderedTable.firstChild);
+        if (thead && !hasChildTag(renderedTable, 'THEAD')) {
+          renderedTable.insertBefore(thead.cloneNode(true), renderedTable.firstChild);
+        }
         renderedTable.setAttribute('data-repeated-headers', 'true');
       });
     }