jfontmaps update 20140120

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

15 files changed, 36 insertions, 20 deletions

diff --git a/Master/texmf-dist/doc/fonts/jfontmaps/ChangeLog b/Master/texmf-dist/doc/fonts/jfontmaps/ChangeLog
index 066f8dd5590..82cf7fcba00 100644
--- a/Master/texmf-dist/doc/fonts/jfontmaps/ChangeLog
+++ b/Master/texmf-dist/doc/fonts/jfontmaps/ChangeLog
@@ -1,6 +1,22 @@
+2014-01-20  Norbert Preining  <preining@logic.at>
+
+	* Release 20140120.0 (HEAD, master) [eef8b75]
+
+2014-01-20  Norbert Preining  <preining@logic.at>
+
+	* update copyrights, add --sys options to k-c-u and use in in -sys var [512948c]
+
+2014-01-20  Norbert Preining  <preining@logic.at>
+
+	* move all maps to subdir for easier installation [48f9097]
+
+2013-11-20  Norbert Preining  <preining@logic.at>
+
+	* fix info for yu-win fonts (origin/master) [a8de4bc]
+
 2013-11-20  Norbert Preining  <preining@logic.at>
 
-	* Release 20131120.0 (HEAD, master) [5289b6d]
+	* Release 20131120.0 (tag: 20131120.0) [5289b6d]
 
 2013-11-20  Norbert Preining  <preining@logic.at>
 
@@ -12,7 +28,7 @@
 
 2013-11-20  Norbert Preining  <preining@logic.at>
 
-	* update README file for renaming (origin/master) [3814a07]
+	* update README file for renaming [3814a07]
 
 2013-11-20  Norbert Preining  <preining@logic.at>
 
diff --git a/Master/texmf-dist/doc/fonts/jfontmaps/README b/Master/texmf-dist/doc/fonts/jfontmaps/README
index a1149e0eb57..754582d0f78 100644
--- a/Master/texmf-dist/doc/fonts/jfontmaps/README
+++ b/Master/texmf-dist/doc/fonts/jfontmaps/README
@@ -1,7 +1,7 @@
 jfontmaps
 =========
 
-Current release: 20131120.0
+Current release: 20140120.0
 
 The files contained in this package contains font maps for dvipdfmx to
 make various Japanese fonts available for (u)ptex and related programs
@@ -39,7 +39,7 @@ X ms - MS Mincho and MS Gothic, shipped with Windows
     msmincho.ttc
     msgothic.ttc
 
-O? yu-win - Yu Mincho and Yu Gothic fonts by Jiyu-koubou LTD.,
+4 yu-win - Yu Mincho and Yu Gothic fonts by Jiyu-koubou LTD.,
        bundled with Win 8.1.
     yumin.ttf
     yuminl.ttf
@@ -114,7 +114,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-2013 by PREINING Norbert
+  Copyright 2011-2014 by PREINING Norbert
 Licensed under the GPL version 3 or any later version, 
 see the file for details.
 
diff --git a/Master/texmf-dist/doc/fonts/jfontmaps/yu-osx/otf-up-yu-osx.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-osx/otf-up-yu-osx.map
index 3f9870ca639..3f9870ca639 100644
--- a/Master/texmf-dist/doc/fonts/jfontmaps/yu-osx/otf-up-yu-osx.map
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-osx/otf-up-yu-osx.map
diff --git a/Master/texmf-dist/doc/fonts/jfontmaps/yu-osx/otf-yu-osx.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-osx/otf-yu-osx.map
index 5026302c739..5026302c739 100644
--- a/Master/texmf-dist/doc/fonts/jfontmaps/yu-osx/otf-yu-osx.map
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-osx/otf-yu-osx.map
diff --git a/Master/texmf-dist/doc/fonts/jfontmaps/yu-osx/ptex-yu-osx-04.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-osx/ptex-yu-osx-04.map
index d9c0ecac493..d9c0ecac493 100644
--- a/Master/texmf-dist/doc/fonts/jfontmaps/yu-osx/ptex-yu-osx-04.map
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-osx/ptex-yu-osx-04.map
diff --git a/Master/texmf-dist/doc/fonts/jfontmaps/yu-osx/ptex-yu-osx.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-osx/ptex-yu-osx.map
index c903ca80f46..c903ca80f46 100644
--- a/Master/texmf-dist/doc/fonts/jfontmaps/yu-osx/ptex-yu-osx.map
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-osx/ptex-yu-osx.map
diff --git a/Master/texmf-dist/doc/fonts/jfontmaps/yu-osx/uptex-yu-osx-04.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-osx/uptex-yu-osx-04.map
index 74652597b59..74652597b59 100644
--- a/Master/texmf-dist/doc/fonts/jfontmaps/yu-osx/uptex-yu-osx-04.map
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-osx/uptex-yu-osx-04.map
diff --git a/Master/texmf-dist/doc/fonts/jfontmaps/yu-osx/uptex-yu-osx.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-osx/uptex-yu-osx.map
index d68e69e1c37..d68e69e1c37 100644
--- a/Master/texmf-dist/doc/fonts/jfontmaps/yu-osx/uptex-yu-osx.map
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-osx/uptex-yu-osx.map
diff --git a/Master/texmf-dist/doc/fonts/jfontmaps/yu-win/otf-up-yu-win.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-win/otf-up-yu-win.map
index 0ba5461c2e1..0ba5461c2e1 100644
--- a/Master/texmf-dist/doc/fonts/jfontmaps/yu-win/otf-up-yu-win.map
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-win/otf-up-yu-win.map
diff --git a/Master/texmf-dist/doc/fonts/jfontmaps/yu-win/otf-yu-win.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-win/otf-yu-win.map
index e0b1794cef7..e0b1794cef7 100644
--- a/Master/texmf-dist/doc/fonts/jfontmaps/yu-win/otf-yu-win.map
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-win/otf-yu-win.map
diff --git a/Master/texmf-dist/doc/fonts/jfontmaps/yu-win/ptex-yu-win.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-win/ptex-yu-win.map
index ad943cc25ef..ad943cc25ef 100644
--- a/Master/texmf-dist/doc/fonts/jfontmaps/yu-win/ptex-yu-win.map
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-win/ptex-yu-win.map
diff --git a/Master/texmf-dist/doc/fonts/jfontmaps/yu-win/uptex-yu-win.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-win/uptex-yu-win.map
index dc64b49c13f..dc64b49c13f 100644
--- a/Master/texmf-dist/doc/fonts/jfontmaps/yu-win/uptex-yu-win.map
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-win/uptex-yu-win.map
diff --git a/Master/texmf-dist/scripts/jfontmaps/kanji-config-updmap-sys.sh b/Master/texmf-dist/scripts/jfontmaps/kanji-config-updmap-sys.sh
index 8ba3de7ab67..4d0944572a1 100755
--- a/Master/texmf-dist/scripts/jfontmaps/kanji-config-updmap-sys.sh
+++ b/Master/texmf-dist/scripts/jfontmaps/kanji-config-updmap-sys.sh
@@ -20,12 +20,5 @@ unset RUNNING_BSH
 test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"'
 export PATH
 
