texlive[46861] Master/texmf-dist: ptex-fontmaps (6mar18)
commits+karl at tug.org
commits+karl at tug.org
Tue Mar 6 23:50:46 CET 2018
Revision: 46861
http://tug.org/svn/texlive?view=revision&revision=46861
Author: karl
Date: 2018-03-06 23:50:46 +0100 (Tue, 06 Mar 2018)
Log Message:
-----------
ptex-fontmaps (6mar18)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/fonts/ptex-fontmaps/ChangeLog
trunk/Master/texmf-dist/doc/fonts/ptex-fontmaps/README
trunk/Master/texmf-dist/scripts/ptex-fontmaps/kanji-config-updmap.pl
trunk/Master/texmf-dist/scripts/ptex-fontmaps/kanji-fontmap-creator.pl
Added Paths:
-----------
trunk/Master/texmf-dist/doc/fonts/ptex-fontmaps/database/
trunk/Master/texmf-dist/doc/fonts/ptex-fontmaps/database/ptex-fontmaps-data.dat
trunk/Master/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/ms-osx/otf-sc-ms-osx.map
trunk/Master/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/ms-osx/uptex-sc-ms-osx.map
Removed Paths:
-------------
trunk/Master/texmf-dist/doc/fonts/ptex-fontmaps/ChangeLog.pre-git
trunk/Master/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/hiragino-elcapitan/
trunk/Master/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/hiragino-elcapitan-pron/
trunk/Master/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/toppanbunkyu-sierra/
trunk/Master/texmf-dist/source/ptex-fontmaps/tools/
Modified: trunk/Master/texmf-dist/doc/fonts/ptex-fontmaps/ChangeLog
===================================================================
--- trunk/Master/texmf-dist/doc/fonts/ptex-fontmaps/ChangeLog 2018-03-06 22:49:32 UTC (rev 46860)
+++ trunk/Master/texmf-dist/doc/fonts/ptex-fontmaps/ChangeLog 2018-03-06 22:50:46 UTC (rev 46861)
@@ -1,10 +1,146 @@
+2018-03-06 Hironobu Yamashita <h.y.acetaminophen at gmail.com>
+
+ * Release 20180306.0 (HEAD -> master) [19cc0e5]
+
+2018-03-06 Hironobu Yamashita <h.y.acetaminophen at gmail.com>
+
+ * release.sh (origin/master, origin/HEAD) [dfbc325]
+
+2018-03-06 Hironobu Yamashita <h.y.acetaminophen at gmail.com>
+
+ * release.sh [f138858]
+
+2018-02-18 Hironobu Yamashita <h.y.acetaminophen at gmail.com>
+
+ * release.sh: adjust for macos package [80fd360]
+
+2018-02-17 Hironobu Yamashita <h.y.acetaminophen at gmail.com>
+
+ * default mode handling [70189bc]
+
+2018-02-17 Hironobu Yamashita <h.y.acetaminophen at gmail.com>
+
+ * Allow multiple language mode [0903e22]
+
+2018-02-17 Hironobu Yamashita <h.y.acetaminophen at gmail.com>
+
+ * cleanup [24df4a4]
+
+2018-02-17 Hironobu Yamashita <h.y.acetaminophen at 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 at gmail.com>
+
+ * Adjust help message [6ff928b]
+
+2018-02-17 Hironobu Yamashita <h.y.acetaminophen at gmail.com>
+
+ * Adjust help message [5c437bd]
+
+2018-02-17 Hironobu Yamashita <h.y.acetaminophen at gmail.com>
+
+ * Separate representative database to external file [d4c973b]
+
+2017-10-14 Hironobu Yamashita <h.y.acetaminophen at gmail.com>
+
+ * update candidates [116b3e9]
+
+2017-09-27 Norbert Preining <norbert at preining.info>
+
+ * Merge pull request #12 from doraTeX/master [31737bb]
+
+2017-09-27 doraTeX <taylorkgb at gmail.com>
+
+ * Update README [996eed3]
+
+2017-09-27 Hironobu Yamashita <h.y.acetaminophen at gmail.com>
+
+ * Update README [54da49f]
+
+2017-09-27 Hironobu Yamashita <h.y.acetaminophen at gmail.com>
+
+ * separate macOS-specific packages [3ecc177]
+
+2017-09-27 doraTeX <taylorkgb at gmail.com>
+
+ * Add toppanbunkyu-highsierra family [8f83fb7]
+
+2017-09-26 Hironobu Yamashita <h.y.acetaminophen at gmail.com>
+
+ * Add highsierra family [787cf68]
+
+2017-07-04 Hironobu Yamashita <h.y.acetaminophen at gmail.com>
+
+ * tests/maptest-plain.tex: More punctuations [3a24605]
+
+2017-07-04 Hironobu Yamashita <h.y.acetaminophen at gmail.com>
+
+ * test-runner.pl: Support partial tests [1e7a933]
+
+2017-07-01 Hironobu Yamashita <h.y.acetaminophen at gmail.com>
+
+ * Fix tests/maptest-plain.tex [d873ad2]
+
+2017-07-01 Hironobu Yamashita <h.y.acetaminophen at gmail.com>
+
+ * Add ms-osx for sc [9f14cbb]
+
+2017-07-01 Hironobu Yamashita <h.y.acetaminophen at gmail.com>
+
+ * Update tests/test-runner.pl [d55568d]
+
+2017-07-01 Hironobu Yamashita <h.y.acetaminophen at gmail.com>
+
+ * Makefile: Add 'install' rule [039f4b6]
+
+2017-07-01 Hironobu Yamashita <h.y.acetaminophen at gmail.com>
+
+ * Add sourcehan, sourcehan-otc, noto [6a1a129]
+
+2017-07-01 Hironobu Yamashita <h.y.acetaminophen at gmail.com>
+
+ * Update tests/test-runner.pl [bd122cb]
+
+2017-07-01 Hironobu Yamashita <h.y.acetaminophen at gmail.com>
+
+ * Add tests/test-runner.pl (WIP) [0ef09f4]
+
+2017-06-30 Hironobu Yamashita <h.y.acetaminophen at gmail.com>
+
+ * Add tests/maptest-plain.tex (WIP) [a07455f]
+
+2017-06-29 Hironobu Yamashita <h.y.acetaminophen at 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 at gmail.com>
+
+ * Add noto-otc, second trial (use Medium) [27e9f51]
+
+2017-06-28 Hironobu Yamashita <h.y.acetaminophen at gmail.com>
+
+ * Add noto-otc, first trial [83b73a6]
+
+2017-06-28 Hironobu Yamashita <h.y.acetaminophen at gmail.com>
+
+ * Add tools/mkmap-ai0-*.lua (currently noto-otc only) [9867594]
+
+2017-06-27 Hironobu Yamashita <h.y.acetaminophen at gmail.com>
+
+ * tools/mkmap-ja.lua: kanjiEmbed -> jaEmbed [f98bcf2]
+
+2017-06-27 Hironobu Yamashita <h.y.acetaminophen at gmail.com>
+
+ * rename: tools/mkmap.lua -> tools/mkmap-ja.lua [6040087]
+
2017-06-24 Hironobu Yamashita <h.y.acetaminophen at gmail.com>
- * Release 20170624.0 (HEAD -> master) [16dca6f]
+ * Release 20170624.0 (tag: 20170624.0) [16dca6f]
2017-06-24 Hironobu Yamashita <h.y.acetaminophen at 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 at gmail.com>
@@ -52,7 +188,7 @@
2017-01-11 aminophen <h.y.acetaminophen at 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 at gmail.com>
@@ -272,7 +408,7 @@
2016-10-04 aminophen <h.y.acetaminophen at 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 at gmail.com>
@@ -316,7 +452,7 @@
2016-09-27 KUROKI Yusuke <kuroky at 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 at users.sourceforge.jp>
Deleted: trunk/Master/texmf-dist/doc/fonts/ptex-fontmaps/ChangeLog.pre-git
===================================================================
--- trunk/Master/texmf-dist/doc/fonts/ptex-fontmaps/ChangeLog.pre-git 2018-03-06 22:49:32 UTC (rev 46860)
+++ trunk/Master/texmf-dist/doc/fonts/ptex-fontmaps/ChangeLog.pre-git 2018-03-06 22:50:46 UTC (rev 46861)
@@ -1,82 +0,0 @@
-
-2012-06-19 Norbert Preining <preining at 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 at logic.at>
-
- * kozuka/otf-up-kozuka.map: fix inconsistency in naming of
- font files
- Version v0.9.5
-
-2012-03-15 Norbert Preining <preining at 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 at 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 at logic.at>
-
- * fontmaps: add ipa and ipaex maps
-
-2012-02-06 Norbert Preining <preining at 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 at 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 at 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 at 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 at mac.com> v0.9
-# use noEmbed.map instead of noEmbeddedFont.map
-# 10 Jun 2005 by KOBAYASHI R. Taizo <tkoba965 at mac.com> v0.8
-# modified to use updmap-sys in teTeX3
-# 07 Nov 2004 by KOBAYASHI R. Taizo <tkoba965 at mac.com> v0.7
-# do not echo back the message of updmap.
-# 17 Oct 2004 by KOBAYASHI R. Taizo <tkoba965 at mac.com> v0.6
-# set hiragino map file if nofont is installed and arg is auto.
-# 04 Oct 2004 by KOBAYASHI R. Taizo <tkoba965 at mac.com> v0.5
-# handl standby map files more strictly
-# 20 Sep 2004 by KOBAYASHI R. Taizo <tkoba965 at mac.com> v0.4
-# hand over current status to map file installer
-# 19 Sep 2004 by KOBAYASHI R. Taizo <tkoba965 at mac.com> v0.3
-# handl *-udvips.map in TEXMF/dvipdfm/config/otf/
-# 02 Mar 2004 by KOBAYASHI R. Taizo <tkoba at ike-dyn.ritsumei.ac.jp> v0.2
-# added noFont-udvips.map
-# 28 Feb 2004 by KOBAYASHI R. Taizo <tkoba at ike-dyn.ritsumei.ac.jp> v0.1
-
Modified: trunk/Master/texmf-dist/doc/fonts/ptex-fontmaps/README
===================================================================
--- trunk/Master/texmf-dist/doc/fonts/ptex-fontmaps/README 2018-03-06 22:49:32 UTC (rev 46860)
+++ trunk/Master/texmf-dist/doc/fonts/ptex-fontmaps/README 2018-03-06 22:50:46 UTC (rev 46861)
@@ -1,11 +1,11 @@
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
@@ -12,11 +12,34 @@
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 @@
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,7 +155,7 @@
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
@@ -139,7 +162,7 @@
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 @@
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 @@
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 @@
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
Added: trunk/Master/texmf-dist/doc/fonts/ptex-fontmaps/database/ptex-fontmaps-data.dat
===================================================================
--- trunk/Master/texmf-dist/doc/fonts/ptex-fontmaps/database/ptex-fontmaps-data.dat (rev 0)
+++ trunk/Master/texmf-dist/doc/fonts/ptex-fontmaps/database/ptex-fontmaps-data.dat 2018-03-06 22:50:46 UTC (rev 46861)
@@ -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
Added: trunk/Master/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/ms-osx/otf-sc-ms-osx.map
===================================================================
--- trunk/Master/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/ms-osx/otf-sc-ms-osx.map (rev 0)
+++ trunk/Master/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/ms-osx/otf-sc-ms-osx.map 2018-03-06 22:50:46 UTC (rev 46861)
@@ -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
Property changes on: trunk/Master/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/ms-osx/otf-sc-ms-osx.map
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/Master/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/ms-osx/uptex-sc-ms-osx.map
===================================================================
--- trunk/Master/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/ms-osx/uptex-sc-ms-osx.map (rev 0)
+++ trunk/Master/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/ms-osx/uptex-sc-ms-osx.map 2018-03-06 22:50:46 UTC (rev 46861)
@@ -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
Property changes on: trunk/Master/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/ms-osx/uptex-sc-ms-osx.map
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/Master/texmf-dist/scripts/ptex-fontmaps/kanji-config-updmap.pl
===================================================================
--- trunk/Master/texmf-dist/scripts/ptex-fontmaps/kanji-config-updmap.pl 2018-03-06 22:49:32 UTC (rev 46860)
+++ trunk/Master/texmf-dist/scripts/ptex-fontmaps/kanji-config-updmap.pl 2018-03-06 22:50:46 UTC (rev 46861)
@@ -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,7 +15,7 @@
# https://github.com/texjporg/jfontmaps
#
# For a changelog see the git log
-#
+#
$^W = 1;
use Getopt::Long qw(:config no_autoabbrev ignore_case_always);
@@ -22,7 +22,7 @@
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_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,15 +56,38 @@
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.";
@@ -66,10 +94,10 @@
}
}
+if ($opt_user && $opt_sys) {
+ die "Only one of -user and -sys can be used!";
+}
-if ($dry_run) {
- $updmap = "echo updmap";
-}
if ($opt_sys) {
$updmap = "$updmap --sys" ;
$updmap_real = "$updmap_real --sys" ;
@@ -90,158 +118,173 @@
}
}
}
+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.
+ $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.
+ 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
+ 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 Korean, Traditional Chinese and Simplified Chinese:
- uptex-<NN>-<family>.map
- otf-<NN>-<family>.map
- (NN being: ko, tc, sc)
+ 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,13 +305,13 @@
}
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");
@@ -275,7 +318,7 @@
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}}) {
@@ -282,7 +325,7 @@
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 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 @@
} 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 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 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");
}
-
- if ($a eq "status") {
- GetStatus();
- exit 0;
- }
-
- return SetupReplacement($a);
}
#
Modified: trunk/Master/texmf-dist/scripts/ptex-fontmaps/kanji-fontmap-creator.pl
===================================================================
--- trunk/Master/texmf-dist/scripts/ptex-fontmaps/kanji-fontmap-creator.pl 2018-03-06 22:49:32 UTC (rev 46860)
+++ trunk/Master/texmf-dist/scripts/ptex-fontmaps/kanji-fontmap-creator.pl 2018-03-06 22:50:46 UTC (rev 46861)
@@ -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_version = 0;
my $prg = "kanji-fontmap-creator";
-my $version = "20170624.0";
+my $version = "20180306.0";
#
# global vars configuring operation
@@ -552,7 +552,7 @@
=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>
More information about the tex-live-commits
mailing list