abstract-document 6.7.0 → 6.8.0

package/src/abstract-document-exporters/__tests__/pdf/tmp/Table of content separator.pdf

@@ -16,19 +16,6 @@ endobj
 /F 4
 >>
 endobj
-11 0 obj
-<<
-/align /left
-/Subtype /Underline
-/QuadPoints [0 840 22.78 840 0 828.44 22.78 828.44]
-/Contents ()
-/Type /Annot
-/Rect [0 828.44 22.78 840]
-/Border [0 0 0]
-/C [0 0 1]
-/Align /left
->>
-endobj
 7 0 obj
 <<
 /Type /Page
@@ -36,7 +23,7 @@ endobj
 /MediaBox [0 0 595 842]
 /Contents 5 0 R
 /Resources 6 0 R
-/Annots [9 0 R 11 0 R]
+/Annots [9 0 R]
 >>
 endobj
 6 0 obj
@@ -77,20 +64,20 @@ Q
 
 endstream
 endobj
-13 0 obj
+12 0 obj
 (PDFKit)
 endobj
-14 0 obj
+13 0 obj
 (PDFKit)
 endobj
-15 0 obj
-(D:20220215122943Z)
+14 0 obj
+(D:20220216115440Z)
 endobj
-12 0 obj
+11 0 obj
 <<
-/Producer 13 0 R
-/Creator 14 0 R
-/CreationDate 15 0 R
+/Producer 12 0 R
+/Creator 13 0 R
+/CreationDate 14 0 R
 >>
 endobj
 10 0 obj
@@ -128,30 +115,29 @@ endobj
 >>
 endobj
 xref
-0 16
+0 15
 0000000000 65535 f 
-0000001335 00000 n 
-0000001392 00000 n 
-0000001273 00000 n 
-0000001252 00000 n 
-0000000574 00000 n 
-0000000484 00000 n 
-0000000357 00000 n 
+0000001128 00000 n 
+0000001185 00000 n 
+0000001066 00000 n 
+0000001045 00000 n 
+0000000367 00000 n 
+0000000277 00000 n 
+0000000157 00000 n 
 0000000015 00000 n 
 0000000051 00000 n 
-0000001154 00000 n 
-0000000157 00000 n 
-0000001078 00000 n 
-0000000992 00000 n 
-0000001017 00000 n 
-0000001042 00000 n 
+0000000947 00000 n 
+0000000871 00000 n 
+0000000785 00000 n 
+0000000810 00000 n 
+0000000835 00000 n 
 trailer
 <<
-/Size 16
+/Size 15
 /Root 3 0 R
-/Info 12 0 R
-/ID [<8a750fe54e8b7b7c776626edd30c9512> <8a750fe54e8b7b7c776626edd30c9512>]
+/Info 11 0 R
+/ID [<611486daff7347181a1808b301876f43> <611486daff7347181a1808b301876f43>]
 >>
 startxref
-1439
+1232
 %%EOF

package/src/abstract-document-exporters/__tests__/pdf/tmp/hello.pdf

@@ -79,7 +79,7 @@ endobj
 (PDFKit)
 endobj
 15 0 obj
-(D:20220215122942Z)
+(D:20220216115439Z)
 endobj
 12 0 obj
 <<
@@ -145,7 +145,7 @@ trailer
 /Size 16
 /Root 3 0 R
 /Info 12 0 R
-/ID [<0277c1a2bcf8027307a6a0802c9f6fb0> <0277c1a2bcf8027307a6a0802c9f6fb0>]
+/ID [<c1726f588f634670baad2b659fd2fbbf> <c1726f588f634670baad2b659fd2fbbf>]
 >>
 startxref
 1212

package/src/abstract-document-exporters/__tests__/pdf/tmp/world.pdf

@@ -43,7 +43,7 @@ endobj
 (PDFKit)
 endobj
 12 0 obj
-(D:20220215122943Z)
+(D:20220216115440Z)
 endobj
 9 0 obj
 <<
@@ -106,7 +106,7 @@ trailer
 /Size 13
 /Root 3 0 R
 /Info 9 0 R
-/ID [<a38fd26bcbe3213b9bf7ac14dce2a0a6> <a38fd26bcbe3213b9bf7ac14dce2a0a6>]
+/ID [<7e7b9497e2b770678124912c78130e86> <7e7b9497e2b770678124912c78130e86>]
 >>
 startxref
 837

package/src/abstract-document-exporters/pdf/render.ts

