ptex-fontmaps (6mar18)

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

4 files changed, 235 insertions, 93 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