diff options
Diffstat (limited to 'Master')
9 files changed, 212 insertions, 15 deletions
diff --git a/Master/texmf-dist/doc/fonts/jfontmaps/ChangeLog b/Master/texmf-dist/doc/fonts/jfontmaps/ChangeLog index 32c234f747d..d0ae127334a 100644 --- a/Master/texmf-dist/doc/fonts/jfontmaps/ChangeLog +++ b/Master/texmf-dist/doc/fonts/jfontmaps/ChangeLog @@ -1,10 +1,62 @@ +2016-09-29 Norbert Preining <norbert@preining.info> + + * Release 20160929.0 (HEAD -> master) [923719e] + +2016-09-29 Norbert Preining <norbert@preining.info> + + * add Yamashita-san to the README, order alphabetically [1bafe91] + +2016-09-29 aminophen <h.y.acetaminophen@gmail.com> + + * README, kanji-config-updmap.pl: add ms-osx (origin/master) [dbeb011] + +2016-09-29 aminophen <h.y.acetaminophen@gmail.com> + + * README, kanji-config-updmap.pl: add ms-osx [82d7439] + +2016-09-29 aminophen <h.y.acetaminophen@gmail.com> + + * rm yu-elcapitan [46e6e97] + +2016-09-29 aminophen <h.y.acetaminophen@gmail.com> + + * Fix for ms-osx [21a094d] + +2016-09-29 Norbert Preining <norbert@preining.info> + + * add two families: yu-elcapitan and ms-osx [6940dc7] + +2016-09-29 Norbert Preining <norbert@preining.info> + + * update copyright year [edb2fd8] + +2016-09-28 Norbert Preining <preining@logic.at> + + * Merge pull request #3 from texjporg/win10 [59fb145] + +2016-09-27 KUROKI Yusuke <kuroky@users.sourceforge.jp> + + * Fixed along Yamashita-san's blog and his commment (origin/win10) [9af5aef] + +2016-09-27 KUROKI Yusuke <kuroky@users.sourceforge.jp> + + * Enable to guess the version of Windows in Yu fonts [af53fc0] + +2016-06-14 H. Yamashita <aminophen@users.noreply.github.com> + + * Merge pull request #2 from takahashim/readme-github [5fccc66] + +2016-06-09 takahashim <maki@rubycolor.org> + + * README: repository moved [b064538] + 2015-10-02 Norbert Preining <norbert@preining.info> - * Release 20151002.0 (HEAD -> master) [544b1f4] + * Release 20151002.0 (tag: 20151002.0, norbu/master) [544b1f4] 2015-09-29 Norbert Preining <norbert@preining.info> - * update mkmap.lua script (origin/master) [aa10c3e] + * update mkmap.lua script [aa10c3e] 2015-09-29 Norbert Preining <preining@logic.at> diff --git a/Master/texmf-dist/doc/fonts/jfontmaps/README b/Master/texmf-dist/doc/fonts/jfontmaps/README index 296a50275f1..2fb46e177b8 100644 --- a/Master/texmf-dist/doc/fonts/jfontmaps/README +++ b/Master/texmf-dist/doc/fonts/jfontmaps/README @@ -1,19 +1,20 @@ jfontmaps ========= -Current release: 20151002.0 +Current release: 20160929.0 The files contained in this package contains font maps for dvipdfmx to make various Japanese fonts available for (u)ptex and related programs and formats. -The font maps were written by several people, including +The font maps were written by several people, including (in alphabetic order) Hironori Kitagawa - Takuji Tanaka - Saito Shuzaburo Norbert Preining -and are now maintained in the tug.org subversion repository: - https://git.gitorious.org/tlptexlive/jfontmaps.git + Saito Shuzaburo + Takuji Tanaka + Hironobu Yamashita +and are now maintained in the github.com git repository: + https://github.com/texjporg/jfontmaps Families, support, and necessary font files =========================================== @@ -39,6 +40,10 @@ X ms - MS Mincho and MS Gothic, shipped with Windows msmincho.ttc msgothic.ttc +X ms-osx - MS Mincho and MS Gothic, shipped with Office for Mac + MS-Mincho.ttf (<= "MS Mincho.ttf") + MS-Gothic.ttf (<= "MS Gothic.ttf") + 4 yu-win - Yu Mincho and Yu Gothic fonts by Jiyu-koubou LTD., bundled with Win 8.1. yumin.ttf @@ -139,7 +144,7 @@ All the (c)map files are under Public Domain. The (deprecated) file updmap-otf.sh and the (in perl rewritten version) kanji-config-updmap.pl are licensed under the following terms: Copyright 2004-2006 by KOBAYASHI Taizo - Copyright 2011-2014 by PREINING Norbert + Copyright 2011-2016 by PREINING Norbert Licensed under the GPL version 3 or any later version, see the file for details. diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ms-osx/otf-ms-osx.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ms-osx/otf-ms-osx.map new file mode 100644 index 00000000000..098764dd06e --- /dev/null +++ b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ms-osx/otf-ms-osx.map @@ -0,0 +1,80 @@ + +% TEXT, 90JIS +hminl-h H MS-Mincho.ttf +hminl-v V MS-Mincho.ttf +hminr-h H MS-Mincho.ttf +hminr-v V MS-Mincho.ttf +hminb-h H MS-Mincho.ttf +hminb-v V MS-Mincho.ttf +hgothr-h H MS-Gothic.ttf +hgothr-v V MS-Gothic.ttf +hgothb-h H MS-Gothic.ttf +hgothb-v V MS-Gothic.ttf +hgotheb-h H MS-Gothic.ttf +hgotheb-v V MS-Gothic.ttf +hmgothr-h H MS-Gothic.ttf +hmgothr-v V MS-Gothic.ttf + +% TEXT, JIS04 +hminln-h H MS-Mincho.ttf +hminln-v V MS-Mincho.ttf +hminrn-h H MS-Mincho.ttf +hminrn-v V MS-Mincho.ttf +hminbn-h H MS-Mincho.ttf +hminbn-v V MS-Mincho.ttf +hgothrn-h H MS-Gothic.ttf +hgothrn-v V MS-Gothic.ttf +hgothbn-h H MS-Gothic.ttf +hgothbn-v V MS-Gothic.ttf +hgothebn-h H MS-Gothic.ttf +hgothebn-v V MS-Gothic.ttf +hmgothrn-h H MS-Gothic.ttf +hmgothrn-v V MS-Gothic.ttf + +% CID +otf-cjml-h Identity-H MS-Mincho.ttf/AJ16 +otf-cjml-v Identity-V MS-Mincho.ttf/AJ16 +otf-cjmr-h Identity-H MS-Mincho.ttf/AJ16 +otf-cjmr-v Identity-V MS-Mincho.ttf/AJ16 +otf-cjmb-h Identity-H MS-Mincho.ttf/AJ16 +otf-cjmb-v Identity-V MS-Mincho.ttf/AJ16 +otf-cjgr-h Identity-H MS-Gothic.ttf/AJ16 +otf-cjgr-v Identity-V MS-Gothic.ttf/AJ16 +otf-cjgb-h Identity-H MS-Gothic.ttf/AJ16 +otf-cjgb-v Identity-V MS-Gothic.ttf/AJ16 +otf-cjge-h Identity-H MS-Gothic.ttf/AJ16 +otf-cjge-v Identity-V MS-Gothic.ttf/AJ16 +otf-cjmgr-h Identity-H MS-Gothic.ttf/AJ16 +otf-cjmgr-v Identity-V MS-Gothic.ttf/AJ16 + +% Unicode 90JIS +otf-ujml-h UniJIS-UTF16-H MS-Mincho.ttf +otf-ujml-v UniJIS-UTF16-V MS-Mincho.ttf +otf-ujmr-h UniJIS-UTF16-H MS-Mincho.ttf +otf-ujmr-v UniJIS-UTF16-V MS-Mincho.ttf +otf-ujmb-h UniJIS-UTF16-H MS-Mincho.ttf +otf-ujmb-v UniJIS-UTF16-V MS-Mincho.ttf +otf-ujgr-h UniJIS-UTF16-H MS-Gothic.ttf +otf-ujgr-v UniJIS-UTF16-V MS-Gothic.ttf +otf-ujgb-h UniJIS-UTF16-H MS-Gothic.ttf +otf-ujgb-v UniJIS-UTF16-V MS-Gothic.ttf +otf-ujge-h UniJIS-UTF16-H MS-Gothic.ttf +otf-ujge-v UniJIS-UTF16-V MS-Gothic.ttf +otf-ujmgr-h UniJIS-UTF16-H MS-Gothic.ttf +otf-ujmgr-v UniJIS-UTF16-V MS-Gothic.ttf + +% Unicode JIS04 +otf-ujmln-h UniJIS2004-UTF16-H MS-Mincho.ttf +otf-ujmln-v UniJIS2004-UTF16-V MS-Mincho.ttf +otf-ujmrn-h UniJIS2004-UTF16-H MS-Mincho.ttf +otf-ujmrn-v UniJIS2004-UTF16-V MS-Mincho.ttf +otf-ujmbn-h UniJIS2004-UTF16-H MS-Mincho.ttf +otf-ujmbn-v UniJIS2004-UTF16-V MS-Mincho.ttf +otf-ujgrn-h UniJIS2004-UTF16-H MS-Gothic.ttf +otf-ujgrn-v UniJIS2004-UTF16-V MS-Gothic.ttf +otf-ujgbn-h UniJIS2004-UTF16-H MS-Gothic.ttf +otf-ujgbn-v UniJIS2004-UTF16-V MS-Gothic.ttf +otf-ujgen-h UniJIS2004-UTF16-H MS-Gothic.ttf +otf-ujgen-v UniJIS2004-UTF16-V MS-Gothic.ttf +otf-ujmgrn-h UniJIS2004-UTF16-H MS-Gothic.ttf +otf-ujmgrn-v UniJIS2004-UTF16-V MS-Gothic.ttf diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ms-osx/otf-up-ms-osx.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ms-osx/otf-up-ms-osx.map new file mode 100644 index 00000000000..179ce994dc3 --- /dev/null +++ b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ms-osx/otf-up-ms-osx.map @@ -0,0 +1,32 @@ + +% TEXT, 90JIS +uphminl-h UniJIS-UTF16-H MS-Mincho.ttf +uphminl-v UniJIS-UTF16-V MS-Mincho.ttf +uphminr-h UniJIS-UTF16-H MS-Mincho.ttf +uphminr-v UniJIS-UTF16-V MS-Mincho.ttf +uphminb-h UniJIS-UTF16-H MS-Mincho.ttf +uphminb-v UniJIS-UTF16-V MS-Mincho.ttf +uphgothr-h UniJIS-UTF16-H MS-Gothic.ttf +uphgothr-v UniJIS-UTF16-V MS-Gothic.ttf +uphgothb-h UniJIS-UTF16-H MS-Gothic.ttf +uphgothb-v UniJIS-UTF16-V MS-Gothic.ttf +uphgotheb-h UniJIS-UTF16-H MS-Gothic.ttf +uphgotheb-v UniJIS-UTF16-V MS-Gothic.ttf +uphmgothr-h UniJIS-UTF16-H MS-Gothic.ttf +uphmgothr-v UniJIS-UTF16-V MS-Gothic.ttf + +% TEXT, JIS04 +uphminln-h UniJIS2004-UTF16-H MS-Mincho.ttf +uphminln-v UniJIS2004-UTF16-V MS-Mincho.ttf +uphminrn-h UniJIS2004-UTF16-H MS-Mincho.ttf +uphminrn-v UniJIS2004-UTF16-V MS-Mincho.ttf +uphminbn-h UniJIS2004-UTF16-H MS-Mincho.ttf +uphminbn-v UniJIS2004-UTF16-V MS-Mincho.ttf +uphgothrn-h UniJIS2004-UTF16-H MS-Gothic.ttf +uphgothrn-v UniJIS2004-UTF16-V MS-Gothic.ttf +uphgothbn-h UniJIS2004-UTF16-H MS-Gothic.ttf +uphgothbn-v UniJIS2004-UTF16-V MS-Gothic.ttf +uphgothebn-h UniJIS2004-UTF16-H MS-Gothic.ttf +uphgothebn-v UniJIS2004-UTF16-V MS-Gothic.ttf +uphmgothrn-h UniJIS2004-UTF16-H MS-Gothic.ttf +uphmgothrn-v UniJIS2004-UTF16-V MS-Gothic.ttf diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ms-osx/ptex-ms-osx.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ms-osx/ptex-ms-osx.map new file mode 100644 index 00000000000..e7d4744dd5b --- /dev/null +++ b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ms-osx/ptex-ms-osx.map @@ -0,0 +1,4 @@ +rml H MS-Mincho.ttf +rmlv V MS-Mincho.ttf +gbm H MS-Gothic.ttf +gbmv V MS-Gothic.ttf diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ms-osx/uptex-ms-osx.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ms-osx/uptex-ms-osx.map new file mode 100644 index 00000000000..ea081feaad9 --- /dev/null +++ b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ms-osx/uptex-ms-osx.map @@ -0,0 +1,10 @@ +urml UniJIS-UTF16-H MS-Mincho.ttf +urmlv UniJIS-UTF16-V MS-Mincho.ttf +ugbm UniJIS-UTF16-H MS-Gothic.ttf +ugbmv UniJIS-UTF16-V MS-Gothic.ttf +uprml-h UniJIS-UTF16-H MS-Mincho.ttf +uprml-v UniJIS-UTF16-V MS-Mincho.ttf +upgbm-h UniJIS-UTF16-H MS-Gothic.ttf +upgbm-v UniJIS-UTF16-V MS-Gothic.ttf +uprml-hq UniJIS-UCS2-H MS-Mincho.ttf +upgbm-hq UniJIS-UCS2-H MS-Gothic.ttf diff --git a/Master/texmf-dist/scripts/jfontmaps/kanji-config-updmap.pl b/Master/texmf-dist/scripts/jfontmaps/kanji-config-updmap.pl index 47da864bab1..aca02e562c5 100755 --- a/Master/texmf-dist/scripts/jfontmaps/kanji-config-updmap.pl +++ b/Master/texmf-dist/scripts/jfontmaps/kanji-config-updmap.pl @@ -1,11 +1,11 @@ #!/usr/bin/env perl # kanji-config-updmap: setup Japanese font embedding -# Version 20151002.0 +# Version 20160929.0 # # formerly known as updmap-setup-kanji # # Copyright 2004-2006 by KOBAYASHI R. Taizo for the shell version (updmap-otf) -# Copyright 2011-2015 by PREINING Norbert +# Copyright 2011-2016 by PREINING Norbert # # This file is licensed under GPL version 3 or any later version. # For copyright statements see end of file. @@ -21,7 +21,7 @@ use Getopt::Long qw(:config no_autoabbrev ignore_case_always); use strict; my $prg = "kanji-config-updmap"; -my $version = '20151002.0'; +my $version = '20160929.0'; my $updmap_real = "updmap"; my $updmap = $updmap_real; @@ -75,7 +75,9 @@ my %representatives = ( "ipa" => "ipam.ttf", "ipaex" => "ipaexm.ttf", "ms" => "msgothic.ttc", - "yu-win" => "yumin.ttf", + "ms-osx" => "MS-Gothic.ttf", + "yu-win" => "yugothib.ttf", + "yu-win10" => "YuGothB.ttc", "yu-osx" => "YuMin-Medium.otf", ); my %available; diff --git a/Master/texmf-dist/scripts/jfontmaps/kanji-fontmap-creator.pl b/Master/texmf-dist/scripts/jfontmaps/kanji-fontmap-creator.pl index 496524eef9e..48a08124617 100755 --- a/Master/texmf-dist/scripts/jfontmaps/kanji-fontmap-creator.pl +++ b/Master/texmf-dist/scripts/jfontmaps/kanji-fontmap-creator.pl @@ -2,7 +2,7 @@ # # kanji-fontmap-creator # (c) 2012-2014 Norbert Preining -# Version: 20151002.0 +# Version: 20160929.0 # Licenced under the GPLv2 or any higher version # # gui to create map files for updmap(-setup-kanji) @@ -41,7 +41,7 @@ my $opt_help = 0; my $opt_version = 0; my $prg = "kanji-fontmap-creator"; -my $version = "20151002.0"; +my $version = "20160929.0"; # # global vars configuring operation diff --git a/Master/texmf-dist/source/jfontmaps/tools/mkmap.lua b/Master/texmf-dist/source/jfontmaps/tools/mkmap.lua index b95fc4af54d..90e8dc0e752 100755 --- a/Master/texmf-dist/source/jfontmaps/tools/mkmap.lua +++ b/Master/texmf-dist/source/jfontmaps/tools/mkmap.lua @@ -20,6 +20,18 @@ local foundry = { mgr=':0:msgothic.ttc', {''}, }, + ['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', |