diff options
31 files changed, 496 insertions, 1685 deletions
diff --git a/Master/texmf-dist/doc/fonts/ptex-fontmaps/ChangeLog b/Master/texmf-dist/doc/fonts/ptex-fontmaps/ChangeLog index 3d0120e5ce3..e343cb56bcb 100644 --- a/Master/texmf-dist/doc/fonts/ptex-fontmaps/ChangeLog +++ b/Master/texmf-dist/doc/fonts/ptex-fontmaps/ChangeLog @@ -1,10 +1,146 @@ +2018-03-06 Hironobu Yamashita <h.y.acetaminophen@gmail.com> + + * Release 20180306.0 (HEAD -> master) [19cc0e5] + +2018-03-06 Hironobu Yamashita <h.y.acetaminophen@gmail.com> + + * release.sh (origin/master, origin/HEAD) [dfbc325] + +2018-03-06 Hironobu Yamashita <h.y.acetaminophen@gmail.com> + + * release.sh [f138858] + +2018-02-18 Hironobu Yamashita <h.y.acetaminophen@gmail.com> + + * release.sh: adjust for macos package [80fd360] + +2018-02-17 Hironobu Yamashita <h.y.acetaminophen@gmail.com> + + * default mode handling [70189bc] + +2018-02-17 Hironobu Yamashita <h.y.acetaminophen@gmail.com> + + * Allow multiple language mode [0903e22] + +2018-02-17 Hironobu Yamashita <h.y.acetaminophen@gmail.com> + + * cleanup [24df4a4] + +2018-02-17 Hironobu Yamashita <h.y.acetaminophen@gmail.com> + + * Throw a warning and continue if database is not found Exit only when the final candidate list is empty [2b05339] + +2018-02-17 Hironobu Yamashita <h.y.acetaminophen@gmail.com> + + * Adjust help message [6ff928b] + +2018-02-17 Hironobu Yamashita <h.y.acetaminophen@gmail.com> + + * Adjust help message [5c437bd] + +2018-02-17 Hironobu Yamashita <h.y.acetaminophen@gmail.com> + + * Separate representative database to external file [d4c973b] + +2017-10-14 Hironobu Yamashita <h.y.acetaminophen@gmail.com> + + * update candidates [116b3e9] + +2017-09-27 Norbert Preining <norbert@preining.info> + + * Merge pull request #12 from doraTeX/master [31737bb] + +2017-09-27 doraTeX <taylorkgb@gmail.com> + + * Update README [996eed3] + +2017-09-27 Hironobu Yamashita <h.y.acetaminophen@gmail.com> + + * Update README [54da49f] + +2017-09-27 Hironobu Yamashita <h.y.acetaminophen@gmail.com> + + * separate macOS-specific packages [3ecc177] + +2017-09-27 doraTeX <taylorkgb@gmail.com> + + * Add toppanbunkyu-highsierra family [8f83fb7] + +2017-09-26 Hironobu Yamashita <h.y.acetaminophen@gmail.com> + + * Add highsierra family [787cf68] + +2017-07-04 Hironobu Yamashita <h.y.acetaminophen@gmail.com> + + * tests/maptest-plain.tex: More punctuations [3a24605] + +2017-07-04 Hironobu Yamashita <h.y.acetaminophen@gmail.com> + + * test-runner.pl: Support partial tests [1e7a933] + +2017-07-01 Hironobu Yamashita <h.y.acetaminophen@gmail.com> + + * Fix tests/maptest-plain.tex [d873ad2] + +2017-07-01 Hironobu Yamashita <h.y.acetaminophen@gmail.com> + + * Add ms-osx for sc [9f14cbb] + +2017-07-01 Hironobu Yamashita <h.y.acetaminophen@gmail.com> + + * Update tests/test-runner.pl [d55568d] + +2017-07-01 Hironobu Yamashita <h.y.acetaminophen@gmail.com> + + * Makefile: Add 'install' rule [039f4b6] + +2017-07-01 Hironobu Yamashita <h.y.acetaminophen@gmail.com> + + * Add sourcehan, sourcehan-otc, noto [6a1a129] + +2017-07-01 Hironobu Yamashita <h.y.acetaminophen@gmail.com> + + * Update tests/test-runner.pl [bd122cb] + +2017-07-01 Hironobu Yamashita <h.y.acetaminophen@gmail.com> + + * Add tests/test-runner.pl (WIP) [0ef09f4] + +2017-06-30 Hironobu Yamashita <h.y.acetaminophen@gmail.com> + + * Add tests/maptest-plain.tex (WIP) [a07455f] + +2017-06-29 Hironobu Yamashita <h.y.acetaminophen@gmail.com> + + * Workaround for TL2017 dvipdfmx bug dvipdfmx in TeX Live 2017 has a bug, that different CMaps are not attached to each instances of font using different OpenType layout features. This causes a problem for Japanese quotes, so we use SChinese fonts instead;) The bug was fixed in r44689-91, so we'll remove this workaround when TL2018 becomes available. (origin/dpxquote, dpxquote) [14db981] + +2017-06-29 Hironobu Yamashita <h.y.acetaminophen@gmail.com> + + * Add noto-otc, second trial (use Medium) [27e9f51] + +2017-06-28 Hironobu Yamashita <h.y.acetaminophen@gmail.com> + + * Add noto-otc, first trial [83b73a6] + +2017-06-28 Hironobu Yamashita <h.y.acetaminophen@gmail.com> + + * Add tools/mkmap-ai0-*.lua (currently noto-otc only) [9867594] + +2017-06-27 Hironobu Yamashita <h.y.acetaminophen@gmail.com> + + * tools/mkmap-ja.lua: kanjiEmbed -> jaEmbed [f98bcf2] + +2017-06-27 Hironobu Yamashita <h.y.acetaminophen@gmail.com> + + * rename: tools/mkmap.lua -> tools/mkmap-ja.lua [6040087] + 2017-06-24 Hironobu Yamashita <h.y.acetaminophen@gmail.com> - * Release 20170624.0 (HEAD -> master) [16dca6f] + * Release 20170624.0 (tag: 20170624.0) [16dca6f] 2017-06-24 Hironobu Yamashita <h.y.acetaminophen@gmail.com> - * Add founder family for sc (origin/master, origin/HEAD, aminophen/master) [837ffdd] + * Add founder family for sc [837ffdd] 2017-06-22 Hironobu Yamashita <h.y.acetaminophen@gmail.com> @@ -52,7 +188,7 @@ 2017-01-11 aminophen <h.y.acetaminophen@gmail.com> - * scEmbed default: fandol -> arphic-ttf This reverts the commit 142decd, for smaller dependency (origin/aminophen-cjk) [7e77414] + * scEmbed default: fandol -> arphic-ttf This reverts the commit 142decd, for smaller dependency [7e77414] 2017-01-11 aminophen <h.y.acetaminophen@gmail.com> @@ -272,7 +408,7 @@ 2016-10-04 aminophen <h.y.acetaminophen@gmail.com> - * hiragino-elcapitan: W2.otf -> W3.ttc; Add toppanbunkyu-sierra (origin/toppan) [9af223b] + * hiragino-elcapitan: W2.otf -> W3.ttc; Add toppanbunkyu-sierra [9af223b] 2016-10-04 aminophen <h.y.acetaminophen@gmail.com> @@ -316,7 +452,7 @@ 2016-09-27 KUROKI Yusuke <kuroky@users.sourceforge.jp> - * Fixed along Yamashita-san's blog and his commment (origin/win10) [9af5aef] + * Fixed along Yamashita-san's blog and his commment [9af5aef] 2016-09-27 KUROKI Yusuke <kuroky@users.sourceforge.jp> diff --git a/Master/texmf-dist/doc/fonts/ptex-fontmaps/ChangeLog.pre-git b/Master/texmf-dist/doc/fonts/ptex-fontmaps/ChangeLog.pre-git deleted file mode 100644 index 937d424ee1a..00000000000 --- a/Master/texmf-dist/doc/fonts/ptex-fontmaps/ChangeLog.pre-git +++ /dev/null @@ -1,82 +0,0 @@ - -2012-06-19 Norbert Preining <preining@logic.at> - - * scripts/updmap-setup-kanji.pl: - - fix and simplify status detection - - add options to the help string - - switch completely to updmap (non -sys) variant, we will - use the usual wrapper system for updmap-setup-kanji-sys - (patch from Hironori Kitagawa) - -2012-04-25 Norbert Preining <preining@logic.at> - - * kozuka/otf-up-kozuka.map: fix inconsistency in naming of - font files - Version v0.9.5 - -2012-03-15 Norbert Preining <preining@logic.at> - - * scripts/updmap-setup-kanji.pl: remove (...) from the output - of --showoption, multi-updmap echos (still, but not for long) - out the configuration file where the variable is set. - Version v0.9.5 - -2012-03-01 Norbert Preining <preining@logic.at> - - * scripts/updmap-setup-kanji.pl: pass --quiet --nomkmap --nohash - to the --setoption calls of updmap. - Version v0.9.4 - -2012-02-10 Norbert Preining <preining@logic.at> - - * fontmaps: add ipa and ipaex maps - -2012-02-06 Norbert Preining <preining@logic.at> - - * scripts/updmap-setup-kanji.pl: change output of status to - only report family, change help text a bit, - fix for win32, thanks Akira Kakuto - Version v0.9.3 - -2012-01-31 Norbert Preining <preining@logic.at> - - * scripts/updmap-setup-kanji.pl: rewrite updmap-otf in perl - so that the script is usable under Windows - add command line options for help, dry-run, etc - support jis2004 via cmd line -jis2004 - -2012-01-27 Norbert Preining <preining@logic.at> - - * scripts/updmap-otf.sh: support IPA and IPAex fonts, - improve and extended documentation - Version v0.9.2 - -2011-11-11 Norbert Preining <preining@logic.at> - - * scripts/updmap-otf.sh: Version v0.9.1 - use kpsewhich for finding fonts - use updmap-sys --setoption kanjiEmbed to select the font family - use current names of map files - use different font name for Kozuka font, as used in the map file - get state from updmap.cfg, not from some state file - -Old changelog of updmap-otf/updmap-setup-kanji.pl: - -# 27 May 2006 by KOBAYASHI R. Taizo <tkoba965@mac.com> v0.9 -# use noEmbed.map instead of noEmbeddedFont.map -# 10 Jun 2005 by KOBAYASHI R. Taizo <tkoba965@mac.com> v0.8 -# modified to use updmap-sys in teTeX3 -# 07 Nov 2004 by KOBAYASHI R. Taizo <tkoba965@mac.com> v0.7 -# do not echo back the message of updmap. -# 17 Oct 2004 by KOBAYASHI R. Taizo <tkoba965@mac.com> v0.6 -# set hiragino map file if nofont is installed and arg is auto. -# 04 Oct 2004 by KOBAYASHI R. Taizo <tkoba965@mac.com> v0.5 -# handl standby map files more strictly -# 20 Sep 2004 by KOBAYASHI R. Taizo <tkoba965@mac.com> v0.4 -# hand over current status to map file installer -# 19 Sep 2004 by KOBAYASHI R. Taizo <tkoba965@mac.com> v0.3 -# handl *-udvips.map in TEXMF/dvipdfm/config/otf/ -# 02 Mar 2004 by KOBAYASHI R. Taizo <tkoba@ike-dyn.ritsumei.ac.jp> v0.2 -# added noFont-udvips.map -# 28 Feb 2004 by KOBAYASHI R. Taizo <tkoba@ike-dyn.ritsumei.ac.jp> v0.1 - diff --git a/Master/texmf-dist/doc/fonts/ptex-fontmaps/README b/Master/texmf-dist/doc/fonts/ptex-fontmaps/README index 9d1403c1b06..036b5292986 100644 --- a/Master/texmf-dist/doc/fonts/ptex-fontmaps/README +++ b/Master/texmf-dist/doc/fonts/ptex-fontmaps/README @@ -1,22 +1,45 @@ ptex-fontmaps ============= -Current release: 20170624.0 +Current release: 20180306.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 -and formats. +make various Japanese/Chinese/Korean fonts available for (u)ptex and +related programs and formats. The font maps were written by several people, including (in alphabetic order) Hironori Kitagawa Norbert Preining Saito Shuzaburo Takuji Tanaka + Yusuke Terada Hironobu Yamashita and are now maintained in the github.com git repository: https://github.com/texjporg/jfontmaps +Note about macOS +================ +Due to frequent incompatible changes in font file names by Apple, +we don't provide macOS-specific map files in TeX Live. This also agrees +with the requirements that TeX Live includes only support for free +software. This package is split into two parts: +* ptex-fontmaps : which contains most of the files and scripts, + as well as support files +* ptex-fontmaps-macos : only the support (map) files for + macOS-specific fonts + +The package `ptex-fontmaps' (this package) is available in TeX Live, +while the package `ptex-fontmaps-macos` is *NOT* available directly from the +TeX Live package mirrors, but can be installed from the tltexjp +repository, by executing the following commands: + tlmgr repository add http://texlive.texjp.org/current/tltexjp tltexjp + tlmgr pinning add tltexjp '*' + tlmgr install ptex-fontmaps-macos +After that updates for the ptex-fontmaps packages will be automatically +installed. + + Families, support, and necessary font files =========================================== This package does *not* ship any of the fonts mentioned, but only @@ -122,7 +145,7 @@ O moga-mobo-ex - MogaEx/MoboEx fonts from Y.Oz Vox http://yozvox.web.fc2.com/ FGCCARGM.TTC O? hiragino - Hiragino fonts by Dainippon Screen Mfg. Co., Ltd. - bundled with Mac OS X 10.5--10.10, + bundled with Mac OS X 10.5--10.10, or Japanese word processor Ichitaro 2012 Premium/Super-premium editions HiraMinPro-W2.otf (<= "ヒラギノ明朝 Pro W2.otf") HiraMinPro-W3.otf (<= "ヒラギノ明朝 Pro W3.otf") @@ -132,14 +155,14 @@ O? hiragino - Hiragino fonts by Dainippon Screen Mfg. Co., Ltd. HiraKakuStd-W8.otf (<= "ヒラギノ角ゴ Std W8.otf") HiraMaruPro-W4.otf (<= "ヒラギノ丸ゴ Pro W4.otf") - If you use Mac OSX, you must create symlink + You must create symlink to use these fonts O hiragino-pron - see above same with ProN/StdN instead of Pro/Std O hiragino-elcapitan-pron O hiragino-elcapitan - bundled with Mac OS X 10.11 El Capitan or later + bundled with Mac OS X 10.11 El Capitan -- 10.12 Sierra HiraginoSansR-W4.ttc (<= "ヒラギノ丸ゴ ProN W4.ttc") HiraginoSans-W3.ttc (<= "ヒラギノ角ゴシック W3.ttc") HiraginoSans-W6.ttc (<= "ヒラギノ角ゴシック W6.ttc") @@ -147,6 +170,15 @@ O hiragino-elcapitan HiraginoSerif-W3.ttc (<= "ヒラギノ明朝 ProN W3.ttc") HiraginoSerif-W6.ttc (<= "ヒラギノ明朝 ProN W6.ttc") +O hiragino-highsierra-pron +O hiragino-highsierra + bundled with Mac OS X 10.13 High Sierra + HiraginoSansR-W4.ttc (<= "ヒラギノ丸ゴ ProN W4.ttc") + HiraginoSans-W3.ttc (<= "ヒラギノ角ゴシック W3.ttc") + HiraginoSans-W6.ttc (<= "ヒラギノ角ゴシック W6.ttc") + HiraginoSans-W8.ttc (<= "ヒラギノ角ゴシック W8.ttc") + HiraginoSerif.ttc (<= "ヒラギノ明朝 ProN.ttc") + O toppanbunkyu-sierra bundled with macOS 10.12 Sierra ToppanBunkyuMincho-Regular.otf @@ -154,6 +186,13 @@ O toppanbunkyu-sierra ToppanBunkyuGothic.ttc ToppanBunkyuMidashiGothic-ExtraBold.otf +O toppanbunkyu-highsierra + bundled with macOS 10.13 Sierra + ToppanBunkyuMinchoPr6N-Regular.otf + ToppanBunkyuMidashiMinchoStdN-ExtraBold.otf + ToppanBunkyuGothicPr6N.ttc + ToppanBunkyuMidashiGothicStdN-ExtraBold.otf + P kozuka - by Adobe Systems, bundled with Adobe's software KozMinPro-Light.otf KozMinPro-Regular.otf @@ -195,6 +234,10 @@ Simplified Chinese simsun.ttc simhei.ttf +* ms-osx - SimSun and SimHei, shipped with Office for Mac + simsun.ttf (<= "SimSun.ttf") + simhei.ttf (<= "SimHei.ttf") + * adobe - by Adobe Systems, bundled with Adobe's software AdobeSongStd-Light.otf AdobeHeitiStd-Regular.otf diff --git a/Master/texmf-dist/doc/fonts/ptex-fontmaps/database/ptex-fontmaps-data.dat b/Master/texmf-dist/doc/fonts/ptex-fontmaps/database/ptex-fontmaps-data.dat new file mode 100644 index 00000000000..ce265d58228 --- /dev/null +++ b/Master/texmf-dist/doc/fonts/ptex-fontmaps/database/ptex-fontmaps-data.dat @@ -0,0 +1,45 @@ +# ptex-fontmaps-data.dat + +JA(10): morisawa-pr6n: A-OTF-RyuminPr6N-Light.otf +JA(20): morisawa: A-OTF-RyuminPro-Light.otf +JA(30): hiragino-pron: HiraMinProN-W3.otf +JA(40): hiragino: HiraMinPro-W3.otf +JA(50): kozuka-pr6n: KozMinPr6N-Regular.otf +JA(60): kozuka-pr6: KozMinProVI-Regular.otf +JA(70): kozuka: KozMinPro-Regular.otf +JA(90): yu-osx: YuMin-Medium.otf +JA(95): yu-win10: YuGothB.ttc +JA(96): yu-win: yugothib.ttf +JA(100): ms: msgothic.ttc +JA(105): ms-osx: MS-Gothic.ttf +JA(110): moga-mobo-ex: mogam.ttc +JA(120): moga-mobo: mogam.ttc +JA(130): ipaex: ipaexm.ttf +JA(140): ipa: ipam.ttf +JA(150): ume: ume-tmo3.ttf +JA(160): canon: FGCCHMW3.TTC + +#sinotype: STSong.ttf # removed +SC(30): fandol: FandolSong-Regular.otf +SC(40): adobe: AdobeSongStd-Light.otf +SC(50): ms: simsun.ttc +SC(55): ms-osx: simsun.ttf +SC(60): founder: FZSSK.TTF +SC(70): cjkunifonts: uming.ttc +SC(75): cjkunifonts-ttf: uming.ttf +SC(80): arphic: gbsn00lp.ttf + +TC(30): dynacomware: LiSongPro.ttf +TC(40): adobe: AdobeMingStd-Light.otf +TC(50): ms-win10: msjh.ttc +TC(55): ms: msjh.ttf +TC(70): cjkunifonts: uming.ttc +TC(75): cjkunifonts-ttf: uming.ttf +TC(80): arphic: bsmi00lp.ttf + +KO(40): adobe: AdobeMyungjoStd-Medium.otf +KO(50): apple: AppleMyungjo.ttf +KO(60): ms: batang.ttc +KO(70): solaris: h2mjsm.ttf +KO(80): unfonts: UnBatang.ttf +KO(90): baekmuk: dotum.ttf # slightly safer than batang.ttf diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/hiragino-elcapitan-pron/otf-hiragino-elcapitan-pron.map b/Master/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/hiragino-elcapitan-pron/otf-hiragino-elcapitan-pron.map deleted file mode 100644 index bd537f76038..00000000000 --- a/Master/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/hiragino-elcapitan-pron/otf-hiragino-elcapitan-pron.map +++ /dev/null @@ -1,92 +0,0 @@ - -% TEXT, 90JIS -hminl-h H :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3 -hminl-v V :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3 -hminr-h H :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3 -hminr-v V :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3 -hminb-h H :0:HiraginoSerif-W6.ttc %!PS HiraMinProN-W6 -hminb-v V :0:HiraginoSerif-W6.ttc %!PS HiraMinProN-W6 -hgothr-h H :2:HiraginoSans-W3.ttc %!PS HiraKakuProN-W3 -hgothr-v V :2:HiraginoSans-W3.ttc %!PS HiraKakuProN-W3 -hgothb-h H :2:HiraginoSans-W6.ttc %!PS HiraKakuProN-W6 -hgothb-v V :2:HiraginoSans-W6.ttc %!PS HiraKakuProN-W6 -hgotheb-h H :3:HiraginoSans-W8.ttc %!PS HiraKakuStdN-W8 -hgotheb-v V :3:HiraginoSans-W8.ttc %!PS HiraKakuStdN-W8 -hmgothr-h H :1:HiraginoSansR-W4.ttc %!PS HiraMaruProN-W4 -hmgothr-v V :1:HiraginoSansR-W4.ttc %!PS HiraMaruProN-W4 - -% TEXT, JIS04 -hminln-h H :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3 -hminln-v V :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3 -hminrn-h H :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3 -hminrn-v V :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3 -hminbn-h H :0:HiraginoSerif-W6.ttc %!PS HiraMinProN-W6 -hminbn-v V :0:HiraginoSerif-W6.ttc %!PS HiraMinProN-W6 -hgothrn-h H :2:HiraginoSans-W3.ttc %!PS HiraKakuProN-W3 -hgothrn-v V :2:HiraginoSans-W3.ttc %!PS HiraKakuProN-W3 -hgothbn-h H :2:HiraginoSans-W6.ttc %!PS HiraKakuProN-W6 -hgothbn-v V :2:HiraginoSans-W6.ttc %!PS HiraKakuProN-W6 -hgothebn-h H :3:HiraginoSans-W8.ttc %!PS HiraKakuStdN-W8 -hgothebn-v V :3:HiraginoSans-W8.ttc %!PS HiraKakuStdN-W8 -hmgothrn-h H :1:HiraginoSansR-W4.ttc %!PS HiraMaruProN-W4 -hmgothrn-v V :1:HiraginoSansR-W4.ttc %!PS HiraMaruProN-W4 - -% CID -otf-cjml-h Identity-H :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3 -otf-cjml-v Identity-V :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3 -otf-cjmr-h Identity-H :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3 -otf-cjmr-v Identity-V :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3 -otf-cjmb-h Identity-H :0:HiraginoSerif-W6.ttc %!PS HiraMinProN-W6 -otf-cjmb-v Identity-V :0:HiraginoSerif-W6.ttc %!PS HiraMinProN-W6 -otf-cjgr-h Identity-H :2:HiraginoSans-W3.ttc %!PS HiraKakuProN-W3 -otf-cjgr-v Identity-V :2:HiraginoSans-W3.ttc %!PS HiraKakuProN-W3 -otf-cjgb-h Identity-H :2:HiraginoSans-W6.ttc %!PS HiraKakuProN-W6 -otf-cjgb-v Identity-V :2:HiraginoSans-W6.ttc %!PS HiraKakuProN-W6 -otf-cjge-h Identity-H :3:HiraginoSans-W8.ttc %!PS HiraKakuStdN-W8 -otf-cjge-v Identity-V :3:HiraginoSans-W8.ttc %!PS HiraKakuStdN-W8 -otf-cjmgr-h Identity-H :1:HiraginoSansR-W4.ttc %!PS HiraMaruProN-W4 -otf-cjmgr-v Identity-V :1:HiraginoSansR-W4.ttc %!PS HiraMaruProN-W4 - -% Unicode 90JIS -otf-ujml-h UniJIS-UTF16-H :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3 -otf-ujml-v UniJIS-UTF16-V :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3 -otf-ujmr-h UniJIS-UTF16-H :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3 -otf-ujmr-v UniJIS-UTF16-V :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3 -otf-ujmb-h UniJIS-UTF16-H :0:HiraginoSerif-W6.ttc %!PS HiraMinProN-W6 -otf-ujmb-v UniJIS-UTF16-V :0:HiraginoSerif-W6.ttc %!PS HiraMinProN-W6 -otf-ujgr-h UniJIS-UTF16-H :2:HiraginoSans-W3.ttc %!PS HiraKakuProN-W3 -otf-ujgr-v UniJIS-UTF16-V :2:HiraginoSans-W3.ttc %!PS HiraKakuProN-W3 -otf-ujgb-h UniJIS-UTF16-H :2:HiraginoSans-W6.ttc %!PS HiraKakuProN-W6 -otf-ujgb-v UniJIS-UTF16-V :2:HiraginoSans-W6.ttc %!PS HiraKakuProN-W6 -otf-ujge-h UniJIS-UTF16-H :3:HiraginoSans-W8.ttc %!PS HiraKakuStdN-W8 -otf-ujge-v UniJIS-UTF16-V :3:HiraginoSans-W8.ttc %!PS HiraKakuStdN-W8 -otf-ujmgr-h UniJIS-UTF16-H :1:HiraginoSansR-W4.ttc %!PS HiraMaruProN-W4 -otf-ujmgr-v UniJIS-UTF16-V :1:HiraginoSansR-W4.ttc %!PS HiraMaruProN-W4 - -% Unicode JIS04 -otf-ujmln-h UniJIS2004-UTF16-H :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3 -otf-ujmln-v UniJIS2004-UTF16-V :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3 -otf-ujmrn-h UniJIS2004-UTF16-H :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3 -otf-ujmrn-v UniJIS2004-UTF16-V :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3 -otf-ujmbn-h UniJIS2004-UTF16-H :0:HiraginoSerif-W6.ttc %!PS HiraMinProN-W6 -otf-ujmbn-v UniJIS2004-UTF16-V :0:HiraginoSerif-W6.ttc %!PS HiraMinProN-W6 -otf-ujgrn-h UniJIS2004-UTF16-H :2:HiraginoSans-W3.ttc %!PS HiraKakuProN-W3 -otf-ujgrn-v UniJIS2004-UTF16-V :2:HiraginoSans-W3.ttc %!PS HiraKakuProN-W3 -otf-ujgbn-h UniJIS2004-UTF16-H :2:HiraginoSans-W6.ttc %!PS HiraKakuProN-W6 -otf-ujgbn-v UniJIS2004-UTF16-V :2:HiraginoSans-W6.ttc %!PS HiraKakuProN-W6 -otf-ujgen-h UniJIS2004-UTF16-H :3:HiraginoSans-W8.ttc %!PS HiraKakuStdN-W8 -otf-ujgen-v UniJIS2004-UTF16-V :3:HiraginoSans-W8.ttc %!PS HiraKakuStdN-W8 -otf-ujmgrn-h UniJIS2004-UTF16-H :1:HiraginoSansR-W4.ttc %!PS HiraMaruProN-W4 -otf-ujmgrn-v UniJIS2004-UTF16-V :1:HiraginoSansR-W4.ttc %!PS HiraMaruProN-W4 - -% hiraprop -hiramin-w3-h Identity-H :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3 -hiramin-w6-h Identity-H :0:HiraginoSerif-W6.ttc %!PS HiraMinProN-W6 -hirakaku-w3-h Identity-H :2:HiraginoSans-W3.ttc %!PS HiraKakuProN-W3 -hirakaku-w6-h Identity-H :2:HiraginoSans-W6.ttc %!PS HiraKakuProN-W6 -hiramaru-w4-h Identity-H :1:HiraginoSansR-W4.ttc %!PS HiraMaruProN-W4 -hiramin-w3-v Identity-V :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3 -hiramin-w6-v Identity-V :0:HiraginoSerif-W6.ttc %!PS HiraMinProN-W6 -hirakaku-w3-v Identity-V :2:HiraginoSans-W3.ttc %!PS HiraKakuProN-W3 -hirakaku-w6-v Identity-V :2:HiraginoSans-W6.ttc %!PS HiraKakuProN-W6 -hiramaru-w4-v Identity-V :1:HiraginoSansR-W4.ttc %!PS HiraMaruProN-W4 diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/hiragino-elcapitan-pron/otf-up-hiragino-elcapitan-pron.map b/Master/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/hiragino-elcapitan-pron/otf-up-hiragino-elcapitan-pron.map deleted file mode 100644 index 50f3ae1653c..00000000000 --- a/Master/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/hiragino-elcapitan-pron/otf-up-hiragino-elcapitan-pron.map +++ /dev/null @@ -1,32 +0,0 @@ - -% TEXT, 90JIS -uphminl-h UniJIS-UTF16-H :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3 -uphminl-v UniJIS-UTF16-V :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3 -uphminr-h UniJIS-UTF16-H :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3 -uphminr-v UniJIS-UTF16-V :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3 -uphminb-h UniJIS-UTF16-H :0:HiraginoSerif-W6.ttc %!PS HiraMinProN-W6 -uphminb-v UniJIS-UTF16-V :0:HiraginoSerif-W6.ttc %!PS HiraMinProN-W6 -uphgothr-h UniJIS-UTF16-H :2:HiraginoSans-W3.ttc %!PS HiraKakuProN-W3 -uphgothr-v UniJIS-UTF16-V :2:HiraginoSans-W3.ttc %!PS HiraKakuProN-W3 -uphgothb-h UniJIS-UTF16-H :2:HiraginoSans-W6.ttc %!PS HiraKakuProN-W6 -uphgothb-v UniJIS-UTF16-V :2:HiraginoSans-W6.ttc %!PS HiraKakuProN-W6 -uphgotheb-h UniJIS-UTF16-H :3:HiraginoSans-W8.ttc %!PS HiraKakuStdN-W8 -uphgotheb-v UniJIS-UTF16-V :3:HiraginoSans-W8.ttc %!PS HiraKakuStdN-W8 -uphmgothr-h UniJIS-UTF16-H :1:HiraginoSansR-W4.ttc %!PS HiraMaruProN-W4 -uphmgothr-v UniJIS-UTF16-V :1:HiraginoSansR-W4.ttc %!PS HiraMaruProN-W4 - -% TEXT, JIS04 -uphminln-h UniJIS2004-UTF16-H :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3 -uphminln-v UniJIS2004-UTF16-V :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3 -uphminrn-h UniJIS2004-UTF16-H :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3 -uphminrn-v UniJIS2004-UTF16-V :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3 -uphminbn-h UniJIS2004-UTF16-H :0:HiraginoSerif-W6.ttc %!PS HiraMinProN-W6 -uphminbn-v UniJIS2004-UTF16-V :0:HiraginoSerif-W6.ttc %!PS HiraMinProN-W6 -uphgothrn-h UniJIS2004-UTF16-H :2:HiraginoSans-W3.ttc %!PS HiraKakuProN-W3 -uphgothrn-v UniJIS2004-UTF16-V :2:HiraginoSans-W3.ttc %!PS HiraKakuProN-W3 -uphgothbn-h UniJIS2004-UTF16-H :2:HiraginoSans-W6.ttc %!PS HiraKakuProN-W6 -uphgothbn-v UniJIS2004-UTF16-V :2:HiraginoSans-W6.ttc %!PS HiraKakuProN-W6 -uphgothebn-h UniJIS2004-UTF16-H :3:HiraginoSans-W8.ttc %!PS HiraKakuStdN-W8 -uphgothebn-v UniJIS2004-UTF16-V :3:HiraginoSans-W8.ttc %!PS HiraKakuStdN-W8 -uphmgothrn-h UniJIS2004-UTF16-H :1:HiraginoSansR-W4.ttc %!PS HiraMaruProN-W4 -uphmgothrn-v UniJIS2004-UTF16-V :1:HiraginoSansR-W4.ttc %!PS HiraMaruProN-W4 diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/hiragino-elcapitan-pron/ptex-hiragino-elcapitan-pron-04.map b/Master/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/hiragino-elcapitan-pron/ptex-hiragino-elcapitan-pron-04.map deleted file mode 100644 index a27347bf962..00000000000 --- a/Master/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/hiragino-elcapitan-pron/ptex-hiragino-elcapitan-pron-04.map +++ /dev/null @@ -1,4 +0,0 @@ -rml 2004-H :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3 -rmlv 2004-V :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3 -gbm 2004-H :2:HiraginoSans-W6.ttc %!PS HiraKakuProN-W6 -gbmv 2004-V :2:HiraginoSans-W6.ttc %!PS HiraKakuProN-W6 diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/hiragino-elcapitan-pron/ptex-hiragino-elcapitan-pron.map b/Master/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/hiragino-elcapitan-pron/ptex-hiragino-elcapitan-pron.map deleted file mode 100644 index 6556548b7e7..00000000000 --- a/Master/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/hiragino-elcapitan-pron/ptex-hiragino-elcapitan-pron.map +++ /dev/null @@ -1,4 +0,0 @@ -rml H :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3 -rmlv V :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3 -gbm H :2:HiraginoSans-W6.ttc %!PS HiraKakuProN-W6 -gbmv V :2:HiraginoSans-W6.ttc %!PS HiraKakuProN-W6 diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/hiragino-elcapitan-pron/uptex-hiragino-elcapitan-pron-04.map b/Master/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/hiragino-elcapitan-pron/uptex-hiragino-elcapitan-pron-04.map deleted file mode 100644 index 057e1097f19..00000000000 --- a/Master/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/hiragino-elcapitan-pron/uptex-hiragino-elcapitan-pron-04.map +++ /dev/null @@ -1,10 +0,0 @@ -urml UniJIS2004-UTF16-H :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3 -urmlv UniJIS2004-UTF16-V :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3 -ugbm UniJIS2004-UTF16-H :2:HiraginoSans-W6.ttc %!PS HiraKakuProN-W6 -ugbmv UniJIS2004-UTF16-V :2:HiraginoSans-W6.ttc %!PS HiraKakuProN-W6 -uprml-h UniJIS2004-UTF16-H :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3 -uprml-v UniJIS2004-UTF16-V :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3 -upgbm-h UniJIS2004-UTF16-H :2:HiraginoSans-W6.ttc %!PS HiraKakuProN-W6 -upgbm-v UniJIS2004-UTF16-V :2:HiraginoSans-W6.ttc %!PS HiraKakuProN-W6 -uprml-hq UniJIS-UCS2-H :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3 -upgbm-hq UniJIS-UCS2-H :2:HiraginoSans-W6.ttc %!PS HiraKakuProN-W6 diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/hiragino-elcapitan-pron/uptex-hiragino-elcapitan-pron.map b/Master/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/hiragino-elcapitan-pron/uptex-hiragino-elcapitan-pron.map deleted file mode 100644 index 2e21b50da69..00000000000 --- a/Master/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/hiragino-elcapitan-pron/uptex-hiragino-elcapitan-pron.map +++ /dev/null @@ -1,10 +0,0 @@ -urml UniJIS-UTF16-H :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3 -urmlv UniJIS-UTF16-V :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3 -ugbm UniJIS-UTF16-H :2:HiraginoSans-W6.ttc %!PS HiraKakuProN-W6 -ugbmv UniJIS-UTF16-V :2:HiraginoSans-W6.ttc %!PS HiraKakuProN-W6 -uprml-h UniJIS-UTF16-H :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3 -uprml-v UniJIS-UTF16-V :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3 -upgbm-h UniJIS-UTF16-H :2:HiraginoSans-W6.ttc %!PS HiraKakuProN-W6 -upgbm-v UniJIS-UTF16-V :2:HiraginoSans-W6.ttc %!PS HiraKakuProN-W6 -uprml-hq UniJIS-UCS2-H :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3 -upgbm-hq UniJIS-UCS2-H :2:HiraginoSans-W6.ttc %!PS HiraKakuProN-W6 diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/hiragino-elcapitan/otf-hiragino-elcapitan.map b/Master/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/hiragino-elcapitan/otf-hiragino-elcapitan.map deleted file mode 100644 index 41c5388d9d8..00000000000 --- a/Master/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/hiragino-elcapitan/otf-hiragino-elcapitan.map +++ /dev/null @@ -1,92 +0,0 @@ - -% TEXT, 90JIS -hminl-h H :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3 -hminl-v V :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3 -hminr-h H :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3 -hminr-v V :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3 -hminb-h H :1:HiraginoSerif-W6.ttc %!PS HiraMinPro-W6 -hminb-v V :1:HiraginoSerif-W6.ttc %!PS HiraMinPro-W6 -hgothr-h H :3:HiraginoSans-W3.ttc %!PS HiraKakuPro-W3 -hgothr-v V :3:HiraginoSans-W3.ttc %!PS HiraKakuPro-W3 -hgothb-h H :3:HiraginoSans-W6.ttc %!PS HiraKakuPro-W6 -hgothb-v V :3:HiraginoSans-W6.ttc %!PS HiraKakuPro-W6 -hgotheb-h H :2:HiraginoSans-W8.ttc %!PS HiraKakuStd-W8 -hgotheb-v V :2:HiraginoSans-W8.ttc %!PS HiraKakuStd-W8 -hmgothr-h H :0:HiraginoSansR-W4.ttc %!PS HiraMaruPro-W4 -hmgothr-v V :0:HiraginoSansR-W4.ttc %!PS HiraMaruPro-W4 - -% TEXT, JIS04 -hminln-h H :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3 -hminln-v V :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3 -hminrn-h H :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3 -hminrn-v V :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3 -hminbn-h H :1:HiraginoSerif-W6.ttc %!PS HiraMinPro-W6 -hminbn-v V :1:HiraginoSerif-W6.ttc %!PS HiraMinPro-W6 -hgothrn-h H :3:HiraginoSans-W3.ttc %!PS HiraKakuPro-W3 -hgothrn-v V :3:HiraginoSans-W3.ttc %!PS HiraKakuPro-W3 -hgothbn-h H :3:HiraginoSans-W6.ttc %!PS HiraKakuPro-W6 -hgothbn-v V :3:HiraginoSans-W6.ttc %!PS HiraKakuPro-W6 -hgothebn-h H :2:HiraginoSans-W8.ttc %!PS HiraKakuStd-W8 -hgothebn-v V :2:HiraginoSans-W8.ttc %!PS HiraKakuStd-W8 -hmgothrn-h H :0:HiraginoSansR-W4.ttc %!PS HiraMaruPro-W4 -hmgothrn-v V :0:HiraginoSansR-W4.ttc %!PS HiraMaruPro-W4 - -% CID -otf-cjml-h Identity-H :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3 -otf-cjml-v Identity-V :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3 -otf-cjmr-h Identity-H :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3 -otf-cjmr-v Identity-V :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3 -otf-cjmb-h Identity-H :1:HiraginoSerif-W6.ttc %!PS HiraMinPro-W6 -otf-cjmb-v Identity-V :1:HiraginoSerif-W6.ttc %!PS HiraMinPro-W6 -otf-cjgr-h Identity-H :3:HiraginoSans-W3.ttc %!PS HiraKakuPro-W3 -otf-cjgr-v Identity-V :3:HiraginoSans-W3.ttc %!PS HiraKakuPro-W3 -otf-cjgb-h Identity-H :3:HiraginoSans-W6.ttc %!PS HiraKakuPro-W6 -otf-cjgb-v Identity-V :3:HiraginoSans-W6.ttc %!PS HiraKakuPro-W6 -otf-cjge-h Identity-H :2:HiraginoSans-W8.ttc %!PS HiraKakuStd-W8 -otf-cjge-v Identity-V :2:HiraginoSans-W8.ttc %!PS HiraKakuStd-W8 -otf-cjmgr-h Identity-H :0:HiraginoSansR-W4.ttc %!PS HiraMaruPro-W4 -otf-cjmgr-v Identity-V :0:HiraginoSansR-W4.ttc %!PS HiraMaruPro-W4 - -% Unicode 90JIS -otf-ujml-h UniJIS-UTF16-H :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3 -otf-ujml-v UniJIS-UTF16-V :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3 -otf-ujmr-h UniJIS-UTF16-H :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3 -otf-ujmr-v UniJIS-UTF16-V :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3 -otf-ujmb-h UniJIS-UTF16-H :1:HiraginoSerif-W6.ttc %!PS HiraMinPro-W6 -otf-ujmb-v UniJIS-UTF16-V :1:HiraginoSerif-W6.ttc %!PS HiraMinPro-W6 -otf-ujgr-h UniJIS-UTF16-H :3:HiraginoSans-W3.ttc %!PS HiraKakuPro-W3 -otf-ujgr-v UniJIS-UTF16-V :3:HiraginoSans-W3.ttc %!PS HiraKakuPro-W3 -otf-ujgb-h UniJIS-UTF16-H :3:HiraginoSans-W6.ttc %!PS HiraKakuPro-W6 -otf-ujgb-v UniJIS-UTF16-V :3:HiraginoSans-W6.ttc %!PS HiraKakuPro-W6 -otf-ujge-h UniJIS-UTF16-H :2:HiraginoSans-W8.ttc %!PS HiraKakuStd-W8 -otf-ujge-v UniJIS-UTF16-V :2:HiraginoSans-W8.ttc %!PS HiraKakuStd-W8 -otf-ujmgr-h UniJIS-UTF16-H :0:HiraginoSansR-W4.ttc %!PS HiraMaruPro-W4 -otf-ujmgr-v UniJIS-UTF16-V :0:HiraginoSansR-W4.ttc %!PS HiraMaruPro-W4 - -% Unicode JIS04 -otf-ujmln-h UniJIS2004-UTF16-H :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3 -otf-ujmln-v UniJIS2004-UTF16-V :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3 -otf-ujmrn-h UniJIS2004-UTF16-H :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3 -otf-ujmrn-v UniJIS2004-UTF16-V :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3 -otf-ujmbn-h UniJIS2004-UTF16-H :1:HiraginoSerif-W6.ttc %!PS HiraMinPro-W6 -otf-ujmbn-v UniJIS2004-UTF16-V :1:HiraginoSerif-W6.ttc %!PS HiraMinPro-W6 -otf-ujgrn-h UniJIS2004-UTF16-H :3:HiraginoSans-W3.ttc %!PS HiraKakuPro-W3 -otf-ujgrn-v UniJIS2004-UTF16-V :3:HiraginoSans-W3.ttc %!PS HiraKakuPro-W3 -otf-ujgbn-h UniJIS2004-UTF16-H :3:HiraginoSans-W6.ttc %!PS HiraKakuPro-W6 -otf-ujgbn-v UniJIS2004-UTF16-V :3:HiraginoSans-W6.ttc %!PS HiraKakuPro-W6 -otf-ujgen-h UniJIS2004-UTF16-H :2:HiraginoSans-W8.ttc %!PS HiraKakuStd-W8 -otf-ujgen-v UniJIS2004-UTF16-V :2:HiraginoSans-W8.ttc %!PS HiraKakuStd-W8 -otf-ujmgrn-h UniJIS2004-UTF16-H :0:HiraginoSansR-W4.ttc %!PS HiraMaruPro-W4 -otf-ujmgrn-v UniJIS2004-UTF16-V :0:HiraginoSansR-W4.ttc %!PS HiraMaruPro-W4 - -% hiraprop -hiramin-w3-h Identity-H :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3 -hiramin-w6-h Identity-H :1:HiraginoSerif-W6.ttc %!PS HiraMinPro-W6 -hirakaku-w3-h Identity-H :3:HiraginoSans-W3.ttc %!PS HiraKakuPro-W3 -hirakaku-w6-h Identity-H :3:HiraginoSans-W6.ttc %!PS HiraKakuPro-W6 -hiramaru-w4-h Identity-H :0:HiraginoSansR-W4.ttc %!PS HiraMaruPro-W4 -hiramin-w3-v Identity-V :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3 -hiramin-w6-v Identity-V :1:HiraginoSerif-W6.ttc %!PS HiraMinPro-W6 -hirakaku-w3-v Identity-V :3:HiraginoSans-W3.ttc %!PS HiraKakuPro-W3 -hirakaku-w6-v Identity-V :3:HiraginoSans-W6.ttc %!PS HiraKakuPro-W6 -hiramaru-w4-v Identity-V :0:HiraginoSansR-W4.ttc %!PS HiraMaruPro-W4 diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/hiragino-elcapitan/otf-up-hiragino-elcapitan.map b/Master/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/hiragino-elcapitan/otf-up-hiragino-elcapitan.map deleted file mode 100644 index d01b53b4f56..00000000000 --- a/Master/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/hiragino-elcapitan/otf-up-hiragino-elcapitan.map +++ /dev/null @@ -1,32 +0,0 @@ - -% TEXT, 90JIS -uphminl-h UniJIS-UTF16-H :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3 -uphminl-v UniJIS-UTF16-V :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3 -uphminr-h UniJIS-UTF16-H :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3 -uphminr-v UniJIS-UTF16-V :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3 -uphminb-h UniJIS-UTF16-H :1:HiraginoSerif-W6.ttc %!PS HiraMinPro-W6 -uphminb-v UniJIS-UTF16-V :1:HiraginoSerif-W6.ttc %!PS HiraMinPro-W6 -uphgothr-h UniJIS-UTF16-H :3:HiraginoSans-W3.ttc %!PS HiraKakuPro-W3 -uphgothr-v UniJIS-UTF16-V :3:HiraginoSans-W3.ttc %!PS HiraKakuPro-W3 -uphgothb-h UniJIS-UTF16-H :3:HiraginoSans-W6.ttc %!PS HiraKakuPro-W6 -uphgothb-v UniJIS-UTF16-V :3:HiraginoSans-W6.ttc %!PS HiraKakuPro-W6 -uphgotheb-h UniJIS-UTF16-H :2:HiraginoSans-W8.ttc %!PS HiraKakuStd-W8 -uphgotheb-v UniJIS-UTF16-V :2:HiraginoSans-W8.ttc %!PS HiraKakuStd-W8 -uphmgothr-h UniJIS-UTF16-H :0:HiraginoSansR-W4.ttc %!PS HiraMaruPro-W4 -uphmgothr-v UniJIS-UTF16-V :0:HiraginoSansR-W4.ttc %!PS HiraMaruPro-W4 - -% TEXT, JIS04 -uphminln-h UniJIS2004-UTF16-H :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3 -uphminln-v UniJIS2004-UTF16-V :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3 -uphminrn-h UniJIS2004-UTF16-H :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3 -uphminrn-v UniJIS2004-UTF16-V :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3 -uphminbn-h UniJIS2004-UTF16-H :1:HiraginoSerif-W6.ttc %!PS HiraMinPro-W6 -uphminbn-v UniJIS2004-UTF16-V :1:HiraginoSerif-W6.ttc %!PS HiraMinPro-W6 -uphgothrn-h UniJIS2004-UTF16-H :3:HiraginoSans-W3.ttc %!PS HiraKakuPro-W3 -uphgothrn-v UniJIS2004-UTF16-V :3:HiraginoSans-W3.ttc %!PS HiraKakuPro-W3 -uphgothbn-h UniJIS2004-UTF16-H :3:HiraginoSans-W6.ttc %!PS HiraKakuPro-W6 -uphgothbn-v UniJIS2004-UTF16-V :3:HiraginoSans-W6.ttc %!PS HiraKakuPro-W6 -uphgothebn-h UniJIS2004-UTF16-H :2:HiraginoSans-W8.ttc %!PS HiraKakuStd-W8 -uphgothebn-v UniJIS2004-UTF16-V :2:HiraginoSans-W8.ttc %!PS HiraKakuStd-W8 -uphmgothrn-h UniJIS2004-UTF16-H :0:HiraginoSansR-W4.ttc %!PS HiraMaruPro-W4 -uphmgothrn-v UniJIS2004-UTF16-V :0:HiraginoSansR-W4.ttc %!PS HiraMaruPro-W4 diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/hiragino-elcapitan/ptex-hiragino-elcapitan-04.map b/Master/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/hiragino-elcapitan/ptex-hiragino-elcapitan-04.map deleted file mode 100644 index 7ffb1d6e7bb..00000000000 --- a/Master/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/hiragino-elcapitan/ptex-hiragino-elcapitan-04.map +++ /dev/null @@ -1,4 +0,0 @@ -rml 2004-H :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3 -rmlv 2004-V :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3 -gbm 2004-H :3:HiraginoSans-W6.ttc %!PS HiraKakuPro-W6 -gbmv 2004-V :3:HiraginoSans-W6.ttc %!PS HiraKakuPro-W6 diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/hiragino-elcapitan/ptex-hiragino-elcapitan.map b/Master/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/hiragino-elcapitan/ptex-hiragino-elcapitan.map deleted file mode 100644 index 05d0f34ee11..00000000000 --- a/Master/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/hiragino-elcapitan/ptex-hiragino-elcapitan.map +++ /dev/null @@ -1,4 +0,0 @@ -rml H :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3 -rmlv V :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3 -gbm H :3:HiraginoSans-W6.ttc %!PS HiraKakuPro-W6 -gbmv V :3:HiraginoSans-W6.ttc %!PS HiraKakuPro-W6 diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/hiragino-elcapitan/uptex-hiragino-elcapitan-04.map b/Master/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/hiragino-elcapitan/uptex-hiragino-elcapitan-04.map deleted file mode 100644 index ce0407b9c0b..00000000000 --- a/Master/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/hiragino-elcapitan/uptex-hiragino-elcapitan-04.map +++ /dev/null @@ -1,10 +0,0 @@ -urml UniJIS2004-UTF16-H :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3 -urmlv UniJIS2004-UTF16-V :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3 -ugbm UniJIS2004-UTF16-H :3:HiraginoSans-W6.ttc %!PS HiraKakuPro-W6 -ugbmv UniJIS2004-UTF16-V :3:HiraginoSans-W6.ttc %!PS HiraKakuPro-W6 -uprml-h UniJIS2004-UTF16-H :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3 -uprml-v UniJIS2004-UTF16-V :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3 -upgbm-h UniJIS2004-UTF16-H :3:HiraginoSans-W6.ttc %!PS HiraKakuPro-W6 -upgbm-v UniJIS2004-UTF16-V :3:HiraginoSans-W6.ttc %!PS HiraKakuPro-W6 -uprml-hq UniJIS-UCS2-H :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3 -upgbm-hq UniJIS-UCS2-H :3:HiraginoSans-W6.ttc %!PS HiraKakuPro-W6 diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/hiragino-elcapitan/uptex-hiragino-elcapitan.map b/Master/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/hiragino-elcapitan/uptex-hiragino-elcapitan.map deleted file mode 100644 index 21af43d0c51..00000000000 --- a/Master/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/hiragino-elcapitan/uptex-hiragino-elcapitan.map +++ /dev/null @@ -1,10 +0,0 @@ -urml UniJIS-UTF16-H :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3 -urmlv UniJIS-UTF16-V :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3 -ugbm UniJIS-UTF16-H :3:HiraginoSans-W6.ttc %!PS HiraKakuPro-W6 -ugbmv UniJIS-UTF16-V :3:HiraginoSans-W6.ttc %!PS HiraKakuPro-W6 -uprml-h UniJIS-UTF16-H :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3 -uprml-v UniJIS-UTF16-V :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3 -upgbm-h UniJIS-UTF16-H :3:HiraginoSans-W6.ttc %!PS HiraKakuPro-W6 -upgbm-v UniJIS-UTF16-V :3:HiraginoSans-W6.ttc %!PS HiraKakuPro-W6 -uprml-hq UniJIS-UCS2-H :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3 -upgbm-hq UniJIS-UCS2-H :3:HiraginoSans-W6.ttc %!PS HiraKakuPro-W6 diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/ms-osx/otf-sc-ms-osx.map b/Master/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/ms-osx/otf-sc-ms-osx.map new file mode 100644 index 00000000000..2a914b44445 --- /dev/null +++ b/Master/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/ms-osx/otf-sc-ms-osx.map @@ -0,0 +1,12 @@ + +% CID +otf-ccmr-h Identity-H simsun.ttf/AG14 %!PS SimSun +otf-ccmr-v Identity-V simsun.ttf/AG14 %!PS SimSun +otf-ccgr-h Identity-H simhei.ttf/AG14 %!PS SimHei +otf-ccgr-v Identity-V simhei.ttf/AG14 %!PS SimHei + +% Unicode +otf-ucmr-h UniGB-UCS2-H simsun.ttf %!PS SimSun +otf-ucmr-v UniGB-UCS2-V simsun.ttf %!PS SimSun +otf-ucgr-h UniGB-UCS2-H simhei.ttf %!PS SimHei +otf-ucgr-v UniGB-UCS2-V simhei.ttf %!PS SimHei diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/ms-osx/uptex-sc-ms-osx.map b/Master/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/ms-osx/uptex-sc-ms-osx.map new file mode 100644 index 00000000000..b601122716e --- /dev/null +++ b/Master/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/ms-osx/uptex-sc-ms-osx.map @@ -0,0 +1,4 @@ +upstsl-h UniGB-UTF16-H simsun.ttf %!PS SimSun +upstsl-v UniGB-UTF16-V simsun.ttf %!PS SimSun +upstht-h UniGB-UTF16-H simhei.ttf %!PS SimHei +upstht-v UniGB-UTF16-V simhei.ttf %!PS SimHei diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/toppanbunkyu-sierra/otf-toppanbunkyu-sierra.map b/Master/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/toppanbunkyu-sierra/otf-toppanbunkyu-sierra.map deleted file mode 100644 index 341ab36feba..00000000000 --- a/Master/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/toppanbunkyu-sierra/otf-toppanbunkyu-sierra.map +++ /dev/null @@ -1,80 +0,0 @@ - -% TEXT, 90JIS -hminl-h H ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular -hminl-v V ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular -hminr-h H ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular -hminr-v V ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular -hminb-h H ToppanBunkyuMidashiMincho-ExtraBold.otf %!PS ToppanBunkyuMidashiMinchoStdN-ExtraBold -hminb-v V ToppanBunkyuMidashiMincho-ExtraBold.otf %!PS ToppanBunkyuMidashiMinchoStdN-ExtraBold -hgothr-h H :1:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-Regular -hgothr-v V :1:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-Regular -hgothb-h H :0:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-DB -hgothb-v V :0:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-DB -hgotheb-h H ToppanBunkyuMidashiGothic-ExtraBold.otf %!PS ToppanBunkyuMidashiGothicStdN-ExtraBold -hgotheb-v V ToppanBunkyuMidashiGothic-ExtraBold.otf %!PS ToppanBunkyuMidashiGothicStdN-ExtraBold -hmgothr-h H :1:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-Regular -hmgothr-v V :1:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-Regular - -% TEXT, JIS04 -hminln-h H ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular -hminln-v V ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular -hminrn-h H ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular -hminrn-v V ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular -hminbn-h H ToppanBunkyuMidashiMincho-ExtraBold.otf %!PS ToppanBunkyuMidashiMinchoStdN-ExtraBold -hminbn-v V ToppanBunkyuMidashiMincho-ExtraBold.otf %!PS ToppanBunkyuMidashiMinchoStdN-ExtraBold -hgothrn-h H :1:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-Regular -hgothrn-v V :1:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-Regular -hgothbn-h H :0:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-DB -hgothbn-v V :0:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-DB -hgothebn-h H ToppanBunkyuMidashiGothic-ExtraBold.otf %!PS ToppanBunkyuMidashiGothicStdN-ExtraBold -hgothebn-v V ToppanBunkyuMidashiGothic-ExtraBold.otf %!PS ToppanBunkyuMidashiGothicStdN-ExtraBold -hmgothrn-h H :1:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-Regular -hmgothrn-v V :1:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-Regular - -% CID -otf-cjml-h Identity-H ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular -otf-cjml-v Identity-V ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular -otf-cjmr-h Identity-H ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular -otf-cjmr-v Identity-V ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular -otf-cjmb-h Identity-H ToppanBunkyuMidashiMincho-ExtraBold.otf %!PS ToppanBunkyuMidashiMinchoStdN-ExtraBold -otf-cjmb-v Identity-V ToppanBunkyuMidashiMincho-ExtraBold.otf %!PS ToppanBunkyuMidashiMinchoStdN-ExtraBold -otf-cjgr-h Identity-H :1:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-Regular -otf-cjgr-v Identity-V :1:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-Regular -otf-cjgb-h Identity-H :0:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-DB -otf-cjgb-v Identity-V :0:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-DB -otf-cjge-h Identity-H ToppanBunkyuMidashiGothic-ExtraBold.otf %!PS ToppanBunkyuMidashiGothicStdN-ExtraBold -otf-cjge-v Identity-V ToppanBunkyuMidashiGothic-ExtraBold.otf %!PS ToppanBunkyuMidashiGothicStdN-ExtraBold -otf-cjmgr-h Identity-H :1:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-Regular -otf-cjmgr-v Identity-V :1:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-Regular - -% Unicode 90JIS -otf-ujml-h UniJIS-UTF16-H ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular -otf-ujml-v UniJIS-UTF16-V ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular -otf-ujmr-h UniJIS-UTF16-H ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular -otf-ujmr-v UniJIS-UTF16-V ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular -otf-ujmb-h UniJIS-UTF16-H ToppanBunkyuMidashiMincho-ExtraBold.otf %!PS ToppanBunkyuMidashiMinchoStdN-ExtraBold -otf-ujmb-v UniJIS-UTF16-V ToppanBunkyuMidashiMincho-ExtraBold.otf %!PS ToppanBunkyuMidashiMinchoStdN-ExtraBold -otf-ujgr-h UniJIS-UTF16-H :1:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-Regular -otf-ujgr-v UniJIS-UTF16-V :1:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-Regular -otf-ujgb-h UniJIS-UTF16-H :0:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-DB -otf-ujgb-v UniJIS-UTF16-V :0:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-DB -otf-ujge-h UniJIS-UTF16-H ToppanBunkyuMidashiGothic-ExtraBold.otf %!PS ToppanBunkyuMidashiGothicStdN-ExtraBold -otf-ujge-v UniJIS-UTF16-V ToppanBunkyuMidashiGothic-ExtraBold.otf %!PS ToppanBunkyuMidashiGothicStdN-ExtraBold -otf-ujmgr-h UniJIS-UTF16-H :1:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-Regular -otf-ujmgr-v UniJIS-UTF16-V :1:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-Regular - -% Unicode JIS04 -otf-ujmln-h UniJIS2004-UTF16-H ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular -otf-ujmln-v UniJIS2004-UTF16-V ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular -otf-ujmrn-h UniJIS2004-UTF16-H ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular -otf-ujmrn-v UniJIS2004-UTF16-V ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular -otf-ujmbn-h UniJIS2004-UTF16-H ToppanBunkyuMidashiMincho-ExtraBold.otf %!PS ToppanBunkyuMidashiMinchoStdN-ExtraBold -otf-ujmbn-v UniJIS2004-UTF16-V ToppanBunkyuMidashiMincho-ExtraBold.otf %!PS ToppanBunkyuMidashiMinchoStdN-ExtraBold -otf-ujgrn-h UniJIS2004-UTF16-H :1:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-Regular -otf-ujgrn-v UniJIS2004-UTF16-V :1:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-Regular -otf-ujgbn-h UniJIS2004-UTF16-H :0:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-DB -otf-ujgbn-v UniJIS2004-UTF16-V :0:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-DB -otf-ujgen-h UniJIS2004-UTF16-H ToppanBunkyuMidashiGothic-ExtraBold.otf %!PS ToppanBunkyuMidashiGothicStdN-ExtraBold -otf-ujgen-v UniJIS2004-UTF16-V ToppanBunkyuMidashiGothic-ExtraBold.otf %!PS ToppanBunkyuMidashiGothicStdN-ExtraBold -otf-ujmgrn-h UniJIS2004-UTF16-H :1:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-Regular -otf-ujmgrn-v UniJIS2004-UTF16-V :1:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-Regular diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/toppanbunkyu-sierra/otf-up-toppanbunkyu-sierra.map b/Master/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/toppanbunkyu-sierra/otf-up-toppanbunkyu-sierra.map deleted file mode 100644 index 660c86b3aa1..00000000000 --- a/Master/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/toppanbunkyu-sierra/otf-up-toppanbunkyu-sierra.map +++ /dev/null @@ -1,32 +0,0 @@ - -% TEXT, 90JIS -uphminl-h UniJIS-UTF16-H ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular -uphminl-v UniJIS-UTF16-V ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular -uphminr-h UniJIS-UTF16-H ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular -uphminr-v UniJIS-UTF16-V ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular -uphminb-h UniJIS-UTF16-H ToppanBunkyuMidashiMincho-ExtraBold.otf %!PS ToppanBunkyuMidashiMinchoStdN-ExtraBold -uphminb-v UniJIS-UTF16-V ToppanBunkyuMidashiMincho-ExtraBold.otf %!PS ToppanBunkyuMidashiMinchoStdN-ExtraBold -uphgothr-h UniJIS-UTF16-H :1:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-Regular -uphgothr-v UniJIS-UTF16-V :1:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-Regular -uphgothb-h UniJIS-UTF16-H :0:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-DB -uphgothb-v UniJIS-UTF16-V :0:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-DB -uphgotheb-h UniJIS-UTF16-H ToppanBunkyuMidashiGothic-ExtraBold.otf %!PS ToppanBunkyuMidashiGothicStdN-ExtraBold -uphgotheb-v UniJIS-UTF16-V ToppanBunkyuMidashiGothic-ExtraBold.otf %!PS ToppanBunkyuMidashiGothicStdN-ExtraBold -uphmgothr-h UniJIS-UTF16-H :1:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-Regular -uphmgothr-v UniJIS-UTF16-V :1:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-Regular - -% TEXT, JIS04 -uphminln-h UniJIS2004-UTF16-H ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular -uphminln-v UniJIS2004-UTF16-V ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular -uphminrn-h UniJIS2004-UTF16-H ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular -uphminrn-v UniJIS2004-UTF16-V ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular -uphminbn-h UniJIS2004-UTF16-H ToppanBunkyuMidashiMincho-ExtraBold.otf %!PS ToppanBunkyuMidashiMinchoStdN-ExtraBold -uphminbn-v UniJIS2004-UTF16-V ToppanBunkyuMidashiMincho-ExtraBold.otf %!PS ToppanBunkyuMidashiMinchoStdN-ExtraBold -uphgothrn-h UniJIS2004-UTF16-H :1:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-Regular -uphgothrn-v UniJIS2004-UTF16-V :1:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-Regular -uphgothbn-h UniJIS2004-UTF16-H :0:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-DB -uphgothbn-v UniJIS2004-UTF16-V :0:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-DB -uphgothebn-h UniJIS2004-UTF16-H ToppanBunkyuMidashiGothic-ExtraBold.otf %!PS ToppanBunkyuMidashiGothicStdN-ExtraBold -uphgothebn-v UniJIS2004-UTF16-V ToppanBunkyuMidashiGothic-ExtraBold.otf %!PS ToppanBunkyuMidashiGothicStdN-ExtraBold -uphmgothrn-h UniJIS2004-UTF16-H :1:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-Regular -uphmgothrn-v UniJIS2004-UTF16-V :1:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-Regular diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/toppanbunkyu-sierra/ptex-toppanbunkyu-sierra-04.map b/Master/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/toppanbunkyu-sierra/ptex-toppanbunkyu-sierra-04.map deleted file mode 100644 index 21df63f4571..00000000000 --- a/Master/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/toppanbunkyu-sierra/ptex-toppanbunkyu-sierra-04.map +++ /dev/null @@ -1,4 +0,0 @@ -rml 2004-H ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular -rmlv 2004-V ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular -gbm 2004-H :0:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-DB -gbmv 2004-V :0:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-DB diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/toppanbunkyu-sierra/ptex-toppanbunkyu-sierra.map b/Master/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/toppanbunkyu-sierra/ptex-toppanbunkyu-sierra.map deleted file mode 100644 index 7f00b869d5c..00000000000 --- a/Master/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/toppanbunkyu-sierra/ptex-toppanbunkyu-sierra.map +++ /dev/null @@ -1,4 +0,0 @@ -rml H ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular -rmlv V ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular -gbm H :0:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-DB -gbmv V :0:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-DB diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/toppanbunkyu-sierra/uptex-toppanbunkyu-sierra-04.map b/Master/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/toppanbunkyu-sierra/uptex-toppanbunkyu-sierra-04.map deleted file mode 100644 index 3c6cbdc57bc..00000000000 --- a/Master/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/toppanbunkyu-sierra/uptex-toppanbunkyu-sierra-04.map +++ /dev/null @@ -1,10 +0,0 @@ -urml UniJIS2004-UTF16-H ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular -urmlv UniJIS2004-UTF16-V ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular -ugbm UniJIS2004-UTF16-H :0:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-DB -ugbmv UniJIS2004-UTF16-V :0:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-DB -uprml-h UniJIS2004-UTF16-H ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular -uprml-v UniJIS2004-UTF16-V ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular -upgbm-h UniJIS2004-UTF16-H :0:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-DB -upgbm-v UniJIS2004-UTF16-V :0:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-DB -uprml-hq UniJIS-UCS2-H ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular -upgbm-hq UniJIS-UCS2-H :0:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-DB diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/toppanbunkyu-sierra/uptex-toppanbunkyu-sierra.map b/Master/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/toppanbunkyu-sierra/uptex-toppanbunkyu-sierra.map deleted file mode 100644 index b15c83c6ab9..00000000000 --- a/Master/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/toppanbunkyu-sierra/uptex-toppanbunkyu-sierra.map +++ /dev/null @@ -1,10 +0,0 @@ -urml UniJIS-UTF16-H ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular -urmlv UniJIS-UTF16-V ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular -ugbm UniJIS-UTF16-H :0:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-DB -ugbmv UniJIS-UTF16-V :0:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-DB -uprml-h UniJIS-UTF16-H ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular -uprml-v UniJIS-UTF16-V ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular -upgbm-h UniJIS-UTF16-H :0:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-DB -upgbm-v UniJIS-UTF16-V :0:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-DB -uprml-hq UniJIS-UCS2-H ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular -upgbm-hq UniJIS-UCS2-H :0:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-DB 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 dad978ee90a..a5159f26786 100755 --- a/Master/texmf-dist/scripts/ptex-fontmaps/kanji-config-updmap.pl +++ b/Master/texmf-dist/scripts/ptex-fontmaps/kanji-config-updmap.pl @@ -1,12 +1,12 @@ #!/usr/bin/env perl # kanji-config-updmap: setup Japanese font embedding -# Version 20170624.0 +# Version 20180306.0 # # formerly known as updmap-setup-kanji # # Copyright 2004-2006 by KOBAYASHI R. Taizo for the shell version (updmap-otf) -# Copyright 2011-2017 by PREINING Norbert -# Copyright 2016-2017 by Japanese TeX Development Community +# Copyright 2011-2018 by PREINING Norbert +# Copyright 2016-2018 by Japanese TeX Development Community # # This file is licensed under GPL version 3 or any later version. # For copyright statements see end of file. @@ -15,14 +15,14 @@ # https://github.com/texjporg/jfontmaps # # For a changelog see the git log -# +# $^W = 1; use Getopt::Long qw(:config no_autoabbrev ignore_case_always); use strict; my $prg = "kanji-config-updmap"; -my $version = '20170624.0'; +my $version = '20180306.0'; my $updmap_real = "updmap"; my $updmap = $updmap_real; @@ -32,18 +32,23 @@ my $opt_help = 0; my $opt_jis = 0; my $opt_sys = 0; my $opt_user = 0; -my $opt_mode = "ja"; my $opt_old = 0; +my @opt_mode_list; +my $opt_mode_one; +my $opt_mode_ja; +my $opt_mode_sc; +my $opt_mode_tc; +my $opt_mode_ko; if (! GetOptions( "n|dry-run" => \$dry_run, "h|help" => \$opt_help, "jis2004" => \$opt_jis, - "mode=s" => \$opt_mode, - "ja" => sub { $opt_mode = "ja"; }, - "sc" => sub { $opt_mode = "sc"; }, - "tc" => sub { $opt_mode = "tc"; }, - "ko" => sub { $opt_mode = "ko"; }, + "mode=s" => \$opt_mode_one, + "ja=s" => \$opt_mode_ja, + "sc=s" => \$opt_mode_sc, + "tc=s" => \$opt_mode_tc, + "ko=s" => \$opt_mode_ko, "sys" => \$opt_sys, "user" => \$opt_user, "old" => \$opt_old, @@ -51,25 +56,48 @@ if (! GetOptions( die "Try \"$0 --help\" for more information.\n"; } +if ($opt_mode_one) { + if (defined($opt_mode_ja) || defined($opt_mode_sc) || + defined($opt_mode_tc) || defined($opt_mode_ko)) { + die "Options --ja/--sc/--tc/--ko are invalid with --mode=NN!\n"; + } + # define a corresponding option by empty string + if ($opt_mode_one eq "ja") { + $opt_mode_ja = ''; + } elsif ($opt_mode_one eq "sc") { + $opt_mode_sc = ''; + } elsif ($opt_mode_one eq "tc") { + $opt_mode_tc = ''; + } elsif ($opt_mode_one eq "ko") { + $opt_mode_ko = ''; + } else { + die "Unknown mode $opt_mode_one!"; + } +} +push @opt_mode_list, "ja" if (defined($opt_mode_ja)); +push @opt_mode_list, "sc" if (defined($opt_mode_sc)); +push @opt_mode_list, "tc" if (defined($opt_mode_tc)); +push @opt_mode_list, "ko" if (defined($opt_mode_ko)); +if (!@opt_mode_list) { + # default mode needs to be set, define it by empty string + $opt_mode_one = "ja"; + $opt_mode_ja = ''; + push @opt_mode_list, "ja"; +} 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"; +if ($opt_user && $opt_sys) { + die "Only one of -user and -sys can be used!"; } + if ($opt_sys) { $updmap = "$updmap --sys" ; $updmap_real = "$updmap_real --sys" ; @@ -90,158 +118,173 @@ if ($opt_sys) { } } } +if ($dry_run) { + $updmap = "echo updmap"; +} if ($opt_help) { Usage(); - exit 0; + exit(0); } # # representatives of support font families # -my %representatives = ( - "ja" => { - "hiragino" => "HiraMinPro-W3.otf", - "hiragino-pron" => "HiraMinProN-W3.otf", - "hiragino-elcapitan" => "HiraginoSerif-W3.ttc", - "hiragino-elcapitan-pron" => "HiraginoSerif-W3.ttc", - "toppanbunkyu-sierra" => "ToppanBunkyuGothic.ttc", - "morisawa" => "A-OTF-RyuminPro-Light.otf", - "morisawa-pr6n" => "A-OTF-RyuminPr6N-Light.otf", - "kozuka" => "KozMinPro-Regular.otf", - "kozuka-pr6n" => "KozMinPr6N-Regular.otf", - "kozuka-pr6" => "KozMinProVI-Regular.otf", - "ipa" => "ipam.ttf", - "ipaex" => "ipaexm.ttf", - "moga-mobo" => "mogam.ttc", - "moga-mobo-ex" => "mogam.ttc", - "ume" => "ume-tmo3.ttf", - "ms" => "msgothic.ttc", - "ms-osx" => "MS-Gothic.ttf", - "yu-win" => "yugothib.ttf", - "yu-win10" => "YuGothB.ttc", - "yu-osx" => "YuMin-Medium.otf", - "canon" => "FGCCHMW3.TTC", - }, - "sc" => { - "ms" => "simsun.ttc", - #"sinotype" => "STSong.ttf", # removed - "adobe" => "AdobeSongStd-Light.otf", - "fandol" => "FandolSong-Regular.otf", - "founder" => "FZSSK.TTF", - "arphic" => "gbsn00lp.ttf", - "cjkunifonts" => "uming.ttc", - "cjkunifonts-ttf" => "uming.ttf", - }, - "tc" => { - "ms" => "msjh.ttf", - "ms-win10" => "msjh.ttc", - "dynacomware" => "LiSongPro.ttf", - "adobe" => "AdobeMingStd-Light.otf", - "arphic" => "bsmi00lp.ttf", - "cjkunifonts" => "uming.ttc", - "cjkunifonts-ttf" => "uming.ttf", - }, - "ko" => { - "ms" => "batang.ttc", - "apple" => "AppleMyungjo.ttf", - "adobe" => "AdobeMyungjoStd-Medium.otf", - "baekmuk" => "dotum.ttf", # slightly safer than batang.ttf on case-insentive systems - "unfonts" => "UnBatang.ttf", - "solaris" => "h2mjsm.ttf", - } -); -my %available; +my %representatives; +my @databaselist = "ptex-fontmaps-data.dat"; +push @databaselist, "ptex-fontmaps-macos-data.dat"; main(@ARGV); sub version { - my $ret = sprintf "%s version %s\n", - $prg, $version; + my $ret = sprintf "%s version %s\n", $prg, $version; return $ret; } sub Usage { my $usage = <<"EOF"; - $prg Set up embedding of Japanese/Chinese/Korean fonts via updmap.cfg. - - This script searches for some of the most common fonts - for embedding into pdfs by dvipdfmx. - - In addition it allows to set up arbitrary font families - to be embedded into the generated pdf files, as long - as at least the map file otf-<family>.map is present. - Other map files that will be used if available are - - For Japanese: - ptex-<family>.map - uptex-<family>.map - otf-<family>.map - otf-up-<family>.map - - For Korean, Traditional Chinese and Simplified Chinese: - uptex-<NN>-<family>.map - otf-<NN>-<family>.map - (NN being: ko, tc, sc) + $prg $version + Set up embedding of Japanese/Chinese/Korean fonts via updmap.cfg. + + This script searches for some of the most common fonts + for embedding into pdfs by dvipdfmx. + + In addition it allows to set up arbitrary font families + to be embedded into the generated pdf files, as long + as at least the representative map file is present. + Other map files will be used if available: + + For Japanese: + ptex-<family>.map (representative map file) + uptex-<family>.map + otf-<family>.map + otf-up-<family>.map + + For Simplified Chinese, Traditional Chinese and Korean: + uptex-<NN>-<family>.map (representative map file) + otf-<NN>-<family>.map + (NN being: sc, tc, ko) Please see the documentation of updmap for details (updmap --help). Usage: $prg [OPTION] {<fontname>|auto|nofont|status} - <family> embed an arbitrary font family <family>, at least the - map file otf-<family>.map has to be available. - auto: embed one of the following supported font families - automatically: - hiragino, hiragino-pron, hiragino-elcapitan, - hiragino-elcapitan-pron, toppanbunkyu-sierra, - morisawa, morisawa-pr6n, - kozuka, kozuka-pr6n, kozuka-pr6, - ipa, ipaex, moga-mobo, moga-mobo-ex, ume, - ms, ms-osx, - yu-win, yu-win10, yu-osx, - canon - and fall back to not embedding any font if none of them - is available - nofont: embed no fonts (and rely on system fonts when displaying pdfs) - If your system does not have any of the supported font - families as specified above, this target is selected - automatically. - status: get information about current environment and usable font map + <family> Embed an arbitrary font family <family>, at least + the representative map file has to be available. + auto: If the current status is noEmbed or unknown, try to embed + one of the supported font families automatically. + If none of them is available, fall back to nofont + nofont: Embed no fonts (and rely on system fonts when displaying pdfs). + If your system does not have any of the supported font + families, this target is selected automatically. + status: Get information about current environment and usable font maps. Options: - -n, --dry-run do not actually run updmap - -h, --help show this message and exit - --mode=NN setup for Japanese (NN=ja), Korean (NN=ko), + -n, --dry-run Do not actually run updmap + -h, --help Show this message and exit + --mode=NN Setup for Japanese (NN=ja), Korean (NN=ko), 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 - --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. + --NN Shorthand for --mode=NN + --jis2004 Use JIS2004 variants for default fonts of (u)pTeX + --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, explicitly use --old. --old Makes $prg call `updmap' without --user argument in user mode. - --version show version information and exit + --version Show version information and exit EOF ; print $usage; - exit 0; + exit(0); } ### +### Collect Database Lines +### + +sub InitDatabase { + %representatives = (); +} + +sub ReadDatabase { + my @curdbl; + # open database + for my $f (@databaselist) { + my $foo = kpse_miscfont($f); + if (!open(FDB, "<$foo")) { + printf STDERR "Cannot find $f, skipping!\n"; + next; + } + @curdbl = <FDB>; + close(FDB); + # parse lines + my $lineno = 0; + chomp(@curdbl); + push @curdbl, ""; # add a "final empty line" to easy parsing + for my $l (@curdbl) { + $lineno++; + next if ($l =~ m/^\s*$/); # skip empty line + next if ($l =~ m/^\s*#/); # skip comment line + $l =~ s/\s*#.*$//; # skip comment after '#' + if ($l =~ m/^JA\((\d+)\):\s*(.*):\s*(.*)$/) { + $representatives{'ja'}{$2}{'priority'} = $1; + $representatives{'ja'}{$2}{'file'} = $3; + next; + } + if ($l =~ m/^SC\((\d+)\):\s*(.*):\s*(.*)$/) { + $representatives{'sc'}{$2}{'priority'} = $1; + $representatives{'sc'}{$2}{'file'} = $3; + next; + } + if ($l =~ m/^TC\((\d+)\):\s*(.*):\s*(.*)$/) { + $representatives{'tc'}{$2}{'priority'} = $1; + $representatives{'tc'}{$2}{'file'} = $3; + next; + } + if ($l =~ m/^KO\((\d+)\):\s*(.*):\s*(.*)$/) { + $representatives{'ko'}{$2}{'priority'} = $1; + $representatives{'ko'}{$2}{'file'} = $3; + next; + } + # we are still here?? + die "Cannot parse \"$foo\" at line $lineno, + exiting. Strange line: >>>$l<<<\n"; + } + } + if (!%representatives) { + die "Candidate list is empty, cannot proceed!\n"; + } +} + +sub kpse_miscfont { + my ($file) = @_; + chomp(my $foo = `kpsewhich -format=miscfont $file`); + # for GitHub repository diretory structure + if ($foo eq "") { + $foo = "database/$file" if (-f "database/$file"); + } + return $foo; +} + +### ### Check Installed Font ### sub CheckInstallFont { - for my $k (keys %{$representatives{$opt_mode}}) { - my $f = `kpsewhich $representatives{$opt_mode}{$k}`; - if (! $?) { - $available{$k} = chomp($f); + for my $opt_mode (@opt_mode_list) { + for my $k (keys %{$representatives{$opt_mode}}) { + my $f = `kpsewhich $representatives{$opt_mode}{$k}{'file'}`; + if ($?) { + $representatives{$opt_mode}{$k}{'available'} = ""; + } else { + $representatives{$opt_mode}{$k}{'available'} = chomp($f); + } } } } @@ -262,27 +305,27 @@ sub check_mapfile { } sub GetStatus { + my $opt_mode = shift; my $val = `$updmap_real --quiet --showoption ${opt_mode}Embed`; my $STATUS; if ($val =~ m/^${opt_mode}Embed=([^()\s]*)(\s+\()?/) { $STATUS = $1; } else { - printf STDERR "Cannot find status of current ${opt_mode}Embed setting via updmap --showoption!\n"; - exit 1; + die "Cannot find status of current ${opt_mode}Embed setting via updmap --showoption!\n"; } my $testmap = ($opt_mode eq "ja" ? "ptex-$STATUS.map" : "uptex-${opt_mode}-$STATUS.map"); if (check_mapfile($testmap)) { print "CURRENT family for $opt_mode: $STATUS\n"; } else { - print "WARNING: Currently selected map file for $opt_mode cannot be found: $testmap\n"; + print STDERR "WARNING: Currently selected map file for $opt_mode cannot be found: $testmap\n"; } for my $k (sort keys %{$representatives{$opt_mode}}) { my $MAPFILE = ($opt_mode eq "ja" ? "ptex-$k.map" : "uptex-${opt_mode}-$k.map"); next if ($MAPFILE eq $testmap); if (check_mapfile($MAPFILE)) { - if ($available{$k}) { + if ($representatives{$opt_mode}{$k}{'available'}) { print "Standby family : $k\n"; } } @@ -295,6 +338,7 @@ sub GetStatus { ### sub SetupMapFile { + my $opt_mode = shift; my $rep = shift; my $MAPFILE = ($opt_mode eq "ja" ? "ptex-$rep.map" : "uptex-${opt_mode}-$rep.map"); if (check_mapfile($MAPFILE)) { @@ -305,70 +349,52 @@ sub SetupMapFile { } else { system("$updmap --quiet --nomkmap --nohash -setoption jaVariant \"\""); } - system("$updmap"); } else { - print "NOT EXIST $MAPFILE\n"; - exit 1; + die "NOT EXIST $MAPFILE\n"; } } sub SetupReplacement { + my $opt_mode = shift; my $rep = shift; if (defined($representatives{$opt_mode}{$rep})) { - if ($available{$rep}) { - return SetupMapFile($rep); + if ($representatives{$opt_mode}{$rep}{'available'}) { + SetupMapFile($opt_mode, $rep); } else { printf STDERR "$rep not available, falling back to auto!\n"; - return SetupReplacement("auto"); + SetupReplacement($opt_mode, "auto"); } } else { if ($rep eq "nofont") { - return SetupMapFile("noEmbed"); + SetupMapFile($opt_mode, "noEmbed"); } elsif ($rep eq "auto") { - my $STATUS = GetStatus(); + my $STATUS = GetStatus($opt_mode); # first check if we have a status set and the font is installed # in this case don't change anything, just make sure - if (defined($representatives{$opt_mode}{$STATUS}) && $available{$STATUS}) { - return SetupMapFile($STATUS); + if (defined($representatives{$opt_mode}{$STATUS}) && + $representatives{$opt_mode}{$STATUS}{'available'}) { + SetupMapFile($opt_mode, $STATUS); } else { if (!($STATUS eq "noEmbed" || $STATUS eq "")) { # some unknown setting is set up currently, overwrite, but warn - print "Previous setting $STATUS for $opt_mode is unknown, replacing it!\n" + print STDERR "Previous setting $STATUS for $opt_mode is unknown, replacing it!\n" } - # if we are in the noEmbed or nothing set case, but one - # of the supported fonts are present then use them - # (originally it said "three fonts hiragino/morisawa/kozuka", but the code below - # was different from this statement; changed to "supported fonts" on 2016/12/08) - my @testlist; - if ($opt_mode eq 'ja') { - @testlist = qw/ - morisawa-pr6n morisawa - hiragino-pron hiragino hiragino-elcapitan-pron hiragino-elcapitan - kozuka-pr6n kozuka-pr6 kozuka - toppanbunkyu-sierra - yu-osx yu-win10 yu-win10 canon - ms ms-osx moga-mobo moga-mobo-ex ume - ipa ipaex/; - } elsif ($opt_mode eq 'tc') { - @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') { - @testlist = qw/apple adobe ms baekmuk unfonts solaris/; - } - # else cannot happen unless getopt is broken - - for my $i (@testlist) { - if ($available{$i}) { - return SetupMapFile($i); + # if we are in the noEmbed or nothing set case, + # and if one of the supported fonts are present, then use them + for my $i (sort { $representatives{$opt_mode}{$a}{'priority'} + <=> + $representatives{$opt_mode}{$b}{'priority'} } + keys %{$representatives{$opt_mode}}) { + if ($representatives{$opt_mode}{$i}{'available'}) { + SetupMapFile($opt_mode, $i); } } # still here, no map file found! - return SetupMapFile("noEmbed"); + SetupMapFile($opt_mode, "noEmbed"); } } else { # anything else is treated as a map file name - return SetupMapFile($rep); + SetupMapFile($opt_mode, $rep); } } } @@ -378,21 +404,52 @@ sub SetupReplacement { ### sub main { + # Number of arguments allowed: + # 0: should be only --NN=<family> lists ('=' can be omitted) + # 1: treated as [--mode=NN] <family> ('=' can be omitted) + # 2 or more: I can't handle! my ($a, $b) = @_; + if (defined($b)) { + die "Number of the arguments should be at most one!\n"; + } + if ($a) { + die "Strange argument found! >>>$a<<<\n" if (!$opt_mode_one); + # argument is passed to defined-but-empty language mode + if (defined($opt_mode_ja) && !$opt_mode_ja) { + $opt_mode_ja = $a; + } elsif (defined($opt_mode_sc) && !$opt_mode_sc) { + $opt_mode_sc = $a; + } elsif (defined($opt_mode_tc) && !$opt_mode_tc) { + $opt_mode_tc = $a; + } elsif (defined($opt_mode_ko) && !$opt_mode_ko) { + $opt_mode_ko = $a; + } + } else { + die "No family or operation is specified for $opt_mode_one!\n", + "Try \"$0 --help\" for more information.\n" if ($opt_mode_one); + } + InitDatabase(); + ReadDatabase(); CheckInstallFont(); - if (!defined($a) || defined($b)) { - Usage(); - exit 1; - } - - if ($a eq "status") { - GetStatus(); - exit 0; + # if one of <family> arguments is "status", then + # all arguments are forced into "status" + if (($opt_mode_ja && ($opt_mode_ja eq "status")) || + ($opt_mode_sc && ($opt_mode_sc eq "status")) || + ($opt_mode_tc && ($opt_mode_tc eq "status")) || + ($opt_mode_ko && ($opt_mode_ko eq "status"))) { + GetStatus("ja") if ($opt_mode_ja); + GetStatus("sc") if ($opt_mode_sc); + GetStatus("tc") if ($opt_mode_tc); + GetStatus("ko") if ($opt_mode_ko); + } else { + SetupReplacement("ja", $opt_mode_ja) if ($opt_mode_ja); + SetupReplacement("sc", $opt_mode_sc) if ($opt_mode_sc); + SetupReplacement("tc", $opt_mode_tc) if ($opt_mode_tc); + SetupReplacement("ko", $opt_mode_ko) if ($opt_mode_ko); + system("$updmap"); } - - return SetupReplacement($a); } # 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 6e64d6bc1bf..dc67800d5f2 100755 --- a/Master/texmf-dist/scripts/ptex-fontmaps/kanji-fontmap-creator.pl +++ b/Master/texmf-dist/scripts/ptex-fontmaps/kanji-fontmap-creator.pl @@ -2,10 +2,10 @@ # # kanji-fontmap-creator # (c) 2012-2014 Norbert Preining -# Version: 20170624.0 +# Version: 20180306.0 # Licenced under the GPLv2 or any higher version # -# gui to create map files for updmap(-setup-kanji) +# gui to create map files for (kanji-config-)updmap # # ptex/uptex: # 2 fonts (rml/gbm) @@ -41,7 +41,7 @@ my $opt_help = 0; my $opt_version = 0; my $prg = "kanji-fontmap-creator"; -my $version = "20170624.0"; +my $version = "20180306.0"; # # global vars configuring operation @@ -552,7 +552,7 @@ kanji-fontmap-creator [I<option>] =head1 DESCRIPTION -Create fontmap families for updmap's C<kanjiEmbed> setting. For details +Create fontmap families for updmap's C<jaEmbed> setting. For details see the man page of B<updmap>(1) and the web page L<http://tug.org/texlive/updmap-kanji.html> diff --git a/Master/texmf-dist/source/ptex-fontmaps/tools/mkmap-ko.lua b/Master/texmf-dist/source/ptex-fontmaps/tools/mkmap-ko.lua deleted file mode 100755 index 8017d7bcf03..00000000000 --- a/Master/texmf-dist/source/ptex-fontmaps/tools/mkmap-ko.lua +++ /dev/null @@ -1,147 +0,0 @@ -#! /usr/bin/env texlua - --- '?' は 'Pro' 等に置換される（今のところ ko では不使用） -local foundry = { - ['noEmbed'] = { - mr='!HYSMyeongJo-Medium', - gr='!HYGoThic-Medium', - mgr='!HYRGoThic-Medium', - {'n'}, - }, - ['adobe'] = { - noncid = false, - mr='AdobeMyungjoStd-Medium.otf', - gr='AdobeGothicStd-Bold.otf', - mgr='AdobeGothicStd-Bold.otf', - {''}, - }, - ['baekmuk'] = { - noncid = true, - mr='batang.ttf %!PS Baekmuk-Batang', - gr='dotum.ttf %!PS Baekmuk-Dotum', - mgr='gulim.ttf %!PS Baekmuk-Gulim', - {''}, - }, - ['unfonts'] = { - noncid = true, - mr='UnBatang.ttf', - gr='UnDotum.ttf', - mgr='UnDinaru.ttf', - {''}, - }, - ['ms'] = { - noncid = true, - mr=':1:batang.ttc %!PS BatangChe', - gr=':3:gulim.ttc %!PS DotumChe', - mgr=':1:gulim.ttc %!PS GulimChe', - {''}, - }, - ['apple'] = { - noncid = true, - mr='AppleMyungjo.ttf', - gr='AppleGothic.ttf', - mgr='AppleGothic.ttf', - {''}, - }, - ['solaris'] = { - noncid = true, - mr='h2mjsm.ttf %!PS Myeongjo', - gr='h2gtrm.ttf %!PS Gothic', - mgr='h2drrm.ttf %!PS RoundedGothic', - {''}, - }, -} - -local suffix = { - -- { '?' 置換, koEmbed 接尾辞, (ttc index mov)} - [''] = {'', ''}, -- 非 CID フォント用ダミー - ['n'] = {'!', ''}, -- 非埋め込みに使用 - ['4'] = {'Pro', ''}, - ['6'] = {'Pr6', '-pr6'}, -} - --- '#' は 'h', 'v' に置換される --- '@' は koEmbed の値に置換される -local maps = { - ['uptex-ko-@'] = { - {'uphysmjm-#', 'UniKS-UTF16-#', 'mr'}, - {'uphygt-#', 'UniKS-UTF16-#', 'gr'}, - }, - ['otf-ko-@'] = { - '% CID', - {'otf-ckmr-#', 'Identity-#', 'mr'}, - {'otf-ckgr-#', 'Identity-#', 'gr'}, - -- {'otf-ckmgr-#','Identity-#', 'mgr'}, - '% Unicode', - {'otf-ukmr-#', 'UniKS-UCS2-#', 'mr'}, - {'otf-ukgr-#', 'UniKS-UCS2-#', 'gr'}, - -- {'otf-ukmgr-#','UniKS-UCS2-#', 'mgr'}, - }, -} - -local jis2004_flag = 'n' -local gsub = string.gsub - -function string.explode(s, sep) - local t = {} - sep = sep or '\n' - string.gsub(s, "([^"..sep.."]*)"..sep, function(c) t[#t+1]=c end) - return t -end - -local function ret_suffix(fd, s, fa) - return suffix[s][1] -end - -local function replace_index(line, s) - local ttc_mov = suffix[s][3] - if ttc_mov then - local ttc_index, ttc_dir = line:match('#(%d)(.)') - if tonumber(ttc_index) then - return line:gsub('#..', ':' .. tostring(tonumber(ttc_index)+tonumber(ttc_dir .. ttc_mov)) .. ':') - end - end - return line -end - -local function make_one_line(o, fd, s) - if type(o) == 'string' then - return '\n' .. o .. '\n' - else - local fx = foundry[fd] - local fn = replace_index(gsub(fx[o[3]], '?', ret_suffix(fd,s,o[3])), s) - if fx.noncid and string.match(o[2],'Identity') then - if string.match(fn, '%!PS') then - fn = gsub(fn, ' %%!PS', '/AK12 %%!PS') - else - fn = fn .. '/AK12' - end - end - if string.match(o[1], '#') then -- 'H', 'V' 一括出力 - return gsub(o[1], '#', 'h') .. '\t' .. gsub(o[2], '#', 'H') .. '\t' .. fn .. '\n' - .. gsub(o[1], '#', 'v') .. '\t' .. gsub(o[2], '#', 'V') .. '\t' .. fn .. '\n' - else - return o[1] .. '\t' .. o[2] .. '\t' .. fn .. '\n' - end - end -end - -for fd, v1 in pairs(foundry) do - for _,s in pairs(v1[1]) do - local dirname = fd .. suffix[s][2] - print('koEmbed: ' .. dirname) - -- Linux しか想定していない - os.execute('mkdir ' .. dirname .. ' &>/dev/null') - for mnx, mcont in pairs(maps) do - --if not string.match(mnx, '-04') or string.match(s, jis2004_flag) then - if not string.match(mnx, '-04') or not foundry[fd].noncid then - local mapbase = gsub(mnx, '@', dirname) - local f = io.open(dirname .. '/' .. mapbase .. '.map', 'w+') - for _,x in ipairs(mcont) do - f:write(make_one_line(x, fd, s)) - end - f:close() - end - end - end -end diff --git a/Master/texmf-dist/source/ptex-fontmaps/tools/mkmap-sc.lua b/Master/texmf-dist/source/ptex-fontmaps/tools/mkmap-sc.lua deleted file mode 100755 index 7a4190c5553..00000000000 --- a/Master/texmf-dist/source/ptex-fontmaps/tools/mkmap-sc.lua +++ /dev/null @@ -1,150 +0,0 @@ -#! /usr/bin/env texlua - --- '?' は 'Pro' 等に置換される（今のところ sc では不使用） -local foundry = { - ['noEmbed'] = { - mr='!STSong-Light', - gr='!STHeiti-Regular', - {'n'}, - }, - ['adobe'] = { - noncid = false, - mr='AdobeSongStd-Light.otf', - gr='AdobeHeitiStd-Regular.otf', - {''}, - }, - ['arphic'] = { -- gr がサンセリフになっていない - noncid = true, - mr='gbsn00lp.ttf %!PS BousungEG-Light-GB', - gr='gkai00mp.ttf %!PS GBZenKai-Medium', - {''}, - }, - ['cjkunifonts'] = { -- gr がサンセリフになっていない - noncid = true, - mr=':0:uming.ttc %!PS UMingCN', - gr=':0:ukai.ttc %!PS UKaiCN', - {''}, - }, - ['cjkunifonts-ttf'] = { -- gr がサンセリフになっていない - noncid = true, - mr='uming.ttf %!PS ShanHeiSun-Uni', -- (-Adobe-GB1) - gr='ukai.ttf %!PS ZenKai-Uni', -- (-Adobe-GB1) - {''}, - }, - ['fandol'] = { - noncid = false, - mr='FandolSong-Regular.otf', - gr='FandolHei-Regular.otf', - {''}, - }, - ['founder'] = { - noncid = true, - mr='FZSSK.TTF %!PS FZSSK--GBK1-0', - gr='FZHTK.TTF %!PS FZHTK--GBK1-0', - {''}, - }, - ['ms'] = { - noncid = true, - mr=':0:simsun.ttc %!PS SimSun', - gr='simhei.ttf %!PS SimHei', - {''}, - }, --- ['sinotype'] = { -- Adobe-GB1 cmap unavailable --- noncid = true, --- mr='STSong.ttf', --- gr='STHeiti.ttf', --- {''}, --- }, -} - -local suffix = { - -- { '?' 置換, scEmbed 接尾辞, (ttc index mov)} - [''] = {'', ''}, -- 非 CID フォント用ダミー - ['n'] = {'!', ''}, -- 非埋め込みに使用 - ['4'] = {'Pro', ''}, - ['6'] = {'Pr6', '-pr6'}, -} - --- '#' は 'h', 'v' に置換される --- '@' は scEmbed の値に置換される -local maps = { - ['uptex-sc-@'] = { - {'upstsl-#', 'UniGB-UTF16-#', 'mr'}, - {'upstht-#', 'UniGB-UTF16-#', 'gr'}, - }, - ['otf-sc-@'] = { - '% CID', - {'otf-ccmr-#', 'Identity-#', 'mr'}, - {'otf-ccgr-#', 'Identity-#', 'gr'}, - '% Unicode', - {'otf-ucmr-#', 'UniGB-UCS2-#', 'mr'}, - {'otf-ucgr-#', 'UniGB-UCS2-#', 'gr'}, - }, -} - -local jis2004_flag = 'n' -local gsub = string.gsub - -function string.explode(s, sep) - local t = {} - sep = sep or '\n' - string.gsub(s, "([^"..sep.."]*)"..sep, function(c) t[#t+1]=c end) - return t -end - -local function ret_suffix(fd, s, fa) - return suffix[s][1] -end - -local function replace_index(line, s) - local ttc_mov = suffix[s][3] - if ttc_mov then - local ttc_index, ttc_dir = line:match('#(%d)(.)') - if tonumber(ttc_index) then - return line:gsub('#..', ':' .. tostring(tonumber(ttc_index)+tonumber(ttc_dir .. ttc_mov)) .. ':') - end - end - return line -end - -local function make_one_line(o, fd, s) - if type(o) == 'string' then - return '\n' .. o .. '\n' - else - local fx = foundry[fd] - local fn = replace_index(gsub(fx[o[3]], '?', ret_suffix(fd,s,o[3])), s) - if fx.noncid and string.match(o[2],'Identity') then - if string.match(fn, '%!PS') then - fn = gsub(fn, ' %%!PS', '/AG14 %%!PS') - else - fn = fn .. '/AG14' - end - end - if string.match(o[1], '#') then -- 'H', 'V' 一括出力 - return gsub(o[1], '#', 'h') .. '\t' .. gsub(o[2], '#', 'H') .. '\t' .. fn .. '\n' - .. gsub(o[1], '#', 'v') .. '\t' .. gsub(o[2], '#', 'V') .. '\t' .. fn .. '\n' - else - return o[1] .. '\t' .. o[2] .. '\t' .. fn .. '\n' - end - end -end - -for fd, v1 in pairs(foundry) do - for _,s in pairs(v1[1]) do - local dirname = fd .. suffix[s][2] - print('scEmbed: ' .. dirname) - -- Linux しか想定していない - os.execute('mkdir ' .. dirname .. ' &>/dev/null') - for mnx, mcont in pairs(maps) do - --if not string.match(mnx, '-04') or string.match(s, jis2004_flag) then - if not string.match(mnx, '-04') or not foundry[fd].noncid then - local mapbase = gsub(mnx, '@', dirname) - local f = io.open(dirname .. '/' .. mapbase .. '.map', 'w+') - for _,x in ipairs(mcont) do - f:write(make_one_line(x, fd, s)) - end - f:close() - end - end - end -end diff --git a/Master/texmf-dist/source/ptex-fontmaps/tools/mkmap-tc.lua b/Master/texmf-dist/source/ptex-fontmaps/tools/mkmap-tc.lua deleted file mode 100755 index db27b831cf8..00000000000 --- a/Master/texmf-dist/source/ptex-fontmaps/tools/mkmap-tc.lua +++ /dev/null @@ -1,144 +0,0 @@ -#! /usr/bin/env texlua - --- '?' は 'Pro' 等に置換される（今のところ tc では不使用） -local foundry = { - ['noEmbed'] = { - mr='!MSung-Light', - gr='!MHei-Medium', - {'n'}, - }, - ['adobe'] = { - noncid = false, - mr='AdobeMingStd-Light.otf', - gr='AdobeFanHeitiStd-Bold.otf', - {''}, - }, - ['arphic'] = { -- gr がサンセリフになっていない - noncid = true, - mr='bsmi00lp.ttf %!PS ShanHeiSun-Light', - gr='bkai00mp.ttf %!PS ZenKai-Medium', - {''}, - }, - ['cjkunifonts'] = { -- gr がサンセリフになっていない - noncid = true, - mr=':2:uming.ttc %!PS UMingTW', - gr=':2:ukai.ttc %!PS UKaiTW', - {''}, - }, - ['cjkunifonts-ttf'] = { -- gr がサンセリフになっていない - noncid = true, - mr='uming.ttf %!PS ShanHeiSun-Uni', - gr='ukai.ttf %!PS ZenKai-Uni', - {''}, - }, - ['ms'] = { -- for windows vista, 7 - noncid = true, - mr=':0:mingliu.ttc %!PS MingLiU', - 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'] = { - noncid = true, - mr='LiSongPro.ttf', - gr='LiHeiPro.ttf', - {''}, - }, -} - -local suffix = { - -- { '?' 置換, tcEmbed 接尾辞, (ttc index mov)} - [''] = {'', ''}, -- 非 CID フォント用ダミー - ['n'] = {'!', ''}, -- 非埋め込みに使用 - ['4'] = {'Pro', ''}, - ['6'] = {'Pr6', '-pr6'}, -} - --- '#' は 'h', 'v' に置換される --- '@' は tcEmbed の値に置換される -local maps = { - ['uptex-tc-@'] = { - {'upmsl-#', 'UniCNS-UTF16-#', 'mr'}, - {'upmhm-#', 'UniCNS-UTF16-#', 'gr'}, - }, - ['otf-tc-@'] = { - '% CID', - {'otf-ctmr-#', 'Identity-#', 'mr'}, - {'otf-ctgr-#', 'Identity-#', 'gr'}, - '% Unicode', - {'otf-utmr-#', 'UniCNS-UCS2-#', 'mr'}, - {'otf-utgr-#', 'UniCNS-UCS2-#', 'gr'}, - }, -} - -local jis2004_flag = 'n' -local gsub = string.gsub - -function string.explode(s, sep) - local t = {} - sep = sep or '\n' - string.gsub(s, "([^"..sep.."]*)"..sep, function(c) t[#t+1]=c end) - return t -end - -local function ret_suffix(fd, s, fa) - return suffix[s][1] -end - -local function replace_index(line, s) - local ttc_mov = suffix[s][3] - if ttc_mov then - local ttc_index, ttc_dir = line:match('#(%d)(.)') - if tonumber(ttc_index) then - return line:gsub('#..', ':' .. tostring(tonumber(ttc_index)+tonumber(ttc_dir .. ttc_mov)) .. ':') - end - end - return line -end - -local function make_one_line(o, fd, s) - if type(o) == 'string' then - return '\n' .. o .. '\n' - else - local fx = foundry[fd] - local fn = replace_index(gsub(fx[o[3]], '?', ret_suffix(fd,s,o[3])), s) - if fx.noncid and string.match(o[2],'Identity') then - if string.match(fn, '%!PS') then - fn = gsub(fn, ' %%!PS', '/AC14 %%!PS') - else - fn = fn .. '/AC14' - end - end - if string.match(o[1], '#') then -- 'H', 'V' 一括出力 - return gsub(o[1], '#', 'h') .. '\t' .. gsub(o[2], '#', 'H') .. '\t' .. fn .. '\n' - .. gsub(o[1], '#', 'v') .. '\t' .. gsub(o[2], '#', 'V') .. '\t' .. fn .. '\n' - else - return o[1] .. '\t' .. o[2] .. '\t' .. fn .. '\n' - end - end -end - -for fd, v1 in pairs(foundry) do - for _,s in pairs(v1[1]) do - local dirname = fd .. suffix[s][2] - print('tcEmbed: ' .. dirname) - -- Linux しか想定していない - os.execute('mkdir ' .. dirname .. ' &>/dev/null') - for mnx, mcont in pairs(maps) do - --if not string.match(mnx, '-04') or string.match(s, jis2004_flag) then - if not string.match(mnx, '-04') or not foundry[fd].noncid then - local mapbase = gsub(mnx, '@', dirname) - local f = io.open(dirname .. '/' .. mapbase .. '.map', 'w+') - for _,x in ipairs(mcont) do - f:write(make_one_line(x, fd, s)) - end - f:close() - end - end - end -end diff --git a/Master/texmf-dist/source/ptex-fontmaps/tools/mkmap.lua b/Master/texmf-dist/source/ptex-fontmaps/tools/mkmap.lua deleted file mode 100755 index 03ab2710f73..00000000000 --- a/Master/texmf-dist/source/ptex-fontmaps/tools/mkmap.lua +++ /dev/null @@ -1,462 +0,0 @@ -#! /usr/bin/env texlua - --- 90 字形と 04 字形が別ファイルに分かれているフォントセットの場合は --- * ml, mr, ... に 90 字形フォント --- * mln, mrn, ... に 04 字形フォント --- を登録し，separate = true とする．それ以外のフォントは ml, mr, ... のほうに登録しておけばよい． --- PSName がファイル名と異なる場合は %!PS も必要． --- CID フォントでない場合は noncid = true とする． --- '?' は 'Pro' 等に置換される -local foundry = { - ['noEmbed'] = { - ml='!Ryumin-Light', - mr='!Ryumin-Light', - mb='!Ryumin-Light,Bold', - gr='!GothicBBB-Medium', - gru='!GothicBBB-Medium', - gb='!GothicBBB-Medium,Bold', - ge='!GothicBBB-Medium,Bold', - mgr='!GothicBBB-Medium', - {'n'}, - }, - ['ms'] = { - noncid = true, - ml=':0:msmincho.ttc %!PS MS-Mincho', - mr=':0:msmincho.ttc %!PS MS-Mincho', - mb=':0:msmincho.ttc %!PS MS-Mincho', - gr=':0:msgothic.ttc %!PS MS-Gothic', - gru=':0:msgothic.ttc %!PS MS-Gothic', - gb=':0:msgothic.ttc %!PS MS-Gothic', - ge=':0:msgothic.ttc %!PS MS-Gothic', - mgr=':0:msgothic.ttc %!PS MS-Gothic', - {''}, - }, - ['ms-osx'] = { - noncid = true, - ml='MS-Mincho.ttf', - mr='MS-Mincho.ttf', - mb='MS-Mincho.ttf', - gr='MS-Gothic.ttf', - gru='MS-Gothic.ttf', - gb='MS-Gothic.ttf', - ge='MS-Gothic.ttf', - mgr='MS-Gothic.ttf', - {''}, - }, - ['yu-win'] = { - noncid = true, - ml='yuminl.ttf %!PS YuMincho-Light', - mr='yumin.ttf %!PS YuMincho-Regular', - mb='yumindb.ttf %!PS YuMincho-DemiBold', - gr='yugothic.ttf %!PS YuGothic-Regular', - gru='yugothic.ttf %!PS YuGothic-Regular', - gb='yugothib.ttf %!PS YuGothic-Bold', - ge='yugothib.ttf %!PS YuGothic-Bold', - mgr='yugothib.ttf %!PS YuGothic-Bold', - {''}, - }, - ['yu-win10'] = { - noncid = true, - ml='yuminl.ttf %!PS YuMincho-Light', - mr='yumin.ttf %!PS YuMincho-Regular', - mb='yumindb.ttf %!PS YuMincho-DemiBold', - gr=':0:YuGothR.ttc %!PS YuGothic-Regular', - gru=':0:YuGothM.ttc %!PS YuGothic-Medium', - gb=':0:YuGothB.ttc %!PS YuGothic-Bold', - ge=':0:YuGothB.ttc %!PS YuGothic-Bold', - mgr=':0:YuGothB.ttc %!PS YuGothic-Bold', - {''}, - }, - ['yu-osx'] = { - noncid = false, - ml='YuMin-Medium.otf', - mr='YuMin-Medium.otf', - mb='YuMin-Demibold.otf', - gr='YuGo-Medium.otf', - gru='YuGo-Medium.otf', - gb='YuGo-Bold.otf', - ge='YuGo-Bold.otf', - mgr='YuGo-Bold.otf', - {''}, - }, - ['ipa'] = { - noncid = true, - ml='ipam.ttf %!PS IPAMincho', - mr='ipam.ttf %!PS IPAMincho', - mb='ipam.ttf %!PS IPAMincho', - gr='ipag.ttf %!PS IPAGothic', - gru='ipag.ttf %!PS IPAGothic', - gb='ipag.ttf %!PS IPAGothic', - ge='ipag.ttf %!PS IPAGothic', - mgr='ipag.ttf %!PS IPAGothic', - {''}, - }, - ['ipaex'] = { - noncid = true, - ml='ipaexm.ttf %!PS IPAexMincho', - mr='ipaexm.ttf %!PS IPAexMincho', - mb='ipaexm.ttf %!PS IPAexMincho', - gr='ipaexg.ttf %!PS IPAexGothic', - gru='ipaexg.ttf %!PS IPAexGothic', - gb='ipaexg.ttf %!PS IPAexGothic', - ge='ipaexg.ttf %!PS IPAexGothic', - mgr='ipaexg.ttf %!PS IPAexGothic', - {''}, - }, - ['moga-mobo'] = { - noncid = true, - separate = true, - ml=':3:mogam.ttc %!PS Moga90Mincho-Regular', - mr=':3:mogam.ttc %!PS Moga90Mincho-Regular', - mb=':2:mogamb.ttc %!PS Moga90Mincho-Bold', - gr=':2:mogag.ttc %!PS Moga90Gothic-Regular', - gru=':2:mogag.ttc %!PS Moga90Gothic-Regular', - gb=':2:mogagb.ttc %!PS Moga90Gothic-Bold', - ge=':2:mogagb.ttc %!PS Moga90Gothic-Bold', - mgr=':2:mobog.ttc %!PS Mobo90Gothic-Regular', - mln=':0:mogam.ttc %!PS MogaMincho-Regular', - mrn=':0:mogam.ttc %!PS MogaMincho-Regular', - mbn=':0:mogamb.ttc %!PS MogaMincho-Bold', - grn=':0:mogag.ttc %!PS MogaGothic-Regular', - grun=':0:mogag.ttc %!PS MogaGothic-Regular', - gbn=':0:mogagb.ttc %!PS MogaGothic-Bold', - gen=':0:mogagb.ttc %!PS MogaGothic-Bold', - mgrn=':0:mobog.ttc %!PS MoboGothic-Regular', - {''}, - }, - ['moga-mobo-ex'] = { - noncid = true, - separate = true, - ml=':4:mogam.ttc %!PS MogaEx90Mincho-Regular', - mr=':4:mogam.ttc %!PS MogaEx90Mincho-Regular', - mb=':3:mogamb.ttc %!PS MogaEx90Mincho-Bold', - gr=':3:mogag.ttc %!PS MogaEx90Gothic-Regular', - gru=':3:mogag.ttc %!PS MogaEx90Gothic-Regular', - gb=':3:mogagb.ttc %!PS MogaEx90Gothic-Bold', - ge=':3:mogagb.ttc %!PS MogaEx90Gothic-Bold', - mgr=':3:mobog.ttc %!PS MoboEx90Gothic-Regular', - mln=':1:mogam.ttc %!PS MogaExMincho-Regular', - mrn=':1:mogam.ttc %!PS MogaExMincho-Regular', - mbn=':1:mogamb.ttc %!PS MogaExMincho-Bold', - grn=':1:mogag.ttc %!PS MogaExGothic-Regular', - grun=':1:mogag.ttc %!PS MogaExGothic-Regular', - gbn=':1:mogagb.ttc %!PS MogaExGothic-Bold', - gen=':1:mogagb.ttc %!PS MogaExGothic-Bold', - mgrn=':1:mobog.ttc %!PS MoboExGothic-Regular', - {''}, - }, - ['ume'] = { - noncid = true, - ml='ume-tmo3.ttf %!PS Ume-Mincho', - mr='ume-tmo3.ttf %!PS Ume-Mincho', - mb='ume-tmo3.ttf %!PS Ume-Mincho', - gr='ume-tgo4.ttf %!PS Ume-Gothic', - gru='ume-tgo5.ttf %!PS Ume-Gothic-O5', - gb='ume-tgo5.ttf %!PS Ume-Gothic-O5', - ge='ume-tgo5.ttf %!PS Ume-Gothic-O5', - mgr='ume-tgo4.ttf %!PS Ume-Gothic', - {''}, - }, - ['canon'] = { - noncid = true, - ml=':0:FGCCHMW3.TTC %!PS FGHeiseiMincho-W3', - mr=':0:FGCCHMW3.TTC %!PS FGHeiseiMincho-W3', - mb=':0:FGCCHMW5.TTC %!PS FGHeiseiMincho-W5', - gr=':0:FGCCHGW5.TTC %!PS FGHeiseiKakuGothic-W5', - gru=':0:FGCCHGW7.TTC %!PS FGHeiseiKakuGothic-W7', - gb=':0:FGCCHGW7.TTC %!PS FGHeiseiKakuGothic-W7', - ge=':0:FGCCHGW9.TTC %!PS FGHeiseiKakuGothic-W9', - mgr=':0:FGCCARGM.TTC %!PS FGMaruGothicCa-M', - {''}, - }, - ['kozuka'] = { - ml='KozMin?-Light.otf', - mr='KozMin?-Regular.otf', - mb='KozMin?-Bold.otf', - gr='KozGo?-Regular.otf', - gru='KozGo?-Medium.otf', - gb='KozGo?-Bold.otf', - ge='KozGo?-Heavy.otf', - mgr='KozGo?-Heavy.otf', - {'4','6','6n'}, -- Pro, Pr6 and Pr6N - }, - ['morisawa'] = { - ml='A-OTF-Ryumin?-Light.otf %!PS Ryumin?-Light', - mr='A-OTF-Ryumin?-Light.otf %!PS Ryumin?-Light', - mb='A-OTF-FutoMinA101?-Bold.otf %!PS FutoMinA101?-Bold', - gr='A-OTF-GothicBBB?-Medium.otf %!PS GothicBBB?-Medium', - gru='A-OTF-GothicBBB?-Medium.otf %!PS GothicBBB?-Medium', - gb='A-OTF-FutoGoB101?-Bold.otf %!PS FutoGoB101?-Bold', - ge='A-OTF-MidashiGo?-MB31.otf %!PS MidashiGo?-MB31', - mgr='A-OTF-Jun101?-Light.otf %!PS Jun101?-Light', - {'4'}, -- Pro - }, - ['morisawa-pr6n'] = { - ml='A-OTF-Ryumin?-Light.otf %!PS Ryumin?-Light', - mr='A-OTF-Ryumin?-Light.otf %!PS Ryumin?-Light', - mb='A-OTF-FutoMinA101?-Bold.otf %!PS FutoMinA101?-Bold', - gr='A-OTF-GothicBBB?-Medium.otf %!PS GothicBBB?-Medium', - gru='A-OTF-GothicBBB?-Medium.otf %!PS GothicBBB?-Medium', - gb='A-OTF-FutoGoB101?-Bold.otf %!PS FutoGoB101?-Bold', - ge='A-OTF-MidashiGo?-MB31.otf %!PS MidashiGo?-MB31', - mgr='A-OTF-ShinMGo?-Light.otf %!PS ShinMGo?-Light', - {'6nm'}, -- Pr6N - }, - ['hiragino'] = { - ml='HiraMin?-W2.otf', -- OSX にはない - mr='HiraMin?-W3.otf', - mb='HiraMin?-W6.otf', - gr='HiraKaku?-W3.otf', - gru='HiraKaku?-W6.otf', - gb='HiraKaku?-W6.otf', - ge='HiraKaku?-W8.otf', - mgr='HiraMaru?-W4.otf', - {'X','Xn'}, -- Pro and ProN - }, - ['hiragino-elcapitan'] = { - ml= '#1-HiraginoSerif-W3.ttc %!PS HiraMin?-W3', -- ここは OTC を使おう - mr= '#1-HiraginoSerif-W3.ttc %!PS HiraMin?-W3', - mb= '#1-HiraginoSerif-W6.ttc %!PS HiraMin?-W6', - gr= '#3-HiraginoSans-W3.ttc %!PS HiraKaku?-W3', - gru='#3-HiraginoSans-W6.ttc %!PS HiraKaku?-W6', - gb= '#3-HiraginoSans-W6.ttc %!PS HiraKaku?-W6', - ge= '#2+HiraginoSans-W8.ttc %!PS HiraKaku?-W8', - mgr='#0+HiraginoSansR-W4.ttc %!PS HiraMaru?-W4', - {'X','Xn'}, -- Pro and ProN - }, - ['toppanbunkyu-sierra'] = { - ml= 'ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular', - mr= 'ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular', - mb= 'ToppanBunkyuMidashiMincho-ExtraBold.otf %!PS ToppanBunkyuMidashiMinchoStdN-ExtraBold', - gr= ':1:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-Regular', - gru=':0:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-DB', - gb= ':0:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-DB', - ge= 'ToppanBunkyuMidashiGothic-ExtraBold.otf %!PS ToppanBunkyuMidashiGothicStdN-ExtraBold', - mgr=':1:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-Regular', - {''}, - }, -} - -local suffix = { - -- { '?' 置換, kanjiEmbed 接尾辞, (ttc index mov)} - [''] = {'', ''}, -- 非 CID フォント用ダミー - ['n'] = {'!', ''}, -- 非埋め込みに使用 - ['4'] = {'Pro', ''}, - ['6'] = {'Pr6', '-pr6'}, - ['X'] = {'Pro', '', '0'}, -- ヒラギノ - ['Xn'] = {'ProN', '-pron', '1'}, -- ヒラギノ - ['6n'] = {'Pr6N','-pr6n'}, - ['6nm'] = {'Pr6N',''}, -- モリサワ Pr6N -} - --- '#' は 'h', 'v' に置換される --- '@' は kanjiEmbed の値に置換される -local maps = { - ['ptex-@'] = { -- pTeX 90JIS - {'rml', 'H', 'mr'}, - {'rmlv', 'V', 'mr'}, - {'gbm', 'H', 'gru'}, - {'gbmv', 'V', 'gru'}, - }, - ['ptex-@-04'] = { -- pTeX JIS04 - {'rml', '2004-H', 'mrn'}, - {'rmlv', '2004-V', 'mrn'}, - {'gbm', '2004-H', 'grun'}, - {'gbmv', '2004-V', 'grun'}, - }, - ['uptex-@'] = { -- upTeX 90JIS - {'urml', 'UniJIS-UTF16-H', 'mr'}, - {'urmlv', 'UniJIS-UTF16-V', 'mr'}, - {'ugbm', 'UniJIS-UTF16-H', 'gru'}, - {'ugbmv', 'UniJIS-UTF16-V', 'gru'}, - {'uprml-#', 'UniJIS-UTF16-#', 'mr'}, - {'upgbm-#', 'UniJIS-UTF16-#', 'gru'}, - {'uprml-hq','UniJIS-UCS2-H', 'mr'}, - {'upgbm-hq','UniJIS-UCS2-H', 'gru'}, - }, - ['uptex-@-04'] = { -- upTeX JIS04 - {'urml', 'UniJIS2004-UTF16-H', 'mrn'}, - {'urmlv', 'UniJIS2004-UTF16-V', 'mrn'}, - {'ugbm', 'UniJIS2004-UTF16-H', 'grun'}, - {'ugbmv', 'UniJIS2004-UTF16-V', 'grun'}, - {'uprml-#', 'UniJIS2004-UTF16-#', 'mrn'}, - {'upgbm-#', 'UniJIS2004-UTF16-#', 'grun'}, - {'uprml-hq','UniJIS-UCS2-H', 'mrn'}, - {'upgbm-hq','UniJIS-UCS2-H', 'grun'}, - }, - ['otf-@'] = { - '% TEXT, 90JIS', - {'hminl-#', '#', 'ml'}, - {'hminr-#', '#', 'mr'}, - {'hminb-#', '#', 'mb'}, - {'hgothr-#', '#', 'gr'}, - {'hgothb-#', '#', 'gb'}, - {'hgotheb-#','#', 'ge'}, - {'hmgothr-#','#', 'mgr'}, - '% TEXT, JIS04', - {'hminln-#', '#', 'mln'}, - {'hminrn-#', '#', 'mrn'}, - {'hminbn-#', '#', 'mbn'}, - {'hgothrn-#', '#', 'grn'}, - {'hgothbn-#', '#', 'gbn'}, - {'hgothebn-#','#', 'gen'}, - {'hmgothrn-#','#', 'mgrn'}, - '% CID', - {'otf-cjml-#', 'Identity-#', 'mln'}, - {'otf-cjmr-#', 'Identity-#', 'mrn'}, - {'otf-cjmb-#', 'Identity-#', 'mbn'}, - {'otf-cjgr-#', 'Identity-#', 'grn'}, - {'otf-cjgb-#', 'Identity-#', 'gbn'}, - {'otf-cjge-#', 'Identity-#', 'gen'}, - {'otf-cjmgr-#','Identity-#', 'mgrn'}, - '% Unicode 90JIS', - {'otf-ujml-#', 'UniJIS-UTF16-#', 'ml'}, - {'otf-ujmr-#', 'UniJIS-UTF16-#', 'mr'}, - {'otf-ujmb-#', 'UniJIS-UTF16-#', 'mb'}, - {'otf-ujgr-#', 'UniJIS-UTF16-#', 'gr'}, - {'otf-ujgb-#', 'UniJIS-UTF16-#', 'gb'}, - {'otf-ujge-#', 'UniJIS-UTF16-#', 'ge'}, - {'otf-ujmgr-#','UniJIS-UTF16-#', 'mgr'}, - '% Unicode JIS04', - {'otf-ujmln-#', 'UniJIS2004-UTF16-#', 'mln'}, - {'otf-ujmrn-#', 'UniJIS2004-UTF16-#', 'mrn'}, - {'otf-ujmbn-#', 'UniJIS2004-UTF16-#', 'mbn'}, - {'otf-ujgrn-#', 'UniJIS2004-UTF16-#', 'grn'}, - {'otf-ujgbn-#', 'UniJIS2004-UTF16-#', 'gbn'}, - {'otf-ujgen-#', 'UniJIS2004-UTF16-#', 'gen'}, - {'otf-ujmgrn-#','UniJIS2004-UTF16-#', 'mgrn'}, - }, - ['otf-up-@'] = { - '% TEXT, 90JIS', - {'uphminl-#', 'UniJIS-UTF16-#', 'ml'}, - {'uphminr-#', 'UniJIS-UTF16-#', 'mr'}, - {'uphminb-#', 'UniJIS-UTF16-#', 'mb'}, - {'uphgothr-#', 'UniJIS-UTF16-#', 'gr'}, - {'uphgothb-#', 'UniJIS-UTF16-#', 'gb'}, - {'uphgotheb-#','UniJIS-UTF16-#', 'ge'}, - {'uphmgothr-#','UniJIS-UTF16-#', 'mgr'}, - '% TEXT, JIS04', - {'uphminln-#', 'UniJIS2004-UTF16-#', 'mln'}, - {'uphminrn-#', 'UniJIS2004-UTF16-#', 'mrn'}, - {'uphminbn-#', 'UniJIS2004-UTF16-#', 'mbn'}, - {'uphgothrn-#', 'UniJIS2004-UTF16-#', 'grn'}, - {'uphgothbn-#', 'UniJIS2004-UTF16-#', 'gbn'}, - {'uphgothebn-#','UniJIS2004-UTF16-#', 'gen'}, - {'uphmgothrn-#','UniJIS2004-UTF16-#', 'mgrn'}, - }, -} - -local jis2004_flag = 'n' -local gsub = string.gsub - -function string.explode(s, sep) - local t = {} - sep = sep or '\n' - string.gsub(s, "([^"..sep.."]*)"..sep, function(c) t[#t+1]=c end) - return t -end - -local function ret_suffix(fd, s, fa) - if fd=='kozuka' and s=='6' then - return 'ProVI' -- 小塚だけ特別 - elseif fd:match('hiragino') then - if string.match(s, jis2004_flag) then - return (fa=='ge' or fa=='gen') and 'StdN' or suffix[s][1] - else - return (fa=='ge' or fa=='gen') and 'Std' or suffix[s][1] - end - -- ヒラギノ角ゴ W8 は StdN/Std しかない - else - return suffix[s][1] - end -end - -local function replace_index(line, s) - local ttc_mov = suffix[s][3] - if ttc_mov then - local ttc_index, ttc_dir = line:match('#(%d)(.)') - if tonumber(ttc_index) then - return line:gsub('#..', ':' .. tostring(tonumber(ttc_index)+tonumber(ttc_dir .. ttc_mov)) .. ':') - end - end - return line -end - -local function make_one_line(o, fd, s) - if type(o) == 'string' then - return '\n' .. o .. '\n' - else - local fx = foundry[fd] - local fn = replace_index(gsub(fx[o[3]], '?', ret_suffix(fd,s,o[3])), s) - if fx.noncid and string.match(o[2],'Identity') then - if string.match(fn, '%!PS') then - fn = gsub(fn, ' %%!PS', '/AJ16 %%!PS') - else - fn = fn .. '/AJ16' - end - end - if string.match(o[1], '#') then -- 'H', 'V' 一括出力 - return gsub(o[1], '#', 'h') .. '\t' .. gsub(o[2], '#', 'H') .. '\t' .. fn .. '\n' - .. gsub(o[1], '#', 'v') .. '\t' .. gsub(o[2], '#', 'V') .. '\t' .. fn .. '\n' - else - return o[1] .. '\t' .. o[2] .. '\t' .. fn .. '\n' - end - end -end - -for fd, v1 in pairs(foundry) do - -- separate でないときは mln などのデータベースを省略してあるので ml などからコピー - if not foundry[fd].separate then - foundry[fd].mln = foundry[fd].ml - foundry[fd].mrn = foundry[fd].mr - foundry[fd].mbn = foundry[fd].mb - foundry[fd].grn = foundry[fd].gr - foundry[fd].grun = foundry[fd].gru - foundry[fd].gbn = foundry[fd].gb - foundry[fd].gen = foundry[fd].ge - foundry[fd].mgrn = foundry[fd].mgr - end - for _,s in pairs(v1[1]) do - local dirname = fd .. suffix[s][2] - print('kanjiEmbed: ' .. dirname) - -- Linux しか想定していない - os.execute('mkdir ' .. dirname .. ' &>/dev/null') - for mnx, mcont in pairs(maps) do - --if not string.match(mnx, '-04') or string.match(s, jis2004_flag) then - -- フォントが OpenType (CID) の場合は、すべての map を作る - -- フォントが TrueType の場合は、基本的に -04 以外の map を作る - -- ただし TrueType でも separate なときは -04 も作る - if not string.match(mnx, '-04') or not foundry[fd].noncid or foundry[fd].separate then - local mapbase = gsub(mnx, '@', dirname) - local f = io.open(dirname .. '/' .. mapbase .. '.map', 'w+') - for _,x in ipairs(mcont) do - f:write(make_one_line(x, fd, s)) - end - if string.match(mapbase,'otf%-hiragino') then - print(' hiraprop: ' .. mapbase) - local v2 = string.explode([[ - -% hiraprop -hiramin-w3-h Identity-H $mr -hiramin-w6-h Identity-H $mb -hirakaku-w3-h Identity-H $gr -hirakaku-w6-h Identity-H $gb -hiramaru-w4-h Identity-H $mgr -hiramin-w3-v Identity-V $mr -hiramin-w6-v Identity-V $mb -hirakaku-w3-v Identity-V $gr -hirakaku-w6-v Identity-V $gb -hiramaru-w4-v Identity-V $mgr - -]]) - for i,v in pairs(v2) do - v = (v:gsub ('$(%w+)', foundry[fd])):gsub('?', ret_suffix(fd,s,'')) - v2[i] = replace_index(v, s) - end - f:write(table.concat(v2, '\n')) - end - f:close() - end - end - end -end diff --git a/Master/texmf-dist/source/ptex-fontmaps/tools/release.sh b/Master/texmf-dist/source/ptex-fontmaps/tools/release.sh deleted file mode 100755 index 60fe0b4f5ee..00000000000 --- a/Master/texmf-dist/source/ptex-fontmaps/tools/release.sh +++ /dev/null @@ -1,57 +0,0 @@ -# -# release.sh -# copied from luatexja project and adapted - -PROJECT=ptex-fontmaps -DIR=`pwd`/.. -VER=${VER:-`date +%Y%m%d.0`} - -TEMP=/tmp - -echo "Making Release $VER. Ctrl-C to cancel." -read REPLY -if test -d "$TEMP/$PROJECT-$VER"; then - echo "Warning: the directory '$TEMP/$PROJECT-$VER' is found:" - echo - ls $TEMP/$PROJECT-$VER - echo - echo -n "I'm going to remove this directory. Continue? yes/No" - echo - read REPLY <&2 - case $REPLY in - y*|Y*) rm -rf $TEMP/$PROJECT-$VER;; - *) echo "Aborted."; exit 1;; - esac -fi -echo -git commit -m "Release $VER" --allow-empty -git archive --format=tar --prefix=$PROJECT-$VER/ HEAD | (cd $TEMP && tar xf -) -git --no-pager log --date=short --format='%ad %aN <%ae>%n%n%x09* %s%d [%h]%n' > $TEMP/$PROJECT-$VER/ChangeLog -cat ChangeLog.pre-git >> $TEMP/$PROJECT-$VER/ChangeLog -cd $TEMP -rm -rf $PROJECT-$VER-orig -# -# remove tl-update stuff that is only here temporarily -rm -rf $PROJECT-$VER/tl-updates -cp -r $PROJECT-$VER $PROJECT-$VER-orig -cd $PROJECT-$VER -rm -f .gitignore -for i in README script/kanji-fontmap-creator.pl script/kanji-config-updmap.pl ; do - perl -pi.bak -e "s/\\\$VER\\\$/$VER/g" $i - rm -f ${i}.bak -done -cd .. -diff -urN $PROJECT-$VER-orig $PROJECT-$VER -tar zcf $DIR/$PROJECT-$VER.tar.gz $PROJECT-$VER -echo -echo You should execute -echo -echo " git push && git tag $VER && git push origin $VER" -echo -echo Informations for submitting CTAN: -echo " CONTRIBUTION: ptex-fontmaps" -echo " SUMMARY: Font maps and configuration tools for Japanese/Chinese/Korean fonts with (u)ptex" -echo " DIRECTORY: language/japanese/ptex-fontmaps" -echo " LICENSE: free/other-free" -echo " FILE: $DIR/$PROJECT-$VER.tar.gz" - |