tlgs: update to gs-9.10, add IPA fonts to cidfmap.TeXLive

git-svn-id: svn://tug.org/texlive/trunk@31760 c570f23f-e606-0410-a88d-b1316a301751

7 files changed, 66 insertions, 39 deletions

diff --git a/Master/tlpkg/tlgs/README.TEXLIVE b/Master/tlpkg/tlgs/README.TEXLIVE
index 81482b04513..710285c4dfd 100644
--- a/Master/tlpkg/tlgs/README.TEXLIVE
+++ b/Master/tlpkg/tlgs/README.TEXLIVE
@@ -1,5 +1,5 @@
 
-This directory contains a subset of the Ghostscript 9.09 distribution
+This directory contains a subset of the Ghostscript 9.10 distribution
 for Windows.  The only purpose of this package is to support programs
 shipped with TeX Live.  It's not intended for general use. 
 
@@ -20,7 +20,7 @@ Changes:
  * The fonts Utopia (Adobe) and Charter (Bitstream) were added.
 
  * A cidfmap file supporting CJK fonts provided by Windows XP and
-   newer releases was added.
+   newer releases as well as the Japanese IPA fonts was added.
 
 This version of Ghostscript will not be installed on your system and
 will not interfere with other versions of Ghostscript which might be
diff --git a/Master/tlpkg/tlgs/bin/gsdll32.dll b/Master/tlpkg/tlgs/bin/gsdll32.dll
index 2377bb2e1a6..13185353e4e 100755
--- a/Master/tlpkg/tlgs/bin/gsdll32.dll
+++ b/Master/tlpkg/tlgs/bin/gsdll32.dll
diff --git a/Master/tlpkg/tlgs/bin/gsdll32.lib b/Master/tlpkg/tlgs/bin/gsdll32.lib
index d0869df0aa1..abb83846083 100644
--- a/Master/tlpkg/tlgs/bin/gsdll32.lib
+++ b/Master/tlpkg/tlgs/bin/gsdll32.lib
diff --git a/Master/tlpkg/tlgs/bin/gswin32.exe b/Master/tlpkg/tlgs/bin/gswin32.exe
index 26c42134773..a3ebe905738 100755
--- a/Master/tlpkg/tlgs/bin/gswin32.exe
+++ b/Master/tlpkg/tlgs/bin/gswin32.exe
diff --git a/Master/tlpkg/tlgs/bin/gswin32c.exe b/Master/tlpkg/tlgs/bin/gswin32c.exe
index b1e0e4e136b..610e97587cc 100755
--- a/Master/tlpkg/tlgs/bin/gswin32c.exe
+++ b/Master/tlpkg/tlgs/bin/gswin32c.exe
diff --git a/Master/tlpkg/tlgs/lib/caption.ps b/Master/tlpkg/tlgs/lib/caption.ps
index fbbd10dbe85..14b310d570f 100644
--- a/Master/tlpkg/tlgs/lib/caption.ps
+++ b/Master/tlpkg/tlgs/lib/caption.ps
@@ -48,7 +48,10 @@ grestore
    grestore
  } bind def
 << /EndPage [
-   /showcaption load /exec load
+   %%
+   %% Only print the caption if 'reason' is not 2 (device deactivation)
+   %%
+   /dup load /exec load 2 /ne load /exec load [ /showcaption load /exec load ] cvx /if load /exec load
    currentpagedevice /EndPage get /exec load
    ] cvx
 >> setpagedevice
diff --git a/Master/tlpkg/tlgs/lib/cidfmap.TeXLive b/Master/tlpkg/tlgs/lib/cidfmap.TeXLive
index f81c8e1827c..28c18280c84 100644
--- a/Master/tlpkg/tlgs/lib/cidfmap.TeXLive
+++ b/Master/tlpkg/tlgs/lib/cidfmap.TeXLive
@@ -9,7 +9,7 @@
 % This file has been composed from cidfmap files created under Windows XP 
 % and Windows 7 using tlgs/lib/mkcidfm.ps.  It supports fonts provided by
 % Microsoft.  Fonts installed by 3rd-party software are not supported.
-
+% The Japanese IPA fonts which are part of TeX Live are supported too.
 
 % Substitutions 
 % =============
@@ -26,49 +26,49 @@
   /FileType /TrueType
   /SubfontID 0
   /CSI [(GB1) 2]
-  /Path (c:/windows/fonts/arialuni.ttf) >> ; % W7
+  /Path (arialuni.ttf) >> ; % W7
 
 /FangSong <<
   /FileType /TrueType
   /SubfontID 0
   /CSI [(GB1) 2]
-  /Path (c:/windows/fonts/simfang.ttf) >> ; % Vista
+  /Path (simfang.ttf) >> ; % Vista
 
 /KaiTi <<
   /FileType /TrueType
   /SubfontID 0
   /CSI [(GB1) 2]