-v=`kpsewhich -var-value TEXMFSYSVAR`
-c=`kpsewhich -var-value TEXMFSYSCONFIG`
-
-TEXMFVAR="$v"
-TEXMFCONFIG="$c"
-export TEXMFVAR TEXMFCONFIG
-
-exec kanji-config-updmap ${1+"$@"}
+exec kanji-config-updmap --sys ${1+"$@"}
 
diff --git a/Master/texmf-dist/scripts/jfontmaps/kanji-config-updmap.pl b/Master/texmf-dist/scripts/jfontmaps/kanji-config-updmap.pl
index 642eed9ad9e..0b013f74c3e 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 20131120.0
+# Version 20140120.0
 #
 # formerly known as updmap-setup-kanji
 #
 # Copyright 2004-2006 by KOBAYASHI R. Taizo for the shell version (updmap-otf)
-# Copyright 2011-2013 by PREINING Norbert
+# Copyright 2011-2014 by PREINING Norbert
 #
 # This file is licensed under GPL version 3 or any later version.
 # For copyright statements see end of file.
@@ -22,7 +22,7 @@ use Getopt::Long qw(:config no_autoabbrev ignore_case_always);
 use strict;
 
 my $prg = "kanji-config-updmap";
-my $version = "20131120.0";
+my $version = '20140120.0';
 
 my $updmap_real = "updmap";
 my $updmap = $updmap_real;
@@ -30,11 +30,13 @@ my $updmap = $updmap_real;
 my $dry_run = 0;
 my $opt_help = 0;
 my $opt_jis = 0;
+my $opt_sys = 0;
 
 if (! GetOptions(
         "n|dry-run" => \$dry_run,
         "h|help" => \$opt_help,
         "jis2004" => \$opt_jis,
+        "sys" => \$opt_sys,
         "version" => sub { print &version(); exit(0); }, ) ) {
   die "Try \"$0 --help\" for more information.\n";
 }
@@ -48,6 +50,10 @@ my $nul = (win32() ? 'nul' : '/dev/null') ;
 if ($dry_run) {
   $updmap = "echo updmap"; 
 }
+if ($opt_sys) {
+  $updmap = "$updmap --sys" ;
+  $updmap_real = "$updmap_real --sys" ;
+}
 
 if ($opt_help) {
   Usage();
@@ -118,7 +124,8 @@ sub Usage {
   Options:
     -n, --dry-run  do not actually run updmap
     -h, --help     show this message and exit
-    -jis2004       use JIS2004 variants for default fonts of (u)pTeX
+    --jis2004      use JIS2004 variants for default fonts of (u)pTeX
+    --sys          run in sys mode, i.e., call updmap-sys
     --version      show version information and exit
 
 EOF
diff --git a/Master/texmf-dist/scripts/jfontmaps/kanji-fontmap-creator.pl b/Master/texmf-dist/scripts/jfontmaps/kanji-fontmap-creator.pl
index c95923bc796..90c5c25778c 100755
--- a/Master/texmf-dist/scripts/jfontmaps/kanji-fontmap-creator.pl
+++ b/Master/texmf-dist/scripts/jfontmaps/kanji-fontmap-creator.pl
@@ -1,8 +1,8 @@
 #!/usr/bin/env perl
 #
 # kanji-fontmap-creator
-# (c) 2012-2013 Norbert Preining
-# Version: 20131120.0
+# (c) 2012-2014 Norbert Preining
+# Version: 20140120.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 = "20131120.0";
+my $version = "20140120.0";
 
 #
 # global vars configuring operation