updmap-setup-kanji:

 - update from Build/source/extra/jfontmaps
 - add -sys.sh script to all bin dirs and scripts etc
 - adjust tlpsrc


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

24 files changed, 125 insertions, 10 deletions

diff --git a/Build/source/extra/jfontmaps/script/updmap-setup-kanji-sys.sh b/Build/source/extra/jfontmaps/script/updmap-setup-kanji-sys.sh
new file mode 100755
index 00000000000..f84fcd7a671
--- /dev/null
+++ b/Build/source/extra/jfontmaps/script/updmap-setup-kanji-sys.sh
@@ -0,0 +1,31 @@
+#!/bin/sh
+
+# updmap-setup-kanji-sys: 
+# copy of fmtutil-sys by Thomas Esser, public domain.
+
+# wrapper script for updmap-setup-kanji with TEXMFVAR and TEXMFCONFIG set to
+#   TEXMFSYSVAR / TEXMFSYSCONFIG
+
+test -f /bin/ksh && test -z "$RUNNING_KSH" \
+  && { UNAMES=`uname -s`; test "x$UNAMES" = xULTRIX; } 2>/dev/null \
+  && { RUNNING_KSH=true; export RUNNING_KSH; exec /bin/ksh $0 ${1+"$@"}; }
+unset RUNNING_KSH
+
+test -f /bin/bsh && test -z "$RUNNING_BSH" \
+  && { UNAMES=`uname -s`; test "x$UNAMES" = xAIX; } 2>/dev/null \
+  && { RUNNING_BSH=true; export RUNNING_BSH; exec /bin/bsh $0 ${1+"$@"}; }
+unset RUNNING_BSH
+
+# hack around a bug in zsh:
+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 updmap-setup-kanji ${1+"$@"}
+
diff --git a/Build/source/texk/texlive/linked_scripts/jfontmaps/updmap-setup-kanji-sys.sh b/Build/source/texk/texlive/linked_scripts/jfontmaps/updmap-setup-kanji-sys.sh
new file mode 100755
index 00000000000..f84fcd7a671
--- /dev/null
+++ b/Build/source/texk/texlive/linked_scripts/jfontmaps/updmap-setup-kanji-sys.sh
@@ -0,0 +1,31 @@
+#!/bin/sh
+
+# updmap-setup-kanji-sys: 
+# copy of fmtutil-sys by Thomas Esser, public domain.
+
+# wrapper script for updmap-setup-kanji with TEXMFVAR and TEXMFCONFIG set to
+#   TEXMFSYSVAR / TEXMFSYSCONFIG
+
+test -f /bin/ksh && test -z "$RUNNING_KSH" \
+  && { UNAMES=`uname -s`; test "x$UNAMES" = xULTRIX; } 2>/dev/null \
+  && { RUNNING_KSH=true; export RUNNING_KSH; exec /bin/ksh $0 ${1+"$@"}; }
+unset RUNNING_KSH
+
+test -f /bin/bsh && test -z "$RUNNING_BSH" \
+  && { UNAMES=`uname -s`; test "x$UNAMES" = xAIX; } 2>/dev/null \
+  && { RUNNING_BSH=true; export RUNNING_BSH; exec /bin/bsh $0 ${1+"$@"}; }
+unset RUNNING_BSH
+
+# hack around a bug in zsh:
+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 updmap-setup-kanji ${1+"$@"}
+
diff --git a/Build/source/texk/texlive/linked_scripts/scripts.lst b/Build/source/texk/texlive/linked_scripts/scripts.lst
index 72f6aded605..d9687ff40c2 100644
--- a/Build/source/texk/texlive/linked_scripts/scripts.lst
+++ b/Build/source/texk/texlive/linked_scripts/scripts.lst
@@ -69,6 +69,7 @@ fontools/ot2kpx
 fragmaster/fragmaster.pl
 glossaries/makeglossaries
 jfontmaps/updmap-setup-kanji.pl
+jfontmaps/updmap-setup-kanji-sys.sh
 latex2man/latex2man
 latexdiff/latexdiff.pl
 latexdiff/latexdiff-vc.pl
