From 0386d5bea367e662c9d30b3cae77d4199e485a01 Mon Sep 17 00:00:00 2001 From: Reinhard Kotucha Date: Tue, 15 Apr 2014 13:38:30 +0000 Subject: Reverted to gs-9.10 due to severe bugs reported by Ulrike and Heiko. git-svn-id: svn://tug.org/texlive/trunk@33453 c570f23f-e606-0410-a88d-b1316a301751 --- Master/tlpkg/tlgs/README.TEXLIVE | 2 +- Master/tlpkg/tlgs/bin/gsdll32.dll | Bin 13090816 -> 11141120 bytes Master/tlpkg/tlgs/bin/gsdll32.lib | Bin 9258 -> 9894 bytes Master/tlpkg/tlgs/bin/gswin32.exe | Bin 151552 -> 151552 bytes Master/tlpkg/tlgs/bin/gswin32c.exe | Bin 143360 -> 143360 bytes Master/tlpkg/tlgs/lib/PDFA_def.ps | 21 ++++++--------------- Master/tlpkg/tlgs/lib/opdfread.ps | 24 +++++------------------- Master/tlpkg/tlgs/lib/ps2epsi.ps | 4 ++-- 8 files changed, 14 insertions(+), 37 deletions(-) diff --git a/Master/tlpkg/tlgs/README.TEXLIVE b/Master/tlpkg/tlgs/README.TEXLIVE index b43f9bfad69..710285c4dfd 100644 --- a/Master/tlpkg/tlgs/README.TEXLIVE +++ b/Master/tlpkg/tlgs/README.TEXLIVE @@ -1,5 +1,5 @@ -This directory contains a subset of the Ghostscript 9.14 distribution +This directory contains a subset of the Ghostscript 9.10 distribution for Windows. The only purpose of this package is to support programs shipped with TeX Live. It's not intended for general use. diff --git a/Master/tlpkg/tlgs/bin/gsdll32.dll b/Master/tlpkg/tlgs/bin/gsdll32.dll index 0d900f008bd..13185353e4e 100755 Binary files a/Master/tlpkg/tlgs/bin/gsdll32.dll and b/Master/tlpkg/tlgs/bin/gsdll32.dll differ diff --git a/Master/tlpkg/tlgs/bin/gsdll32.lib b/Master/tlpkg/tlgs/bin/gsdll32.lib index f1071482a3d..abb83846083 100644 Binary files a/Master/tlpkg/tlgs/bin/gsdll32.lib and b/Master/tlpkg/tlgs/bin/gsdll32.lib differ diff --git a/Master/tlpkg/tlgs/bin/gswin32.exe b/Master/tlpkg/tlgs/bin/gswin32.exe index 5e83567d981..a3ebe905738 100755 Binary files a/Master/tlpkg/tlgs/bin/gswin32.exe and b/Master/tlpkg/tlgs/bin/gswin32.exe differ diff --git a/Master/tlpkg/tlgs/bin/gswin32c.exe b/Master/tlpkg/tlgs/bin/gswin32c.exe index 6b7f4e50d0b..610e97587cc 100755 Binary files a/Master/tlpkg/tlgs/bin/gswin32c.exe and b/Master/tlpkg/tlgs/bin/gswin32c.exe differ diff --git a/Master/tlpkg/tlgs/lib/PDFA_def.ps b/Master/tlpkg/tlgs/lib/PDFA_def.ps index f0ff0d1b6f9..3923d5fb21a 100644 --- a/Master/tlpkg/tlgs/lib/PDFA_def.ps +++ b/Master/tlpkg/tlgs/lib/PDFA_def.ps @@ -1,31 +1,22 @@ %! % This is a sample prefix file for creating a PDF/A document. % Feel free to modify entries marked with "Customize". + % This assumes an ICC profile to reside in the file (ISO Coated sb.icc), % unless the user modifies the corresponding line below. % Define entries in the document Info dictionary : -/ICCProfile (srgb.icc) % Customise + +/ICCProfile (ISO Coated sb.icc) % Customize. def -[ /Title (Title) % Customise +[ /Title (Title) % Customize. /DOCINFO pdfmark % Define an ICC profile : [/_objdef {icc_PDFA} /type /stream /OBJ pdfmark -[{icc_PDFA} -<< - /N currentpagedevice /ProcessColorModel known { - currentpagedevice /ProcessColorModel get dup /DeviceGray eq - {pop 1} { - /DeviceRGB eq - {3}{4} ifelse - } ifelse - } { - (ERROR, unable to determine ProcessColorModel) == flush - } ifelse ->> /PUT pdfmark +[{icc_PDFA} <> /PUT pdfmark [{icc_PDFA} ICCProfile (r) file /PUT pdfmark % Define the output intent dictionary : @@ -35,6 +26,6 @@ def /Type /OutputIntent % Must be so (the standard requires). /S /GTS_PDFA1 % Must be so (the standard requires). /DestOutputProfile {icc_PDFA} % Must be so (see above). - /OutputConditionIdentifier (sRGB) % Customize + /OutputConditionIdentifier (CGATS TR001) % Customize >> /PUT pdfmark [{Catalog} <> /PUT pdfmark diff --git a/Master/tlpkg/tlgs/lib/opdfread.ps b/Master/tlpkg/tlgs/lib/opdfread.ps index 6ef1564ea5a..ebb7caaaaca 100644 --- a/Master/tlpkg/tlgs/lib/opdfread.ps +++ b/Master/tlpkg/tlgs/lib/opdfread.ps @@ -742,7 +742,7 @@ currentdict end readonly def copypage } repeat } if - EPS2Write not {showpage} if + showpage } if } bind def @@ -896,27 +896,13 @@ currentdict end readonly def 0 0 % dummy page size values if not known }ifelse % bw bh px0 py0 bw bh bool bw bh Width Height - round cvi 2 index round cvi eq % bw bh px0 py0 bw bh bool bw bh Width bool + round cvi 2 index round cvi % bw bh px0 py0 bw bh bool bw bh Width bool exch round cvi 3 index round cvi eq and % bw bh px0 py0 bw bh bool bw bh bool { % Page Size unchanged, do not emit setpagedevice pop pop % bw bh px0 py0 bw bh bool } { - /MediaRequested where { - % bw bh px0 py0 bw bh - /MediaRequested get aload pop % bw bh px0 py0 bw bh Width Height - round cvi 2 index round cvi eq % bw bh px0 py0 bw bh bool bw bh Width bool - exch round cvi 3 index round cvi eq and % bw bh px0 py0 bw bh bool bw bh bool - {pop pop false} % We already requested this media size, so don't re-request - {true} ifelse % Media request different to last request - } { - true % No stored media request, so apply setpagedevice - } ifelse - { - 2 array astore % bw bh px0 py0 bw bh bool [] - dup /MediaRequested exch def - << exch /PageSize exch >> setpagedevice % bw bh px0 py0 bw bh bool - /pagesave save def - } if + 2 array astore % bw bh px0 py0 bw bh bool [] + << exch /PageSize exch >> setpagedevice % bw bh px0 py0 bw bh bool } ifelse userdict /PDFR_InitialGS gstate put setglobal % bw bh px0 py0 bw bh @@ -985,7 +971,7 @@ currentdict end readonly def 1 index exch /Context exch put % id obj dup /ImmediateExec true put dup /IsPage true put - SetPageSize {dup /Context get //SetupPageView exec} if + dup /Context get //SetupPageView exec } bind def /FontFileDaemon % FontFileDaemon diff --git a/Master/tlpkg/tlgs/lib/ps2epsi.ps b/Master/tlpkg/tlgs/lib/ps2epsi.ps index 35c203a85c6..cc308ae484d 100644 --- a/Master/tlpkg/tlgs/lib/ps2epsi.ps +++ b/Master/tlpkg/tlgs/lib/ps2epsi.ps @@ -190,8 +190,8 @@ ps2edict begin epsifile (\n) writestring epsifile flushfile - epsifile BBoxString writestring epsifile (\n) writestring - epsifile HiresBBoxString writestring epsifile (\n) writestring + epsifile BBoxString writestring epsifile (\r) writestring + epsifile HiresBBoxString writestring epsifile (\r) writestring % Define character and bit widths for the output line buffer: /cwidth rm lm sub 1 add def -- cgit v1.2.3