summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Master/tlpkg/tlgs/README.TEXLIVE2
-rwxr-xr-xMaster/tlpkg/tlgs/bin/gsdll32.dllbin11141120 -> 13090816 bytes
-rw-r--r--Master/tlpkg/tlgs/bin/gsdll32.libbin9894 -> 9258 bytes
-rwxr-xr-xMaster/tlpkg/tlgs/bin/gswin32.exebin151552 -> 151552 bytes
-rwxr-xr-xMaster/tlpkg/tlgs/bin/gswin32c.exebin143360 -> 143360 bytes
-rw-r--r--Master/tlpkg/tlgs/lib/PDFA_def.ps21
-rw-r--r--Master/tlpkg/tlgs/lib/cidfmap.TeXLive8
-rw-r--r--Master/tlpkg/tlgs/lib/opdfread.ps24
-rw-r--r--Master/tlpkg/tlgs/lib/ps2epsi.ps4
9 files changed, 41 insertions, 18 deletions
diff --git a/Master/tlpkg/tlgs/README.TEXLIVE b/Master/tlpkg/tlgs/README.TEXLIVE
index 710285c4dfd..b43f9bfad69 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.10 distribution
+This directory contains a subset of the Ghostscript 9.14 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 13185353e4e..0d900f008bd 100755
--- a/Master/tlpkg/tlgs/bin/gsdll32.dll
+++ b/Master/tlpkg/tlgs/bin/gsdll32.dll
Binary files differ
diff --git a/Master/tlpkg/tlgs/bin/gsdll32.lib b/Master/tlpkg/tlgs/bin/gsdll32.lib
index abb83846083..f1071482a3d 100644
--- a/Master/tlpkg/tlgs/bin/gsdll32.lib
+++ b/Master/tlpkg/tlgs/bin/gsdll32.lib
Binary files differ
diff --git a/Master/tlpkg/tlgs/bin/gswin32.exe b/Master/tlpkg/tlgs/bin/gswin32.exe
index a3ebe905738..5e83567d981 100755
--- a/Master/tlpkg/tlgs/bin/gswin32.exe
+++ b/Master/tlpkg/tlgs/bin/gswin32.exe
Binary files differ
diff --git a/Master/tlpkg/tlgs/bin/gswin32c.exe b/Master/tlpkg/tlgs/bin/gswin32c.exe
index 610e97587cc..6b7f4e50d0b 100755
--- a/Master/tlpkg/tlgs/bin/gswin32c.exe
+++ b/Master/tlpkg/tlgs/bin/gswin32c.exe
Binary files differ
diff --git a/Master/tlpkg/tlgs/lib/PDFA_def.ps b/Master/tlpkg/tlgs/lib/PDFA_def.ps
index 3923d5fb21a..f0ff0d1b6f9 100644
--- a/Master/tlpkg/tlgs/lib/PDFA_def.ps
+++ b/Master/tlpkg/tlgs/lib/PDFA_def.ps
@@ -1,22 +1,31 @@
%!
% 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 (ISO Coated sb.icc) % Customize.
+/ICCProfile (srgb.icc) % Customise
def
-[ /Title (Title) % Customize.
+[ /Title (Title) % Customise
/DOCINFO pdfmark
% Define an ICC profile :
[/_objdef {icc_PDFA} /type /stream /OBJ pdfmark
-[{icc_PDFA} <</N systemdict /ProcessColorModel get /DeviceGray eq {1} {4} ifelse >> /PUT 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} ICCProfile (r) file /PUT pdfmark
% Define the output intent dictionary :
@@ -26,6 +35,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 (CGATS TR001) % Customize
+ /OutputConditionIdentifier (sRGB) % Customize
>> /PUT pdfmark
[{Catalog} <</OutputIntents [ {OutputIntent_PDFA} ]>> /PUT pdfmark
diff --git a/Master/tlpkg/tlgs/lib/cidfmap.TeXLive b/Master/tlpkg/tlgs/lib/cidfmap.TeXLive
index 28c18280c84..68ca38293b8 100644
--- a/Master/tlpkg/tlgs/lib/cidfmap.TeXLive
+++ b/Master/tlpkg/tlgs/lib/cidfmap.TeXLive
@@ -26,7 +26,7 @@
/FileType /TrueType
/SubfontID 0
/CSI [(GB1) 2]
- /Path (arialuni.ttf) >> ; % W7
+ /Path (ARIALUNI.TTF) >> ; % W7
/FangSong <<
/FileType /TrueType
@@ -78,7 +78,7 @@
/FileType /TrueType
/SubfontID 0
/CSI [(CNS1) 2]
- /Path (arialuni.ttf) >> ; % W7
+ /Path (ARIALUNI.TTF) >> ; % W7
/DFKaiShu-SB-Estd-BF <<
/FileType /TrueType
@@ -118,7 +118,7 @@
/FileType /TrueType
/SubfontID 0
/CSI [(Japan1) 3]
- /Path (arialuni.ttf) >> ; % W7
+ /Path (ARIALUNI.TTF) >> ; % W7
/MS-Gothic <<
/FileType /TrueType
@@ -206,7 +206,7 @@
/FileType /TrueType
/SubfontID 0
/CSI [(Korea1) 3]
- /Path (arialuni.ttf) >> ; % W7
+ /Path (ARIALUNI.TTF) >> ; % W7
/Batang <<
/FileType /TrueType
diff --git a/Master/tlpkg/tlgs/lib/opdfread.ps b/Master/tlpkg/tlgs/lib/opdfread.ps
index ebb7caaaaca..6ef1564ea5a 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
- showpage
+ EPS2Write not {showpage} if
} if
} bind def
@@ -896,13 +896,27 @@ 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 % bw bh px0 py0 bw bh bool bw bh Width bool
+ 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
{ % Page Size unchanged, do not emit setpagedevice
pop pop % bw bh px0 py0 bw bh bool
} {
- 2 array astore % bw bh px0 py0 bw bh bool []
- << exch /PageSize exch >> setpagedevice % 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
} ifelse
userdict /PDFR_InitialGS gstate put
setglobal % bw bh px0 py0 bw bh
@@ -971,7 +985,7 @@ currentdict end readonly def
1 index exch /Context exch put % id obj
dup /ImmediateExec true put
dup /IsPage true put
- dup /Context get //SetupPageView exec
+ SetPageSize {dup /Context get //SetupPageView exec} if
} bind def
/FontFileDaemon % <id> <obj> <font_descriptor> FontFileDaemon <id> <obj>
diff --git a/Master/tlpkg/tlgs/lib/ps2epsi.ps b/Master/tlpkg/tlgs/lib/ps2epsi.ps
index cc308ae484d..35c203a85c6 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 (\r) writestring
- epsifile HiresBBoxString writestring epsifile (\r) writestring
+ epsifile BBoxString writestring epsifile (\n) writestring
+ epsifile HiresBBoxString writestring epsifile (\n) writestring
% Define character and bit widths for the output line buffer:
/cwidth rm lm sub 1 add def