5 files changed, 36 insertions, 28 deletions
diff --git a/Build/source/texk/texlive/linked_scripts/Makefile.am b/Build/source/texk/texlive/linked_scripts/Makefile.am
index 120524abc4a..b9715d12db5 100644
--- a/Build/source/texk/texlive/linked_scripts/Makefile.am
+++ b/Build/source/texk/texlive/linked_scripts/Makefile.am
@@ -102,8 +102,8 @@ texmf_other_scripts = \
 	fragmaster/fragmaster.pl \
 	glossaries/makeglossaries \
 	jfontmaps/kanji-fontmap-creator.pl \
-	jfontmaps/updmap-setup-kanji.pl \
-	jfontmaps/updmap-setup-kanji-sys.sh \
+	jfontmaps/kanji-config-updmap.pl \
+	jfontmaps/kanji-config-updmap-sys.sh \
 	latex2man/latex2man \
 	latexdiff/latexdiff.pl \
 	latexdiff/latexdiff-vc.pl \
diff --git a/Build/source/texk/texlive/linked_scripts/Makefile.in b/Build/source/texk/texlive/linked_scripts/Makefile.in
index d3472726fef..58bc635805e 100644
--- a/Build/source/texk/texlive/linked_scripts/Makefile.in
+++ b/Build/source/texk/texlive/linked_scripts/Makefile.in
@@ -279,8 +279,8 @@ texmf_other_scripts = \
 	fragmaster/fragmaster.pl \
 	glossaries/makeglossaries \
 	jfontmaps/kanji-fontmap-creator.pl \
-	jfontmaps/updmap-setup-kanji.pl \
-	jfontmaps/updmap-setup-kanji-sys.sh \
+	jfontmaps/kanji-config-updmap.pl \
+	jfontmaps/kanji-config-updmap-sys.sh \
 	latex2man/latex2man \
 	latexdiff/latexdiff.pl \
 	latexdiff/latexdiff-vc.pl \
diff --git a/Build/source/texk/texlive/linked_scripts/jfontmaps/updmap-setup-kanji-sys.sh b/Build/source/texk/texlive/linked_scripts/jfontmaps/kanji-config-updmap-sys.sh
index f84fcd7a671..92ff2248727 100755
--- a/Build/source/texk/texlive/linked_scripts/jfontmaps/updmap-setup-kanji-sys.sh
+++ b/Build/source/texk/texlive/linked_scripts/jfontmaps/kanji-config-updmap-sys.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# updmap-setup-kanji-sys: 
+# updmap-kanji-sys: 
 # copy of fmtutil-sys by Thomas Esser, public domain.
 
 # wrapper script for updmap-setup-kanji with TEXMFVAR and TEXMFCONFIG set to
@@ -27,5 +27,5 @@ TEXMFVAR="$v"
 TEXMFCONFIG="$c"
 export TEXMFVAR TEXMFCONFIG
 
-exec updmap-setup-kanji ${1+"$@"}
+exec updmap-kanji ${1+"$@"}
 
diff --git a/Build/source/texk/texlive/linked_scripts/jfontmaps/updmap-setup-kanji.pl b/Build/source/texk/texlive/linked_scripts/jfontmaps/kanji-config-updmap.pl
index 367fddff829..7ffc386965f 100755
--- a/Build/source/texk/texlive/linked_scripts/jfontmaps/updmap-setup-kanji.pl
+++ b/Build/source/texk/texlive/linked_scripts/jfontmaps/kanji-config-updmap.pl
@@ -1,26 +1,28 @@
 #!/usr/bin/env perl
-# updmap-setup-kanji: setup Japanese font embedding
+# kanji-config-updmap: setup Japanese font embedding
+# Version 20130410.0
+#
+# formerly known as updmap-setup-kanji
 #
 # Copyright 2004-2006 by KOBAYASHI R. Taizo for the shell version (updmap-otf)
-# Copyright 2011-2012 by PREINING Norbert
+# Copyright 2011-2013 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
-#  http://www.tug.org/svn/texlive/trunk/Build/source/extra/jfontmaps/
+#  https://git.gitorious.org/tlptexlive/jfontmaps.git
 #
 # For a changelog see
-#  http://www.tug.org/svn/texlive/trunk/Build/source/extra/jfontmaps/ChangeLog
+#  https://gitorious.org/tlptexlive/jfontmaps/blobs/master/ChangeLog
 # 
 
 $^W = 1;
 use Getopt::Long qw(:config no_autoabbrev ignore_case_always);
 use strict;
 
