From 59f17143c54efcdc9b7d1b9c679659eedee33378 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 5 May 2017 22:45:15 +0000 Subject: ptex-fontmaps (5may17) git-svn-id: svn://tug.org/texlive/trunk@44206 c570f23f-e606-0410-a88d-b1316a301751 --- Master/bin/amd64-freebsd/kanji-config-updmap-user | 1 + Master/bin/amd64-netbsd/kanji-config-updmap-user | 1 + Master/bin/armel-linux/kanji-config-updmap-user | 1 + Master/bin/armhf-linux/kanji-config-updmap-user | 1 + Master/bin/i386-cygwin/kanji-config-updmap-user | 1 + Master/bin/i386-darwin/kanji-config-updmap-user | 1 + Master/bin/i386-freebsd/kanji-config-updmap-user | 1 + Master/bin/i386-linux/kanji-config-updmap-user | 1 + Master/bin/i386-netbsd/kanji-config-updmap-user | 1 + Master/bin/i386-solaris/kanji-config-updmap-user | 1 + Master/bin/powerpc-darwin/kanji-config-updmap-user | 1 + Master/bin/powerpc-linux/kanji-config-updmap-user | 1 + Master/bin/sparc-solaris/kanji-config-updmap-user | 1 + Master/bin/win32/kanji-config-updmap-user.exe | Bin 0 -> 1536 bytes Master/bin/x86_64-cygwin/kanji-config-updmap-user | 1 + Master/bin/x86_64-darwin/kanji-config-updmap-user | 1 + .../x86_64-darwinlegacy/kanji-config-updmap-user | 1 + Master/bin/x86_64-linux/kanji-config-updmap-user | 1 + Master/bin/x86_64-solaris/kanji-config-updmap-user | 1 + .../texmf-dist/doc/fonts/ptex-fontmaps/ChangeLog | 36 +++++++++++--- Master/texmf-dist/doc/fonts/ptex-fontmaps/README | 12 +++-- .../ptex-fontmaps/ms-win10/otf-tc-ms-win10.map | 12 +++++ .../ptex-fontmaps/ms-win10/uptex-tc-ms-win10.map | 4 ++ .../map/dvipdfmx/ptex-fontmaps/ms/otf-tc-ms.map | 8 +-- .../map/dvipdfmx/ptex-fontmaps/ms/uptex-tc-ms.map | 4 +- .../ptex-fontmaps/kanji-config-updmap-user.sh | 24 +++++++++ .../scripts/ptex-fontmaps/kanji-config-updmap.pl | 54 ++++++++++++++++++--- .../scripts/ptex-fontmaps/kanji-fontmap-creator.pl | 4 +- .../source/ptex-fontmaps/tools/mkmap-tc.lua | 10 +++- Master/tlpkg/tlpsrc/ptex-fontmaps.tlpsrc | 1 + 30 files changed, 159 insertions(+), 28 deletions(-) create mode 120000 Master/bin/amd64-freebsd/kanji-config-updmap-user create mode 120000 Master/bin/amd64-netbsd/kanji-config-updmap-user create mode 120000 Master/bin/armel-linux/kanji-config-updmap-user create mode 120000 Master/bin/armhf-linux/kanji-config-updmap-user create mode 120000 Master/bin/i386-cygwin/kanji-config-updmap-user create mode 120000 Master/bin/i386-darwin/kanji-config-updmap-user create mode 120000 Master/bin/i386-freebsd/kanji-config-updmap-user create mode 120000 Master/bin/i386-linux/kanji-config-updmap-user create mode 120000 Master/bin/i386-netbsd/kanji-config-updmap-user create mode 120000 Master/bin/i386-solaris/kanji-config-updmap-user create mode 120000 Master/bin/powerpc-darwin/kanji-config-updmap-user create mode 120000 Master/bin/powerpc-linux/kanji-config-updmap-user create mode 120000 Master/bin/sparc-solaris/kanji-config-updmap-user create mode 100755 Master/bin/win32/kanji-config-updmap-user.exe create mode 120000 Master/bin/x86_64-cygwin/kanji-config-updmap-user create mode 120000 Master/bin/x86_64-darwin/kanji-config-updmap-user create mode 120000 Master/bin/x86_64-darwinlegacy/kanji-config-updmap-user create mode 120000 Master/bin/x86_64-linux/kanji-config-updmap-user create mode 120000 Master/bin/x86_64-solaris/kanji-config-updmap-user create mode 100644 Master/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/ms-win10/otf-tc-ms-win10.map create mode 100644 Master/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/ms-win10/uptex-tc-ms-win10.map create mode 100755 Master/texmf-dist/scripts/ptex-fontmaps/kanji-config-updmap-user.sh (limited to 'Master') diff --git a/Master/bin/amd64-freebsd/kanji-config-updmap-user b/Master/bin/amd64-freebsd/kanji-config-updmap-user new file mode 120000 index 00000000000..792d3f5ee2c --- /dev/null +++ b/Master/bin/amd64-freebsd/kanji-config-updmap-user @@ -0,0 +1 @@ +../../texmf-dist/scripts/ptex-fontmaps/kanji-config-updmap-user.sh \ No newline at end of file diff --git a/Master/bin/amd64-netbsd/kanji-config-updmap-user b/Master/bin/amd64-netbsd/kanji-config-updmap-user new file mode 120000 index 00000000000..792d3f5ee2c --- /dev/null +++ b/Master/bin/amd64-netbsd/kanji-config-updmap-user @@ -0,0 +1 @@ +../../texmf-dist/scripts/ptex-fontmaps/kanji-config-updmap-user.sh \ No newline at end of file diff --git a/Master/bin/armel-linux/kanji-config-updmap-user b/Master/bin/armel-linux/kanji-config-updmap-user new file mode 120000 index 00000000000..792d3f5ee2c --- /dev/null +++ b/Master/bin/armel-linux/kanji-config-updmap-user @@ -0,0 +1 @@ +../../texmf-dist/scripts/ptex-fontmaps/kanji-config-updmap-user.sh \ No newline at end of file diff --git a/Master/bin/armhf-linux/kanji-config-updmap-user b/Master/bin/armhf-linux/kanji-config-updmap-user new file mode 120000 index 00000000000..792d3f5ee2c --- /dev/null +++ b/Master/bin/armhf-linux/kanji-config-updmap-user @@ -0,0 +1 @@ +../../texmf-dist/scripts/ptex-fontmaps/kanji-config-updmap-user.sh \ No newline at end of file diff --git a/Master/bin/i386-cygwin/kanji-config-updmap-user b/Master/bin/i386-cygwin/kanji-config-updmap-user new file mode 120000 index 00000000000..792d3f5ee2c --- /dev/null +++ b/Master/bin/i386-cygwin/kanji-config-updmap-user @@ -0,0 +1 @@ +../../texmf-dist/scripts/ptex-fontmaps/kanji-config-updmap-user.sh \ No newline at end of file diff --git a/Master/bin/i386-darwin/kanji-config-updmap-user b/Master/bin/i386-darwin/kanji-config-updmap-user new file mode 120000 index 00000000000..792d3f5ee2c --- /dev/null +++ b/Master/bin/i386-darwin/kanji-config-updmap-user @@ -0,0 +1 @@ +../../texmf-dist/scripts/ptex-fontmaps/kanji-config-updmap-user.sh \ No newline at end of file diff --git a/Master/bin/i386-freebsd/kanji-config-updmap-user b/Master/bin/i386-freebsd/kanji-config-updmap-user new file mode 120000 index 00000000000..792d3f5ee2c --- /dev/null +++ b/Master/bin/i386-freebsd/kanji-config-updmap-user @@ -0,0 +1 @@ +../../texmf-dist/scripts/ptex-fontmaps/kanji-config-updmap-user.sh \ No newline at end of file diff --git a/Master/bin/i386-linux/kanji-config-updmap-user b/Master/bin/i386-linux/kanji-config-updmap-user new file mode 120000 index 00000000000..792d3f5ee2c --- /dev/null +++ b/Master/bin/i386-linux/kanji-config-updmap-user @@ -0,0 +1 @@ +../../texmf-dist/scripts/ptex-fontmaps/kanji-config-updmap-user.sh \ No newline at end of file diff --git a/Master/bin/i386-netbsd/kanji-config-updmap-user b/Master/bin/i386-netbsd/kanji-config-updmap-user new file mode 120000 index 00000000000..792d3f5ee2c --- /dev/null +++ b/Master/bin/i386-netbsd/kanji-config-updmap-user @@ -0,0 +1 @@ +../../texmf-dist/scripts/ptex-fontmaps/kanji-config-updmap-user.sh \ No newline at end of file diff --git a/Master/bin/i386-solaris/kanji-config-updmap-user b/Master/bin/i386-solaris/kanji-config-updmap-user new file mode 120000 index 00000000000..792d3f5ee2c --- /dev/null +++ b/Master/bin/i386-solaris/kanji-config-updmap-user @@ -0,0 +1 @@ +../../texmf-dist/scripts/ptex-fontmaps/kanji-config-updmap-user.sh \ No newline at end of file diff --git a/Master/bin/powerpc-darwin/kanji-config-updmap-user b/Master/bin/powerpc-darwin/kanji-config-updmap-user new file mode 120000 index 00000000000..792d3f5ee2c --- /dev/null +++ b/Master/bin/powerpc-darwin/kanji-config-updmap-user @@ -0,0 +1 @@ +../../texmf-dist/scripts/ptex-fontmaps/kanji-config-updmap-user.sh \ No newline at end of file diff --git a/Master/bin/powerpc-linux/kanji-config-updmap-user b/Master/bin/powerpc-linux/kanji-config-updmap-user new file mode 120000 index 00000000000..792d3f5ee2c --- /dev/null +++ b/Master/bin/powerpc-linux/kanji-config-updmap-user @@ -0,0 +1 @@ +../../texmf-dist/scripts/ptex-fontmaps/kanji-config-updmap-user.sh \ No newline at end of file diff --git a/Master/bin/sparc-solaris/kanji-config-updmap-user b/Master/bin/sparc-solaris/kanji-config-updmap-user new file mode 120000 index 00000000000..792d3f5ee2c --- /dev/null +++ b/Master/bin/sparc-solaris/kanji-config-updmap-user @@ -0,0 +1 @@ +../../texmf-dist/scripts/ptex-fontmaps/kanji-config-updmap-user.sh \ No newline at end of file diff --git a/Master/bin/win32/kanji-config-updmap-user.exe b/Master/bin/win32/kanji-config-updmap-user.exe new file mode 100755 index 00000000000..5777d90a17a Binary files /dev/null and b/Master/bin/win32/kanji-config-updmap-user.exe differ diff --git a/Master/bin/x86_64-cygwin/kanji-config-updmap-user b/Master/bin/x86_64-cygwin/kanji-config-updmap-user new file mode 120000 index 00000000000..792d3f5ee2c --- /dev/null +++ b/Master/bin/x86_64-cygwin/kanji-config-updmap-user @@ -0,0 +1 @@ +../../texmf-dist/scripts/ptex-fontmaps/kanji-config-updmap-user.sh \ No newline at end of file diff --git a/Master/bin/x86_64-darwin/kanji-config-updmap-user b/Master/bin/x86_64-darwin/kanji-config-updmap-user new file mode 120000 index 00000000000..792d3f5ee2c --- /dev/null +++ b/Master/bin/x86_64-darwin/kanji-config-updmap-user @@ -0,0 +1 @@ +../../texmf-dist/scripts/ptex-fontmaps/kanji-config-updmap-user.sh \ No newline at end of file diff --git a/Master/bin/x86_64-darwinlegacy/kanji-config-updmap-user b/Master/bin/x86_64-darwinlegacy/kanji-config-updmap-user new file mode 120000 index 00000000000..792d3f5ee2c --- /dev/null +++ b/Master/bin/x86_64-darwinlegacy/kanji-config-updmap-user @@ -0,0 +1 @@ +../../texmf-dist/scripts/ptex-fontmaps/kanji-config-updmap-user.sh \ No newline at end of file diff --git a/Master/bin/x86_64-linux/kanji-config-updmap-user b/Master/bin/x86_64-linux/kanji-config-updmap-user new file mode 120000 index 00000000000..792d3f5ee2c --- /dev/null +++ b/Master/bin/x86_64-linux/kanji-config-updmap-user @@ -0,0 +1 @@ +../../texmf-dist/scripts/ptex-fontmaps/kanji-config-updmap-user.sh \ No newline at end of file diff --git a/Master/bin/x86_64-solaris/kanji-config-updmap-user b/Master/bin/x86_64-solaris/kanji-config-updmap-user new file mode 120000 index 00000000000..792d3f5ee2c --- /dev/null +++ b/Master/bin/x86_64-solaris/kanji-config-updmap-user @@ -0,0 +1 @@ +../../texmf-dist/scripts/ptex-fontmaps/kanji-config-updmap-user.sh \ No newline at end of file diff --git a/Master/texmf-dist/doc/fonts/ptex-fontmaps/ChangeLog b/Master/texmf-dist/doc/fonts/ptex-fontmaps/ChangeLog index 908c7278c8e..cc4e263a937 100644 --- a/Master/texmf-dist/doc/fonts/ptex-fontmaps/ChangeLog +++ b/Master/texmf-dist/doc/fonts/ptex-fontmaps/ChangeLog @@ -1,6 +1,30 @@ +2017-05-05 Hironobu Yamashita + + * Release 20170505.0 (HEAD -> master) [a9058af] + +2017-04-29 Norbert Preining + + * add -user script (origin/master, origin/HEAD) [b7a2df4] + +2017-04-29 Norbert Preining + + * support old and new updmap, add -sys and -user cmd line args [0445b02] + +2017-04-27 Hironobu Yamashita + + * updmap requires --user option (change for tl2017) [8d2d784] + +2017-04-15 Hironobu Yamashita + + * Use MicrosoftJhengHeiRegular for TC [8b7a652] + +2017-03-10 Hironobu Yamashita + + * typo (mingliu.ttc) [95c64ea] + 2017-01-14 Norbert Preining - * Release 20170114.0 (HEAD -> master) [7826c5c] + * Release 20170114.0 (tag: 20170114.0) [7826c5c] 2017-01-14 Norbert Preining @@ -12,11 +36,11 @@ 2017-01-14 Norbert Preining - * don't put tl-update dir into release tarball (origin/master, origin/aminophen-cjk, aminophen-cjk) [8e79949] + * don't put tl-update dir into release tarball [8e79949] 2017-01-11 aminophen - * scEmbed default: fandol -> arphic-ttf This reverts the commit 142decd, for smaller dependency [7e77414] + * scEmbed default: fandol -> arphic-ttf This reverts the commit 142decd, for smaller dependency (origin/aminophen-cjk, aminophen/master) [7e77414] 2017-01-11 aminophen @@ -236,7 +260,7 @@ 2016-10-04 aminophen - * hiragino-elcapitan: W2.otf -> W3.ttc; Add toppanbunkyu-sierra [9af223b] + * hiragino-elcapitan: W2.otf -> W3.ttc; Add toppanbunkyu-sierra (origin/toppan) [9af223b] 2016-10-04 aminophen @@ -296,7 +320,7 @@ 2015-10-02 Norbert Preining - * Release 20151002.0 (tag: 20151002.0, norbu/master) [544b1f4] + * Release 20151002.0 (tag: 20151002.0) [544b1f4] 2015-10-02 Norbert Preining @@ -348,7 +372,7 @@ 2015-07-31 Hironori Kitagawa - * Oops, forgot to update script (gito-h7ks/h7k, h7k) [8eb1df3] + * Oops, forgot to update script [8eb1df3] 2015-07-31 Hironori Kitagawa diff --git a/Master/texmf-dist/doc/fonts/ptex-fontmaps/README b/Master/texmf-dist/doc/fonts/ptex-fontmaps/README index ad3d32f9f1c..67fe24f1013 100644 --- a/Master/texmf-dist/doc/fonts/ptex-fontmaps/README +++ b/Master/texmf-dist/doc/fonts/ptex-fontmaps/README @@ -1,7 +1,7 @@ ptex-fontmaps ============= -Current release: 20170114.0 +Current release: 20170505.0 The files contained in this package contains font maps for dvipdfmx to make various Japanese/Chinese/Korean fonts available for (u)ptex and related programs @@ -221,9 +221,13 @@ Traditional Chinese * noEmbed - no embedding is done at all, fonts are selected by the viewer (no font needed for dvipdfmx) -* ms - MingLiU and MicrosoftMHei, shipped with Windows - mingliu.ttf - MSMHei.ttf +* ms - MingLiU and MicrosoftJhengHeiRegular, shipped with Windows Vista/7 + mingliu.ttc + msjh.ttf + +* ms-win10 - MingLiU and MicrosoftJhengHeiRegular, shipped with Windows 8/8.1/10 + mingliu.ttc + msjh.ttc * dynacomware - DynaComware Taiwan Inc. LiSongPro.ttf (<= "儷宋 Pro.ttf") diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/ms-win10/otf-tc-ms-win10.map b/Master/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/ms-win10/otf-tc-ms-win10.map new file mode 100644 index 00000000000..ad87df24111 --- /dev/null +++ b/Master/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/ms-win10/otf-tc-ms-win10.map @@ -0,0 +1,12 @@ + +% CID +otf-ctmr-h Identity-H :0:mingliu.ttc/AC14 %!PS MingLiU +otf-ctmr-v Identity-V :0:mingliu.ttc/AC14 %!PS MingLiU +otf-ctgr-h Identity-H :0:msjh.ttc/AC14 %!PS MicrosoftJhengHeiRegular +otf-ctgr-v Identity-V :0:msjh.ttc/AC14 %!PS MicrosoftJhengHeiRegular + +% Unicode +otf-utmr-h UniCNS-UCS2-H :0:mingliu.ttc %!PS MingLiU +otf-utmr-v UniCNS-UCS2-V :0:mingliu.ttc %!PS MingLiU +otf-utgr-h UniCNS-UCS2-H :0:msjh.ttc %!PS MicrosoftJhengHeiRegular +otf-utgr-v UniCNS-UCS2-V :0:msjh.ttc %!PS MicrosoftJhengHeiRegular diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/ms-win10/uptex-tc-ms-win10.map b/Master/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/ms-win10/uptex-tc-ms-win10.map new file mode 100644 index 00000000000..f77e094ca17 --- /dev/null +++ b/Master/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/ms-win10/uptex-tc-ms-win10.map @@ -0,0 +1,4 @@ +upmsl-h UniCNS-UTF16-H :0:mingliu.ttc %!PS MingLiU +upmsl-v UniCNS-UTF16-V :0:mingliu.ttc %!PS MingLiU +upmhm-h UniCNS-UTF16-H :0:msjh.ttc %!PS MicrosoftJhengHeiRegular +upmhm-v UniCNS-UTF16-V :0:msjh.ttc %!PS MicrosoftJhengHeiRegular diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/ms/otf-tc-ms.map b/Master/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/ms/otf-tc-ms.map index 10f0ef0cb06..6e9ea9fc294 100644 --- a/Master/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/ms/otf-tc-ms.map +++ b/Master/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/ms/otf-tc-ms.map @@ -2,11 +2,11 @@ % CID otf-ctmr-h Identity-H :0:mingliu.ttc/AC14 %!PS MingLiU otf-ctmr-v Identity-V :0:mingliu.ttc/AC14 %!PS MingLiU -otf-ctgr-h Identity-H MSMHei.ttf/AC14 %!PS MicrosoftMHei -otf-ctgr-v Identity-V MSMHei.ttf/AC14 %!PS MicrosoftMHei +otf-ctgr-h Identity-H msjh.ttf/AC14 %!PS MicrosoftJhengHeiRegular +otf-ctgr-v Identity-V msjh.ttf/AC14 %!PS MicrosoftJhengHeiRegular % Unicode otf-utmr-h UniCNS-UCS2-H :0:mingliu.ttc %!PS MingLiU otf-utmr-v UniCNS-UCS2-V :0:mingliu.ttc %!PS MingLiU -otf-utgr-h UniCNS-UCS2-H MSMHei.ttf %!PS MicrosoftMHei -otf-utgr-v UniCNS-UCS2-V MSMHei.ttf %!PS MicrosoftMHei +otf-utgr-h UniCNS-UCS2-H msjh.ttf %!PS MicrosoftJhengHeiRegular +otf-utgr-v UniCNS-UCS2-V msjh.ttf %!PS MicrosoftJhengHeiRegular diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/ms/uptex-tc-ms.map b/Master/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/ms/uptex-tc-ms.map index 1921fa86515..fcdeb557613 100644 --- a/Master/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/ms/uptex-tc-ms.map +++ b/Master/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/ms/uptex-tc-ms.map @@ -1,4 +1,4 @@ upmsl-h UniCNS-UTF16-H :0:mingliu.ttc %!PS MingLiU upmsl-v UniCNS-UTF16-V :0:mingliu.ttc %!PS MingLiU -upmhm-h UniCNS-UTF16-H MSMHei.ttf %!PS MicrosoftMHei -upmhm-v UniCNS-UTF16-V MSMHei.ttf %!PS MicrosoftMHei +upmhm-h UniCNS-UTF16-H msjh.ttf %!PS MicrosoftJhengHeiRegular +upmhm-v UniCNS-UTF16-V msjh.ttf %!PS MicrosoftJhengHeiRegular diff --git a/Master/texmf-dist/scripts/ptex-fontmaps/kanji-config-updmap-user.sh b/Master/texmf-dist/scripts/ptex-fontmaps/kanji-config-updmap-user.sh new file mode 100755 index 00000000000..8426f66e57f --- /dev/null +++ b/Master/texmf-dist/scripts/ptex-fontmaps/kanji-config-updmap-user.sh @@ -0,0 +1,24 @@ +#!/bin/sh + +# kanji-config-updmap-user: +# copy of fmtutil-sys by Thomas Esser, public domain. + +# wrapper script for updmap-setup-kanji with TEXMFVAR and TEXMFCONFIG set to +# TEXMFVAR / TEXMFCONFIG + +test -f /bin/ksh && test -z "$RUNNING_KSH" \ + && { UNAMES=`uname -s`; test "x$UNAMES" = xULTRIX; } 2>/dev/null \ + && { RUNNING_KSH=true; export RUNNING_KSH; exec /bin/ksh $0 ${1+"$@"}; } +unset RUNNING_KSH + +test -f /bin/bsh && test -z "$RUNNING_BSH" \ + && { UNAMES=`uname -s`; test "x$UNAMES" = xAIX; } 2>/dev/null \ + && { RUNNING_BSH=true; export RUNNING_BSH; exec /bin/bsh $0 ${1+"$@"}; } +unset RUNNING_BSH + +# hack around a bug in zsh: +test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"' +export PATH + +exec kanji-config-updmap --user ${1+"$@"} + diff --git a/Master/texmf-dist/scripts/ptex-fontmaps/kanji-config-updmap.pl b/Master/texmf-dist/scripts/ptex-fontmaps/kanji-config-updmap.pl index f1b88fbe12c..0caff69f627 100755 --- a/Master/texmf-dist/scripts/ptex-fontmaps/kanji-config-updmap.pl +++ b/Master/texmf-dist/scripts/ptex-fontmaps/kanji-config-updmap.pl @@ -1,11 +1,12 @@ #!/usr/bin/env perl # kanji-config-updmap: setup Japanese font embedding -# Version 20170114.0 +# Version 20170505.0 # # formerly known as updmap-setup-kanji # # Copyright 2004-2006 by KOBAYASHI R. Taizo for the shell version (updmap-otf) -# Copyright 2011-2016 by PREINING Norbert +# Copyright 2011-2017 by PREINING Norbert +# Copyright 2016-2017 by Japanese TeX Development Community # # This file is licensed under GPL version 3 or any later version. # For copyright statements see end of file. @@ -21,7 +22,7 @@ use Getopt::Long qw(:config no_autoabbrev ignore_case_always); use strict; my $prg = "kanji-config-updmap"; -my $version = '20170114.0'; +my $version = '20170505.0'; my $updmap_real = "updmap"; my $updmap = $updmap_real; @@ -30,7 +31,9 @@ my $dry_run = 0; my $opt_help = 0; my $opt_jis = 0; my $opt_sys = 0; +my $opt_user = 0; my $opt_mode = "ja"; +my $opt_old = 0; if (! GetOptions( "n|dry-run" => \$dry_run, @@ -41,8 +44,10 @@ if (! GetOptions( "sc" => sub { $opt_mode = "sc"; }, "tc" => sub { $opt_mode = "tc"; }, "ko" => sub { $opt_mode = "ko"; }, - "sys" => \$opt_sys, - "version" => sub { print &version(); exit(0); }, ) ) { + "sys" => \$opt_sys, + "user" => \$opt_user, + "old" => \$opt_old, + "version" => sub { print &version(); exit(0); }, ) ) { die "Try \"$0 --help\" for more information.\n"; } @@ -51,6 +56,16 @@ sub win32 { return ($^O=~/^MSWin(32|64)$/i); } my $nul = (win32() ? 'nul' : '/dev/null') ; +if ($opt_user && $opt_sys) { + die "Only one of -user and -sys can be used!"; +} + +if (defined($ARGV[0]) && $ARGV[0] ne "status") { + if (!($opt_user || $opt_sys)) { + die "Either -user or -sys mode is required."; + } +} + if ($dry_run) { $updmap = "echo updmap"; @@ -58,6 +73,22 @@ if ($dry_run) { if ($opt_sys) { $updmap = "$updmap --sys" ; $updmap_real = "$updmap_real --sys" ; +} else { + # TeX Live 2017 requires --user option + # try to determine the version of updmap installed + my $updver = `updmap --version 2>&1`; + if ($updver =~ m/^updmap version r([0-9]*) /) { + if ($1 >= 44080) { + $updmap = "$updmap --user" ; + $updmap_real = "$updmap_real --user" ; + } # else nothing to do, already set up for old updmap + } else { + # not recognized updmap -> assume new updmap unless --old + if (!$opt_old) { + $updmap = "$updmap --user" ; + $updmap_real = "$updmap_real --user" ; + } + } } if ($opt_help) { @@ -102,7 +133,8 @@ my %representatives = ( "cjkunifonts-ttf" => "uming.ttf", }, "tc" => { - "ms" => "mingliu.ttc", + "ms" => "msjh.ttf", + "ms-win10" => "msjh.ttc", "dynacomware" => "LiSongPro.ttf", "adobe" => "AdobeMingStd-Light.otf", "arphic" => "bsmi00lp.ttf", @@ -183,7 +215,13 @@ sub Usage { Simplified Chinese (NN=sc), Traditional Chinese (NN=tc) --NN short for --mode=NN --jis2004 use JIS2004 variants for default fonts of (u)pTeX - --sys run in sys mode, i.e., call updmap-sys + --sys run in sys mode, i.e., call updmap -sys + --user run in user mode, i.e., call updmap -user or updmap + by checking the version of the updmap script. If a + non-parsable output of `updmap --version' is found, a new + updmap with --user option is assumed. If this is not the + case, use --old. + --old Makes $prg call `updmap' without --user argument in user mode. --version show version information and exit EOF @@ -311,7 +349,7 @@ sub SetupReplacement { ms ms-osx moga-mobo moga-mobo-ex ume ipa ipaex/; } elsif ($opt_mode eq 'tc') { - @testlist = qw/dynacomware adobe ms arphic cjkunifonts cjkunifonts-ttf/; + @testlist = qw/dynacomware adobe ms-win10 ms arphic cjkunifonts cjkunifonts-ttf/; } elsif ($opt_mode eq 'sc') { @testlist = qw/fandol adobe ms arphic cjkunifonts cjkunifonts-ttf/; } elsif ($opt_mode eq 'ko') { diff --git a/Master/texmf-dist/scripts/ptex-fontmaps/kanji-fontmap-creator.pl b/Master/texmf-dist/scripts/ptex-fontmaps/kanji-fontmap-creator.pl index b364d7e9c93..b26d4fc217d 100755 --- a/Master/texmf-dist/scripts/ptex-fontmaps/kanji-fontmap-creator.pl +++ b/Master/texmf-dist/scripts/ptex-fontmaps/kanji-fontmap-creator.pl @@ -2,7 +2,7 @@ # # kanji-fontmap-creator # (c) 2012-2014 Norbert Preining -# Version: 20170114.0 +# Version: 20170505.0 # Licenced under the GPLv2 or any higher version # # gui to create map files for updmap(-setup-kanji) @@ -41,7 +41,7 @@ my $opt_help = 0; my $opt_version = 0; my $prg = "kanji-fontmap-creator"; -my $version = "20170114.0"; +my $version = "20170505.0"; # # global vars configuring operation diff --git a/Master/texmf-dist/source/ptex-fontmaps/tools/mkmap-tc.lua b/Master/texmf-dist/source/ptex-fontmaps/tools/mkmap-tc.lua index 6634a2ac848..db27b831cf8 100755 --- a/Master/texmf-dist/source/ptex-fontmaps/tools/mkmap-tc.lua +++ b/Master/texmf-dist/source/ptex-fontmaps/tools/mkmap-tc.lua @@ -31,10 +31,16 @@ local foundry = { gr='ukai.ttf %!PS ZenKai-Uni', {''}, }, - ['ms'] = { + ['ms'] = { -- for windows vista, 7 noncid = true, mr=':0:mingliu.ttc %!PS MingLiU', - gr='MSMHei.ttf %!PS MicrosoftMHei', -- ほかに見当たらなかったので + gr='msjh.ttf %!PS MicrosoftJhengHeiRegular', + {''}, + }, + ['ms-win10'] = { -- for windows 8, 8.1, 10 + noncid = true, + mr=':0:mingliu.ttc %!PS MingLiU', + gr=':0:msjh.ttc %!PS MicrosoftJhengHeiRegular', {''}, }, ['dynacomware'] = { diff --git a/Master/tlpkg/tlpsrc/ptex-fontmaps.tlpsrc b/Master/tlpkg/tlpsrc/ptex-fontmaps.tlpsrc index 3f12003d7ac..72e9cabd8ef 100644 --- a/Master/tlpkg/tlpsrc/ptex-fontmaps.tlpsrc +++ b/Master/tlpkg/tlpsrc/ptex-fontmaps.tlpsrc @@ -6,4 +6,5 @@ runpattern +d texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps runpattern +d texmf-dist/fonts/cmap/ptex-fontmaps binpattern f bin/${ARCH}/kanji-config-updmap binpattern f bin/${ARCH}/kanji-config-updmap-sys +binpattern f bin/${ARCH}/kanji-config-updmap-user binpattern f bin/${ARCH}/kanji-fontmap-creator -- cgit v1.2.3