danfickle#80 Fixed bookmark page offset with multi-PDFs.

rototor · May 22, 2018 · 436dbab · 436dbab
1 parent e7daf36
commit 436dbab
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 8 deletions.
diff --git a/openhtmltopdf-examples/src/main/resources/testcases/svg-sizes.html b/openhtmltopdf-examples/src/main/resources/testcases/svg-sizes.html
@@ -1,31 +1,44 @@
     <html>
+    <head>
+        <bookmarks>
+            <bookmark name="Text" href="#text"></bookmark>
+			<bookmark name="SVG" href="#svg">
+                <bookmark name="Width 25%" href="#w25"/>
+				<bookmark name="Width 10%" href="#w10"/>
+				<bookmark name="Width 8cm" href="#w8"/>
+				<bookmark name="Width 4cm" href="#w4"/>
+				<bookmark name="Height 50%" href="#h50"/>
+				<bookmark name="Height 4cm" href="#h4"/>
+            </bookmark>
+        </bookmarks>
+    </head>
     <body>
 
-    <h2>Text</h2>
+    <h2 id="text">Text</h2>
     <div style="width: 25%; border: 1px solid black;">
         <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit.
             Donec venenatis velit enim, a placerat lectus viverra non.
             Proin varius porta ligula, in fringilla erat suscipit a.</p>
     </div>
-    <h2>SVG</h2>
+    <h2 id="SVG">SVG</h2>
 
-    <h3>width: percentage, max-width: none, calc-width: 25%</h3>
+    <h3 id="w25">width: percentage, max-width: none, calc-width: 25%</h3>
 
     <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 30 20"
         style="width: 25%; border: black 1px solid;">
         <rect x="1" y="1" rx="5" ry="5" width="28" height="18"
             stroke="blue" fill="yellow" stroke-width="2" />
     </svg>
 
-    <h3>width: percentage, max-width: absolute, calc-width: 8cm</h3>
+    <h3 id="w8">width: percentage, max-width: absolute, calc-width: 8cm</h3>
 
     <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 30 20"
         style="width: 80%; max-width: 8cm; border: black 1px solid;">
         <rect x="1" y="1" rx="5" ry="5" width="28" height="18"
             stroke="blue" fill="yellow" stroke-width="2" />
     </svg>
 
-    <h3>width: absolute, max-width: percentage, calc-width: 10%</h3>
+    <h3 id="#w10">width: absolute, max-width: percentage, calc-width: 10%</h3>
 
     <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 30 20"
         style="width: 500px; max-width: 10%; border: black 1px solid;">
@@ -34,15 +47,15 @@ <h3>width: absolute, max-width: percentage, calc-width: 10%</h3>
     </svg>
 
 
-    <h3>height: absolute, max-height: none, calc-height: 4cm</h3>
+    <h3 id="w4">height: absolute, max-height: none, calc-height: 4cm</h3>
 
     <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 30 20" width="300" height="200"
         style="height: 4cm; border: black 1px solid;">
         <rect x="1" y="1" rx="5" ry="5" width="28" height="18"
             stroke="blue" fill="yellow" stroke-width="2" />
     </svg>
 
-    <h3>height: absolute, max-height: percentage, calc-height: 2.5cm (50% of containing block)</h3>
+    <h3 id="h50">height: absolute, max-height: percentage, calc-height: 2.5cm (50% of containing block)</h3>
 
     <div style="height: 5cm; border: 1px solid red;">
     <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 30 20" width="300" height="200"
@@ -52,7 +65,7 @@ <h3>height: absolute, max-height: percentage, calc-height: 2.5cm (50% of contain
     </svg>
     </div>
 
-    <h3>height: absolute, max-height: absolute, calc-height: 4cm</h3>
+    <h3 id="h4">height: absolute, max-height: absolute, calc-height: 4cm</h3>
 
     <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 30 20" width="300" height="200"
         style="height: 45cm; max-height: 4cm; border: black 1px solid;">

diff --git a/openhtmltopdf-pdfbox/src/main/java/com/openhtmltopdf/pdfboxout/PdfBoxRenderer.java b/openhtmltopdf-pdfbox/src/main/java/com/openhtmltopdf/pdfboxout/PdfBoxRenderer.java
@@ -125,6 +125,7 @@ public class PdfBoxRenderer implements Closeable {
         _testMode = state._testMode;
         _outputDevice = new PdfBoxOutputDevice(DEFAULT_DOTS_PER_POINT, _testMode);
         _outputDevice.setWriter(_pdfDoc);
+        _outputDevice.setStartPageNo(_pdfDoc.getNumberOfPages());
 
         PdfBoxUserAgent userAgent = new PdfBoxUserAgent(_outputDevice);