-  /Path (c:/windows/fonts/simkai.ttf) >> ; % Vista
+  /Path (simkai.ttf) >> ; % Vista
 
 /MicrosoftYaHei <<
   /FileType /TrueType
   /SubfontID 0
   /CSI [(GB1) 2]
-  /Path (c:/windows/fonts/msyh.ttf) >> ; % Vista
+  /Path (msyh.ttf) >> ; % Vista
 
 /MicrosoftYaHeiBold <<
   /FileType /TrueType
   /SubfontID 0
   /CSI [(GB1) 2]
-  /Path (c:/windows/fonts/msyhbd.ttf) >> ; % Vista
+  /Path (msyhbd.ttf) >> ; % Vista
 
 /NSimSun <<
   /FileType /TrueType
   /SubfontID 1
   /CSI [(GB1) 2]
-  /Path (c:/windows/fonts/simsun.ttc) >> ; % XP
+  /Path (simsun.ttc) >> ; % XP
 
 /SimHei <<
   /FileType /TrueType
   /SubfontID 0
   /CSI [(GB1) 2]
-  /Path (c:/windows/fonts/simhei.ttf) >> ; % XP
+  /Path (simhei.ttf) >> ; % XP
 
 /SimSun <<
   /FileType /TrueType
   /SubfontID 0
   /CSI [(GB1) 2]
-  /Path (c:/windows/fonts/simsun.ttc) >> ; % XP
+  /Path (simsun.ttc) >> ; % XP
 
 
 % Chinese, traditional
@@ -78,37 +78,37 @@
   /FileType /TrueType
   /SubfontID 0
   /CSI [(CNS1) 2]
-  /Path (c:/windows/fonts/arialuni.ttf) >> ; % W7
+  /Path (arialuni.ttf) >> ; % W7
 
 /DFKaiShu-SB-Estd-BF <<
   /FileType /TrueType
   /SubfontID 0
   /CSI [(CNS1) 2]
-  /Path (c:/windows/fonts/kaiu.ttf) >> ;  % Vista
+  /Path (kaiu.ttf) >> ;  % Vista
 
 /MicrosoftJhengHeiBold <<
   /FileType /TrueType
   /SubfontID 0
   /CSI [(CNS1) 2]
-  /Path (c:/windows/fonts/msjhbd.ttf) >> ; % Vista
+  /Path (msjhbd.ttf) >> ; % Vista
 
 /MicrosoftJhengHeiRegular <<  
   /FileType /TrueType
   /SubfontID 0
   /CSI [(CNS1) 2] 
-  /Path (c:/windows/fonts/msjh.ttf) >> ; % Vista
+  /Path (msjh.ttf) >> ; % Vista
 
 /MingLiU <<
   /FileType /TrueType
   /SubfontID 0
   /CSI [(CNS1) 2]
-  /Path (c:/windows/fonts/mingliu.ttc) >> ; % XP
+  /Path (mingliu.ttc) >> ; % XP
 
 /PMingLiU <<
   /FileType /TrueType
   /SubfontID 1
   /CSI [(CNS1) 2]
-  /Path (c:/windows/fonts/mingliu.ttc) >> ; % XP
+  /Path (mingliu.ttc) >> ; % XP
 
 
 % Japanese
@@ -118,61 +118,85 @@
   /FileType /TrueType
   /SubfontID 0
   /CSI [(Japan1) 3]
-  /Path (c:/windows/fonts/arialuni.ttf) >> ; % W7
+  /Path (arialuni.ttf) >> ; % W7
 
 /MS-Gothic <<
   /FileType /TrueType
   /SubfontID 0
   /CSI [(Japan1) 3]
-  /Path (c:/windows/fonts/msgothic.ttc) >> ; % XP
+  /Path (msgothic.ttc) >> ; % XP
 
 /MS-Mincho <<
   /FileType /TrueType
   /SubfontID 0
   /CSI [(Japan1) 3]
-  /Path (c:/windows/fonts/msmincho.ttc) >> ; % XP
+  /Path (msmincho.ttc) >> ; % XP
 
 /MS-PGothic <<
   /FileType /TrueType
   /SubfontID 1
   /CSI [(Japan1) 3]
-  /Path (c:/windows/fonts/msgothic.ttc) >> ; % XP
+  /Path (msgothic.ttc) >> ; % XP
 
 /MS-PMincho <<
   /FileType /TrueType
   /SubfontID 1
   /CSI [(Japan1) 3]
-  /Path (c:/windows/fonts/msmincho.ttc) >> ; % XP
+  /Path (msmincho.ttc) >> ; % XP
 
 /MS-UI-Gothic <<
   /FileType /TrueType
   /SubfontID 2
   /CSI [(Japan1) 3]
-  /Path (c:/windows/fonts/msgothic.ttc) >> ; % XP
+  /Path (msgothic.ttc) >> ; % XP
 
 /Meiryo <<
   /FileType /TrueType
   /SubfontID 0
   /CSI [(Japan1) 3]