@@ -113,7 +113,7 @@ function renderPage(
   headerY += style.headerMargins.bottom;
 
   const footerHeight = page.footer.reduce(
-    (a, b) => a + getDesiredSize(b, desiredSizes).height,
+    (a, b) => a + (AD.Position.isPositionAbsolute(b) ? 0 : getDesiredSize(b, desiredSizes).height),
     style.footerMargins.top + style.footerMargins.bottom
   );
   const footerX = style.footerMargins.left;
@@ -383,7 +383,7 @@ function renderAtom(
       renderHyperLink(resources, pdf, finalRect, textStyle, atom, alignment, isFirstAtom, isLastAtom, availableWidth);
       return;
     case "TocSeparator":
-      renderTocSeparator(pdf, finalRect, textStyle);
+      renderTocSeparator(pdf, finalRect, textStyle, atom);
       return;
     case "LinkTarget":
       return;
@@ -476,8 +476,13 @@ function renderHyperLink(
   drawHyperLink(pdf, finalRect, style, hyperLink, textAlignment, isFirstAtom, isLastAtom, availableWidth);
 }
 
-function renderTocSeparator(pdf: {}, finalRect: AD.Rect.Rect, textStyle: AD.TextStyle.TextStyle): void {
-  drawDottedLine(pdf, finalRect, textStyle);
+function renderTocSeparator(
+  pdf: {},
+  finalRect: AD.Rect.Rect,
+  textStyle: AD.TextStyle.TextStyle,
+  tocSeparator: AD.TocSeparator.TocSeparator
+): void {
+  drawDottedLine(pdf, finalRect, textStyle, tocSeparator);
 }
 
 function drawHyperLink(
@@ -513,34 +518,34 @@ function drawHyperLink(
   // so always set alignment to left and handle it through an x offset
   // if its just a single atom then we can use its alignment to partially support multi-line texts for other alignments
   if (isFirstAtom || alignment !== "left") {
-    pdf
-      .text(hyperLink.text, finalRect.x, finalRect.y, {
-        width: availableWidth,
-        underline: textStyle.underline || false,
-        align: isSingleAtom ? alignment : "left",
-        goTo: isInternalLink ? hyperLink.target.substr(1) : undefined,
-        indent: textStyle.indent || 0,
-        continued: alignment !== "left" ? false : !isLastAtom,
-        baseline: textStyle.baseline || "top",
-        ...(textStyle.lineGap !== undefined ? { lineGap: textStyle.lineGap } : {}),
-      })
-      .underline(xUnderline, finalRect.y + 2, finalRect.width, finalRect.height, {
+    pdf.text(hyperLink.text, finalRect.x, finalRect.y, {
+      width: availableWidth,
+      align: isSingleAtom ? alignment : "left",
+      goTo: isInternalLink ? hyperLink.target.substr(1) : undefined,
+      indent: textStyle.indent || 0,
+      continued: alignment !== "left" ? false : !isLastAtom,
+      baseline: textStyle.baseline || "top",
+      ...(textStyle.lineGap !== undefined ? { lineGap: textStyle.lineGap } : {}),
+    });
+    if (textStyle.underline === undefined ? true : textStyle.underline) {
+      pdf.underline(xUnderline, finalRect.y + 2, finalRect.width, finalRect.height, {
         align: isSingleAtom ? alignment : "left",
         color: "blue",
       });
+    }
   } else {
-    pdf
-      .text(hyperLink.text, {
-        underline: textStyle.underline || false,
-        align: "left",
-        goTo: isInternalLink ? hyperLink.target.substr(1) : undefined,
-        indent: textStyle.indent || 0,
-        continued: !isLastAtom,
-        ...(textStyle.lineGap !== undefined ? { lineGap: textStyle.lineGap } : {}),
-      })
-      .underline(xUnderline, finalRect.y + 2, finalRect.width, finalRect.height, {
+    pdf.text(hyperLink.text, {
+      align: "left",
+      goTo: isInternalLink ? hyperLink.target.substr(1) : undefined,
+      indent: textStyle.indent || 0,
+      continued: !isLastAtom,
+      ...(textStyle.lineGap !== undefined ? { lineGap: textStyle.lineGap } : {}),
+    });
+    if (textStyle.underline === undefined ? true : textStyle.underline) {
+      pdf.underline(xUnderline, finalRect.y + 2, finalRect.width, finalRect.height, {
         color: "blue",
       });
+    }
   }
 
   resetTextOffset(pdf, textStyle);
@@ -597,19 +602,26 @@ function drawText(
   resetTextOffset(pdf, textStyle);
 }
 
-function drawDottedLine(pdf: any, finalRect: AD.Rect.Rect, textStyle: AD.TextStyle.TextStyle): void {
+function drawDottedLine(
+  pdf: any,
+  finalRect: AD.Rect.Rect,
+  textStyle: AD.TextStyle.TextStyle,
+  tocSeparator: AD.TocSeparator.TocSeparator
+): void {
   const font = getFontNameStyle(textStyle);
   const fontSize = AD.TextStyle.calculateFontSize(textStyle, 10);
 
+  const charSpacing = tocSeparator.width ? tocSeparator.width : 5;
+
   const oneDotW = pdf.widthOfString(".", {
     width: finalRect.width,
     height: finalRect.height,
-    characterSpacing: 5,
+    characterSpacing: charSpacing,
   });
   const twoDotsW = pdf.widthOfString("..", {
     width: finalRect.width,
     height: finalRect.height,
-    characterSpacing: 5,
+    characterSpacing: charSpacing,
   });
   const numberOfDots = Math.floor((finalRect.width - oneDotW) / (twoDotsW - oneDotW)) + 1;
   if (twoDotsW - oneDotW === 0 || numberOfDots < 1) {
@@ -633,7 +645,7 @@ function drawDottedLine(pdf: any, finalRect: AD.Rect.Rect, textStyle: AD.TextSty
     width: finalRect.width,
     height: finalRect.height,
     align: "right",
-    characterSpacing: 5,
+    characterSpacing: charSpacing,
   });
   resetTextOffset(pdf, textStyle);
 }

package/LICENSE

@@ -1,21 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2018 Divid AB
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.