diff --git a/Master/bin/alpha-linux/updmap-setup-kanji-sys b/Master/bin/alpha-linux/updmap-setup-kanji-sys
new file mode 120000
index 00000000000..963b1f2cfc0
--- /dev/null
+++ b/Master/bin/alpha-linux/updmap-setup-kanji-sys
@@ -0,0 +1 @@
+../texmf-dist/scripts/jfontmaps/updmap-setup-kanji-sys.sh
\ No newline at end of file
diff --git a/Master/bin/amd64-freebsd/updmap-setup-kanji-sys b/Master/bin/amd64-freebsd/updmap-setup-kanji-sys
new file mode 120000
index 00000000000..963b1f2cfc0
--- /dev/null
+++ b/Master/bin/amd64-freebsd/updmap-setup-kanji-sys
@@ -0,0 +1 @@
+../texmf-dist/scripts/jfontmaps/updmap-setup-kanji-sys.sh
\ No newline at end of file
diff --git a/Master/bin/amd64-kfreebsd/updmap-setup-kanji-sys b/Master/bin/amd64-kfreebsd/updmap-setup-kanji-sys
new file mode 120000
index 00000000000..963b1f2cfc0
--- /dev/null
+++ b/Master/bin/amd64-kfreebsd/updmap-setup-kanji-sys
@@ -0,0 +1 @@
+../texmf-dist/scripts/jfontmaps/updmap-setup-kanji-sys.sh
\ No newline at end of file
diff --git a/Master/bin/armel-linux/updmap-setup-kanji-sys b/Master/bin/armel-linux/updmap-setup-kanji-sys
new file mode 120000
index 00000000000..963b1f2cfc0
--- /dev/null
+++ b/Master/bin/armel-linux/updmap-setup-kanji-sys
@@ -0,0 +1 @@
+../texmf-dist/scripts/jfontmaps/updmap-setup-kanji-sys.sh
\ No newline at end of file
diff --git a/Master/bin/i386-cygwin/updmap-setup-kanji-sys b/Master/bin/i386-cygwin/updmap-setup-kanji-sys
new file mode 120000
index 00000000000..963b1f2cfc0
--- /dev/null
+++ b/Master/bin/i386-cygwin/updmap-setup-kanji-sys
@@ -0,0 +1 @@
+../texmf-dist/scripts/jfontmaps/updmap-setup-kanji-sys.sh
\ No newline at end of file
diff --git a/Master/bin/i386-freebsd/updmap-setup-kanji-sys b/Master/bin/i386-freebsd/updmap-setup-kanji-sys
new file mode 120000
index 00000000000..963b1f2cfc0
--- /dev/null
+++ b/Master/bin/i386-freebsd/updmap-setup-kanji-sys
@@ -0,0 +1 @@
+../texmf-dist/scripts/jfontmaps/updmap-setup-kanji-sys.sh
\ No newline at end of file
diff --git a/Master/bin/i386-kfreebsd/updmap-setup-kanji-sys b/Master/bin/i386-kfreebsd/updmap-setup-kanji-sys
new file mode 120000
index 00000000000..963b1f2cfc0
--- /dev/null
+++ b/Master/bin/i386-kfreebsd/updmap-setup-kanji-sys
@@ -0,0 +1 @@
+../texmf-dist/scripts/jfontmaps/updmap-setup-kanji-sys.sh
\ No newline at end of file
diff --git a/Master/bin/i386-linux/updmap-setup-kanji-sys b/Master/bin/i386-linux/updmap-setup-kanji-sys
new file mode 120000
index 00000000000..963b1f2cfc0
--- /dev/null
+++ b/Master/bin/i386-linux/updmap-setup-kanji-sys
@@ -0,0 +1 @@
+../texmf-dist/scripts/jfontmaps/updmap-setup-kanji-sys.sh
\ No newline at end of file
diff --git a/Master/bin/i386-solaris/updmap-setup-kanji-sys b/Master/bin/i386-solaris/updmap-setup-kanji-sys
new file mode 120000
index 00000000000..963b1f2cfc0
--- /dev/null
+++ b/Master/bin/i386-solaris/updmap-setup-kanji-sys
@@ -0,0 +1 @@
+../texmf-dist/scripts/jfontmaps/updmap-setup-kanji-sys.sh
\ No newline at end of file
diff --git a/Master/bin/mipsel-linux/updmap-setup-kanji-sys b/Master/bin/mipsel-linux/updmap-setup-kanji-sys
new file mode 120000
index 00000000000..963b1f2cfc0
--- /dev/null
+++ b/Master/bin/mipsel-linux/updmap-setup-kanji-sys
@@ -0,0 +1 @@
+../texmf-dist/scripts/jfontmaps/updmap-setup-kanji-sys.sh
\ No newline at end of file
diff --git a/Master/bin/powerpc-aix/updmap-setup-kanji-sys b/Master/bin/powerpc-aix/updmap-setup-kanji-sys
new file mode 120000
index 00000000000..963b1f2cfc0
--- /dev/null
+++ b/Master/bin/powerpc-aix/updmap-setup-kanji-sys
@@ -0,0 +1 @@
+../texmf-dist/scripts/jfontmaps/updmap-setup-kanji-sys.sh
\ No newline at end of file
diff --git a/Master/bin/powerpc-linux/updmap-setup-kanji-sys b/Master/bin/powerpc-linux/updmap-setup-kanji-sys
new file mode 120000
index 00000000000..963b1f2cfc0
--- /dev/null
+++ b/Master/bin/powerpc-linux/updmap-setup-kanji-sys
@@ -0,0 +1 @@
+../texmf-dist/scripts/jfontmaps/updmap-setup-kanji-sys.sh
\ No newline at end of file
diff --git a/Master/bin/sparc-solaris/updmap-setup-kanji-sys b/Master/bin/sparc-solaris/updmap-setup-kanji-sys
new file mode 120000
index 00000000000..963b1f2cfc0
--- /dev/null
+++ b/Master/bin/sparc-solaris/updmap-setup-kanji-sys
@@ -0,0 +1 @@
+../texmf-dist/scripts/jfontmaps/updmap-setup-kanji-sys.sh
\ No newline at end of file
diff --git a/Master/bin/universal-darwin/updmap-setup-kanji-sys b/Master/bin/universal-darwin/updmap-setup-kanji-sys
new file mode 120000
index 00000000000..963b1f2cfc0
--- /dev/null
+++ b/Master/bin/universal-darwin/updmap-setup-kanji-sys
@@ -0,0 +1 @@
+../texmf-dist/scripts/jfontmaps/updmap-setup-kanji-sys.sh
\ No newline at end of file
diff --git a/Master/bin/win32/updmap-setup-kanji-sys.exe b/Master/bin/win32/updmap-setup-kanji-sys.exe
new file mode 100755
index 00000000000..5777d90a17a
--- /dev/null
+++ b/Master/bin/win32/updmap-setup-kanji-sys.exe
diff --git a/Master/bin/x86_64-darwin/updmap-setup-kanji-sys b/Master/bin/x86_64-darwin/updmap-setup-kanji-sys
new file mode 120000
index 00000000000..963b1f2cfc0
--- /dev/null
+++ b/Master/bin/x86_64-darwin/updmap-setup-kanji-sys
@@ -0,0 +1 @@
+../texmf-dist/scripts/jfontmaps/updmap-setup-kanji-sys.sh
\ No newline at end of file
diff --git a/Master/bin/x86_64-linux/updmap-setup-kanji-sys b/Master/bin/x86_64-linux/updmap-setup-kanji-sys
new file mode 120000
index 00000000000..963b1f2cfc0
--- /dev/null
+++ b/Master/bin/x86_64-linux/updmap-setup-kanji-sys
@@ -0,0 +1 @@
+../texmf-dist/scripts/jfontmaps/updmap-setup-kanji-sys.sh
\ No newline at end of file
diff --git a/Master/bin/x86_64-solaris/updmap-setup-kanji-sys b/Master/bin/x86_64-solaris/updmap-setup-kanji-sys
new file mode 120000
index 00000000000..963b1f2cfc0
--- /dev/null
+++ b/Master/bin/x86_64-solaris/updmap-setup-kanji-sys
@@ -0,0 +1 @@
+../texmf-dist/scripts/jfontmaps/updmap-setup-kanji-sys.sh
\ No newline at end of file
diff --git a/Master/texmf-dist/scripts/jfontmaps/updmap-setup-kanji-sys.sh b/Master/texmf-dist/scripts/jfontmaps/updmap-setup-kanji-sys.sh
new file mode 100755
index 00000000000..f84fcd7a671
--- /dev/null
+++ b/Master/texmf-dist/scripts/jfontmaps/updmap-setup-kanji-sys.sh
@@ -0,0 +1,31 @@
+#!/bin/sh
+
+# updmap-setup-kanji-sys: 
+# copy of fmtutil-sys by Thomas Esser, public domain.
+
+# wrapper script for updmap-setup-kanji with TEXMFVAR and TEXMFCONFIG set to
+#   TEXMFSYSVAR / TEXMFSYSCONFIG
+
+test -f /bin/ksh && test -z "$RUNNING_KSH" \
+  && { UNAMES=`uname -s`; test "x$UNAMES" = xULTRIX; } 2>/dev/null \
+  && { RUNNING_KSH=true; export RUNNING_KSH; exec /bin/ksh $0 ${1+"$@"}; }
+unset RUNNING_KSH
+
+test -f /bin/bsh && test -z "$RUNNING_BSH" \
+  && { UNAMES=`uname -s`; test "x$UNAMES" = xAIX; } 2>/dev/null \
+  && { RUNNING_BSH=true; export RUNNING_BSH; exec /bin/bsh $0 ${1+"$@"}; }
+unset RUNNING_BSH
+
+# hack around a bug in zsh:
+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 updmap-setup-kanji ${1+"$@"}
+
diff --git a/Master/texmf-dist/scripts/jfontmaps/updmap-setup-kanji.pl b/Master/texmf-dist/scripts/jfontmaps/updmap-setup-kanji.pl
index 167c4073abb..367fddff829 100755
--- a/Master/texmf-dist/scripts/jfontmaps/updmap-setup-kanji.pl
+++ b/Master/texmf-dist/scripts/jfontmaps/updmap-setup-kanji.pl
@@ -19,10 +19,10 @@ use Getopt::Long qw(:config no_autoabbrev ignore_case_always);
 use strict;
 
 my $prg = "updmap-setup-kanji";