-  /Path (c:/windows/fonts/meiryo.ttc) >> ; % Vista
+  /Path (meiryo.ttc) >> ; % Vista
 
 /Meiryo-Bold <<
   /FileType /TrueType
   /SubfontID 0
   /CSI [(Japan1) 3]
-  /Path (c:/windows/fonts/meiryob.ttc) >> ; % Vista
+  /Path (meiryob.ttc) >> ; % Vista
 
 /Meiryo-BoldItalic <<
   /FileType /TrueType
   /SubfontID 1
   /CSI [(Japan1) 3]
-  /Path (c:/windows/fonts/meiryob.ttc) >> ; % Vista
+  /Path (meiryob.ttc) >> ; % Vista
 
 /Meiryo-Italic <<
   /FileType /TrueType
   /SubfontID 1
   /CSI [(Japan1) 3]
-  /Path (c:/windows/fonts/meiryo.ttc) >> ; % Vista
+  /Path (meiryo.ttc) >> ; % Vista
+
+/IPAexMincho <<
+  /FileType /TrueType
+  /SubfontID 0
+  /CSI [(Japan1) 6]
+  /Path (truetype/public/ipaex/ipaexm.ttf) >> ; % TeX Live
+  
+/IPAexGothic <<
+  /FileType /TrueType
+  /SubfontID 0
+  /CSI [(Japan1) 6]
+  /Path (truetype/public/ipaex/ipaexg.ttf) >> ; % TeX Live
+  
+/IPAMincho <<
+  /FileType /TrueType
+  /SubfontID 0
+  /CSI [(Japan1) 6]
+  /Path (truetype/public/ipaex/ipam.ttf) >> ; % TeX Live
+  
+/IPAGothic <<
+  /FileType /TrueType
+  /SubfontID 0
+  /CSI [(Japan1) 6]
+  /Path (truetype/public/ipaex/ipag.ttf) >> ; % TeX Live
 
 
 % Korean
@@ -182,67 +206,67 @@
   /FileType /TrueType
   /SubfontID 0
   /CSI [(Korea1) 3]
-  /Path (c:/windows/fonts/arialuni.ttf) >> ; % W7
+  /Path (arialuni.ttf) >> ; % W7
 
 /Batang << 
   /FileType /TrueType
   /SubfontID 0
   /CSI [(Korea1) 3]
-  /Path (c:/windows/fonts/batang.ttc) >> ; % XP
+  /Path (batang.ttc) >> ; % XP
 
 /BatangChe <<
   /FileType /TrueType
   /SubfontID 1
   /CSI [(Korea1) 3]
-  /Path (c:/windows/fonts/batang.ttc) >> ; % XP
+  /Path (batang.ttc) >> ; % XP
 
 /Dotum <<
   /FileType /TrueType
   /SubfontID 2 
   /CSI [(Korea1) 3]
-  /Path (c:/windows/fonts/gulim.ttc) >> ; % XP
+  /Path (gulim.ttc) >> ; % XP
 
 /DotumChe <<
   /FileType /TrueType
   /SubfontID 3 
   /CSI [(Korea1) 3]
-  /Path (c:/windows/fonts/gulim.ttc) >> ; % XP
+  /Path (gulim.ttc) >> ; % XP
 
 /Gulim <<
   /FileType /TrueType
   /SubfontID 0
   /CSI [(Korea1) 3]
-  /Path (c:/windows/fonts/gulim.ttc) >> ; % XP
+  /Path (gulim.ttc) >> ; % XP
 
 /GulimChe <<
   /FileType /TrueType
   /SubfontID 1
   /CSI [(Korea1) 3]
-  /Path (c:/windows/fonts/gulim.ttc) >> ; % XP
+  /Path (gulim.ttc) >> ; % XP
 
 /Gungsuh << 
   /FileType /TrueType
   /SubfontID 2
   /CSI [(Korea1) 3]
-  /Path (c:/windows/fonts/batang.ttc) >> ; % XP
+  /Path (batang.ttc) >> ; % XP
 
 /GungsuhChe <<
   /FileType /TrueType
   /SubfontID 3
   /CSI [(Korea1) 3]
-  /Path (c:/windows/fonts/batang.ttc) >> ; % XP
+  /Path (batang.ttc) >> ; % XP
 
 /MalgunGothicBold <<
   /FileType /TrueType
   /SubfontID 0
   /CSI [(Korea1) 3]
-  /Path (c:/windows/fonts/malgunbd.ttf) >> ; % Vista
+  /Path (malgunbd.ttf) >> ; % Vista
 
 /MalgunGothicRegular <<
   /FileType /TrueType
   /SubfontID 0
   /CSI [(Korea1) 3]
-  /Path (c:/windows/fonts/malgun.ttf) >> ; % Vista
+  /Path (malgun.ttf) >> ; % Vista
 
 
 % Aliases for Windows XP and later versions