diff options
4 files changed, 45 insertions, 11 deletions
diff --git a/Master/texmf-dist/doc/fonts/ptex-fontmaps/ChangeLog b/Master/texmf-dist/doc/fonts/ptex-fontmaps/ChangeLog index e343cb56bcb..ed952c759e7 100644 --- a/Master/texmf-dist/doc/fonts/ptex-fontmaps/ChangeLog +++ b/Master/texmf-dist/doc/fonts/ptex-fontmaps/ChangeLog @@ -1,10 +1,26 @@ +2018-03-28 Hironobu Yamashita <h.y.acetaminophen@gmail.com> + + * Release 20180328.0 (HEAD -> master) [74238a2] + +2018-03-11 Hironobu Yamashita <h.y.acetaminophen@gmail.com> + + * updmap.pl from 'embed-sub' branch by norbert (origin/master, origin/HEAD) [7c4334a] + +2018-03-11 Hironobu Yamashita <h.y.acetaminophen@gmail.com> + + * updmap.pl from tl2017 frozen [1c77d33] + +2018-03-11 Hironobu Yamashita <h.y.acetaminophen@gmail.com> + + * Fix README, macOS database is only effective on macOS (#14) [9f9a864] + 2018-03-06 Hironobu Yamashita <h.y.acetaminophen@gmail.com> - * Release 20180306.0 (HEAD -> master) [19cc0e5] + * Release 20180306.0 (tag: 20180306.0) [19cc0e5] 2018-03-06 Hironobu Yamashita <h.y.acetaminophen@gmail.com> - * release.sh (origin/master, origin/HEAD) [dfbc325] + * release.sh [dfbc325] 2018-03-06 Hironobu Yamashita <h.y.acetaminophen@gmail.com> diff --git a/Master/texmf-dist/doc/fonts/ptex-fontmaps/README b/Master/texmf-dist/doc/fonts/ptex-fontmaps/README index 036b5292986..be19d1670d4 100644 --- a/Master/texmf-dist/doc/fonts/ptex-fontmaps/README +++ b/Master/texmf-dist/doc/fonts/ptex-fontmaps/README @@ -1,7 +1,7 @@ ptex-fontmaps ============= -Current release: 20180306.0 +Current release: 20180328.0 The files contained in this package contains font maps for dvipdfmx to make various Japanese/Chinese/Korean fonts available for (u)ptex and @@ -31,10 +31,10 @@ software. This package is split into two parts: 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 +TeX Live package mirrors, but can be installed from the TLContrib repository, by executing the following commands: - tlmgr repository add http://texlive.texjp.org/current/tltexjp tltexjp - tlmgr pinning add tltexjp '*' + tlmgr repository add http://texlive.texjp.org/current/tlcontrib tlcontrib + tlmgr pinning add tlcontrib '*' tlmgr install ptex-fontmaps-macos After that updates for the ptex-fontmaps packages will be automatically installed. 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 a5159f26786..1a0f1f2530a 100755 --- a/Master/texmf-dist/scripts/ptex-fontmaps/kanji-config-updmap.pl +++ b/Master/texmf-dist/scripts/ptex-fontmaps/kanji-config-updmap.pl @@ -1,6 +1,6 @@ #!/usr/bin/env perl # kanji-config-updmap: setup Japanese font embedding -# Version 20180306.0 +# Version 20180328.0 # # formerly known as updmap-setup-kanji # @@ -22,7 +22,7 @@ use Getopt::Long qw(:config no_autoabbrev ignore_case_always); use strict; my $prg = "kanji-config-updmap"; -my $version = '20180306.0'; +my $version = '20180328.0'; my $updmap_real = "updmap"; my $updmap = $updmap_real; @@ -132,11 +132,29 @@ if ($opt_help) { # my %representatives; my @databaselist = "ptex-fontmaps-data.dat"; -push @databaselist, "ptex-fontmaps-macos-data.dat"; +push @databaselist, "ptex-fontmaps-macos-data.dat" if (macosx_new()); main(@ARGV); +sub macosx { return ($^O=~/^darwin$/i); } + +sub macosx_new { + if (macosx()) { + my $macos_ver = `sw_vers -productVersion`; + my $macos_ver_major = $macos_ver; + $macos_ver_major =~ s/^(\d+)\.(\d+).*/$1/; + my $macos_ver_minor = $macos_ver; + $macos_ver_minor =~ s/^(\d+)\.(\d+).*/$2/; + if ($macos_ver_major==10) { + if ($macos_ver_minor>=11) { + return 1; + } + } + } + return 0; +} + sub version { my $ret = sprintf "%s version %s\n", $prg, $version; return $ret; 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 dc67800d5f2..4631e48c275 100755 --- a/Master/texmf-dist/scripts/ptex-fontmaps/kanji-fontmap-creator.pl +++ b/Master/texmf-dist/scripts/ptex-fontmaps/kanji-fontmap-creator.pl @@ -2,7 +2,7 @@ # # kanji-fontmap-creator # (c) 2012-2014 Norbert Preining -# Version: 20180306.0 +# Version: 20180328.0 # Licenced under the GPLv2 or any higher version # # gui to create map files for (kanji-config-)updmap @@ -41,7 +41,7 @@ my $opt_help = 0; my $opt_version = 0; my $prg = "kanji-fontmap-creator"; -my $version = "20180306.0"; +my $version = "20180328.0"; # # global vars configuring operation |