Merge pull request #2866 from HackbrettXXX/fix-xref-table

fix XREF table generation
parallax · Aug 20, 2020 · 07d682a · 07d682a
2 parents d6d6640 + 22b7e25
commit 07d682a
Show file tree

Hide file tree

Showing 147 changed files with 70 additions and 70 deletions.
diff --git a/src/jspdf.js b/src/jspdf.js
@@ -2872,16 +2872,16 @@ function jsPDF(options) {
 
     out("xref");
     out("0 " + (objectNumber + 1));
-    out("0000000000 65535 f");
+    out("0000000000 65535 f ");
     for (var i = 1; i <= objectNumber; i++) {
       var offset = offsets[i];
       if (typeof offset === "function") {
-        out((p + offsets[i]()).slice(-10) + " 00000 n");
+        out((p + offsets[i]()).slice(-10) + " 00000 n ");
       } else {
         if (typeof offsets[i] !== "undefined") {
-          out((p + offsets[i]).slice(-10) + " 00000 n");
+          out((p + offsets[i]).slice(-10) + " 00000 n ");
         } else {
-          out("0000000000 00000 n");
+          out("0000000000 00000 n ");
         }
       }
     }

diff --git a/test/reference/2pages.pdf b/test/reference/2pages.pdf
diff --git a/test/reference/3pages.pdf b/test/reference/3pages.pdf
diff --git a/test/reference/FitWindow.pdf b/test/reference/FitWindow.pdf
diff --git a/test/reference/HideMenubar.pdf b/test/reference/HideMenubar.pdf
diff --git a/test/reference/HideToolbar.pdf b/test/reference/HideToolbar.pdf
diff --git a/test/reference/HideWindowUI.pdf b/test/reference/HideWindowUI.pdf
diff --git a/test/reference/NumCopies.pdf b/test/reference/NumCopies.pdf
diff --git a/test/reference/PrintPageRange.pdf b/test/reference/PrintPageRange.pdf
diff --git a/test/reference/ViewAreaMediaBox.pdf b/test/reference/ViewAreaMediaBox.pdf
diff --git a/test/reference/alignment.pdf b/test/reference/alignment.pdf
diff --git a/test/reference/alternating-text-styling.pdf b/test/reference/alternating-text-styling.pdf
diff --git a/test/reference/angle.pdf b/test/reference/angle.pdf
diff --git a/test/reference/autoPaging10Pages.pdf b/test/reference/autoPaging10Pages.pdf
diff --git a/test/reference/autoprint-js.pdf b/test/reference/autoprint-js.pdf
diff --git a/test/reference/autoprint-nc.pdf b/test/reference/autoprint-nc.pdf
diff --git a/test/reference/bar_graph_with_text_and_lines.pdf b/test/reference/bar_graph_with_text_and_lines.pdf
diff --git a/test/reference/blackpixel.pdf b/test/reference/blackpixel.pdf
diff --git a/test/reference/blank.pdf b/test/reference/blank.pdf
diff --git a/test/reference/bmp1p.pdf b/test/reference/bmp1p.pdf
diff --git a/test/reference/bmp24p.pdf b/test/reference/bmp24p.pdf
diff --git a/test/reference/bmp32p.pdf b/test/reference/bmp32p.pdf
diff --git a/test/reference/bmp4p.pdf b/test/reference/bmp4p.pdf
diff --git a/test/reference/bmp8p.pdf b/test/reference/bmp8p.pdf
diff --git a/test/reference/bookmark-in.pdf b/test/reference/bookmark-in.pdf
diff --git a/test/reference/bookmark-mm.pdf b/test/reference/bookmark-mm.pdf
diff --git a/test/reference/bookmark-pt.pdf b/test/reference/bookmark-pt.pdf
diff --git a/test/reference/checkbox.pdf b/test/reference/checkbox.pdf
diff --git a/test/reference/circles.pdf b/test/reference/circles.pdf
diff --git a/test/reference/closed.pdf b/test/reference/closed.pdf
diff --git a/test/reference/cm.pdf b/test/reference/cm.pdf
diff --git a/test/reference/color.pdf b/test/reference/color.pdf
diff --git a/test/reference/colortype_1_grayscale_8_bit_png.pdf b/test/reference/colortype_1_grayscale_8_bit_png.pdf
diff --git a/test/reference/colortype_2_rgb_16_bit_png.pdf b/test/reference/colortype_2_rgb_16_bit_png.pdf
diff --git a/test/reference/colortype_2_rgb_8_bit_png.pdf b/test/reference/colortype_2_rgb_8_bit_png.pdf
diff --git a/test/reference/colortype_3_indexed_multi_colour_alpha_8_bit_png.pdf b/test/reference/colortype_3_indexed_multi_colour_alpha_8_bit_png.pdf
diff --git a/test/reference/colortype_3_indexed_single_colour_alpha_4_bit_png.pdf b/test/reference/colortype_3_indexed_single_colour_alpha_4_bit_png.pdf
diff --git a/test/reference/colortype_3_indexed_single_colour_alpha_8_bit_png.pdf b/test/reference/colortype_3_indexed_single_colour_alpha_8_bit_png.pdf
diff --git a/test/reference/colortype_4_grayscale_alpha_16_bit_png.pdf b/test/reference/colortype_4_grayscale_alpha_16_bit_png.pdf
diff --git a/test/reference/colortype_4_grayscale_alpha_8_bit_png.pdf b/test/reference/colortype_4_grayscale_alpha_8_bit_png.pdf
diff --git a/test/reference/colortype_6_rgba_16_bit_png.pdf b/test/reference/colortype_6_rgba_16_bit_png.pdf
diff --git a/test/reference/colortype_6_rgba_8_bit_png.pdf b/test/reference/colortype_6_rgba_8_bit_png.pdf
diff --git a/test/reference/colortype_6_rgba_8_bit_png_FAST.pdf b/test/reference/colortype_6_rgba_8_bit_png_FAST.pdf
diff --git a/test/reference/colortype_6_rgba_8_bit_png_MEDIUM.pdf b/test/reference/colortype_6_rgba_8_bit_png_MEDIUM.pdf
diff --git a/test/reference/colortype_6_rgba_8_bit_png_NONE.pdf b/test/reference/colortype_6_rgba_8_bit_png_NONE.pdf
diff --git a/test/reference/colortype_6_rgba_8_bit_png_SLOW.pdf b/test/reference/colortype_6_rgba_8_bit_png_SLOW.pdf
diff --git a/test/reference/combobox.pdf b/test/reference/combobox.pdf
diff --git a/test/reference/compress.pdf b/test/reference/compress.pdf
diff --git a/test/reference/context2d-custom-fonts.pdf b/test/reference/context2d-custom-fonts.pdf
diff --git a/test/reference/continuous.pdf b/test/reference/continuous.pdf
diff --git a/test/reference/csscolornames.pdf b/test/reference/csscolornames.pdf
diff --git a/test/reference/curves.pdf b/test/reference/curves.pdf
diff --git a/test/reference/customfont.pdf b/test/reference/customfont.pdf
diff --git a/test/reference/different-sizes.pdf b/test/reference/different-sizes.pdf
diff --git a/test/reference/drawImage.pdf b/test/reference/drawImage.pdf
diff --git a/test/reference/em.pdf b/test/reference/em.pdf
diff --git a/test/reference/enUS.pdf b/test/reference/enUS.pdf
diff --git a/test/reference/ex.pdf b/test/reference/ex.pdf
diff --git a/test/reference/fill-color.pdf b/test/reference/fill-color.pdf
diff --git a/test/reference/fillRect_strokeRect.pdf b/test/reference/fillRect_strokeRect.pdf
diff --git a/test/reference/fillStyle_strokeStyle.pdf b/test/reference/fillStyle_strokeStyle.pdf
diff --git a/test/reference/font-faces.pdf b/test/reference/font-faces.pdf
diff --git a/test/reference/fonts.pdf b/test/reference/fonts.pdf
diff --git a/test/reference/freetext.pdf b/test/reference/freetext.pdf
diff --git a/test/reference/fullscreen.pdf b/test/reference/fullscreen.pdf
diff --git a/test/reference/gif.pdf b/test/reference/gif.pdf
diff --git a/test/reference/html-basic.pdf b/test/reference/html-basic.pdf
diff --git a/test/reference/in.pdf b/test/reference/in.pdf
diff --git a/test/reference/japanese-kana-nani.pdf b/test/reference/japanese-kana-nani.pdf
diff --git a/test/reference/jpg.pdf b/test/reference/jpg.pdf
diff --git a/test/reference/landscape.pdf b/test/reference/landscape.pdf
diff --git a/test/reference/letter-spacing.pdf b/test/reference/letter-spacing.pdf
diff --git a/test/reference/line-break.pdf b/test/reference/line-break.pdf
diff --git a/test/reference/line.pdf b/test/reference/line.pdf
diff --git a/test/reference/lines.pdf b/test/reference/lines.pdf
diff --git a/test/reference/listbox.pdf b/test/reference/listbox.pdf
diff --git a/test/reference/mm.pdf b/test/reference/mm.pdf
diff --git a/test/reference/moveTo_lineTo_stroke_fill.pdf b/test/reference/moveTo_lineTo_stroke_fill.pdf
diff --git a/test/reference/open.pdf b/test/reference/open.pdf
diff --git a/test/reference/outlines.pdf b/test/reference/outlines.pdf
diff --git a/test/reference/password.pdf b/test/reference/password.pdf
diff --git a/test/reference/paths.pdf b/test/reference/paths.pdf
diff --git a/test/reference/pc.pdf b/test/reference/pc.pdf
diff --git a/test/reference/piechart.pdf b/test/reference/piechart.pdf
diff --git a/test/reference/properties.pdf b/test/reference/properties.pdf
diff --git a/test/reference/pt.pdf b/test/reference/pt.pdf
diff --git a/test/reference/pushbutton.pdf b/test/reference/pushbutton.pdf
diff --git a/test/reference/px.pdf b/test/reference/px.pdf
diff --git a/test/reference/radiogroup.pdf b/test/reference/radiogroup.pdf
diff --git a/test/reference/radiogroup2.pdf b/test/reference/radiogroup2.pdf
diff --git a/test/reference/rectangles.pdf b/test/reference/rectangles.pdf
diff --git a/test/reference/red-black.pdf b/test/reference/red-black.pdf
diff --git a/test/reference/rotation-45.pdf b/test/reference/rotation-45.pdf
diff --git a/test/reference/rotation-90.pdf b/test/reference/rotation-90.pdf
diff --git a/test/reference/russian-1line.pdf b/test/reference/russian-1line.pdf
diff --git a/test/reference/russian-2line.pdf b/test/reference/russian-2line.pdf
diff --git a/test/reference/sierpinski.pdf b/test/reference/sierpinski.pdf
diff --git a/test/reference/single.pdf b/test/reference/single.pdf
diff --git a/test/reference/smiley.pdf b/test/reference/smiley.pdf
diff --git a/test/reference/standard.pdf b/test/reference/standard.pdf
diff --git a/test/reference/standardfont.pdf b/test/reference/standardfont.pdf
diff --git a/test/reference/stroke.pdf b/test/reference/stroke.pdf
diff --git a/test/reference/table-autoSize.pdf b/test/reference/table-autoSize.pdf
diff --git a/test/reference/table.pdf b/test/reference/table.pdf
diff --git a/test/reference/textBaseline.pdf b/test/reference/textBaseline.pdf
diff --git a/test/reference/textfield.pdf b/test/reference/textfield.pdf
diff --git a/test/reference/thumbs.pdf b/test/reference/thumbs.pdf
diff --git a/test/reference/two-page.pdf b/test/reference/two-page.pdf
diff --git a/test/reference/twoleft.pdf b/test/reference/twoleft.pdf
diff --git a/test/reference/tworight.pdf b/test/reference/tworight.pdf
diff --git a/test/reference/w3s_arc.pdf b/test/reference/w3s_arc.pdf
diff --git a/test/reference/w3s_bezierCurveTo.pdf b/test/reference/w3s_bezierCurveTo.pdf
diff --git a/test/reference/w3s_clip.pdf b/test/reference/w3s_clip.pdf
diff --git a/test/reference/w3s_closePath_v1.pdf b/test/reference/w3s_closePath_v1.pdf
diff --git a/test/reference/w3s_closePath_v2.pdf b/test/reference/w3s_closePath_v2.pdf
diff --git a/test/reference/w3s_fillStyle.pdf b/test/reference/w3s_fillStyle.pdf
diff --git a/test/reference/w3s_fillText.pdf b/test/reference/w3s_fillText.pdf
diff --git a/test/reference/w3s_font.pdf b/test/reference/w3s_font.pdf
diff --git a/test/reference/w3s_lineCap_butt.pdf b/test/reference/w3s_lineCap_butt.pdf
diff --git a/test/reference/w3s_lineCap_round.pdf b/test/reference/w3s_lineCap_round.pdf
diff --git a/test/reference/w3s_lineCap_square.pdf b/test/reference/w3s_lineCap_square.pdf
diff --git a/test/reference/w3s_lineJoin_bevel.pdf b/test/reference/w3s_lineJoin_bevel.pdf
diff --git a/test/reference/w3s_lineJoin_miter.pdf b/test/reference/w3s_lineJoin_miter.pdf
diff --git a/test/reference/w3s_lineJoin_round.pdf b/test/reference/w3s_lineJoin_round.pdf
diff --git a/test/reference/w3s_lineTo.pdf b/test/reference/w3s_lineTo.pdf
diff --git a/test/reference/w3s_quadraticCurveTo.pdf b/test/reference/w3s_quadraticCurveTo.pdf
diff --git a/test/reference/w3s_rotate.pdf b/test/reference/w3s_rotate.pdf
diff --git a/test/reference/w3s_scale.pdf b/test/reference/w3s_scale.pdf
diff --git a/test/reference/w3s_setTransform.pdf b/test/reference/w3s_setTransform.pdf
diff --git a/test/reference/w3s_strokeStyle.pdf b/test/reference/w3s_strokeStyle.pdf
diff --git a/test/reference/w3s_strokeText.pdf b/test/reference/w3s_strokeText.pdf
diff --git a/test/reference/w3s_textAlign.pdf b/test/reference/w3s_textAlign.pdf
diff --git a/test/reference/w3s_textBaseline.pdf b/test/reference/w3s_textBaseline.pdf
diff --git a/test/reference/w3s_transform.pdf b/test/reference/w3s_transform.pdf
diff --git a/test/reference/w3s_translate.pdf b/test/reference/w3s_translate.pdf
diff --git a/test/reference/warnsign.pdf b/test/reference/warnsign.pdf
diff --git a/test/reference/webp.pdf b/test/reference/webp.pdf
diff --git a/test/reference/with_annotations.pdf b/test/reference/with_annotations.pdf
diff --git a/test/reference/xmpmetadata-defaultNS.pdf b/test/reference/xmpmetadata-defaultNS.pdf
diff --git a/test/reference/xmpmetadata.pdf b/test/reference/xmpmetadata.pdf
diff --git a/test/reference/zoom-2x.pdf b/test/reference/zoom-2x.pdf
diff --git a/test/reference/zoom-3x.pdf b/test/reference/zoom-3x.pdf
diff --git a/test/reference/zoom-full-height.pdf b/test/reference/zoom-full-height.pdf
diff --git a/test/reference/zoom-full-page.pdf b/test/reference/zoom-full-page.pdf
diff --git a/test/reference/zoom-full-width.pdf b/test/reference/zoom-full-width.pdf
diff --git a/test/reference/zoom-original.pdf b/test/reference/zoom-original.pdf
diff --git a/test/specs/jspdf.unit.spec.js b/test/specs/jspdf.unit.spec.js
@@ -771,27 +771,27 @@ describe("Core: Unit Tests", () => {
       "endobj",
       "xref",
       "0 21",
-      "0000000000 65535 f",
-      "0000000184 00000 n",
-      "0000002001 00000 n",
-      "0000000015 00000 n",
-      "0000000124 00000 n",
-      "0000000241 00000 n",
-      "0000000366 00000 n",
-      "0000000496 00000 n",
-      "0000000629 00000 n",
-      "0000000766 00000 n",
-      "0000000889 00000 n",
-      "0000001018 00000 n",
-      "0000001150 00000 n",
-      "0000001286 00000 n",
-      "0000001414 00000 n",
-      "0000001541 00000 n",
-      "0000001670 00000 n",
-      "0000001803 00000 n",
-      "0000001905 00000 n",
-      "0000002249 00000 n",
-      "0000002335 00000 n",
+      "0000000000 65535 f ",
+      "0000000184 00000 n ",
+      "0000002001 00000 n ",
+      "0000000015 00000 n ",
+      "0000000124 00000 n ",
+      "0000000241 00000 n ",
+      "0000000366 00000 n ",
+      "0000000496 00000 n ",
+      "0000000629 00000 n ",
+      "0000000766 00000 n ",
+      "0000000889 00000 n ",
+      "0000001018 00000 n ",
+      "0000001150 00000 n ",
+      "0000001286 00000 n ",
+      "0000001414 00000 n ",
+      "0000001541 00000 n ",
+      "0000001670 00000 n ",
+      "0000001803 00000 n ",
+      "0000001905 00000 n ",
+      "0000002249 00000 n ",
+      "0000002335 00000 n ",
       "trailer",
       "<<",
       "/Size 21",
@@ -2911,9 +2911,9 @@ break`,
     expect(writeArray).toEqual([
       "xref",
       "0 3",
-      "0000000000 65535 f",
-      "0000000039 00000 n",
-      "0000000058 00000 n"
+      "0000000000 65535 f ",
+      "0000000040 00000 n ",
+      "0000000060 00000 n "
     ]);
   });
 
@@ -3315,27 +3315,27 @@ break`,
       "endobj",
       "xref",
       "0 21",
-      "0000000000 65535 f",
-      "0000000184 00000 n",
-      "0000002001 00000 n",
-      "0000000015 00000 n",
-      "0000000124 00000 n",
-      "0000000241 00000 n",
-      "0000000366 00000 n",
-      "0000000496 00000 n",
-      "0000000629 00000 n",
-      "0000000766 00000 n",
-      "0000000889 00000 n",
-      "0000001018 00000 n",
-      "0000001150 00000 n",
-      "0000001286 00000 n",
-      "0000001414 00000 n",
-      "0000001541 00000 n",
-      "0000001670 00000 n",
-      "0000001803 00000 n",
-      "0000001905 00000 n",
-      "0000002249 00000 n",
-      "0000002335 00000 n",
+      "0000000000 65535 f ",
+      "0000000184 00000 n ",
+      "0000002001 00000 n ",
+      "0000000015 00000 n ",
+      "0000000124 00000 n ",
+      "0000000241 00000 n ",
+      "0000000366 00000 n ",
+      "0000000496 00000 n ",
+      "0000000629 00000 n ",
+      "0000000766 00000 n ",
+      "0000000889 00000 n ",
+      "0000001018 00000 n ",
+      "0000001150 00000 n ",
+      "0000001286 00000 n ",
+      "0000001414 00000 n ",
+      "0000001541 00000 n ",
+      "0000001670 00000 n ",
+      "0000001803 00000 n ",
+      "0000001905 00000 n ",
+      "0000002249 00000 n ",
+      "0000002335 00000 n ",
       "trailer",
       "<<",
       "/Size 21",
@@ -3556,27 +3556,27 @@ break`,
       "endobj",
       "xref",
       "0 21",
-      "0000000000 65535 f",
-      "0000000184 00000 n",
-      "0000002001 00000 n",
-      "0000000015 00000 n",
-      "0000000124 00000 n",
-      "0000000241 00000 n",
-      "0000000366 00000 n",
-      "0000000496 00000 n",
-      "0000000629 00000 n",
-      "0000000766 00000 n",
-      "0000000889 00000 n",
-      "0000001018 00000 n",
-      "0000001150 00000 n",
-      "0000001286 00000 n",
-      "0000001414 00000 n",
-      "0000001541 00000 n",
-      "0000001670 00000 n",
-      "0000001803 00000 n",
-      "0000001905 00000 n",
-      "0000002249 00000 n",
-      "0000002335 00000 n",
+      "0000000000 65535 f ",
+      "0000000184 00000 n ",
+      "0000002001 00000 n ",
+      "0000000015 00000 n ",
+      "0000000124 00000 n ",
+      "0000000241 00000 n ",
+      "0000000366 00000 n ",
+      "0000000496 00000 n ",
+      "0000000629 00000 n ",
+      "0000000766 00000 n ",
+      "0000000889 00000 n ",
+      "0000001018 00000 n ",
+      "0000001150 00000 n ",
+      "0000001286 00000 n ",
+      "0000001414 00000 n ",
+      "0000001541 00000 n ",
+      "0000001670 00000 n ",
+      "0000001803 00000 n ",
+      "0000001905 00000 n ",
+      "0000002249 00000 n ",
+      "0000002335 00000 n ",
       "trailer",
       "<<",
       "/Size 21",