texlive[41915] Build/source/texk/web2c/luatexdir: luatexdir: sync

commits+kakuto at tug.org commits+kakuto at tug.org
Tue Aug 23 23:44:55 CEST 2016


Revision: 41915
          http://tug.org/svn/texlive?view=revision&revision=41915
Author:   kakuto
Date:     2016-08-23 23:44:55 +0200 (Tue, 23 Aug 2016)
Log Message:
-----------
luatexdir: sync with the upstream

Modified Paths:
--------------
    trunk/Build/source/texk/web2c/luatexdir/pdf/pdfgen.w
    trunk/Build/source/texk/web2c/luatexdir/tex/extensions.w

Modified: trunk/Build/source/texk/web2c/luatexdir/pdf/pdfgen.w
===================================================================
--- trunk/Build/source/texk/web2c/luatexdir/pdf/pdfgen.w	2016-08-23 16:45:43 UTC (rev 41914)
+++ trunk/Build/source/texk/web2c/luatexdir/pdf/pdfgen.w	2016-08-23 21:44:55 UTC (rev 41915)
@@ -284,9 +284,13 @@
         /* Check that variables for \.{PDF} output are unchanged */
         if (pdf->minor_version != pdf_minor_version)
             normal_error("pdf backend", "minorversion cannot be changed after data is written to the PDF file");
-        if (pdf->draftmode != draft_mode_par)
-            normal_error("pdf backend", "draftmode cannot be changed after data is written to the PDF file");
     }
+}
+
+static void fix_pdf_draftmode(PDF pdf)
+{
+    if (pdf->draftmode != draft_mode_par)
+        normal_error("pdf backend", "draftmode cannot be changed after data is written to the PDF file");
     if (pdf->draftmode != 0) {
         pdf->compress_level = 0;        /* re-fix it, might have been changed inbetween */
         pdf->objcompresslevel = 0;
@@ -1025,6 +1029,7 @@
     /* Initialize variables for \.{PDF} output */
     fix_pdf_minorversion(pdf);
     init_pdf_outputparameters(pdf);
+    fix_pdf_draftmode(pdf);
     /* Write \.{PDF} header */
     pdf_printf(pdf, "%%PDF-1.%d\n", pdf->minor_version);
     /* The next blob will be removed 1.0. */

Modified: trunk/Build/source/texk/web2c/luatexdir/tex/extensions.w
===================================================================
--- trunk/Build/source/texk/web2c/luatexdir/tex/extensions.w	2016-08-23 16:45:43 UTC (rev 41914)
+++ trunk/Build/source/texk/web2c/luatexdir/tex/extensions.w	2016-08-23 21:44:55 UTC (rev 41915)
@@ -294,7 +294,6 @@
             }
             break;
         case save_image_resource_code:
-            fix_pdf_minorversion(static_pdf);
             scan_pdfximage(static_pdf);
             if (immediate) {
                 pdf_write_image(static_pdf, last_saved_image_index);



More information about the tex-live-commits mailing list