summaryrefslogtreecommitdiff
path: root/Master/tlpkg
diff options
context:
space:
mode:
authorReinhard Kotucha <reinhard.kotucha@web.de>2023-03-25 20:17:31 +0000
committerReinhard Kotucha <reinhard.kotucha@web.de>2023-03-25 20:17:31 +0000
commitc7d2c919c8f33429589b6bc2e75b69c8b1c511ab (patch)
tree5d29b6b544dbc79fe55bc10d6e08f00c064afbd0 /Master/tlpkg
parent04cb3d18358368fcfa8b981a6b1641353e1fbd6e (diff)
Upgrade gs-9.56.1 -> gs-10.01.0
git-svn-id: svn://tug.org/texlive/trunk@66672 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/tlpkg')
-rw-r--r--Master/tlpkg/tlgs/README.TEXLIVE2
-rw-r--r--Master/tlpkg/tlgs/Resource/Font/COPYING (renamed from Master/tlpkg/tlgs/fonts/COPYING)0
-rw-r--r--Master/tlpkg/tlgs/Resource/Font/LICENSE-utopia.txt (renamed from Master/tlpkg/tlgs/fonts/LICENSE-utopia.txt)0
-rw-r--r--Master/tlpkg/tlgs/Resource/Font/README1
-rw-r--r--Master/tlpkg/tlgs/Resource/Font/README-utopia.txt (renamed from Master/tlpkg/tlgs/fonts/README-utopia.txt)0
-rw-r--r--Master/tlpkg/tlgs/Resource/Font/README.base35 (renamed from Master/tlpkg/tlgs/fonts/README.base35)0
-rw-r--r--Master/tlpkg/tlgs/Resource/Font/bchb8a.afm (renamed from Master/tlpkg/tlgs/fonts/bchb8a.afm)0
-rw-r--r--Master/tlpkg/tlgs/Resource/Font/bchb8a.pfb (renamed from Master/tlpkg/tlgs/fonts/bchb8a.pfb)bin33799 -> 33799 bytes
-rw-r--r--Master/tlpkg/tlgs/Resource/Font/bchbi8a.afm (renamed from Master/tlpkg/tlgs/fonts/bchbi8a.afm)0
-rw-r--r--Master/tlpkg/tlgs/Resource/Font/bchbi8a.pfb (renamed from Master/tlpkg/tlgs/fonts/bchbi8a.pfb)bin35229 -> 35229 bytes
-rw-r--r--Master/tlpkg/tlgs/Resource/Font/bchr8a.afm (renamed from Master/tlpkg/tlgs/fonts/bchr8a.afm)0
-rw-r--r--Master/tlpkg/tlgs/Resource/Font/bchr8a.pfb (renamed from Master/tlpkg/tlgs/fonts/bchr8a.pfb)bin34869 -> 34869 bytes
-rw-r--r--Master/tlpkg/tlgs/Resource/Font/bchri8a.afm (renamed from Master/tlpkg/tlgs/fonts/bchri8a.afm)0
-rw-r--r--Master/tlpkg/tlgs/Resource/Font/bchri8a.pfb (renamed from Master/tlpkg/tlgs/fonts/bchri8a.pfb)bin35118 -> 35118 bytes
-rw-r--r--Master/tlpkg/tlgs/Resource/Font/putb8a.afm (renamed from Master/tlpkg/tlgs/fonts/putb8a.afm)0
-rw-r--r--Master/tlpkg/tlgs/Resource/Font/putb8a.pfb (renamed from Master/tlpkg/tlgs/fonts/putb8a.pfb)bin36737 -> 36737 bytes
-rw-r--r--Master/tlpkg/tlgs/Resource/Font/putbi8a.afm (renamed from Master/tlpkg/tlgs/fonts/putbi8a.afm)0
-rw-r--r--Master/tlpkg/tlgs/Resource/Font/putbi8a.pfb (renamed from Master/tlpkg/tlgs/fonts/putbi8a.pfb)bin37993 -> 37993 bytes
-rw-r--r--Master/tlpkg/tlgs/Resource/Font/putr8a.afm (renamed from Master/tlpkg/tlgs/fonts/putr8a.afm)0
-rw-r--r--Master/tlpkg/tlgs/Resource/Font/putr8a.pfb (renamed from Master/tlpkg/tlgs/fonts/putr8a.pfb)bin36507 -> 36507 bytes
-rw-r--r--Master/tlpkg/tlgs/Resource/Font/putri8a.afm (renamed from Master/tlpkg/tlgs/fonts/putri8a.afm)0
-rw-r--r--Master/tlpkg/tlgs/Resource/Font/putri8a.pfb (renamed from Master/tlpkg/tlgs/fonts/putri8a.pfb)bin37756 -> 37756 bytes
-rw-r--r--Master/tlpkg/tlgs/Resource/Font/readme.charter (renamed from Master/tlpkg/tlgs/fonts/readme.charter)0
-rw-r--r--Master/tlpkg/tlgs/Resource/Font/uagd8a.afm (renamed from Master/tlpkg/tlgs/fonts/uagd8a.afm)0
-rw-r--r--Master/tlpkg/tlgs/Resource/Font/uagd8a.pfb (renamed from Master/tlpkg/tlgs/fonts/uagd8a.pfb)bin36354 -> 36354 bytes
-rw-r--r--Master/tlpkg/tlgs/Resource/Font/uagdo8a.afm (renamed from Master/tlpkg/tlgs/fonts/uagdo8a.afm)0
-rw-r--r--Master/tlpkg/tlgs/Resource/Font/uagdo8a.pfb (renamed from Master/tlpkg/tlgs/fonts/uagdo8a.pfb)bin36128 -> 36128 bytes
-rw-r--r--Master/tlpkg/tlgs/Resource/Font/uagk8a.afm (renamed from Master/tlpkg/tlgs/fonts/uagk8a.afm)0
-rw-r--r--Master/tlpkg/tlgs/Resource/Font/uagk8a.pfb (renamed from Master/tlpkg/tlgs/fonts/uagk8a.pfb)bin34871 -> 34871 bytes
-rw-r--r--Master/tlpkg/tlgs/Resource/Font/uagko8a.afm (renamed from Master/tlpkg/tlgs/fonts/uagko8a.afm)0
-rw-r--r--Master/tlpkg/tlgs/Resource/Font/uagko8a.pfb (renamed from Master/tlpkg/tlgs/fonts/uagko8a.pfb)bin35156 -> 35156 bytes
-rw-r--r--Master/tlpkg/tlgs/Resource/Font/ubkd8a.afm (renamed from Master/tlpkg/tlgs/fonts/ubkd8a.afm)0
-rw-r--r--Master/tlpkg/tlgs/Resource/Font/ubkd8a.pfb (renamed from Master/tlpkg/tlgs/fonts/ubkd8a.pfb)bin44768 -> 44768 bytes
-rw-r--r--Master/tlpkg/tlgs/Resource/Font/ubkdi8a.afm (renamed from Master/tlpkg/tlgs/fonts/ubkdi8a.afm)0
-rw-r--r--Master/tlpkg/tlgs/Resource/Font/ubkdi8a.pfb (renamed from Master/tlpkg/tlgs/fonts/ubkdi8a.pfb)bin44950 -> 44950 bytes
-rw-r--r--Master/tlpkg/tlgs/Resource/Font/ubkl8a.afm (renamed from Master/tlpkg/tlgs/fonts/ubkl8a.afm)0
-rw-r--r--Master/tlpkg/tlgs/Resource/Font/ubkl8a.pfb (renamed from Master/tlpkg/tlgs/fonts/ubkl8a.pfb)bin44934 -> 44934 bytes
-rw-r--r--Master/tlpkg/tlgs/Resource/Font/ubkli8a.afm (renamed from Master/tlpkg/tlgs/fonts/ubkli8a.afm)0
-rw-r--r--Master/tlpkg/tlgs/Resource/Font/ubkli8a.pfb (renamed from Master/tlpkg/tlgs/fonts/ubkli8a.pfb)bin44162 -> 44162 bytes
-rw-r--r--Master/tlpkg/tlgs/Resource/Font/ucrb8a.afm (renamed from Master/tlpkg/tlgs/fonts/ucrb8a.afm)0
-rw-r--r--Master/tlpkg/tlgs/Resource/Font/ucrb8a.pfb (renamed from Master/tlpkg/tlgs/fonts/ucrb8a.pfb)bin50493 -> 50493 bytes
-rw-r--r--Master/tlpkg/tlgs/Resource/Font/ucrbo8a.afm (renamed from Master/tlpkg/tlgs/fonts/ucrbo8a.afm)0
-rw-r--r--Master/tlpkg/tlgs/Resource/Font/ucrbo8a.pfb (renamed from Master/tlpkg/tlgs/fonts/ucrbo8a.pfb)bin51527 -> 51527 bytes
-rw-r--r--Master/tlpkg/tlgs/Resource/Font/ucrr8a.afm (renamed from Master/tlpkg/tlgs/fonts/ucrr8a.afm)0
-rw-r--r--Master/tlpkg/tlgs/Resource/Font/ucrr8a.pfb (renamed from Master/tlpkg/tlgs/fonts/ucrr8a.pfb)bin45758 -> 45758 bytes
-rw-r--r--Master/tlpkg/tlgs/Resource/Font/ucrro8a.afm (renamed from Master/tlpkg/tlgs/fonts/ucrro8a.afm)0
-rw-r--r--Master/tlpkg/tlgs/Resource/Font/ucrro8a.pfb (renamed from Master/tlpkg/tlgs/fonts/ucrro8a.pfb)bin44404 -> 44404 bytes
-rw-r--r--Master/tlpkg/tlgs/Resource/Font/uhvb8a.afm (renamed from Master/tlpkg/tlgs/fonts/uhvb8a.afm)0
-rw-r--r--Master/tlpkg/tlgs/Resource/Font/uhvb8a.pfb (renamed from Master/tlpkg/tlgs/fonts/uhvb8a.pfb)bin35941 -> 35941 bytes
-rw-r--r--Master/tlpkg/tlgs/Resource/Font/uhvb8ac.afm (renamed from Master/tlpkg/tlgs/fonts/uhvb8ac.afm)0
-rw-r--r--Master/tlpkg/tlgs/Resource/Font/uhvb8ac.pfb (renamed from Master/tlpkg/tlgs/fonts/uhvb8ac.pfb)bin37240 -> 37240 bytes
-rw-r--r--Master/tlpkg/tlgs/Resource/Font/uhvbo8a.afm (renamed from Master/tlpkg/tlgs/fonts/uhvbo8a.afm)0
-rw-r--r--Master/tlpkg/tlgs/Resource/Font/uhvbo8a.pfb (renamed from Master/tlpkg/tlgs/fonts/uhvbo8a.pfb)bin39013 -> 39013 bytes
-rw-r--r--Master/tlpkg/tlgs/Resource/Font/uhvbo8ac.afm (renamed from Master/tlpkg/tlgs/fonts/uhvbo8ac.afm)0
-rw-r--r--Master/tlpkg/tlgs/Resource/Font/uhvbo8ac.pfb (renamed from Master/tlpkg/tlgs/fonts/uhvbo8ac.pfb)bin38310 -> 38310 bytes
-rw-r--r--Master/tlpkg/tlgs/Resource/Font/uhvr8a-105.pfb (renamed from Master/tlpkg/tlgs/fonts/uhvr8a-105.pfb)bin36026 -> 36026 bytes
-rw-r--r--Master/tlpkg/tlgs/Resource/Font/uhvr8a.afm (renamed from Master/tlpkg/tlgs/fonts/uhvr8a.afm)0
-rw-r--r--Master/tlpkg/tlgs/Resource/Font/uhvr8a.pfb (renamed from Master/tlpkg/tlgs/fonts/uhvr8a.pfb)bin44648 -> 44648 bytes
-rw-r--r--Master/tlpkg/tlgs/Resource/Font/uhvr8ac.afm (renamed from Master/tlpkg/tlgs/fonts/uhvr8ac.afm)0
-rw-r--r--Master/tlpkg/tlgs/Resource/Font/uhvr8ac.pfb (renamed from Master/tlpkg/tlgs/fonts/uhvr8ac.pfb)bin36615 -> 36615 bytes
-rw-r--r--Master/tlpkg/tlgs/Resource/Font/uhvro8a-105.pfb (renamed from Master/tlpkg/tlgs/fonts/uhvro8a-105.pfb)bin38314 -> 38314 bytes
-rw-r--r--Master/tlpkg/tlgs/Resource/Font/uhvro8a.afm (renamed from Master/tlpkg/tlgs/fonts/uhvro8a.afm)0
-rw-r--r--Master/tlpkg/tlgs/Resource/Font/uhvro8a.pfb (renamed from Master/tlpkg/tlgs/fonts/uhvro8a.pfb)bin48169 -> 48169 bytes
-rw-r--r--Master/tlpkg/tlgs/Resource/Font/uhvro8ac.afm (renamed from Master/tlpkg/tlgs/fonts/uhvro8ac.afm)0
-rw-r--r--Master/tlpkg/tlgs/Resource/Font/uhvro8ac.pfb (renamed from Master/tlpkg/tlgs/fonts/uhvro8ac.pfb)bin37247 -> 37247 bytes
-rw-r--r--Master/tlpkg/tlgs/Resource/Font/uncb8a.afm (renamed from Master/tlpkg/tlgs/fonts/uncb8a.afm)0
-rw-r--r--Master/tlpkg/tlgs/Resource/Font/uncb8a.pfb (renamed from Master/tlpkg/tlgs/fonts/uncb8a.pfb)bin48864 -> 48864 bytes
-rw-r--r--Master/tlpkg/tlgs/Resource/Font/uncbi8a.afm (renamed from Master/tlpkg/tlgs/fonts/uncbi8a.afm)0
-rw-r--r--Master/tlpkg/tlgs/Resource/Font/uncbi8a.pfb (renamed from Master/tlpkg/tlgs/fonts/uncbi8a.pfb)bin47083 -> 47083 bytes
-rw-r--r--Master/tlpkg/tlgs/Resource/Font/uncr8a.afm (renamed from Master/tlpkg/tlgs/fonts/uncr8a.afm)0
-rw-r--r--Master/tlpkg/tlgs/Resource/Font/uncr8a.pfb (renamed from Master/tlpkg/tlgs/fonts/uncr8a.pfb)bin46830 -> 46830 bytes
-rw-r--r--Master/tlpkg/tlgs/Resource/Font/uncri8a.afm (renamed from Master/tlpkg/tlgs/fonts/uncri8a.afm)0
-rw-r--r--Master/tlpkg/tlgs/Resource/Font/uncri8a.pfb (renamed from Master/tlpkg/tlgs/fonts/uncri8a.pfb)bin45832 -> 45832 bytes
-rw-r--r--Master/tlpkg/tlgs/Resource/Font/uplb8a.afm (renamed from Master/tlpkg/tlgs/fonts/uplb8a.afm)0
-rw-r--r--Master/tlpkg/tlgs/Resource/Font/uplb8a.pfb (renamed from Master/tlpkg/tlgs/fonts/uplb8a.pfb)bin52406 -> 52406 bytes
-rw-r--r--Master/tlpkg/tlgs/Resource/Font/uplbi8a.afm (renamed from Master/tlpkg/tlgs/fonts/uplbi8a.afm)0
-rw-r--r--Master/tlpkg/tlgs/Resource/Font/uplbi8a.pfb (renamed from Master/tlpkg/tlgs/fonts/uplbi8a.pfb)bin51285 -> 51285 bytes
-rw-r--r--Master/tlpkg/tlgs/Resource/Font/uplr8a.afm (renamed from Master/tlpkg/tlgs/fonts/uplr8a.afm)0
-rw-r--r--Master/tlpkg/tlgs/Resource/Font/uplr8a.pfb (renamed from Master/tlpkg/tlgs/fonts/uplr8a.pfb)bin52665 -> 52665 bytes
-rw-r--r--Master/tlpkg/tlgs/Resource/Font/uplri8a.afm (renamed from Master/tlpkg/tlgs/fonts/uplri8a.afm)0
-rw-r--r--Master/tlpkg/tlgs/Resource/Font/uplri8a.pfb (renamed from Master/tlpkg/tlgs/fonts/uplri8a.pfb)bin50022 -> 50022 bytes
-rw-r--r--Master/tlpkg/tlgs/Resource/Font/usyr.afm (renamed from Master/tlpkg/tlgs/fonts/usyr.afm)0
-rw-r--r--Master/tlpkg/tlgs/Resource/Font/usyr.pfb (renamed from Master/tlpkg/tlgs/fonts/usyr.pfb)bin33709 -> 33709 bytes
-rw-r--r--Master/tlpkg/tlgs/Resource/Font/utmb8a.afm (renamed from Master/tlpkg/tlgs/fonts/utmb8a.afm)0
-rw-r--r--Master/tlpkg/tlgs/Resource/Font/utmb8a.pfb (renamed from Master/tlpkg/tlgs/fonts/utmb8a.pfb)bin44729 -> 44729 bytes
-rw-r--r--Master/tlpkg/tlgs/Resource/Font/utmbi8a.afm (renamed from Master/tlpkg/tlgs/fonts/utmbi8a.afm)0
-rw-r--r--Master/tlpkg/tlgs/Resource/Font/utmbi8a.pfb (renamed from Master/tlpkg/tlgs/fonts/utmbi8a.pfb)bin44656 -> 44656 bytes
-rw-r--r--Master/tlpkg/tlgs/Resource/Font/utmr8a.afm (renamed from Master/tlpkg/tlgs/fonts/utmr8a.afm)0
-rw-r--r--Master/tlpkg/tlgs/Resource/Font/utmr8a.pfb (renamed from Master/tlpkg/tlgs/fonts/utmr8a.pfb)bin46026 -> 46026 bytes
-rw-r--r--Master/tlpkg/tlgs/Resource/Font/utmri8a.afm (renamed from Master/tlpkg/tlgs/fonts/utmri8a.afm)0
-rw-r--r--Master/tlpkg/tlgs/Resource/Font/utmri8a.pfb (renamed from Master/tlpkg/tlgs/fonts/utmri8a.pfb)bin45458 -> 45458 bytes
-rw-r--r--Master/tlpkg/tlgs/Resource/Font/uzcmi8a.afm (renamed from Master/tlpkg/tlgs/fonts/uzcmi8a.afm)0
-rw-r--r--Master/tlpkg/tlgs/Resource/Font/uzcmi8a.pfb (renamed from Master/tlpkg/tlgs/fonts/uzcmi8a.pfb)bin49289 -> 49289 bytes
-rw-r--r--Master/tlpkg/tlgs/Resource/Font/uzdr.afm (renamed from Master/tlpkg/tlgs/fonts/uzdr.afm)0
-rw-r--r--Master/tlpkg/tlgs/Resource/Font/uzdr.pfb (renamed from Master/tlpkg/tlgs/fonts/uzdr.pfb)bin45955 -> 45955 bytes
-rw-r--r--Master/tlpkg/tlgs/Resource/Init/FAPIcidfmap32
-rw-r--r--Master/tlpkg/tlgs/Resource/Init/FAPIconfig14
-rw-r--r--Master/tlpkg/tlgs/Resource/Init/FAPIfontmap33
-rw-r--r--Master/tlpkg/tlgs/Resource/Init/FCOfontmap-PCLPS2106
-rw-r--r--Master/tlpkg/tlgs/Resource/Init/Fontmap11
-rw-r--r--Master/tlpkg/tlgs/Resource/Init/Fontmap.GS (renamed from Master/tlpkg/tlgs/lib/Fontmap.TeXLive)2
-rw-r--r--Master/tlpkg/tlgs/Resource/Init/cidfmap (renamed from Master/tlpkg/tlgs/lib/cidfmap.TeXLive)2
-rw-r--r--Master/tlpkg/tlgs/Resource/Init/gs_cidfn.ps23
-rw-r--r--Master/tlpkg/tlgs/Resource/Init/gs_epsf.ps6
-rw-r--r--Master/tlpkg/tlgs/Resource/Init/gs_fonts.ps14
-rw-r--r--Master/tlpkg/tlgs/Resource/Init/gs_init.ps8
-rw-r--r--Master/tlpkg/tlgs/Resource/Init/gs_pdfwr.ps4
-rw-r--r--Master/tlpkg/tlgs/Resource/Init/gs_type1.ps8
-rw-r--r--Master/tlpkg/tlgs/Resource/Init/pdf_draw.ps2
-rw-r--r--Master/tlpkg/tlgs/Resource/Init/pdf_main.ps598
-rwxr-xr-xMaster/tlpkg/tlgs/bin/gsdll32.dllbin14564864 -> 0 bytes
-rw-r--r--Master/tlpkg/tlgs/bin/gsdll32.libbin12018 -> 0 bytes
-rwxr-xr-xMaster/tlpkg/tlgs/bin/gsdll64.dllbin16438272 -> 16559104 bytes
-rwxr-xr-xMaster/tlpkg/tlgs/bin/gswin32.exebin210944 -> 0 bytes
-rwxr-xr-xMaster/tlpkg/tlgs/bin/gswin32c.exebin204288 -> 0 bytes
-rwxr-xr-xMaster/tlpkg/tlgs/bin/gswin64.exebin240640 -> 241664 bytes
-rwxr-xr-xMaster/tlpkg/tlgs/bin/gswin64c.exebin231936 -> 232960 bytes
-rw-r--r--Master/tlpkg/tlgs/lib/Fontmap7
-rw-r--r--Master/tlpkg/tlgs/lib/Fontmap.GS108
-rw-r--r--Master/tlpkg/tlgs/lib/cidfmap9
-rw-r--r--Master/tlpkg/tlgs/lib/pdf_info.ps160
-rw-r--r--Master/tlpkg/tlgs/lib/viewcmyk.ps2
-rw-r--r--Master/tlpkg/tlgs/lib/viewjpeg.ps3
-rw-r--r--Master/tlpkg/tlgs/lib/viewpbm.ps2
-rw-r--r--Master/tlpkg/tlgs/lib/viewpcx.ps2
-rw-r--r--Master/tlpkg/tlgs/lib/viewraw.ps2
-rw-r--r--Master/tlpkg/tlgs/lib/viewrgb.ps2
-rw-r--r--Master/tlpkg/tlgs/lib/zugferd.ps2
128 files changed, 581 insertions, 584 deletions
diff --git a/Master/tlpkg/tlgs/README.TEXLIVE b/Master/tlpkg/tlgs/README.TEXLIVE
index eceb6f81daa..d4229c3f405 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.56.1 distribution
+This directory contains a subset of the Ghostscript 10.01.0 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/fonts/COPYING b/Master/tlpkg/tlgs/Resource/Font/COPYING
index d60c31a97a5..d60c31a97a5 100644
--- a/Master/tlpkg/tlgs/fonts/COPYING
+++ b/Master/tlpkg/tlgs/Resource/Font/COPYING
diff --git a/Master/tlpkg/tlgs/fonts/LICENSE-utopia.txt b/Master/tlpkg/tlgs/Resource/Font/LICENSE-utopia.txt
index 9755d3cec66..9755d3cec66 100644
--- a/Master/tlpkg/tlgs/fonts/LICENSE-utopia.txt
+++ b/Master/tlpkg/tlgs/Resource/Font/LICENSE-utopia.txt
diff --git a/Master/tlpkg/tlgs/Resource/Font/README b/Master/tlpkg/tlgs/Resource/Font/README
deleted file mode 100644
index e63a1cb1c80..00000000000
--- a/Master/tlpkg/tlgs/Resource/Font/README
+++ /dev/null
@@ -1 +0,0 @@
-This otherwise-empty directory is needed.
diff --git a/Master/tlpkg/tlgs/fonts/README-utopia.txt b/Master/tlpkg/tlgs/Resource/Font/README-utopia.txt
index 9fbd5f90cf0..9fbd5f90cf0 100644
--- a/Master/tlpkg/tlgs/fonts/README-utopia.txt
+++ b/Master/tlpkg/tlgs/Resource/Font/README-utopia.txt
diff --git a/Master/tlpkg/tlgs/fonts/README.base35 b/Master/tlpkg/tlgs/Resource/Font/README.base35
index e3d3d8e7d72..e3d3d8e7d72 100644
--- a/Master/tlpkg/tlgs/fonts/README.base35
+++ b/Master/tlpkg/tlgs/Resource/Font/README.base35
diff --git a/Master/tlpkg/tlgs/fonts/bchb8a.afm b/Master/tlpkg/tlgs/Resource/Font/bchb8a.afm
index 31721010cfd..31721010cfd 100644
--- a/Master/tlpkg/tlgs/fonts/bchb8a.afm
+++ b/Master/tlpkg/tlgs/Resource/Font/bchb8a.afm
diff --git a/Master/tlpkg/tlgs/fonts/bchb8a.pfb b/Master/tlpkg/tlgs/Resource/Font/bchb8a.pfb
index 07011728968..07011728968 100644
--- a/Master/tlpkg/tlgs/fonts/bchb8a.pfb
+++ b/Master/tlpkg/tlgs/Resource/Font/bchb8a.pfb
Binary files differ
diff --git a/Master/tlpkg/tlgs/fonts/bchbi8a.afm b/Master/tlpkg/tlgs/Resource/Font/bchbi8a.afm
index d16eb097077..d16eb097077 100644
--- a/Master/tlpkg/tlgs/fonts/bchbi8a.afm
+++ b/Master/tlpkg/tlgs/Resource/Font/bchbi8a.afm
diff --git a/Master/tlpkg/tlgs/fonts/bchbi8a.pfb b/Master/tlpkg/tlgs/Resource/Font/bchbi8a.pfb
index d68f639bb01..d68f639bb01 100644
--- a/Master/tlpkg/tlgs/fonts/bchbi8a.pfb
+++ b/Master/tlpkg/tlgs/Resource/Font/bchbi8a.pfb
Binary files differ
diff --git a/Master/tlpkg/tlgs/fonts/bchr8a.afm b/Master/tlpkg/tlgs/Resource/Font/bchr8a.afm
index 6d58e7c65a7..6d58e7c65a7 100644
--- a/Master/tlpkg/tlgs/fonts/bchr8a.afm
+++ b/Master/tlpkg/tlgs/Resource/Font/bchr8a.afm
diff --git a/Master/tlpkg/tlgs/fonts/bchr8a.pfb b/Master/tlpkg/tlgs/Resource/Font/bchr8a.pfb
index 72a1606b4b4..72a1606b4b4 100644
--- a/Master/tlpkg/tlgs/fonts/bchr8a.pfb
+++ b/Master/tlpkg/tlgs/Resource/Font/bchr8a.pfb
Binary files differ
diff --git a/Master/tlpkg/tlgs/fonts/bchri8a.afm b/Master/tlpkg/tlgs/Resource/Font/bchri8a.afm
index 0f721845f66..0f721845f66 100644
--- a/Master/tlpkg/tlgs/fonts/bchri8a.afm
+++ b/Master/tlpkg/tlgs/Resource/Font/bchri8a.afm
diff --git a/Master/tlpkg/tlgs/fonts/bchri8a.pfb b/Master/tlpkg/tlgs/Resource/Font/bchri8a.pfb
index b5d4ded6b26..b5d4ded6b26 100644
--- a/Master/tlpkg/tlgs/fonts/bchri8a.pfb
+++ b/Master/tlpkg/tlgs/Resource/Font/bchri8a.pfb
Binary files differ
diff --git a/Master/tlpkg/tlgs/fonts/putb8a.afm b/Master/tlpkg/tlgs/Resource/Font/putb8a.afm
index a3fcbc59365..a3fcbc59365 100644
--- a/Master/tlpkg/tlgs/fonts/putb8a.afm
+++ b/Master/tlpkg/tlgs/Resource/Font/putb8a.afm
diff --git a/Master/tlpkg/tlgs/fonts/putb8a.pfb b/Master/tlpkg/tlgs/Resource/Font/putb8a.pfb
index f4ddef7473a..f4ddef7473a 100644
--- a/Master/tlpkg/tlgs/fonts/putb8a.pfb
+++ b/Master/tlpkg/tlgs/Resource/Font/putb8a.pfb
Binary files differ
diff --git a/Master/tlpkg/tlgs/fonts/putbi8a.afm b/Master/tlpkg/tlgs/Resource/Font/putbi8a.afm
index 3c00da960a8..3c00da960a8 100644
--- a/Master/tlpkg/tlgs/fonts/putbi8a.afm
+++ b/Master/tlpkg/tlgs/Resource/Font/putbi8a.afm
diff --git a/Master/tlpkg/tlgs/fonts/putbi8a.pfb b/Master/tlpkg/tlgs/Resource/Font/putbi8a.pfb
index 1caf6daeb79..1caf6daeb79 100644
--- a/Master/tlpkg/tlgs/fonts/putbi8a.pfb
+++ b/Master/tlpkg/tlgs/Resource/Font/putbi8a.pfb
Binary files differ
diff --git a/Master/tlpkg/tlgs/fonts/putr8a.afm b/Master/tlpkg/tlgs/Resource/Font/putr8a.afm
index 30c1e7fb129..30c1e7fb129 100644
--- a/Master/tlpkg/tlgs/fonts/putr8a.afm
+++ b/Master/tlpkg/tlgs/Resource/Font/putr8a.afm
diff --git a/Master/tlpkg/tlgs/fonts/putr8a.pfb b/Master/tlpkg/tlgs/Resource/Font/putr8a.pfb
index 12843819ada..12843819ada 100644
--- a/Master/tlpkg/tlgs/fonts/putr8a.pfb
+++ b/Master/tlpkg/tlgs/Resource/Font/putr8a.pfb
Binary files differ
diff --git a/Master/tlpkg/tlgs/fonts/putri8a.afm b/Master/tlpkg/tlgs/Resource/Font/putri8a.afm
index 4b460805ad4..4b460805ad4 100644
--- a/Master/tlpkg/tlgs/fonts/putri8a.afm
+++ b/Master/tlpkg/tlgs/Resource/Font/putri8a.afm
diff --git a/Master/tlpkg/tlgs/fonts/putri8a.pfb b/Master/tlpkg/tlgs/Resource/Font/putri8a.pfb
index 5e969b17852..5e969b17852 100644
--- a/Master/tlpkg/tlgs/fonts/putri8a.pfb
+++ b/Master/tlpkg/tlgs/Resource/Font/putri8a.pfb
Binary files differ
diff --git a/Master/tlpkg/tlgs/fonts/readme.charter b/Master/tlpkg/tlgs/Resource/Font/readme.charter
index 789bb43e809..789bb43e809 100644
--- a/Master/tlpkg/tlgs/fonts/readme.charter
+++ b/Master/tlpkg/tlgs/Resource/Font/readme.charter
diff --git a/Master/tlpkg/tlgs/fonts/uagd8a.afm b/Master/tlpkg/tlgs/Resource/Font/uagd8a.afm
index 392b98ec68b..392b98ec68b 100644
--- a/Master/tlpkg/tlgs/fonts/uagd8a.afm
+++ b/Master/tlpkg/tlgs/Resource/Font/uagd8a.afm
diff --git a/Master/tlpkg/tlgs/fonts/uagd8a.pfb b/Master/tlpkg/tlgs/Resource/Font/uagd8a.pfb
index 67046dbe684..67046dbe684 100644
--- a/Master/tlpkg/tlgs/fonts/uagd8a.pfb
+++ b/Master/tlpkg/tlgs/Resource/Font/uagd8a.pfb
Binary files differ
diff --git a/Master/tlpkg/tlgs/fonts/uagdo8a.afm b/Master/tlpkg/tlgs/Resource/Font/uagdo8a.afm
index a0dfd3829b0..a0dfd3829b0 100644
--- a/Master/tlpkg/tlgs/fonts/uagdo8a.afm
+++ b/Master/tlpkg/tlgs/Resource/Font/uagdo8a.afm
diff --git a/Master/tlpkg/tlgs/fonts/uagdo8a.pfb b/Master/tlpkg/tlgs/Resource/Font/uagdo8a.pfb
index e0f6559e932..e0f6559e932 100644
--- a/Master/tlpkg/tlgs/fonts/uagdo8a.pfb
+++ b/Master/tlpkg/tlgs/Resource/Font/uagdo8a.pfb
Binary files differ
diff --git a/Master/tlpkg/tlgs/fonts/uagk8a.afm b/Master/tlpkg/tlgs/Resource/Font/uagk8a.afm
index bc4cca1ade5..bc4cca1ade5 100644
--- a/Master/tlpkg/tlgs/fonts/uagk8a.afm
+++ b/Master/tlpkg/tlgs/Resource/Font/uagk8a.afm
diff --git a/Master/tlpkg/tlgs/fonts/uagk8a.pfb b/Master/tlpkg/tlgs/Resource/Font/uagk8a.pfb
index 4d3a8b2ba78..4d3a8b2ba78 100644
--- a/Master/tlpkg/tlgs/fonts/uagk8a.pfb
+++ b/Master/tlpkg/tlgs/Resource/Font/uagk8a.pfb
Binary files differ
diff --git a/Master/tlpkg/tlgs/fonts/uagko8a.afm b/Master/tlpkg/tlgs/Resource/Font/uagko8a.afm
index 01ce91b852b..01ce91b852b 100644
--- a/Master/tlpkg/tlgs/fonts/uagko8a.afm
+++ b/Master/tlpkg/tlgs/Resource/Font/uagko8a.afm
diff --git a/Master/tlpkg/tlgs/fonts/uagko8a.pfb b/Master/tlpkg/tlgs/Resource/Font/uagko8a.pfb
index c25c6ee4ccf..c25c6ee4ccf 100644
--- a/Master/tlpkg/tlgs/fonts/uagko8a.pfb
+++ b/Master/tlpkg/tlgs/Resource/Font/uagko8a.pfb
Binary files differ
diff --git a/Master/tlpkg/tlgs/fonts/ubkd8a.afm b/Master/tlpkg/tlgs/Resource/Font/ubkd8a.afm
index 470e52694c1..470e52694c1 100644
--- a/Master/tlpkg/tlgs/fonts/ubkd8a.afm
+++ b/Master/tlpkg/tlgs/Resource/Font/ubkd8a.afm
diff --git a/Master/tlpkg/tlgs/fonts/ubkd8a.pfb b/Master/tlpkg/tlgs/Resource/Font/ubkd8a.pfb
index 4e26c1cf52e..4e26c1cf52e 100644
--- a/Master/tlpkg/tlgs/fonts/ubkd8a.pfb
+++ b/Master/tlpkg/tlgs/Resource/Font/ubkd8a.pfb
Binary files differ
diff --git a/Master/tlpkg/tlgs/fonts/ubkdi8a.afm b/Master/tlpkg/tlgs/Resource/Font/ubkdi8a.afm
index 15c87a1597a..15c87a1597a 100644
--- a/Master/tlpkg/tlgs/fonts/ubkdi8a.afm
+++ b/Master/tlpkg/tlgs/Resource/Font/ubkdi8a.afm
diff --git a/Master/tlpkg/tlgs/fonts/ubkdi8a.pfb b/Master/tlpkg/tlgs/Resource/Font/ubkdi8a.pfb
index 6520e718dce..6520e718dce 100644
--- a/Master/tlpkg/tlgs/fonts/ubkdi8a.pfb
+++ b/Master/tlpkg/tlgs/Resource/Font/ubkdi8a.pfb
Binary files differ
diff --git a/Master/tlpkg/tlgs/fonts/ubkl8a.afm b/Master/tlpkg/tlgs/Resource/Font/ubkl8a.afm
index 8117c789e92..8117c789e92 100644
--- a/Master/tlpkg/tlgs/fonts/ubkl8a.afm
+++ b/Master/tlpkg/tlgs/Resource/Font/ubkl8a.afm
diff --git a/Master/tlpkg/tlgs/fonts/ubkl8a.pfb b/Master/tlpkg/tlgs/Resource/Font/ubkl8a.pfb
index 7cbac2c456c..7cbac2c456c 100644
--- a/Master/tlpkg/tlgs/fonts/ubkl8a.pfb
+++ b/Master/tlpkg/tlgs/Resource/Font/ubkl8a.pfb
Binary files differ
diff --git a/Master/tlpkg/tlgs/fonts/ubkli8a.afm b/Master/tlpkg/tlgs/Resource/Font/ubkli8a.afm
index b32d77bd12d..b32d77bd12d 100644
--- a/Master/tlpkg/tlgs/fonts/ubkli8a.afm
+++ b/Master/tlpkg/tlgs/Resource/Font/ubkli8a.afm
diff --git a/Master/tlpkg/tlgs/fonts/ubkli8a.pfb b/Master/tlpkg/tlgs/Resource/Font/ubkli8a.pfb
index 3ef45dcbecd..3ef45dcbecd 100644
--- a/Master/tlpkg/tlgs/fonts/ubkli8a.pfb
+++ b/Master/tlpkg/tlgs/Resource/Font/ubkli8a.pfb
Binary files differ
diff --git a/Master/tlpkg/tlgs/fonts/ucrb8a.afm b/Master/tlpkg/tlgs/Resource/Font/ucrb8a.afm
index 0bafed51b84..0bafed51b84 100644
--- a/Master/tlpkg/tlgs/fonts/ucrb8a.afm
+++ b/Master/tlpkg/tlgs/Resource/Font/ucrb8a.afm
diff --git a/Master/tlpkg/tlgs/fonts/ucrb8a.pfb b/Master/tlpkg/tlgs/Resource/Font/ucrb8a.pfb
index f1da6121bba..f1da6121bba 100644
--- a/Master/tlpkg/tlgs/fonts/ucrb8a.pfb
+++ b/Master/tlpkg/tlgs/Resource/Font/ucrb8a.pfb
Binary files differ
diff --git a/Master/tlpkg/tlgs/fonts/ucrbo8a.afm b/Master/tlpkg/tlgs/Resource/Font/ucrbo8a.afm
index 8e614b89bed..8e614b89bed 100644
--- a/Master/tlpkg/tlgs/fonts/ucrbo8a.afm
+++ b/Master/tlpkg/tlgs/Resource/Font/ucrbo8a.afm
diff --git a/Master/tlpkg/tlgs/fonts/ucrbo8a.pfb b/Master/tlpkg/tlgs/Resource/Font/ucrbo8a.pfb
index 8b7c24ff3a4..8b7c24ff3a4 100644
--- a/Master/tlpkg/tlgs/fonts/ucrbo8a.pfb
+++ b/Master/tlpkg/tlgs/Resource/Font/ucrbo8a.pfb
Binary files differ
diff --git a/Master/tlpkg/tlgs/fonts/ucrr8a.afm b/Master/tlpkg/tlgs/Resource/Font/ucrr8a.afm
index 2ebe8d247b3..2ebe8d247b3 100644
--- a/Master/tlpkg/tlgs/fonts/ucrr8a.afm
+++ b/Master/tlpkg/tlgs/Resource/Font/ucrr8a.afm
diff --git a/Master/tlpkg/tlgs/fonts/ucrr8a.pfb b/Master/tlpkg/tlgs/Resource/Font/ucrr8a.pfb
index 0cadce7d139..0cadce7d139 100644
--- a/Master/tlpkg/tlgs/fonts/ucrr8a.pfb
+++ b/Master/tlpkg/tlgs/Resource/Font/ucrr8a.pfb
Binary files differ
diff --git a/Master/tlpkg/tlgs/fonts/ucrro8a.afm b/Master/tlpkg/tlgs/Resource/Font/ucrro8a.afm
index 718ec5de05a..718ec5de05a 100644
--- a/Master/tlpkg/tlgs/fonts/ucrro8a.afm
+++ b/Master/tlpkg/tlgs/Resource/Font/ucrro8a.afm
diff --git a/Master/tlpkg/tlgs/fonts/ucrro8a.pfb b/Master/tlpkg/tlgs/Resource/Font/ucrro8a.pfb
index 107a513372d..107a513372d 100644
--- a/Master/tlpkg/tlgs/fonts/ucrro8a.pfb
+++ b/Master/tlpkg/tlgs/Resource/Font/ucrro8a.pfb
Binary files differ
diff --git a/Master/tlpkg/tlgs/fonts/uhvb8a.afm b/Master/tlpkg/tlgs/Resource/Font/uhvb8a.afm
index fe41636b63c..fe41636b63c 100644
--- a/Master/tlpkg/tlgs/fonts/uhvb8a.afm
+++ b/Master/tlpkg/tlgs/Resource/Font/uhvb8a.afm
diff --git a/Master/tlpkg/tlgs/fonts/uhvb8a.pfb b/Master/tlpkg/tlgs/Resource/Font/uhvb8a.pfb
index aec380a3310..aec380a3310 100644
--- a/Master/tlpkg/tlgs/fonts/uhvb8a.pfb
+++ b/Master/tlpkg/tlgs/Resource/Font/uhvb8a.pfb
Binary files differ
diff --git a/Master/tlpkg/tlgs/fonts/uhvb8ac.afm b/Master/tlpkg/tlgs/Resource/Font/uhvb8ac.afm
index e865d9372e4..e865d9372e4 100644
--- a/Master/tlpkg/tlgs/fonts/uhvb8ac.afm
+++ b/Master/tlpkg/tlgs/Resource/Font/uhvb8ac.afm
diff --git a/Master/tlpkg/tlgs/fonts/uhvb8ac.pfb b/Master/tlpkg/tlgs/Resource/Font/uhvb8ac.pfb
index 7ee6a2c812c..7ee6a2c812c 100644
--- a/Master/tlpkg/tlgs/fonts/uhvb8ac.pfb
+++ b/Master/tlpkg/tlgs/Resource/Font/uhvb8ac.pfb
Binary files differ
diff --git a/Master/tlpkg/tlgs/fonts/uhvbo8a.afm b/Master/tlpkg/tlgs/Resource/Font/uhvbo8a.afm
index 9433a322e29..9433a322e29 100644
--- a/Master/tlpkg/tlgs/fonts/uhvbo8a.afm
+++ b/Master/tlpkg/tlgs/Resource/Font/uhvbo8a.afm
diff --git a/Master/tlpkg/tlgs/fonts/uhvbo8a.pfb b/Master/tlpkg/tlgs/Resource/Font/uhvbo8a.pfb
index 479904083a9..479904083a9 100644
--- a/Master/tlpkg/tlgs/fonts/uhvbo8a.pfb
+++ b/Master/tlpkg/tlgs/Resource/Font/uhvbo8a.pfb
Binary files differ
diff --git a/Master/tlpkg/tlgs/fonts/uhvbo8ac.afm b/Master/tlpkg/tlgs/Resource/Font/uhvbo8ac.afm
index 8dbd253f0c5..8dbd253f0c5 100644
--- a/Master/tlpkg/tlgs/fonts/uhvbo8ac.afm
+++ b/Master/tlpkg/tlgs/Resource/Font/uhvbo8ac.afm
diff --git a/Master/tlpkg/tlgs/fonts/uhvbo8ac.pfb b/Master/tlpkg/tlgs/Resource/Font/uhvbo8ac.pfb
index d2e96f3b7e7..d2e96f3b7e7 100644
--- a/Master/tlpkg/tlgs/fonts/uhvbo8ac.pfb
+++ b/Master/tlpkg/tlgs/Resource/Font/uhvbo8ac.pfb
Binary files differ
diff --git a/Master/tlpkg/tlgs/fonts/uhvr8a-105.pfb b/Master/tlpkg/tlgs/Resource/Font/uhvr8a-105.pfb
index ff605552c96..ff605552c96 100644
--- a/Master/tlpkg/tlgs/fonts/uhvr8a-105.pfb
+++ b/Master/tlpkg/tlgs/Resource/Font/uhvr8a-105.pfb
Binary files differ
diff --git a/Master/tlpkg/tlgs/fonts/uhvr8a.afm b/Master/tlpkg/tlgs/Resource/Font/uhvr8a.afm
index 36133a4290f..36133a4290f 100644
--- a/Master/tlpkg/tlgs/fonts/uhvr8a.afm
+++ b/Master/tlpkg/tlgs/Resource/Font/uhvr8a.afm
diff --git a/Master/tlpkg/tlgs/fonts/uhvr8a.pfb b/Master/tlpkg/tlgs/Resource/Font/uhvr8a.pfb
index ee77b02bdf5..ee77b02bdf5 100644
--- a/Master/tlpkg/tlgs/fonts/uhvr8a.pfb
+++ b/Master/tlpkg/tlgs/Resource/Font/uhvr8a.pfb
Binary files differ
diff --git a/Master/tlpkg/tlgs/fonts/uhvr8ac.afm b/Master/tlpkg/tlgs/Resource/Font/uhvr8ac.afm
index c78fd9bd32a..c78fd9bd32a 100644
--- a/Master/tlpkg/tlgs/fonts/uhvr8ac.afm
+++ b/Master/tlpkg/tlgs/Resource/Font/uhvr8ac.afm
diff --git a/Master/tlpkg/tlgs/fonts/uhvr8ac.pfb b/Master/tlpkg/tlgs/Resource/Font/uhvr8ac.pfb
index f2387225df2..f2387225df2 100644
--- a/Master/tlpkg/tlgs/fonts/uhvr8ac.pfb
+++ b/Master/tlpkg/tlgs/Resource/Font/uhvr8ac.pfb
Binary files differ
diff --git a/Master/tlpkg/tlgs/fonts/uhvro8a-105.pfb b/Master/tlpkg/tlgs/Resource/Font/uhvro8a-105.pfb
index 876cda876de..876cda876de 100644
--- a/Master/tlpkg/tlgs/fonts/uhvro8a-105.pfb
+++ b/Master/tlpkg/tlgs/Resource/Font/uhvro8a-105.pfb
Binary files differ
diff --git a/Master/tlpkg/tlgs/fonts/uhvro8a.afm b/Master/tlpkg/tlgs/Resource/Font/uhvro8a.afm
index 0172d808283..0172d808283 100644
--- a/Master/tlpkg/tlgs/fonts/uhvro8a.afm
+++ b/Master/tlpkg/tlgs/Resource/Font/uhvro8a.afm
diff --git a/Master/tlpkg/tlgs/fonts/uhvro8a.pfb b/Master/tlpkg/tlgs/Resource/Font/uhvro8a.pfb
index d978164f2db..d978164f2db 100644
--- a/Master/tlpkg/tlgs/fonts/uhvro8a.pfb
+++ b/Master/tlpkg/tlgs/Resource/Font/uhvro8a.pfb
Binary files differ
diff --git a/Master/tlpkg/tlgs/fonts/uhvro8ac.afm b/Master/tlpkg/tlgs/Resource/Font/uhvro8ac.afm
index 3948cea9777..3948cea9777 100644
--- a/Master/tlpkg/tlgs/fonts/uhvro8ac.afm
+++ b/Master/tlpkg/tlgs/Resource/Font/uhvro8ac.afm
diff --git a/Master/tlpkg/tlgs/fonts/uhvro8ac.pfb b/Master/tlpkg/tlgs/Resource/Font/uhvro8ac.pfb
index 4ff13e5f64d..4ff13e5f64d 100644
--- a/Master/tlpkg/tlgs/fonts/uhvro8ac.pfb
+++ b/Master/tlpkg/tlgs/Resource/Font/uhvro8ac.pfb
Binary files differ
diff --git a/Master/tlpkg/tlgs/fonts/uncb8a.afm b/Master/tlpkg/tlgs/Resource/Font/uncb8a.afm
index 65a3c60529d..65a3c60529d 100644
--- a/Master/tlpkg/tlgs/fonts/uncb8a.afm
+++ b/Master/tlpkg/tlgs/Resource/Font/uncb8a.afm
diff --git a/Master/tlpkg/tlgs/fonts/uncb8a.pfb b/Master/tlpkg/tlgs/Resource/Font/uncb8a.pfb
index 321a282f43c..321a282f43c 100644
--- a/Master/tlpkg/tlgs/fonts/uncb8a.pfb
+++ b/Master/tlpkg/tlgs/Resource/Font/uncb8a.pfb
Binary files differ
diff --git a/Master/tlpkg/tlgs/fonts/uncbi8a.afm b/Master/tlpkg/tlgs/Resource/Font/uncbi8a.afm
index 57d3e386a8e..57d3e386a8e 100644
--- a/Master/tlpkg/tlgs/fonts/uncbi8a.afm
+++ b/Master/tlpkg/tlgs/Resource/Font/uncbi8a.afm
diff --git a/Master/tlpkg/tlgs/fonts/uncbi8a.pfb b/Master/tlpkg/tlgs/Resource/Font/uncbi8a.pfb
index 31e589003a4..31e589003a4 100644
--- a/Master/tlpkg/tlgs/fonts/uncbi8a.pfb
+++ b/Master/tlpkg/tlgs/Resource/Font/uncbi8a.pfb
Binary files differ
diff --git a/Master/tlpkg/tlgs/fonts/uncr8a.afm b/Master/tlpkg/tlgs/Resource/Font/uncr8a.afm
index b8f6643983a..b8f6643983a 100644
--- a/Master/tlpkg/tlgs/fonts/uncr8a.afm
+++ b/Master/tlpkg/tlgs/Resource/Font/uncr8a.afm
diff --git a/Master/tlpkg/tlgs/fonts/uncr8a.pfb b/Master/tlpkg/tlgs/Resource/Font/uncr8a.pfb
index 6cbded3c764..6cbded3c764 100644
--- a/Master/tlpkg/tlgs/fonts/uncr8a.pfb
+++ b/Master/tlpkg/tlgs/Resource/Font/uncr8a.pfb
Binary files differ
diff --git a/Master/tlpkg/tlgs/fonts/uncri8a.afm b/Master/tlpkg/tlgs/Resource/Font/uncri8a.afm
index 2e365d486c7..2e365d486c7 100644
--- a/Master/tlpkg/tlgs/fonts/uncri8a.afm
+++ b/Master/tlpkg/tlgs/Resource/Font/uncri8a.afm
diff --git a/Master/tlpkg/tlgs/fonts/uncri8a.pfb b/Master/tlpkg/tlgs/Resource/Font/uncri8a.pfb
index 2fbd6164793..2fbd6164793 100644
--- a/Master/tlpkg/tlgs/fonts/uncri8a.pfb
+++ b/Master/tlpkg/tlgs/Resource/Font/uncri8a.pfb
Binary files differ
diff --git a/Master/tlpkg/tlgs/fonts/uplb8a.afm b/Master/tlpkg/tlgs/Resource/Font/uplb8a.afm
index 6b6b6bbc43f..6b6b6bbc43f 100644
--- a/Master/tlpkg/tlgs/fonts/uplb8a.afm
+++ b/Master/tlpkg/tlgs/Resource/Font/uplb8a.afm
diff --git a/Master/tlpkg/tlgs/fonts/uplb8a.pfb b/Master/tlpkg/tlgs/Resource/Font/uplb8a.pfb
index 7f5df43f3df..7f5df43f3df 100644
--- a/Master/tlpkg/tlgs/fonts/uplb8a.pfb
+++ b/Master/tlpkg/tlgs/Resource/Font/uplb8a.pfb
Binary files differ
diff --git a/Master/tlpkg/tlgs/fonts/uplbi8a.afm b/Master/tlpkg/tlgs/Resource/Font/uplbi8a.afm
index 360d7d4863d..360d7d4863d 100644
--- a/Master/tlpkg/tlgs/fonts/uplbi8a.afm
+++ b/Master/tlpkg/tlgs/Resource/Font/uplbi8a.afm
diff --git a/Master/tlpkg/tlgs/fonts/uplbi8a.pfb b/Master/tlpkg/tlgs/Resource/Font/uplbi8a.pfb
index 1c812b83916..1c812b83916 100644
--- a/Master/tlpkg/tlgs/fonts/uplbi8a.pfb
+++ b/Master/tlpkg/tlgs/Resource/Font/uplbi8a.pfb
Binary files differ
diff --git a/Master/tlpkg/tlgs/fonts/uplr8a.afm b/Master/tlpkg/tlgs/Resource/Font/uplr8a.afm
index 4173bfe004e..4173bfe004e 100644
--- a/Master/tlpkg/tlgs/fonts/uplr8a.afm
+++ b/Master/tlpkg/tlgs/Resource/Font/uplr8a.afm
diff --git a/Master/tlpkg/tlgs/fonts/uplr8a.pfb b/Master/tlpkg/tlgs/Resource/Font/uplr8a.pfb
index 4101b733586..4101b733586 100644
--- a/Master/tlpkg/tlgs/fonts/uplr8a.pfb
+++ b/Master/tlpkg/tlgs/Resource/Font/uplr8a.pfb
Binary files differ
diff --git a/Master/tlpkg/tlgs/fonts/uplri8a.afm b/Master/tlpkg/tlgs/Resource/Font/uplri8a.afm
index 063f437d1e3..063f437d1e3 100644
--- a/Master/tlpkg/tlgs/fonts/uplri8a.afm
+++ b/Master/tlpkg/tlgs/Resource/Font/uplri8a.afm
diff --git a/Master/tlpkg/tlgs/fonts/uplri8a.pfb b/Master/tlpkg/tlgs/Resource/Font/uplri8a.pfb
index 8d0f820de16..8d0f820de16 100644
--- a/Master/tlpkg/tlgs/fonts/uplri8a.pfb
+++ b/Master/tlpkg/tlgs/Resource/Font/uplri8a.pfb
Binary files differ
diff --git a/Master/tlpkg/tlgs/fonts/usyr.afm b/Master/tlpkg/tlgs/Resource/Font/usyr.afm
index d8c193623fc..d8c193623fc 100644
--- a/Master/tlpkg/tlgs/fonts/usyr.afm
+++ b/Master/tlpkg/tlgs/Resource/Font/usyr.afm
diff --git a/Master/tlpkg/tlgs/fonts/usyr.pfb b/Master/tlpkg/tlgs/Resource/Font/usyr.pfb
index d0505e46cd5..d0505e46cd5 100644
--- a/Master/tlpkg/tlgs/fonts/usyr.pfb
+++ b/Master/tlpkg/tlgs/Resource/Font/usyr.pfb
Binary files differ
diff --git a/Master/tlpkg/tlgs/fonts/utmb8a.afm b/Master/tlpkg/tlgs/Resource/Font/utmb8a.afm
index 8931279b60d..8931279b60d 100644
--- a/Master/tlpkg/tlgs/fonts/utmb8a.afm
+++ b/Master/tlpkg/tlgs/Resource/Font/utmb8a.afm
diff --git a/Master/tlpkg/tlgs/fonts/utmb8a.pfb b/Master/tlpkg/tlgs/Resource/Font/utmb8a.pfb
index 47f8fd57da4..47f8fd57da4 100644
--- a/Master/tlpkg/tlgs/fonts/utmb8a.pfb
+++ b/Master/tlpkg/tlgs/Resource/Font/utmb8a.pfb
Binary files differ
diff --git a/Master/tlpkg/tlgs/fonts/utmbi8a.afm b/Master/tlpkg/tlgs/Resource/Font/utmbi8a.afm
index 0833e4f046f..0833e4f046f 100644
--- a/Master/tlpkg/tlgs/fonts/utmbi8a.afm
+++ b/Master/tlpkg/tlgs/Resource/Font/utmbi8a.afm
diff --git a/Master/tlpkg/tlgs/fonts/utmbi8a.pfb b/Master/tlpkg/tlgs/Resource/Font/utmbi8a.pfb
index 2d19d942eae..2d19d942eae 100644
--- a/Master/tlpkg/tlgs/fonts/utmbi8a.pfb
+++ b/Master/tlpkg/tlgs/Resource/Font/utmbi8a.pfb
Binary files differ
diff --git a/Master/tlpkg/tlgs/fonts/utmr8a.afm b/Master/tlpkg/tlgs/Resource/Font/utmr8a.afm
index 95759a53b04..95759a53b04 100644
--- a/Master/tlpkg/tlgs/fonts/utmr8a.afm
+++ b/Master/tlpkg/tlgs/Resource/Font/utmr8a.afm
diff --git a/Master/tlpkg/tlgs/fonts/utmr8a.pfb b/Master/tlpkg/tlgs/Resource/Font/utmr8a.pfb
index cbae7ed157e..cbae7ed157e 100644
--- a/Master/tlpkg/tlgs/fonts/utmr8a.pfb
+++ b/Master/tlpkg/tlgs/Resource/Font/utmr8a.pfb
Binary files differ
diff --git a/Master/tlpkg/tlgs/fonts/utmri8a.afm b/Master/tlpkg/tlgs/Resource/Font/utmri8a.afm
index 8454d36a0c6..8454d36a0c6 100644
--- a/Master/tlpkg/tlgs/fonts/utmri8a.afm
+++ b/Master/tlpkg/tlgs/Resource/Font/utmri8a.afm
diff --git a/Master/tlpkg/tlgs/fonts/utmri8a.pfb b/Master/tlpkg/tlgs/Resource/Font/utmri8a.pfb
index aa9ff5f8ac9..aa9ff5f8ac9 100644
--- a/Master/tlpkg/tlgs/fonts/utmri8a.pfb
+++ b/Master/tlpkg/tlgs/Resource/Font/utmri8a.pfb
Binary files differ
diff --git a/Master/tlpkg/tlgs/fonts/uzcmi8a.afm b/Master/tlpkg/tlgs/Resource/Font/uzcmi8a.afm
index d3ad8d0abad..d3ad8d0abad 100644
--- a/Master/tlpkg/tlgs/fonts/uzcmi8a.afm
+++ b/Master/tlpkg/tlgs/Resource/Font/uzcmi8a.afm
diff --git a/Master/tlpkg/tlgs/fonts/uzcmi8a.pfb b/Master/tlpkg/tlgs/Resource/Font/uzcmi8a.pfb
index 28443517d30..28443517d30 100644
--- a/Master/tlpkg/tlgs/fonts/uzcmi8a.pfb
+++ b/Master/tlpkg/tlgs/Resource/Font/uzcmi8a.pfb
Binary files differ
diff --git a/Master/tlpkg/tlgs/fonts/uzdr.afm b/Master/tlpkg/tlgs/Resource/Font/uzdr.afm
index 98735a0aa7b..98735a0aa7b 100644
--- a/Master/tlpkg/tlgs/fonts/uzdr.afm
+++ b/Master/tlpkg/tlgs/Resource/Font/uzdr.afm
diff --git a/Master/tlpkg/tlgs/fonts/uzdr.pfb b/Master/tlpkg/tlgs/Resource/Font/uzdr.pfb
index 4a3c386d292..4a3c386d292 100644
--- a/Master/tlpkg/tlgs/fonts/uzdr.pfb
+++ b/Master/tlpkg/tlgs/Resource/Font/uzdr.pfb
Binary files differ
diff --git a/Master/tlpkg/tlgs/Resource/Init/FAPIcidfmap b/Master/tlpkg/tlgs/Resource/Init/FAPIcidfmap
deleted file mode 100644
index 38e42e60df1..00000000000
--- a/Master/tlpkg/tlgs/Resource/Init/FAPIcidfmap
+++ /dev/null
@@ -1,32 +0,0 @@
-%!
-% $Id: FAPIcidfmap 6826 2006-05-31 15:29:52Z leonardo $
-% This is a sample map file for FAPI CID fonts.
-
-%
-% The map is a set of records like this :
-%
-% /CIDfont_name options_dict ;
-%
-% where options_dict is a dictionary with the following entries :
-%
-% Key Type Description
-% Path string Absolute path to font file, or relative path to font file from
-% the GS_EXTFONTPATH value.
-% CIDFontType interger PostScript type for this CID font. Only 0 is currently allowed.
-% Note that this is unrelated to the real type of the font file -
-% the bridge will perform format conversion.
-% FAPI name Name of the renderer to be used with the font. Only /UFST is now allowed.
-% SubfontId integer (optional) Index of the font in font collection, such as FCO or TTC.
-% It is being ignored if /Path doesn't specify a collection.
-% Default value is 0.
-% CSI array Must have strongly 2 elements.
-% The first element of the array specifies Ordering of CIDSystemInfo.
-% The second element specifies Supplement of CIDSystemInfo.
-%
-% Use regular Postscript syntax.
-%
-% Examples :
-%
-% /Ryumin-Medium << /Path (msgothic.ttc) /CIDFontType 0 /FAPI /UFST /CSI [(Japan1) 2] >> ;
-% /HeiseiKakuGo-W5 << /Path (F:/WIN2000/Fonts/BATANG.TTC) /CIDFontType 0 /FAPI /UFST /CSI [(Japan1) 2] >> ;
-
diff --git a/Master/tlpkg/tlgs/Resource/Init/FAPIconfig b/Master/tlpkg/tlgs/Resource/Init/FAPIconfig
deleted file mode 100644
index f893add7db2..00000000000
--- a/Master/tlpkg/tlgs/Resource/Init/FAPIconfig
+++ /dev/null
@@ -1,14 +0,0 @@
-%!
-% $Id: FAPIconfig 6870 2006-06-20 16:31:15Z leonardo $
-% This is configuration file for FAPI client.
-%
-% /FontPath (/Fonts) % A default directory for FAPI-handled font files path in FAPIfontmap.
-% /CIDFontPath (/CIDFonts) % A default directory for FAPI-handled CID font files path in FAPIcidfmap.
-% /HookDiskFonts [1 2 9 11 42] % FontType values for disk PS fonts to be redirected to FAPI.
-% /HookEmbeddedFonts [1 2 9 11 42] % FontType values for embedded PS fonts to be redirected to FAPI.
-%
-% Values allowed for HookDiskFonts and HookEmbeddedFonts are 1, 2, 9, 11, 42.
-% "Disk fonts" are fonts being installed to Ghostscript with 'lib/Fontmap' or with GS_FONTPATH,
-% and CID font resource files.
-% "Embedded fonts" are fonts and CID fonts being embedded into a document.
-
diff --git a/Master/tlpkg/tlgs/Resource/Init/FAPIfontmap b/Master/tlpkg/tlgs/Resource/Init/FAPIfontmap
deleted file mode 100644
index 0fedcdeaef8..00000000000
--- a/Master/tlpkg/tlgs/Resource/Init/FAPIfontmap
+++ /dev/null
@@ -1,33 +0,0 @@
-%!
-% $Id: FAPIfontmap 6870 2006-06-20 16:31:15Z leonardo $
-% This is a sample map file for FAPI fonts.
-
-%
-% The map is a set of records like this :
-%
-% /font_name options_dict ;
-%
-% where options_dict is a dictionary with the following entries :
-%
-% Key Type Description
-% Path string Absolute path to font file, or relative path to font file from
-% the GS_EXTFONTPATH value.
-% FontType interger PostScript type for this font. Only 1 and 42 are currently allowed.
-% Note that this is unrelated to the real type of the font file -
-% the bridge will perform format conversion.
-% FAPI name Name of the renderer to be used with the font. Only /AgfaUFST is now allowed.
-% SubfontId integer (optional) Index of the font in font collection, such as FCO or TTC.
-% It is being ignored if /Path doesn't specify a collection.
-% Default value is 0.
-% Decoding name (optional) The name of a Decoding resource to be used with the font.
-% If specified, "xlatmap" doesn't work for this font.
-%
-% Use regular Postscript syntax.
-%
-% Examples :
-%
-% /ArialTT << /Path (arial.ttf) /FontType 1 /FAPI /UFST >> ;
-% /CourierTT << /Path (F:/WIN2000/Fonts/cour.ttf) /FontType 1 /FAPI /UFST >> ;
-% /FCO1 << /Path (F:/AFPL/ufst/fontdata/MTFONTS/PCLPS3/MT1/PCLP3__G.FCO) /FontType 42 /FAPI /UFST /SubfontId 10 >> ;
-%
-
diff --git a/Master/tlpkg/tlgs/Resource/Init/FCOfontmap-PCLPS2 b/Master/tlpkg/tlgs/Resource/Init/FCOfontmap-PCLPS2
deleted file mode 100644
index e51db629fcc..00000000000
--- a/Master/tlpkg/tlgs/Resource/Init/FCOfontmap-PCLPS2
+++ /dev/null
@@ -1,106 +0,0 @@
-% Copyright (C) 2001-2021 Artifex Software, Inc.
-% All Rights Reserved.
-%
-% This software is provided AS-IS with no warranty, either express or
-% implied.
-%
-% This software is distributed under license and may not be copied,
-% modified or distributed except as expressly authorized under the terms
-% of the license contained in the file LICENSE in this distribution.
-%
-% Refer to licensing information at http://www.artifex.com or contact
-% Artifex Software, Inc., 1305 Grant Avenue - Suite 200, Novato,
-% CA 94945, U.S.A., +1(415)492-9861, for further information.
-%
-
-
-% May add general FAPIfontmap records here like this :
-/Wingdings-Regular << /Path FCOfontfile2 /FontType 1 /FAPI /UFST /SubfontId 0 /Encoding /Wingdings /Decoding /FCO_Wingdings>> ;
-
-% Mapping Postscript fonts to pclp2_xj.fco FCO members :
-FCOfontfile ReadFCOfontmap:
-0 Albertus-Medium
-1 Albertus-ExtraBold
-2 AntiqueOlive
-3 AntiqueOlive-Italic
-4 AntiqueOlive-Bold
-5 Arial
-6 Arial-Italic
-7 Arial-Bold
-8 Arial-BoldItalic
-9 Clarendon-Condensed-Bold
-10 Coronet
-11 CourierHP
-12 CourierHP-Italic
-13 CourierHP-Bold
-14 CourierHP-BoldItalic
-15 Garamond-Antiqua
-16 Garamond-Kursiv
-17 Garamond-Halbfett
-18 Garamond-KursivHalbfett
-19 LetterGothic
-20 LetterGothic-Italic
-21 LetterGothic-Bold
-22 Marigold
-23 CGOmega
-24 CGOmega-Italic
-25 CGOmega-Bold
-26 CGOmega-BoldItalic
-27 SymbolMT SymbolEncoding FCO_Symbol
-28 CGTimes
-29 CGTimes-Italic
-30 CGTimes-Bold
-31 CGTimes-BoldItalic
-32 TimesNewRoman
-33 TimesNewRoman-Italic
-34 TimesNewRoman-Bold
-35 TimesNewRoman-BoldItalic
-36 UniversMedium
-37 UniversMedium-Italic
-38 Univers-Bold
-39 Univers-BoldItalic
-40 Univers-Condensed-Medium
-41 Univers-Condensed-MediumItalic
-42 Univers-Condensed-Bold
-43 Univers-Condensed-BoldItalic
-44 Courier-
-45 Courier-Italic
-46 Courier-Bold-
-47 Courier-BoldItalic
-48 AvantGarde-Book
-49 AvantGarde-BookOblique
-50 AvantGarde-Demi
-51 AvantGarde-DemiOblique
-52 Bookman-Light
-53 Bookman-LightItalic
-54 Bookman-Demi
-55 Bookman-DemiItalic
-56 Courier
-57 Courier-Oblique
-58 Courier-Bold
-59 Courier-BoldOblique
-60 Helvetica
-61 Helvetica-Oblique
-62 Helvetica-Bold
-63 Helvetica-BoldOblique
-64 Helvetica-Narrow
-65 Helvetica-Narrow-Oblique
-66 Helvetica-Narrow-Bold
-67 Helvetica-Narrow-BoldOblique
-68 NewCenturySchlbk-Roman
-69 NewCenturySchlbk-Italic
-70 NewCenturySchlbk-Bold
-71 NewCenturySchlbk-BoldItalic
-72 Palatino-Roman
-73 Palatino-Italic
-74 Palatino-Bold
-75 Palatino-BoldItalic
-76 Symbol SymbolEncoding FCO_Symbol
-77 Times-Roman
-78 Times-Italic
-79 Times-Bold
-80 Times-BoldItalic
-81 ZapfChancery-MediumItalic
-82 ZapfDingbats DingbatsEncoding FCO_Dingbats
-EndFCOfontmap
-%EOF
diff --git a/Master/tlpkg/tlgs/Resource/Init/Fontmap b/Master/tlpkg/tlgs/Resource/Init/Fontmap
new file mode 100644
index 00000000000..1fa896c3e67
--- /dev/null
+++ b/Master/tlpkg/tlgs/Resource/Init/Fontmap
@@ -0,0 +1,11 @@
+%!
+%% $Id$
+
+% See Fontmap.GS for the syntax of real Fontmap files.
+%
+% This file formery loaded Fontmap.TeXLive but Ghostscript's
+% new PDF interpreter doesn't read this file and expects the
+% fontmap file to be named Fontmap.GS. However, this file is
+% still read by the PostScript interpreter.
+
+(Fontmap.GS) .runlibfile
diff --git a/Master/tlpkg/tlgs/lib/Fontmap.TeXLive b/Master/tlpkg/tlgs/Resource/Init/Fontmap.GS
index ed079d50fc1..3dc7fe38cef 100644
--- a/Master/tlpkg/tlgs/lib/Fontmap.TeXLive
+++ b/Master/tlpkg/tlgs/Resource/Init/Fontmap.GS
@@ -1,5 +1,5 @@
%% Fontmap.TeXLive
-%% $Id: Fontmap.TeXLive 7680 2008-04-27 12:21:15Z reinhardk $
+%% $Id$
%% This file is part of TeXLive.
%% You may freely use, modify and/or distribute this file.
diff --git a/Master/tlpkg/tlgs/lib/cidfmap.TeXLive b/Master/tlpkg/tlgs/Resource/Init/cidfmap
index d0cda3eeb28..68ca38293b8 100644
--- a/Master/tlpkg/tlgs/lib/cidfmap.TeXLive
+++ b/Master/tlpkg/tlgs/Resource/Init/cidfmap
@@ -1,5 +1,5 @@
% cidfmap.TeXLive
-% $Id: $
+% $Id$
% This file is part of TeXLive.
% You may freely use, modify and/or distribute this file.
diff --git a/Master/tlpkg/tlgs/Resource/Init/gs_cidfn.ps b/Master/tlpkg/tlgs/Resource/Init/gs_cidfn.ps
index 870a2e11c65..fa050ed7acf 100644
--- a/Master/tlpkg/tlgs/Resource/Init/gs_cidfn.ps
+++ b/Master/tlpkg/tlgs/Resource/Init/gs_cidfn.ps
@@ -1,4 +1,4 @@
-% Copyright (C) 2001-2021 Artifex Software, Inc.
+% Copyright (C) 2001-2022 Artifex Software, Inc.
% All Rights Reserved.
%
% This software is provided AS-IS with no warranty, either express or
@@ -36,6 +36,17 @@
30 dict begin
+/.gcompatstringcopy % <string> <global> .gcompatstringcopy <string>
+{
+ dup 2 index gcheck eq
+ { pop }
+ {
+ currentglobal 3 1 roll setglobal
+ dup length string copy
+ exch setglobal
+ } ifelse
+} bind def
+
% The key in .cidfonttypes is the CIDFontType value;
% the value is a procedure that takes a font name and the CIDFont dictionary
% and replaces the latter with a real font.
@@ -58,7 +69,7 @@ dup 0 {
end
} if
1 index exch .buildfont9
- .currentresourcefile dup type /filetype eq { //.filename {1 index exch /ResourcePath exch put} if }{ pop} ifelse
+ .currentresourcefile dup type /filetype eq { //.filename {1 index gcheck //.gcompatstringcopy exec 1 index exch /ResourcePath exch put} if }{ pop} ifelse
exch pop
} put % Don't bind it here, because gs_fapi.ps redefines .buildfont9
@@ -138,10 +149,11 @@ dup 0 {
% ------ CIDFontType 1 (FontType 10) ------ %
+
dup 1 {
10 //.checkfonttype exec pop
1 index exch .buildfont10
- .currentresourcefile dup type /filetype eq { //.filename {1 index exch /ResourcePath exch put} if }{ pop} ifelse
+ .currentresourcefile dup type /filetype eq { //.filename {1 index gcheck //.gcompatstringcopy exec 1 index exch /ResourcePath exch put} if }{ pop} ifelse
exch pop
} put % Don't bind it here because gs_fapi.ps redefines .buildfont10
@@ -150,12 +162,15 @@ dup 1 {
dup 2 {
11 //.checkfonttype exec pop
1 index exch .buildfont11
- .currentresourcefile dup type /filetype eq { //.filename {1 index exch /ResourcePath exch put} if }{ pop} ifelse
+ .currentresourcefile dup type /filetype eq { //.filename {1 index gcheck //.gcompatstringcopy exec 1 index exch /ResourcePath exch put} if }{ pop} ifelse
exch pop
} put % Don't bind it here because gs_fapi.ps redefines .buildfont11
+currentdict /.gcompatstringcopy .undef
+
pop % .cidfonttypes
+
% ---------------- Reading CIDFontType 0 files ---------------- %
/StartData { % <(Binary)|(Hex)> <datalength> StartData -
diff --git a/Master/tlpkg/tlgs/Resource/Init/gs_epsf.ps b/Master/tlpkg/tlgs/Resource/Init/gs_epsf.ps
index 7f2329d6ab3..fce2e2363bb 100644
--- a/Master/tlpkg/tlgs/Resource/Init/gs_epsf.ps
+++ b/Master/tlpkg/tlgs/Resource/Init/gs_epsf.ps
@@ -1,4 +1,4 @@
-% Copyright (C) 2001-2021 Artifex Software, Inc.
+% Copyright (C) 2001-2022 Artifex Software, Inc.
% All Rights Reserved.
%
% This software is provided AS-IS with no warranty, either express or
@@ -120,7 +120,9 @@
% even if HiResBoundingBox occurs first in the EPS file.
//systemdict /EPSBoundingBoxState get 1 index lt {
% save the BBoxString for possible FitPage when EndComments is seen
- exch dup //systemdict /EPSBoundingBoxString 3 -1 roll .forceput
+ exch dup currentglobal //true setglobal exch
+ dup length string copy //systemdict /EPSBoundingBoxString 3 -1 roll .forceput
+ setglobal
EPSBoundingBoxParse
{
//systemdict /EPSCrop known {
diff --git a/Master/tlpkg/tlgs/Resource/Init/gs_fonts.ps b/Master/tlpkg/tlgs/Resource/Init/gs_fonts.ps
index aaee616f4af..b1206c46872 100644
--- a/Master/tlpkg/tlgs/Resource/Init/gs_fonts.ps
+++ b/Master/tlpkg/tlgs/Resource/Init/gs_fonts.ps
@@ -1,4 +1,4 @@
-% Copyright (C) 2001-2021 Artifex Software, Inc.
+% Copyright (C) 2001-2023 Artifex Software, Inc.
% All Rights Reserved.
%
% This software is provided AS-IS with no warranty, either express or
@@ -22,7 +22,10 @@
% Note that the "%%Replace " comment below provides the font map file name
% for compiling initialization files into executable. Most likely it should be
% consistent with the one specified here.
-/defaultfontmap (Fontmap) def
+/FONTMAP where
+{/FONTMAP get /defaultfontmap exch def}
+{/defaultfontmap (Fontmap) def}
+ifelse
% we have to set .languagelevel to 2 so the parser will accept the names
% '<<' and '>>', then we use a local definition here.
@@ -432,6 +435,7 @@ FONTPATH
/FONTMAP where
{
dup /FONTMAP get /FONTMAP exch [ exch //.pathlist exec] put
+ /FONTMAP dup where pop exch get {/PermitFileReading exch .addcontrolpath} forall
} if
% Try to enumerate native fonts registered with the os
@@ -929,10 +933,14 @@ FAKEFONTS not { (%END FAKEFONTS) .skipeof } if
} if
% No aliasing.
% This mode is incompatible with high level devices.
+ defaultfontname /None eq { /findfont cvx /invalidfont signalerror } if
cleartomark mark defaultfontname
} {
dup .substitutefont
- 2 copy eq { pop defaultfontname } if
+ 2 copy eq {
+ defaultfontname /None eq { /findfont cvx /invalidfont signalerror } if
+ pop defaultfontname
+ } if
//.checkalias exec
QUIET not {
SHORTERRORS {
diff --git a/Master/tlpkg/tlgs/Resource/Init/gs_init.ps b/Master/tlpkg/tlgs/Resource/Init/gs_init.ps
index ada1811b177..c364f3e03ff 100644
--- a/Master/tlpkg/tlgs/Resource/Init/gs_init.ps
+++ b/Master/tlpkg/tlgs/Resource/Init/gs_init.ps
@@ -1,4 +1,4 @@
-% Copyright (C) 2001-2021 Artifex Software, Inc.
+% Copyright (C) 2001-2023 Artifex Software, Inc.
% All Rights Reserved.
%
% This software is provided AS-IS with no warranty, either express or
@@ -34,7 +34,7 @@
% Interpreter library version number
% NOTE: the interpreter code requires that the first non-comment token
% in this file be an integer, and that it match the compiled-in version!
-9561
+10010
% Check the interpreter revision.
dup revision ne
@@ -283,9 +283,7 @@ userdict /=string 256 string put
(\)\n) revisiondate 10 mod revisiondate 10 idiv 10 mod (-)
revisiondate 100 idiv 10 mod revisiondate 1000 idiv 10 mod (-)
revisiondate 10000 idiv ( \()
- revision 10 mod (.)
- revision 1000 mod 10 idiv (.)
- revision 1000 idiv ( )
+ .revisionstring ( )
product
counttomark
{ (%stdout) (w) file exch 0 .writecvp
diff --git a/Master/tlpkg/tlgs/Resource/Init/gs_pdfwr.ps b/Master/tlpkg/tlgs/Resource/Init/gs_pdfwr.ps
index 7945a322102..a04d9e35053 100644
--- a/Master/tlpkg/tlgs/Resource/Init/gs_pdfwr.ps
+++ b/Master/tlpkg/tlgs/Resource/Init/gs_pdfwr.ps
@@ -1,4 +1,4 @@
-% Copyright (C) 2001-2021 Artifex Software, Inc.
+% Copyright (C) 2001-2023 Artifex Software, Inc.
% All Rights Reserved.
%
% This software is provided AS-IS with no warranty, either express or
@@ -847,6 +847,8 @@ currentdict /.pdf_hook_DSC_Creator undef
/PassThroughJPXImages { }
/PSDocOptions { }
/PSPageOptions { }
+ /AlwaysOutline { }
+ /NeverOutline { }
.dicttomark readonly def
/.distillerdevice
{
diff --git a/Master/tlpkg/tlgs/Resource/Init/gs_type1.ps b/Master/tlpkg/tlgs/Resource/Init/gs_type1.ps
index fa3cdd8826e..ef36509377f 100644
--- a/Master/tlpkg/tlgs/Resource/Init/gs_type1.ps
+++ b/Master/tlpkg/tlgs/Resource/Init/gs_type1.ps
@@ -1,4 +1,4 @@
-% Copyright (C) 2001-2021 Artifex Software, Inc.
+% Copyright (C) 2001-2022 Artifex Software, Inc.
% All Rights Reserved.
%
% This software is provided AS-IS with no warranty, either express or
@@ -224,6 +224,12 @@ currentdict /.loadfont1 .undef
ifelse
/.notdef CharStrings /.notdef get
} if
+ dup type /integertype eq
+ currentdict /CFFCharStrings known and
+ {
+ CFFCharStrings exch .knownget not
+ { CFFCharStrings 0 get} if
+ } if
end
} bind def
diff --git a/Master/tlpkg/tlgs/Resource/Init/pdf_draw.ps b/Master/tlpkg/tlgs/Resource/Init/pdf_draw.ps
index 691a8bd6a91..117b362cfb9 100644
--- a/Master/tlpkg/tlgs/Resource/Init/pdf_draw.ps
+++ b/Master/tlpkg/tlgs/Resource/Init/pdf_draw.ps
@@ -1421,7 +1421,7 @@ currentdict end readonly def
% untouched as set above.
%
currentpagedevice dup
- /Overprint get /simulate eq
+ /Overprint .knownget {/simulate eq}{false} ifelse
1 index /PageSpotColors known not and
exch /PageUsesOverprint .knownget not { //false } if
and
diff --git a/Master/tlpkg/tlgs/Resource/Init/pdf_main.ps b/Master/tlpkg/tlgs/Resource/Init/pdf_main.ps
index 3259c0fe34d..32af17e3319 100644
--- a/Master/tlpkg/tlgs/Resource/Init/pdf_main.ps
+++ b/Master/tlpkg/tlgs/Resource/Init/pdf_main.ps
@@ -1,4 +1,4 @@
-% Copyright (C) 2001-2022 Artifex Software, Inc.
+% Copyright (C) 2001-2023 Artifex Software, Inc.
% All Rights Reserved.
%
% This software is provided AS-IS with no warranty, either express or
@@ -218,7 +218,7 @@ DingbatsEncoding pop
% Redefine 'run' so it recognizes PDF files.
systemdict begin
-systemdict /NEWPDF known not {/NEWPDF //true def} if
+systemdict /OLDPDF known not {/OLDPDF //false def} if
% PostScript interface to the ghostpdf C-based interpreter
%
@@ -258,6 +258,9 @@ systemdict /NEWPDF known not {/NEWPDF //true def} if
% Uses currentdict as an argument to pdfclose, which closes /PDFfile. Also
% executes restore and various cleanup activities.
%
+% pdfavailable - pdfavailable <bool>
+% Determines if there is a PDF interpreter available
+%
% Also Used by gsview 5
% =====================
% pdfopen <file> pdfopen <dict>
@@ -341,10 +344,14 @@ systemdict /NEWPDF known not {/NEWPDF //true def} if
/PageUsesTransparency exch % << >> <<page dict>> /PageUsesTransparency bool
3 index 3 1 roll % << >> <<page dict>> <<info dict>> << >> /PageUsesTransparency bool
put % <</PageUsesTransparency bool>> <<page dict>>
- /NumSpots get % <</PageUsesTransparency bool>> int
- /PageSpotColors exch % <</PageUsesTransparency bool>> /PageSpotColors int
- 2 index 3 1 roll % <</PageUsesTransparency bool>> <<page dict>> /PageSpotColors int
- put % <</PageUsesTransparency bool /PageSpotColors int >>
+ currentpagedevice /PageSpotColors known {
+ /NumSpots get % <</PageUsesTransparency bool>> int
+ /PageSpotColors exch % <</PageUsesTransparency bool>> /PageSpotColors int
+ 2 index 3 1 roll % <</PageUsesTransparency bool>> <<page dict>> /PageSpotColors int
+ put % <</PageUsesTransparency bool /PageSpotColors int >>
+ }{
+ pop
+ } ifelse
setpagedevice
}bind def
@@ -364,6 +371,7 @@ systemdict /NEWPDF known not {/NEWPDF //true def} if
3 1 roll eq
or % square media or square page, no point in rotating
{
+ pop pop pop pop
//false
}
{
@@ -403,21 +411,42 @@ systemdict /NEWPDF known not {/NEWPDF //true def} if
exch % swap media width/height for scaling calculation
}if
- % Stack - box boxwidth boxheight mediawidth mediaheight
- % Incorporate up any offset from 0,0
- 4 index aload pop pop pop neg exch neg
+ % Now use the box and media values to calculate the required x/y scale factors
+ 4 copy % Stack - box boxwidth boxheight mediawidth mediaheight boxwidth boxheight mediawidth mediaheight
+ 3 -1 roll div % box boxwidth boxheight mediawidth mediaheight boxwidth mediawidth (mediaheight / boxheight)
+ 3 1 roll % box boxwidth boxheight mediawidth mediaheight (mediaheight / boxheight) boxwidth mediawidth
+ exch % box boxwidth boxheight mediawidth mediaheight (mediaheight / boxheight) mediawidth boxwidth
+ div % box boxwidth boxheight mediawidth mediaheight (mediaheight / boxheight) (mediawidth / boxwidth)
+
+ % Stack - box boxwidth boxheight mediawidth mediaheight Yscale Xscale
+
+ % Centre the output on the media
+ 2 copy % box boxwidth boxheight mediawidth mediaheight Yscale Xscale Yscale Xscale
+ gt {
+ exch pop % box boxwidth boxheight mediawidth mediaheight Xscale
+ dup 4 index mul % box boxwidth boxheight mediawidth mediaheight Xscale (boxheight * Xscale)
+ 3 -1 roll sub dup
+ 0 lt {-1 mul} if % box boxwidth boxheight mediawidth Xscale ((boxheight * Xscale) - mediaheight)
+ dup 0 ne {2 div} if % box boxwidth boxheight mediawidth Xscale (heightdiff / 2)
+ 0 exch translate % box boxwidth boxheight mediawidth Xscale
+ } {
+ pop % box boxwidth boxheight mediawidth mediaheight Yscale
+ dup 5 index mul % box boxwidth boxheight mediawidth mediaheight Yscale (boxwidth * Yscale)
+ 4 -1 roll sub dup
+ 0 lt {-1 mul} if % box boxwidth boxheight mediaheight Yscale ((boxwidth * Yscale) - mediawidth)
+ dup 0 ne {2 div} if % box boxwidth boxheight mediawidth Yscale (widthdiff / 2)
+ 0 translate % box boxwidth boxheight mediawidth Yscale
+ } ifelse
+
+ % Apply any 'offset' in the Box. Tht is, if the llx and lly are not 0, then we need to
+ % shift the origin of the content so that they become 0,0. We need to take into
+ % account the scaling from above.
+ 4 index aload pop pop pop
+ neg 2 index mul exch neg 2 index mul exch
translate
- % Now use the box and media values to calculate the required x/y scale factors
- 3 -1 roll div % box boxwidth mediawidth (mediaheight / boxheight)
- 3 1 roll % box (mediaheight / boxheight) boxwidth mediawidth
- exch % box (mediaheight / boxheight) mediawidth boxwidth
- div % box (mediaheight / boxheight) (mediawidth / boxwidth)
-
- 2 copy % box Yscale Xscale Yscale Xscale
- gt {exch} if % select smallest scale factor
- pop %
- dup scale % and scale page isomorphically
+ dup scale % scale both axes the same
+ pop pop pop % remove the leftover boxwidth, boxheight and mediawidth/height
} bind def
/newpdf_get_media_box { % <pagedict> get_media_box <box> <bool>
@@ -644,18 +673,27 @@ systemdict /NEWPDF known not {/NEWPDF //true def} if
}
{
2 index /UserUnit get
- % The PageSize needs to be multiplied too
- exch aload 5 1 roll % UserUnit box llx lly urx ury
- 2 index sub exch % UserUnit box llx lly (ury - lly) urx
- 3 index sub % UserUnit box llx lly boxheight boxwidth
- 5 index mul % UserUnit box llx lly boxheight (Boxwidth*UserUnit)
- exch
- 5 index mul % UserUnit box llx lly (Boxwidth*UserUnit) (boxheight*UserUnit)
- 4 -2 roll
- 5 index mul exch % UserUnit box (Boxwidth*UserUnit) (boxheight*UserUnit) (lly*UserUnit) llx
- 5 index mul exch % UserUnit box (Boxwidth*UserUnit) (boxheight*UserUnit) (llx*UserUnit) (lly*UserUnit)
- 4 2 roll % UserUnit box (llx*UserUnit) (lly*UserUnit) (Boxwidth*UserUnit) (boxheight*UserUnit)
- 6 -1 roll pop % box (llx*UserUnit) (lly*UserUnit) (Boxwidth*UserUnit) (boxheight*UserUnit)
+ /PassUserUnit /GetDeviceParam .special_op {exch pop} {//false} ifelse {
+ [ /UserUnit 3 -1 roll .pdfputparams pop pop
+ % No media scaling required, calculate PageSize as the width and height of the box
+ aload 5 1 roll % box llx lly urx ury
+ 2 index sub % box llx lly urx (ury - lly)
+ exch 3 index sub % box llx lly (ury - lly) (urx - llx)
+ exch
+ }{
+ % The PageSize needs to be multiplied too
+ exch aload 5 1 roll % UserUnit box llx lly urx ury
+ 2 index sub exch % UserUnit box llx lly (ury - lly) urx
+ 3 index sub % UserUnit box llx lly boxheight boxwidth
+ 5 index mul % UserUnit box llx lly boxheight (Boxwidth*UserUnit)
+ exch
+ 5 index mul % UserUnit box llx lly (Boxwidth*UserUnit) (boxheight*UserUnit)
+ 4 -2 roll
+ 5 index mul exch % UserUnit box (Boxwidth*UserUnit) (boxheight*UserUnit) (lly*UserUnit) llx
+ 5 index mul exch % UserUnit box (Boxwidth*UserUnit) (boxheight*UserUnit) (llx*UserUnit) (lly*UserUnit)
+ 4 2 roll % UserUnit box (llx*UserUnit) (lly*UserUnit) (Boxwidth*UserUnit) (boxheight*UserUnit)
+ 6 -1 roll pop % box (llx*UserUnit) (lly*UserUnit) (Boxwidth*UserUnit) (boxheight*UserUnit)
+ } ifelse
} ifelse
}
{
@@ -739,8 +777,18 @@ systemdict /NEWPDF known not {/NEWPDF //true def} if
//systemdict /NoUserUnit .knownget not { //false } if not
{
2 index /UserUnit known {
- 2 index /UserUnit get
- dup scale
+ /PassUserUnit /GetDeviceParam .special_op {
+ exch pop not
+ } {
+ true
+ }ifelse
+
+ % If PassUserUnit isn't handled by the device, or it returns 'false'
+ % then scale the content by the UserUnit. Otherwise do not scale.
+ {
+ 2 index /UserUnit get
+ dup scale
+ } if
} if
} if
} ifelse
@@ -748,7 +796,7 @@ systemdict /NEWPDF known not {/NEWPDF //true def} if
pop % The box
% If we are using the MediaBox (and only the MediaBox) then we
- % want to clip to the CropBox, if there s one present
+ % want to clip to the CropBox, if there is one present
/MediaBox eq {
dup /CropBox known {
@@ -772,172 +820,88 @@ systemdict /NEWPDF known not {/NEWPDF //true def} if
% NB device parameters will already have been sent to the device and used to configure it
% so here we should only handle parameters which control the behaviour of the interpreter.
%
+/PDFSwitches [ /QUIET /PDFPassword /PDFDEBUG /PDFSTOPONERROR /PDFSTOPONWARNING /NOTRANSPARENCY /FirstPage /LastPage
+ /PDFNOCIDFALLBACK /NO_PDFMARK_OUTLINES /NO_PDFMARK_DESTS /PDFFitPage /Printed /UsePDFX3Profile
+ /UseBleedBox /UseCropBox /UseArtBox /UseTrimBox /ShowAcroForm /ShowAnnots /PreserveAnnots
+ /NoUserUnit /RENDERTTNOTDEF /DOPDFMARKS /PDFINFO /ShowAnnotTypes /PreserveAnnotTypes
+ /CIDFSubstPath /CIDFSubstFont /SUBSTFONT /IgnoreToUnicode /NONATIVEFONTMAP /PreserveMarkedContent ] def
+
/newpdf_gather_parameters
{
10 dict begin
- /PDFSwitches [ /QUIET /PDFPassword /PDFDEBUG /PDFSTOPONERROR /PDFSTOPONWARNING /NOTRANSPARENCY /FirstPage /LastPage
- /PDFNOCIDFALLBACK /NO_PDFMARK_OUTLINES /NO_PDFMARK_DESTS /PDFFitPage /Printed /UsePDFX3Profile
- /UseBleedBox /UseCropBox /UseArtBox /UseTrimBox /ShowAcroForm /ShowAnnots /PreserveAnnots
- /NoUserUnit /RENDERTTNOTDEF /DOPDFMARKS /PDFINFO /SHOWANNOTTYPES /PRESERVEANNOTTYPES
- /CIDSubstPath /CIDSubstFont /IgnoreToUnicode /NONATIVEFONTMAP ] def
-
- 0 1 PDFSwitches length 1 sub {
- PDFSwitches exch get dup where {
- exch dup 3 1 roll get def
- }
- {
- pop
- } ifelse
- } for
- currentdict /PDFSwitches undef
+
+ //PDFSwitches {
+ dup where
+ { exch dup 3 1 roll get def }
+ { pop } ifelse
+ } forall
+
+ % This isn't a command line parameter, we track it internally, but we need to
+ % send it to the interpreter. It is used to 'offset' the page Dest for Link
+ % annotations and Outlines by the numebr of pages processed so far.
+ /PageCount /CumulativePageCount where { /CumulativePageCount get }{currentpagedevice /PageCount get} ifelse def
+
currentdict end
} bind executeonly def
+currentdict /PDFSwitches undef
+
/newpdf_pagecount
{
- PDFFile //null eq not
+ currentdict /PDFInfo known
+ {
+ PDFInfo
+ }
{
- PDFFile {.PDFInfo} stopped not
+ PDFFile //null eq not
{
- dup /NumPages known
+ PDFSTOPONERROR
{
- /NumPages get
+ PDFFile .PDFInfo //false
}
{
- pop 0
+ PDFFile {.PDFInfo} stopped
} ifelse
}
{
- pop 0
- } ifelse
+ //true
+ }ifelse
+
+ {
+ <</NumPages 0>>
+ } if
+ } ifelse
+
+ dup /NumPages known
+ {
+ /NumPages get
}
{
- 0
+ pop 0
} ifelse
}bind def
/newpdf_runpdfpagerange
{
/PageList where {
- pop PageList
- (even) anchorsearch {
- pop length 0 gt {
- /runpdfpagerange cvx /syntaxerror signalerror
- } if
- /PDFPageList pdfpagecount 1 add array def
- 2 2 pdfpagecount {
- PDFPageList exch 1 put
- } for
- QUIET not {
- (Processing even-numbered pages\n) print (1 through ) print pdfpagecount =only
- (.) = flush
- } if
- } {
- (odd) anchorsearch {
- pop length 0 gt {
- /runpdfpagerange cvx /syntaxerror signalerror
- } if
- /PDFPageList pdfpagecount 1 add array def
- 1 2 pdfpagecount {
- PDFPageList exch 1 put
- } for
- QUIET not {
- (Processing odd-numbered pages\n) print (1 through ) print pdfpagecount =only
- (.) = flush
- } if
- } {
- %% validate string contents, check for digit comma or minus
- dup
- {
- dup 44 eq not {
- dup 45 eq not {
- dup 48 lt 1 index 57 gt or {
- /runpdfpagerange cvx /syntaxerror signalerror
- } if
- } if
- } if
- pop
- }
- forall
- /PDFPageList pdfpagecount 1 add array def
- {
- (,) search {
- %% We now have (post) (,) (pre)
- exch pop %% get rid of the (,), leave the (post) as the string for the next iteration, deal with the section up to the comma
- (-) search {
- %% Now we have (end) (-) (start)
- exch pop %% get rid of the minus (end) (start)
- 0 exch {48 sub exch 10 mul add} forall
- %% Make sure the start of the range is inside the number of available pages
- dup pdfpagecount le {
- exch
- %% deal with a trailing '-' by replacing it with the number of pages in the file
- dup length 0 eq {
- pop pdfpagecount
- }{
- 0 exch {48 sub exch 10 mul add} forall
- } ifelse
- 1 exch %% start 1 end
- %% Make sure the end of the range is inside the number of available pages
- dup pdfpagecount gt {pop pdfpagecount} if
- {PDFPageList exch 1 put} for
- } {
- %% start of range invalid, drop this range.
- pop pop
- }ifelse
- }{
- %% no minus signs, must be a simple page number
- 0 exch {48 sub exch 10 mul add} forall
- %% ensure its in the valid range of pages
- dup pdfpagecount le {
- PDFPageList exch 1 put
- } {
- pop
- } ifelse
- } ifelse
- }{
- %% no commas separating pages, just the original string (), deal with its as a section, then exit the loop
- (-) search {
- %% Now we have (end) (-) (start)
- exch pop %% get rid of the minus (end) (start)
- 0 exch {48 sub exch 10 mul add} forall
- %% Make sure the start of the range is inside the number of available pages
- dup pdfpagecount le {
- exch
- %% deal with a trailing '-' by replacing it with the number of pages in the file
- dup length 0 eq {
- pop pdfpagecount
- }{
- 0 exch {48 sub exch 10 mul add} forall
- } ifelse
- 1 exch %% start 1 end
- %% Make sure the end of the range is inside the number of available pages
- dup pdfpagecount gt {pop pdfpagecount} if
- {PDFPageList exch 1 put} for
- } {
- %% start of range invalid, drop this range.
- pop pop
- }ifelse
- }{
- %% no minus signs, must be a simple page number
- 0 exch {48 sub exch 10 mul add} forall
- %% ensure its in the valid range of pages
- dup pdfpagecount le {
- PDFPageList exch 1 put
- } {
- pop
- } ifelse
- } ifelse
- exit %% done all the sections.
- } ifelse
- } loop
- QUIET not {
- (Processing pages ) print PageList =only
- (.) = flush
- } if
- } ifelse
- } ifelse
- 1 pdfpagecount
+ pop
+ % make sure string is NUL terminated as C expects.
+ PageList 1 string dup 0 0 put concatstrings
+ pdfpagecount
+ .PDFparsePageList
+ dup 0 eq { % No ranges, error
+ (\n **** Error: Invalid PageList: ) print
+ PageList print
+ (\n No pages will be processed.) = flush
+ /runpdfpagerange cvx /syntaxerror signalerror
+ } if
+ array astore % move integer triples from the stack to the array
+ % newpdf PDFPageList is an array of 3 elements per range: even/odd flag, start, end
+ /PDFPageList exch def
+ QUIET not {
+ (Processing pages ) print PageList =only (.) = flush
+ } if
+ 1 pdfpagecount % dummy parameters for newpdf_dopages
}{
/FirstPage where {
pop FirstPage dup pdfpagecount gt {
@@ -963,22 +927,27 @@ systemdict /NEWPDF known not {/NEWPDF //true def} if
/newpdf_runpdf
{
runpdfbegin % <file> runpdfbegin -
- PDFInfo /Collection known
+ PDFInfo type /dicttype eq
{
- PDFInfo /Collection get
- pdfclose
- dup length 1 sub 0 2 3 -1 roll
+ PDFInfo /Collection known
{
- 1 index exch get (r) file runpdf
- } for
- pop
- }
- {
- process_trailer_attrs % - process_trailer_attrs -
- runpdfpagerange % - runpdfpagerange <int> <int>
- dopdfpages % <int> <int> dopdfpages -
- runpdfend % - runpdfend -
- } ifelse
+ PDFInfo /Collection get
+ pdfclose
+ dup length 1 sub 0 2 3 -1 roll
+ {
+ 1 index exch get (r) file runpdf
+ } for
+ pop
+ }
+ {
+ process_trailer_attrs % - process_trailer_attrs -
+ runpdfpagerange % - runpdfpagerange <int> <int>
+ dopdfpages % <int> <int> dopdfpages -
+ runpdfend % - runpdfend -
+ } ifelse
+ } {
+ pop pop
+ }ifelse
} bind def
/newpdf_runpdfbegin
@@ -986,6 +955,8 @@ systemdict /NEWPDF known not {/NEWPDF //true def} if
/pdfdict 10 dict def
pdfdict begin
+ currentpagedevice /PageCount get
+ /CumulativePageCount exch def
% This is for the benefit of pdf2dsc which assumes it will be present
/Trailer << >> def
/PDFSave save def
@@ -1011,28 +982,51 @@ systemdict /NEWPDF known not {/NEWPDF //true def} if
/pget {2 copy known {get //true}{pop pop //false}ifelse}bind def
newpdf_gather_parameters
- {.PDFInit} stopped
- {
- /PDFFile //null def
- /PDFInfo //null def
- }
+ PDFSTOPONERROR
{
+ .PDFInit
/PDFFile exch def
pdfopen
/PDFInfo exch def
pop
+ }
+ {
+ {.PDFInit} stopped
+ {
+ ( **** Error: Failed to initialise PDF interpreter.\n) newpdf_pdfformaterror
+ /PDFFile //null def
+ /PDFInfo //null def
+ }
+ {
+ /PDFFile exch def
+ pdfopen
+ /PDFInfo exch def
+ pop
+ }ifelse
}ifelse
} bind def
/newpdf_pdfgetpage
{
- PDFFile exch 1 sub {.PDFPageInfo} stopped
+ dup 1 sub
+ PDFSTOPONERROR
{
- pop pop
- ( **** Error: Couldn't get page info.\n) newpdf_pdfformaterror
- ( Output may be incorrect.\n) newpdf_pdfformaterror
- //null
- } if
+ PDFFile exch .PDFPageInfo
+ dup 3 -1 roll
+ /Page# exch put
+ }
+ {
+ PDFFile exch {.PDFPageInfo} stopped
+ {
+ pop pop
+ ( **** Error: Couldn't get page info.\n) newpdf_pdfformaterror
+ ( Output may be incorrect.\n) newpdf_pdfformaterror
+ //null
+ }{
+ dup 3 -1 roll
+ /Page# exch put
+ } ifelse
+ }ifelse
} bind def
/newpdf_process_trailer_attrs
@@ -1041,7 +1035,6 @@ systemdict /NEWPDF known not {/NEWPDF //true def} if
/newpdf_pdfshowpage_init
{
- gsave
} bind def
/newpdf_pdfshowpage_setpage
@@ -1052,54 +1045,87 @@ systemdict /NEWPDF known not {/NEWPDF //true def} if
/newpdf_pdfshowpage_finish
{
- /Page# get PDFFile exch 1 sub {.PDFDrawPage} stopped
+ PDFSTOPONERROR
{
- pop pop
- ( **** Error: Page drawing error occured.\n) newpdf_pdfformaterror
- ( Output may be incorrect.\n) newpdf_pdfformaterror
- } if
- {showpage} stopped
+ /Page# get PDFFile exch 1 sub .PDFDrawPage
+ showpage
+ }
{
- ( **** Error: Page drawing error occured.\n) newpdf_pdfformaterror
- ( Could not draw this page at all, page will be missing in the output.\n) newpdf_pdfformaterror
- } if
- grestore
+ /Page# get PDFFile exch 1 sub {.PDFDrawPage} stopped
+ {
+ pop pop
+ ( **** Error: Page drawing error occurred.\n) newpdf_pdfformaterror
+ ( Output may be incorrect.\n) newpdf_pdfformaterror
+ } if
+ {showpage} stopped
+ {
+ ( **** Error: Page drawing error occurred.\n) newpdf_pdfformaterror
+ ( Could not draw this page at all, page will be missing in the output.\n) newpdf_pdfformaterror
+ } if
+ }ifelse
} bind def
/newpdf_pdfshowpage
{
- pdfshowpage_init
- pdfshowpage_setpage
- pdfshowpage_finish
+ /PDFINFO where {/PDFINFO get}{//false}ifelse
+ {
+ /Page# get PDFFile exch 1 sub {.PDFDrawPage} stopped pop
+ }
+ {
+ pdfshowpage_init
+ pdfshowpage_setpage
+ pdfshowpage_finish
+ }ifelse
} bind def
/newpdf_runpdfend
{
+ % Get the accumulated count of pages processed so far
+ % and the number of pages in this file. Do this before
+ % we close the file and restore the state. Save the values
+ % on the stack.
+ pdfpagecount
+ CumulativePageCount
+
pdfclose
PDFSave restore
+
end % pdfdict
+
+ % add the number of pages in this file to the accumulated count,
+ % and store that in the device for later reuse. This allows us to
+ % add the number of pages already in the output to the 'Dest' of
+ % Outlines and Link annotations.
+ add <</PageCount 3 -1 roll >> setpagedevice
} bind def
/newpdf_pdfopen
{
dup PDFFile //null ne
{
- PDFFile {.PDFStream} stopped
+ PDFSTOPONERROR
{
- pop pop
- ( **** Error: Couldn't initialise file.\n) newpdf_pdfformaterror
- ( Output may be incorrect.\n) newpdf_pdfformaterror
- <</NumPages 0>>
+ PDFFile .PDFStream
+ PDFFile .PDFInfo
}
{
- PDFFile {.PDFInfo} stopped
+ PDFFile {.PDFStream} stopped
{
- pop
- ( **** Error: Couldn't get page information.\n) newpdf_pdfformaterror
+ pop pop
+ ( **** Error: Couldn't initialise file.\n) newpdf_pdfformaterror
( Output may be incorrect.\n) newpdf_pdfformaterror
<</NumPages 0>>
- } if
- } ifelse
+ }
+ {
+ PDFFile {.PDFInfo} stopped
+ {
+ pop
+ ( **** Error: Couldn't get page information.\n) newpdf_pdfformaterror
+ ( Output may be incorrect.\n) newpdf_pdfformaterror
+ <</NumPages 0>>
+ } if
+ } ifelse
+ }ifelse
}
{
pop
@@ -1109,30 +1135,48 @@ systemdict /NEWPDF known not {/NEWPDF //true def} if
/newpdf_pdfclose
{
- PDFFile {.PDFClose} stopped
+ PDFSTOPONERROR
{
- pop
- } if
+ PDFFile .PDFClose
+ }
+ {
+ PDFFile {.PDFClose} stopped
+ {
+ pop
+ } if
+ }ifelse
+} bind def
+
+/pdfavailable
+{
+ .PDFAvailable OLDPDF or
} bind def
% <int> <int> dopdfpages -
% First Page and then LastPage
+% If PDFPageList array exists, the parameters are 1 pdfpagecount and are ignored.
/newpdf_dopdfpages
{
//DisablePageHandlerDevice exec
- 1 exch
- {
- %% If we have a array of pages to render, use it.
- /PDFPageList where {
- pop dup PDFPageList exch get 1 eq
- }
- {//true} ifelse
-
+ %% If we have a array of page ranges to render, use it.
+ /PDFPageList where {
+ pop
+ pop pop % don't use dummy parameters
+ PDFPageList
+ % process the ranges (3 elements per range)
+ 0 3 2 index length 1 sub {
+ 1 index 1 index get % even = 2, odd = 1 any = 0
+ 2 index 2 index 1 add get % start of range
+ exch
+ 3 index 3 index 2 add get % end of range
+ exch
+ % stack: start end even/odd
+ 0 eq { 1 } { 2 } ifelse
+ 2 index 2 index gt { neg } if % negate increment for reverse range
+ exch
{
- dup pdfgetpage
+ pdfgetpage
dup //null ne {
- exch 1 index
- /Page# 3 -1 roll put
pdfshowpage
} {
PDFSTOPONERROR {
@@ -1143,10 +1187,28 @@ systemdict /NEWPDF known not {/NEWPDF //true def} if
( not found.\n) newpdf_pdfformaterror
} ifelse
} ifelse
- }{
- pop
- }ifelse
- } for
+ } for
+ pop % for loop index
+ } for
+ pop % done with array
+ } {
+ % else, Process the pages given by the FirstPage, LastPage
+ 1 exch
+ {
+ pdfgetpage
+ dup //null ne {
+ pdfshowpage
+ } {
+ PDFSTOPONERROR {
+ /dopdfpages cvx /syntaxerror signalerror
+ } {
+ pop pop
+ ( **** Error: page) newpdf_pdfformaterror
+ ( not found.\n) newpdf_pdfformaterror
+ } ifelse
+ } ifelse
+ } for
+ } ifelse
//EnablePageHandlerDevice exec
} bind def
@@ -1176,6 +1238,9 @@ systemdict /NEWPDF known not {/NEWPDF //true def} if
(%stderr) (w) file dup
( **** Warning: File has some garbage before %PDF- .\n)
writestring flushfile
+ PDFSTOPONWARNING {
+ /run cvx /unregistered signalerror
+ } if
} {
pop
} ifelse
@@ -1195,10 +1260,20 @@ systemdict /NEWPDF known not {/NEWPDF //true def} if
% stack: tempname tempfile
dup 0 setfileposition
dup
- runpdf
+ pdfavailable {
+ runpdf
+ }{
+ closefile
+ (%stderr) (w) file ( **** ERROR: No PDF interpreter available, unable to process PDF files as input.\n)writestring
+ } ifelse
closefile deletefile
} {
- runpdf
+ pdfavailable {
+ runpdf
+ }{
+ closefile
+ (%stderr) (w) file ( **** ERROR: No PDF interpreter available, unable to process PDF files as input.\n)writestring
+ } ifelse
} ifelse
} {
pop pop pop pop cvx .runps % (%!PS) found first
@@ -1214,7 +1289,7 @@ systemdict /NEWPDF known not {/NEWPDF //true def} if
currentdict /runpdfstring .undef
/runpdfbegin { % <file> runpdfbegin -
- /NEWPDF where {/NEWPDF get} {//true} ifelse
+ /OLDPDF where {/OLDPDF get not} {//true} ifelse
{
newpdf_runpdfbegin
}
@@ -1258,7 +1333,7 @@ currentdict /runpdfstring .undef
/runpdfpagerange { % - runpdfpagerange <firstpage#> <lastpage#>
- /NEWPDF where {/NEWPDF get} {//true} ifelse
+ /OLDPDF where {/OLDPDF get not} {//true} ifelse
{
newpdf_runpdfpagerange
}
@@ -1446,7 +1521,7 @@ currentdict /runpdfstring .undef
} bind executeonly def
/dopdfpages { % firstpage# lastpage# dopdfpages -
- /NEWPDF where {/NEWPDF get} {//true} ifelse
+ /OLDPDF where {/OLDPDF get not} {//true} ifelse
{
newpdf_dopdfpages
}
@@ -1489,7 +1564,7 @@ currentdict /runpdfstring .undef
} bind executeonly def
/runpdfend {
- /NEWPDF where {/NEWPDF get} {//true} ifelse
+ /OLDPDF where {/OLDPDF get not} {//true} ifelse
{
newpdf_runpdfend
}
@@ -1595,8 +1670,27 @@ currentdict /EnablePageHandlerDevice undef
} bind executeonly def
/runpdf { % <file> runpdf -
- /NEWPDF where {/NEWPDF get} {//true} ifelse
- {newpdf_runpdf}
+ /OLDPDF where {/OLDPDF get not} {//true} ifelse
+ {
+ dup type /filetype eq
+ {
+ dup
+ PDFSTOPONERROR
+ {
+ newpdf_runpdf
+ }
+ {
+ {newpdf_runpdf} stopped
+ {
+ ( **** Error: PDF interpreter encountered an error processing the file.\n) pdfformaterror
+ } if
+ }ifelse
+ closefile
+ }
+ {
+ ( **** Error: Attempt to process something other than a file object in runpdf.\n) pdfformaterror
+ } ifelse
+ }
{
%% Get the PDF filename (it *must* be a file even if it came from stdin it gets
%% copied to a temporary file) and store it in pdfdict. We will use this for
@@ -2076,7 +2170,7 @@ currentdict /xref-char-dict undef
% Open a PDF file and read the header, trailer, and cross-reference.
/pdfopen { % <file> pdfopen <dict>
- /NEWPDF where {/NEWPDF get} {//true} ifelse
+ /OLDPDF where {/OLDPDF get not} {//true} ifelse
{
newpdf_pdfopen
}
diff --git a/Master/tlpkg/tlgs/bin/gsdll32.dll b/Master/tlpkg/tlgs/bin/gsdll32.dll
deleted file mode 100755
index 13779e711d7..00000000000
--- a/Master/tlpkg/tlgs/bin/gsdll32.dll
+++ /dev/null
Binary files differ
diff --git a/Master/tlpkg/tlgs/bin/gsdll32.lib b/Master/tlpkg/tlgs/bin/gsdll32.lib
deleted file mode 100644
index d9f2c73dcf2..00000000000
--- a/Master/tlpkg/tlgs/bin/gsdll32.lib
+++ /dev/null
Binary files differ
diff --git a/Master/tlpkg/tlgs/bin/gsdll64.dll b/Master/tlpkg/tlgs/bin/gsdll64.dll
index ccc45e3e5f3..fff2f7641dd 100755
--- a/Master/tlpkg/tlgs/bin/gsdll64.dll
+++ b/Master/tlpkg/tlgs/bin/gsdll64.dll
Binary files differ
diff --git a/Master/tlpkg/tlgs/bin/gswin32.exe b/Master/tlpkg/tlgs/bin/gswin32.exe
deleted file mode 100755
index 7345772111c..00000000000
--- a/Master/tlpkg/tlgs/bin/gswin32.exe
+++ /dev/null
Binary files differ
diff --git a/Master/tlpkg/tlgs/bin/gswin32c.exe b/Master/tlpkg/tlgs/bin/gswin32c.exe
deleted file mode 100755
index 83a0a415cca..00000000000
--- a/Master/tlpkg/tlgs/bin/gswin32c.exe
+++ /dev/null
Binary files differ
diff --git a/Master/tlpkg/tlgs/bin/gswin64.exe b/Master/tlpkg/tlgs/bin/gswin64.exe
index 8a1c9230a0a..29b750680fd 100755
--- a/Master/tlpkg/tlgs/bin/gswin64.exe
+++ b/Master/tlpkg/tlgs/bin/gswin64.exe
Binary files differ
diff --git a/Master/tlpkg/tlgs/bin/gswin64c.exe b/Master/tlpkg/tlgs/bin/gswin64c.exe
index 4e27dae815e..f9624a33326 100755
--- a/Master/tlpkg/tlgs/bin/gswin64c.exe
+++ b/Master/tlpkg/tlgs/bin/gswin64c.exe
Binary files differ
diff --git a/Master/tlpkg/tlgs/lib/Fontmap b/Master/tlpkg/tlgs/lib/Fontmap
deleted file mode 100644
index 04702bb5e72..00000000000
--- a/Master/tlpkg/tlgs/lib/Fontmap
+++ /dev/null
@@ -1,7 +0,0 @@
-%!
-%% $Id: Fontmap 7680 2008-04-27 12:21:15Z reinhardk $
-
-% See Fontmap.TeXLive for the syntax of real Fontmap files.
-%% Replace 1 (Fontmap.TeXLive)
-
-(Fontmap.TeXLive) .runlibfile
diff --git a/Master/tlpkg/tlgs/lib/Fontmap.GS b/Master/tlpkg/tlgs/lib/Fontmap.GS
deleted file mode 100644
index 044457ac7c3..00000000000
--- a/Master/tlpkg/tlgs/lib/Fontmap.GS
+++ /dev/null
@@ -1,108 +0,0 @@
-%% Fontmap.TeXLive
-%% $Id: Fontmap.TeXLive 7680 2008-04-27 12:21:15Z reinhardk $
-
-%% This file is part of TeXLive.
-%% You may freely use, modify and/or distribute this file.
-
-%% Bitstream Charter
-
-/CharterBT-Bold /bchb8a.pfb ;
-/CharterBT-BoldItalic /bchbi8a.pfb ;
-/CharterBT-Roman /bchr8a.pfb ;
-/CharterBT-Italic /bchri8a.pfb ;
-
-%% Adobe Utopia
-
-/Utopia-Bold /putb8a.pfb ;
-/Utopia-BoldItalic /putbi8a.pfb ;
-/Utopia-Regular /putr8a.pfb ;
-/Utopia-Italic /putri8a.pfb ;
-
-%% URW LW35 Fonts
-
-/URWGothicL-Demi /uagd8a.pfb ;
-/URWGothicL-DemiObli /uagdo8a.pfb ;
-/URWGothicL-Book /uagk8a.pfb ;
-/URWGothicL-BookObli /uagko8a.pfb ;
-/URWBookmanL-DemiBold /ubkd8a.pfb ;
-/URWBookmanL-DemiBoldItal /ubkdi8a.pfb ;
-/URWBookmanL-Ligh /ubkl8a.pfb ;
-/URWBookmanL-LighItal /ubkli8a.pfb ;
-/NimbusMonL-Bold /ucrb8a.pfb ;
-/NimbusMonL-BoldObli /ucrbo8a.pfb ;
-/NimbusMonL-Regu /ucrr8a.pfb ;
-/NimbusMonL-ReguObli /ucrro8a.pfb ;
-/NimbusSanL-Bold /uhvb8a.pfb ;
-/NimbusSanL-BoldCond /uhvb8ac.pfb ;
-/NimbusSanL-BoldItal /uhvbo8a.pfb ;
-/NimbusSanL-BoldCondItal /uhvbo8ac.pfb ;
-%%%/NimbusSanL-Regu /uhvr8a-105.pfb ;
-/NimbusSanL-Regu /uhvr8a.pfb ;
-/NimbusSanL-ReguCond /uhvr8ac.pfb ;
-%%%/NimbusSanL-ReguItal /uhvro8a-105.pfb ;
-/NimbusSanL-ReguItal /uhvro8a.pfb ;
-/NimbusSanL-ReguCondItal /uhvro8ac.pfb ;
-/CenturySchL-Bold /uncb8a.pfb ;
-/CenturySchL-BoldItal /uncbi8a.pfb ;
-/CenturySchL-Roma /uncr8a.pfb ;
-/CenturySchL-Ital /uncri8a.pfb ;
-/URWPalladioL-Bold /uplb8a.pfb ;
-/URWPalladioL-BoldItal /uplbi8a.pfb ;
-/URWPalladioL-Roma /uplr8a.pfb ;
-/URWPalladioL-Ital /uplri8a.pfb ;
-/StandardSymL /usyr.pfb ;
-/NimbusRomNo9L-Medi /utmb8a.pfb ;
-/NimbusRomNo9L-MediItal /utmbi8a.pfb ;
-/NimbusRomNo9L-Regu /utmr8a.pfb ;
-/NimbusRomNo9L-ReguItal /utmri8a.pfb ;
-/URWChanceryL-MediItal /uzcmi8a.pfb ;
-/Dingbats /uzdr.pfb ;
-
-
-% Aliases
-
-/Bookman-Demi /URWBookmanL-DemiBold ;
-/Bookman-DemiItalic /URWBookmanL-DemiBoldItal ;
-/Bookman-Light /URWBookmanL-Ligh ;
-/Bookman-LightItalic /URWBookmanL-LighItal ;
-
-/Courier /NimbusMonL-Regu ;
-/Courier-Oblique /NimbusMonL-ReguObli ;
-/Courier-Bold /NimbusMonL-Bold ;
-/Courier-BoldOblique /NimbusMonL-BoldObli ;
-
-/AvantGarde-Book /URWGothicL-Book ;
-/AvantGarde-BookOblique /URWGothicL-BookObli ;
-/AvantGarde-Demi /URWGothicL-Demi ;
-/AvantGarde-DemiOblique /URWGothicL-DemiObli ;
-
-/Helvetica /NimbusSanL-Regu ;
-/Helvetica-Oblique /NimbusSanL-ReguItal ;
-/Helvetica-Bold /NimbusSanL-Bold ;
-/Helvetica-BoldOblique /NimbusSanL-BoldItal ;
-
-/Helvetica-Narrow /NimbusSanL-ReguCond ;
-/Helvetica-Narrow-Oblique /NimbusSanL-ReguCondItal ;
-/Helvetica-Narrow-Bold /NimbusSanL-BoldCond ;
-/Helvetica-Narrow-BoldOblique /NimbusSanL-BoldCondItal ;
-
-/Palatino-Roman /URWPalladioL-Roma ;
-/Palatino-Italic /URWPalladioL-Ital ;
-/Palatino-Bold /URWPalladioL-Bold ;
-/Palatino-BoldItalic /URWPalladioL-BoldItal ;
-
-/NewCenturySchlbk-Roman /CenturySchL-Roma ;
-/NewCenturySchlbk-Italic /CenturySchL-Ital ;
-/NewCenturySchlbk-Bold /CenturySchL-Bold ;
-/NewCenturySchlbk-BoldItalic /CenturySchL-BoldItal ;
-
-/Times-Roman /NimbusRomNo9L-Regu ;
-/Times-Italic /NimbusRomNo9L-ReguItal ;
-/Times-Bold /NimbusRomNo9L-Medi ;
-/Times-BoldItalic /NimbusRomNo9L-MediItal ;
-
-/Symbol /StandardSymL ;
-
-/ZapfChancery-MediumItalic /URWChanceryL-MediItal ;
-
-/ZapfDingbats /Dingbats ;
diff --git a/Master/tlpkg/tlgs/lib/cidfmap b/Master/tlpkg/tlgs/lib/cidfmap
deleted file mode 100644
index 8905898db4d..00000000000
--- a/Master/tlpkg/tlgs/lib/cidfmap
+++ /dev/null
@@ -1,9 +0,0 @@
-%!
-% $Id: $
-%
-% This file is part of TeX Live.
-% Don't edit this file. It will be overwritten by TeX Live updates.
-
-(cidfmap.TeXLive) .runlibfile
-
-%EOF
diff --git a/Master/tlpkg/tlgs/lib/pdf_info.ps b/Master/tlpkg/tlgs/lib/pdf_info.ps
index 35951e9a736..2a5f5796658 100644
--- a/Master/tlpkg/tlgs/lib/pdf_info.ps
+++ b/Master/tlpkg/tlgs/lib/pdf_info.ps
@@ -527,6 +527,164 @@ systemdict /.sort known not {
} ifelse
} bind def
-enum-pdfs
+/NEWPDF where {/NEWPDF get}{false}ifelse
+{
+ /knownoget
+ {
+ 2 copy known {
+ get
+ true
+ }{
+ pop pop false
+ } ifelse
+ }bind def
+
+ /PDFContext << >> .PDFInit def
+ {File (r) file PDFContext .PDFStream} stopped not
+ {
+
+ PDFContext .PDFInfo
+ File
+ () = ( ) print print ( has ) print
+ dup /NumPages get dup =print 10 mod 1 eq { ( page.\n) } { ( pages\n) } ifelse = flush
+
+ /DumpXML where {/DumpXML get}{//false}ifelse
+ {
+ (\n*** DumpXML is no longer supported. ***\n\n) print
+ }if
+
+ dup /Title knownoget { (Title: ) print write-doc-string () = flush } if
+ dup /Author knownoget { (Author: ) print write-doc-string () = flush } if
+ dup /Subject knownoget { (Subject: ) print write-doc-string () = flush } if
+ dup /Keywords knownoget { (Keywords: ) print write-doc-string () = flush } if
+ dup /Creator knownoget { (Creator: ) print write-doc-string () = flush } if
+ dup /Producer knownoget { (Producer: ) print write-doc-string () = flush } if
+ dup /CreationDate knownoget { (CreationDate: ) print write-doc-string () = flush } if
+ dup /ModDate knownoget { (ModDate: ) print write-doc-string () = flush } if
+ dup /Trapped knownoget { (Trapped: ) print write-doc-string () = flush } if
+ (\n) print flush
+
+ /EmbeddedFonts 10 dict def
+ /UnEmbeddedFonts 10 dict def
+ /FontNumbers 10 dict def
+
+ /NumPages get 0 1 3 -1 roll 1 sub
+ {
+ dup
+ PDFContext exch .PDFPageInfoExt exch
+ DumpMediaSizes {
+ (Page ) print 1 add =print
+ dup /UserUnit knownoget {( UserUnit: ) print =print} if
+ dup /MediaBox knownoget {( MediaBox: ) print ==only} if
+ dup /CropBox knownoget {( CropBox: ) print ==only} if
+ dup /BleedBox knownoget {( BleedBox: ) print ==only} if
+ dup /TrimBox knownoget {( TrimBox: ) print ==only} if
+ dup /ArtBox knownoget {( ArtBox: ) print ==only} if
+ dup /Rotate knownoget not {0}if ( Rotate = ) print =print
+ dup /Annots knownoget {{( Page contains Annotations) print} if} if
+ dup /UsesTransparency knownoget {{( Page uses transparency features) print} if} if
+ dup /Spots knownoget {
+ (\n Page Spot colors: ) =
+ {( ) print (') print 256 string cvs print (') =} forall
+ } if
+ (\n) print flush
+ (\n) print flush
+ }
+ {
+ pop
+ } ifelse
+
+ /Fonts knownoget
+ {
+ {
+ dup /ObjectNum known
+ {
+ %% Fonts with an ObjectNumber may have been previously referenced on another page
+ dup /ObjectNum get
+ dup FontNumbers exch known
+ {
+ pop
+ %% found the ObjectNumber in the FontNumbers dictionary so we've seen this one.
+ //false
+ }
+ {
+ %% Not seen before, add the number to the array and process this font
+ FontNumbers exch dup put
+ //true
+ }ifelse
+ }{
+ %% Fonts without an ObjectNumber are defined inline and so must be unique
+ //true
+ } ifelse
+ {
+ % First time we've seen the font
+ dup /Descendants known
+ {
+ dup /BaseFont get
+ EmbeddedFonts exch dup put % We class the Type 0 font as 'embedded', but it's really the descendant which is embedded or not.
+ dup /Descendants get
+ 1 index /BaseFont get
+ 2 index /Embedded get
+ {
+ EmbeddedFonts exch dup put
+ }
+ {
+ UnEmbeddedFonts exch dup put
+ }ifelse
+ pop
+ }
+ {
+ dup /BaseFont get
+ 1 index /Embedded get
+ {
+ EmbeddedFonts exch dup put
+ }
+ {
+ UnEmbeddedFonts exch dup put
+ } ifelse
+ }ifelse
+ pop
+ }
+ {
+ pop
+ } ifelse
+ }forall
+ } if
+ } for
+
+ /DumpFontsUsed where {/DumpFontsUsed get}{//false}ifelse
+ {
+ [
+ UnEmbeddedFonts {pop} forall
+ /ShowEmbeddedFonts where {/ShowEmbeddedFonts get}{//false}ifelse
+ {
+ EmbeddedFonts {pop} forall
+ } if
+ ]
+ dup length 0 gt {
+ { 100 string cvs exch 100 string cvs exch lt } .sort
+ (\nFont or CIDFont resources used (plain name and ASCIIHEX string representation):) =
+ { 128 string cvs dup print ( ) print (<) print 128 string cvs {16 8 string cvrs print} forall (>) print (\n) print} forall
+ } if
+ }
+ {
+ [
+ DumpFontsNeeded
+ {
+ UnEmbeddedFonts {pop} forall
+ } if
+ ]
+ dup length 0 gt {
+ { 100 string cvs exch 100 string cvs exch lt } .sort
+ (\nFonts Needed that are not embedded \(system fonts required\):) =
+ { ( ) print 128 string cvs dup print ( ) print (<) print {16 8 string cvrs print} forall (>) print (\n) print} forall
+ } if
+ }ifelse
+ } if
+ PDFContext .PDFClose
+}
+{
+ enum-pdfs
+} ifelse
end
quit
diff --git a/Master/tlpkg/tlgs/lib/viewcmyk.ps b/Master/tlpkg/tlgs/lib/viewcmyk.ps
index e8034e53346..33c5bdceb15 100644
--- a/Master/tlpkg/tlgs/lib/viewcmyk.ps
+++ b/Master/tlpkg/tlgs/lib/viewcmyk.ps
@@ -56,6 +56,8 @@
cleartomark
(Usage: gs -- viewcmyk.ps filename.cmyk width\n) print
( e.g.: gs -- viewcmyk.ps my.cmyk 2550\n) print flush
+ (From version 9.50 you must supply permissions for this program to read the input file(s)\n) print flush
+ (either by using -dNOSAFER or by supplying --permit-file-read=<filename>\n) = flush
} ifelse
} {
pop
diff --git a/Master/tlpkg/tlgs/lib/viewjpeg.ps b/Master/tlpkg/tlgs/lib/viewjpeg.ps
index 71cb5d44131..54453fe4d83 100644
--- a/Master/tlpkg/tlgs/lib/viewjpeg.ps
+++ b/Master/tlpkg/tlgs/lib/viewjpeg.ps
@@ -35,6 +35,9 @@
% Usage example:
% (jpeg-6/testimg.jpg) viewJPEG
+% From version 9.50 you must supply permissions for this program
+% to read the input file(s) either by using -dNOSAFER or by
+% supplying --permit-file-read=<filename>
/languagelevel where {pop languagelevel 2 lt}{true} ifelse {
(JPEG needs PostScript Level 2!\n) print flush stop
diff --git a/Master/tlpkg/tlgs/lib/viewpbm.ps b/Master/tlpkg/tlgs/lib/viewpbm.ps
index c8d3f86bc84..143a056a68a 100644
--- a/Master/tlpkg/tlgs/lib/viewpbm.ps
+++ b/Master/tlpkg/tlgs/lib/viewpbm.ps
@@ -327,6 +327,8 @@
( e.g.: gs [-dSCALE=#.#] [-dFITPAGE] [--] viewpbm.ps my.ppm another.ppm\n) print flush
( also -dTAG option can be used to show the pseudo-color tag image from a\n) print flush
( P7 RGB_TAG PAM file created by the bitrgbtags device.\n) print flush
+ (From version 9.50 you must supply permissions for this program to read the input file(s)\n) print flush
+ (either by using -dNOSAFER or by supplying --permit-file-read=<filename>\n) = flush
}
ifelse
}
diff --git a/Master/tlpkg/tlgs/lib/viewpcx.ps b/Master/tlpkg/tlgs/lib/viewpcx.ps
index 76bfdfae6eb..0b549ad90fe 100644
--- a/Master/tlpkg/tlgs/lib/viewpcx.ps
+++ b/Master/tlpkg/tlgs/lib/viewpcx.ps
@@ -183,6 +183,8 @@
{ cleartomark
(Usage: gs -- viewpcx.ps filename.pcx ...\n) print
( e.g.: gs -- viewpcx.ps my.pcx another.pcx\n) print flush
+ (From version 9.50 you must supply permissions for this program to read the input file(s)\n) print flush
+ (either by using -dNOSAFER or by supplying --permit-file-read=<filename>\n) = flush
}
ifelse
}
diff --git a/Master/tlpkg/tlgs/lib/viewraw.ps b/Master/tlpkg/tlgs/lib/viewraw.ps
index dee86e02300..85438ffa103 100644
--- a/Master/tlpkg/tlgs/lib/viewraw.ps
+++ b/Master/tlpkg/tlgs/lib/viewraw.ps
@@ -181,6 +181,8 @@
cleartomark
(Usage: gs -- viewraw filename.raw width\n) print
( e.g.: gs -- viewraw my.raw 2550\n) print flush
+ (From version 9.50 you must supply permissions for this program to read the input file(s)\n) print flush
+ (either by using -dNOSAFER or by supplying --permit-file-read=<filename>\n) = flush
} ifelse
} {
pop
diff --git a/Master/tlpkg/tlgs/lib/viewrgb.ps b/Master/tlpkg/tlgs/lib/viewrgb.ps
index ab2f6d82c4a..c2c34fec635 100644
--- a/Master/tlpkg/tlgs/lib/viewrgb.ps
+++ b/Master/tlpkg/tlgs/lib/viewrgb.ps
@@ -143,6 +143,8 @@
( e.g.: gs -- viewrgb.ps my.rgb 2550\n) print flush
( -dSCALE=### sets specific scaling \(default = 1.0\)) = flush
( -dBITS=# sets the BitsPerComponent \(1, 2, 8, 12] \(default = 1\)) = flush
+ (From version 9.50 you must supply permissions for this program to read the input file(s)\n) print flush
+ (either by using -dNOSAFER or by supplying --permit-file-read=<filename>\n) = flush
} ifelse
} {
pop
diff --git a/Master/tlpkg/tlgs/lib/zugferd.ps b/Master/tlpkg/tlgs/lib/zugferd.ps
index 97d33d4d2b4..d20c39edc0c 100644
--- a/Master/tlpkg/tlgs/lib/zugferd.ps
+++ b/Master/tlpkg/tlgs/lib/zugferd.ps
@@ -455,7 +455,7 @@ ZUGFeRDVersion (2p1) eq {
[ /_objdef {FSDict} /type /dict /OBJ pdfmark
% Fill in the required dictionary elements
[ {FSDict} <<
- /Type /FileSpec
+ /Type /Filespec
/F ZUGFeRDDocumentFileName
/UF ZUGFeRDDocumentFileName SimpleUTF16BE
/Desc (ZUGFeRD electronic invoice)