jfontmaps (25sep15)

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

2 files changed, 15 insertions, 12 deletions

diff --git a/Master/texmf-dist/scripts/jfontmaps/kanji-config-updmap.pl b/Master/texmf-dist/scripts/jfontmaps/kanji-config-updmap.pl
index c255c8c8215..ce1613d82ee 100755
--- a/Master/texmf-dist/scripts/jfontmaps/kanji-config-updmap.pl
+++ b/Master/texmf-dist/scripts/jfontmaps/kanji-config-updmap.pl
@@ -1,20 +1,19 @@
 #!/usr/bin/env perl
 # kanji-config-updmap: setup Japanese font embedding
-# Version 20140301.0
+# Version 20150924.0
 #
 # formerly known as updmap-setup-kanji
 #
 # Copyright 2004-2006 by KOBAYASHI R. Taizo for the shell version (updmap-otf)
-# Copyright 2011-2014 by PREINING Norbert
+# Copyright 2011-2015 by PREINING Norbert
 #
 # This file is licensed under GPL version 3 or any later version.
 # For copyright statements see end of file.
 #
 # For development see
-#  https://git.gitorious.org/tlptexlive/jfontmaps.git
+#  https://github.com/norbusan/jfontmaps
 #
-# For a changelog see
-#  https://gitorious.org/tlptexlive/jfontmaps/blobs/master/ChangeLog
+# For a changelog see the git log
 # 
 
 $^W = 1;
@@ -22,7 +21,7 @@ use Getopt::Long qw(:config no_autoabbrev ignore_case_always);
 use strict;
 
 my $prg = "kanji-config-updmap";
-my $version = '20140301.0';
+my $version = '20150924.0';
 
 my $updmap_real = "updmap";
 my $updmap = $updmap_real;
@@ -66,6 +65,8 @@ if ($opt_help) {
 my %representatives = (
   "hiragino"      => "HiraMinPro-W3.otf",
   "hiragino-pron" => "HiraMinProN-W3.otf",
+  "hiragino-elcapitan" => "HiraginoSerif-W3.ttc",
+  "hiragino-elcapitan-pron" => "HiraginoSerif-W3.ttc",
   "morisawa"      => "A-OTF-RyuminPro-Light.otf",
   "morisawa-pr6n" => "A-OTF-RyuminPr6N-Light.otf",
   "kozuka"        => "KozMinPro-Regular.otf",
@@ -112,9 +113,10 @@ sub Usage {
                  map file otf-<family>.map has to be available.
      auto:       embed one of the following supported font families
                  automatically:
-                   hiragino, hiragino-pron, morisawa, morisawa-pr6n, 
+                   hiragino, hiragino-pron, hiragino-elcapitan,
+                   hiragino-elcapitan-pron, morisawa, morisawa-pr6n,
                    kozuka, kozuka-pr6, kozuka-pr6n, ipaex, ipa, ms, 
-                   yu-osx, yu-win
+                   yu-osx, yu-win, yu-win10
                  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)
@@ -244,8 +246,9 @@ sub SetupReplacement {
         # then use them
         for my $i (qw/
             morisawa-pr6n yu-osx kozuka-pr6n kozuka-pr6
-            hiragino-pron hiragino
-            morisawa kozuka yu-win ipaex ipa ms/) {
+            hiragino-pron hiragino-elcapitan-pron hiragino
+            hiragino-elcapitan
+            morisawa kozuka yu-win yu-win10 ipaex ipa ms/) {
           if ($available{$i}) {
             return SetupMapFile($i);
           }
diff --git a/Master/texmf-dist/scripts/jfontmaps/kanji-fontmap-creator.pl b/Master/texmf-dist/scripts/jfontmaps/kanji-fontmap-creator.pl
index 75e632e3cd8..3f7a58ac69b 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: 20140301.0
+# Version: 20150924.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 = "20140301.0";
+my $version = "20150924.0";
 
 #
 # global vars configuring operation