-my $vers = "0.9.5";
-my $version = '$Id: updmap-setup-kanji.pl 25640 2012-03-14 22:44:37Z preining $';
+my $vers = "0.9.6";
+my $version = '$Id: updmap-setup-kanji.pl 27277 2012-08-02 00:16:14Z karl $';
 
-my $updmap_real = "updmap-sys";
+my $updmap_real = "updmap";
 my $updmap = $updmap_real;
 
 my $dry_run = 0;
@@ -44,7 +44,7 @@ my $nul = (win32() ? 'nul' : '/dev/null') ;
 
 
 if ($dry_run) {
-  $updmap = "echo updmap-sys"; 
+  $updmap = "echo updmap"; 
 }
 
 if ($opt_help) {
@@ -91,7 +91,7 @@ sub Usage {
 
   Please see the documentation of updmap for details (updmap --help).
 
-  Usage:  $prg {<fontname>|auto|nofont|status}
+  Usage:  $prg [OPTION] {<fontname>|auto|nofont|status}
 
      <family>    embed an arbitrary font family <family>, at least the
                  map file otf-<family>.map has to be available.
@@ -106,6 +106,12 @@ sub Usage {
                  automatically.
      status:     get information about current environment and usable font map
 
+  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
+    --version      show version information and exit
+
 EOF
 ;
   print $usage;
@@ -145,13 +151,10 @@ sub check_mapfile {
 sub GetStatus {
   my $val = `$updmap_real --quiet --showoption kanjiEmbed`;
   my $STATUS;
-  if ($val =~ m/^kanjiEmbed=(.*)( \()?/) {
+  if ($val =~ m/^kanjiEmbed=([^()\s]*)(\s+\()?/) {
     $STATUS = $1;
-    $STATUS =~ s/\s*$//;
-    $STATUS =~ s/\(.*\)$//;
-    $STATUS =~ s/^"(.*)"$/\1/;
   } else {
-    printf STDERR "Cannot find status of current kanjiEmbed setting via updmap-sys --showoption!\n";
+    printf STDERR "Cannot find status of current kanjiEmbed setting via updmap --showoption!\n";
     exit 1;
   }
 
diff --git a/Master/tlpkg/tlpsrc/jfontmaps.tlpsrc b/Master/tlpkg/tlpsrc/jfontmaps.tlpsrc
index 56775fc6eae..7b402e02b6a 100644
--- a/Master/tlpkg/tlpsrc/jfontmaps.tlpsrc
+++ b/Master/tlpkg/tlpsrc/jfontmaps.tlpsrc
@@ -1,2 +1,3 @@
 runpattern +d texmf-dist/fonts/map/dvipdfmx/jfontmaps
 binpattern f bin/${ARCH}/updmap-setup-kanji
+binpattern f bin/${ARCH}/updmap-setup-kanji-sys