-my $prg = "updmap-setup-kanji";
-my $vers = "0.9.6";
-my $version = '$Id: updmap-setup-kanji.pl 27277 2012-08-02 00:16:14Z karl $';
+my $prg = "kanji-config-updmap";
+my $version = "20130410.0";
 
 my $updmap_real = "updmap";
 my $updmap = $updmap_real;
@@ -56,11 +58,16 @@ if ($opt_help) {
 # representatives of support font families
 #
 my %representatives = (
-  hiragino => "HiraMinPro-W3.otf",
-  morisawa => "A-OTF-RyuminPro-Light.otf",
-  kozuka   => "KozMinPro-Regular.otf",
-  ipa      => "ipam.ttf",
-  ipaex    => "ipaexm.ttf",
+  "hiragino"      => "HiraMinPro-W3.otf",
+  "hiragino-pron" => "HiraMinProN-W3.otf",
+  "morisawa"      => "A-OTF-RyuminPro-Light.otf",
+  "morisawa-pr6n" => "A-OTF-RyuminPr6N-Light.otf",
+  "kozuka"        => "KozMinPro-Regular.otf",
+  "kozuka-pr6n"   => "KozMinPr6N-Regular.otf",
+  "kozuka-pr6"    => "KozMinProVI-Regular.otf",
+  "ipa"           => "ipam.ttf",
+  "ipaex"         => "ipaexm.ttf",
+  "ms"            => "msgothic.tcc",
 );
 my %available;
 
@@ -68,8 +75,8 @@ my %available;
 main(@ARGV);
 
 sub version {
-  my $ret = sprintf "%s version %s\n(svn id: %s)\n", 
-    $prg, $vers, $version;
+  my $ret = sprintf "%s version %s\n", 
+    $prg, $version;
   return $ret;
 }
 
@@ -97,7 +104,8 @@ sub Usage {
                  map file otf-<family>.map has to be available.
      auto:       embed one of the following supported font families
                  automatically:
-                   hiragino, morisawa, kozuka, ipaex, ipa
+                   hiragino, hiragino-pron, morisawa, morisawa-pr6n, 
+                   kozuka, kozuka-pr6, kozuka-pr6n, ipaex, ipa, ms
                  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)
@@ -158,15 +166,15 @@ sub GetStatus {
     exit 1;
   }
 
-  if (check_mapfile("otf-$STATUS.map")) {
+  if (check_mapfile("ptex-$STATUS.map")) {
     print "CURRENT family : $STATUS\n";
   } else {
-    print "WARNING: Currently selected map file cannot be found: otf-$STATUS.map\n";
+    print "WARNING: Currently selected map file cannot be found: ptex-$STATUS.map\n";
   }
 
   for my $k (sort keys %representatives) {
-    my $MAPFILE = "otf-$k.map";
-    next if ($MAPFILE eq "otf-$STATUS.map");
+    my $MAPFILE = "ptex-$k.map";
+    next if ($MAPFILE eq "ptex-$STATUS.map");
     if (check_mapfile($MAPFILE)) {
       if ($available{$k}) {
         print "Standby family : $k\n";
@@ -182,7 +190,7 @@ sub GetStatus {
 
 sub SetupMapFile {
   my $rep = shift;
-  my $MAPFILE = "otf-$rep.map";
+  my $MAPFILE = "ptex-$rep.map";
   if (check_mapfile($MAPFILE)) {
     print "Setting up ... $MAPFILE\n";
     system("$updmap --quiet --nomkmap --nohash -setoption kanjiEmbed $rep");
diff --git a/Build/source/texk/texlive/linked_scripts/scripts.lst b/Build/source/texk/texlive/linked_scripts/scripts.lst
index 96a46245afb..c83550dde7e 100644
--- a/Build/source/texk/texlive/linked_scripts/scripts.lst
+++ b/Build/source/texk/texlive/linked_scripts/scripts.lst
@@ -51,8 +51,8 @@ fontools/ot2kpx
 fragmaster/fragmaster.pl
 glossaries/makeglossaries
 jfontmaps/kanji-fontmap-creator.pl
-jfontmaps/updmap-setup-kanji.pl
-jfontmaps/updmap-setup-kanji-sys.sh
+jfontmaps/kanji-config-updmap.pl
+jfontmaps/kanji-config-updmap-sys.sh
 latex2man/latex2man
 latexdiff/latexdiff.pl
 latexdiff/latexdiff-vc.pl