summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorNorbert Preining <preining@logic.at>2012-02-05 23:21:57 +0000
committerNorbert Preining <preining@logic.at>2012-02-05 23:21:57 +0000
commit2d1b4013b165e1ce117c1c08fe6005f66b880c7a (patch)
treecfcb63d7388dc7aeac099f027ca142a6c09e7d6c /Master
parentfcfcd6a1b62bb9f80ed10f4d91999f991d2af8ed (diff)
jfontmaps: include script, update linked_scripts, adjust ctan2tds, adjust
tlpsrc, add a README to Build/source/texk/texlive/linked_scripts/ git-svn-id: svn://tug.org/texlive/trunk@25294 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
l---------Master/bin/alpha-linux/updmap-setup-kanji1
l---------Master/bin/amd64-freebsd/updmap-setup-kanji1
l---------Master/bin/amd64-kfreebsd/updmap-setup-kanji1
l---------Master/bin/i386-cygwin/updmap-setup-kanji1
l---------Master/bin/i386-freebsd/updmap-setup-kanji1
l---------Master/bin/i386-kfreebsd/updmap-setup-kanji1
l---------Master/bin/i386-linux/updmap-setup-kanji1
l---------Master/bin/i386-netbsd/updmap-setup-kanji1
l---------Master/bin/i386-solaris/updmap-setup-kanji1
l---------Master/bin/mips-irix/updmap-setup-kanji1
l---------Master/bin/powerpc-aix/updmap-setup-kanji1
l---------Master/bin/powerpc-linux/updmap-setup-kanji1
l---------Master/bin/sparc-linux/updmap-setup-kanji1
l---------Master/bin/sparc-solaris/updmap-setup-kanji1
l---------Master/bin/universal-darwin/updmap-setup-kanji1
-rwxr-xr-xMaster/bin/win32/updmap-setup-kanji.exebin0 -> 1536 bytes
l---------Master/bin/x86_64-darwin/updmap-setup-kanji1
l---------Master/bin/x86_64-linux/updmap-setup-kanji1
l---------Master/bin/x86_64-solaris/updmap-setup-kanji1
-rwxr-xr-xMaster/texmf-dist/doc/fonts/jfontmaps/updmap-otf.sh323
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka/otf-up-kozuka.map15
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/otf-hiragino.map (renamed from Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino/otf-hiragino.map)0
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/otf-kozuka.map (renamed from Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka/otf-kozuka.map)20
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/otf-morisawa.map (renamed from Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/morisawa/otf-morisawa.map)0
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/otf-up-hiragino.map (renamed from Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino/otf-up-hiragino.map)0
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/otf-up-kozuka.map15
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/otf-up-morisawa.map (renamed from Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/morisawa/otf-up-morisawa.map)0
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ptex-hiragino-04.map (renamed from Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino/ptex-hiragino-04.map)0
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ptex-hiragino.map (renamed from Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino/ptex-hiragino.map)0
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ptex-kozuka-04.map (renamed from Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka/ptex-kozuka-04.map)0
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ptex-kozuka.map (renamed from Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka/ptex-kozuka.map)0
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ptex-morisawa-04.map (renamed from Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/morisawa/ptex-morisawa-04.map)0
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ptex-morisawa.map (renamed from Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/morisawa/ptex-morisawa.map)0
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/uptex-hiragino-04.map (renamed from Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino/uptex-hiragino-04.map)0
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/uptex-hiragino.map (renamed from Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino/uptex-hiragino.map)0
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/uptex-kozuka-04.map (renamed from Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka/uptex-kozuka-04.map)0
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/uptex-kozuka.map (renamed from Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka/uptex-kozuka.map)0
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/uptex-morisawa-04.map (renamed from Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/morisawa/uptex-morisawa-04.map)0
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/uptex-morisawa.map (renamed from Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/morisawa/uptex-morisawa.map)0
-rwxr-xr-xMaster/texmf-dist/scripts/jfontmaps/updmap-setup-kanji.pl295
-rwxr-xr-xMaster/tlpkg/libexec/ctan2tds4
-rw-r--r--Master/tlpkg/tlpsrc/jfontmaps.tlpsrc4
42 files changed, 666 insertions, 28 deletions
diff --git a/Master/bin/alpha-linux/updmap-setup-kanji b/Master/bin/alpha-linux/updmap-setup-kanji
new file mode 120000
index 00000000000..4fa7fcc27b2
--- /dev/null
+++ b/Master/bin/alpha-linux/updmap-setup-kanji
@@ -0,0 +1 @@
+../../texmf-dist/scripts/jfontmaps/updmap-setup-kanji.pl \ No newline at end of file
diff --git a/Master/bin/amd64-freebsd/updmap-setup-kanji b/Master/bin/amd64-freebsd/updmap-setup-kanji
new file mode 120000
index 00000000000..4fa7fcc27b2
--- /dev/null
+++ b/Master/bin/amd64-freebsd/updmap-setup-kanji
@@ -0,0 +1 @@
+../../texmf-dist/scripts/jfontmaps/updmap-setup-kanji.pl \ No newline at end of file
diff --git a/Master/bin/amd64-kfreebsd/updmap-setup-kanji b/Master/bin/amd64-kfreebsd/updmap-setup-kanji
new file mode 120000
index 00000000000..4fa7fcc27b2
--- /dev/null
+++ b/Master/bin/amd64-kfreebsd/updmap-setup-kanji
@@ -0,0 +1 @@
+../../texmf-dist/scripts/jfontmaps/updmap-setup-kanji.pl \ No newline at end of file
diff --git a/Master/bin/i386-cygwin/updmap-setup-kanji b/Master/bin/i386-cygwin/updmap-setup-kanji
new file mode 120000
index 00000000000..4fa7fcc27b2
--- /dev/null
+++ b/Master/bin/i386-cygwin/updmap-setup-kanji
@@ -0,0 +1 @@
+../../texmf-dist/scripts/jfontmaps/updmap-setup-kanji.pl \ No newline at end of file
diff --git a/Master/bin/i386-freebsd/updmap-setup-kanji b/Master/bin/i386-freebsd/updmap-setup-kanji
new file mode 120000
index 00000000000..4fa7fcc27b2
--- /dev/null
+++ b/Master/bin/i386-freebsd/updmap-setup-kanji
@@ -0,0 +1 @@
+../../texmf-dist/scripts/jfontmaps/updmap-setup-kanji.pl \ No newline at end of file
diff --git a/Master/bin/i386-kfreebsd/updmap-setup-kanji b/Master/bin/i386-kfreebsd/updmap-setup-kanji
new file mode 120000
index 00000000000..4fa7fcc27b2
--- /dev/null
+++ b/Master/bin/i386-kfreebsd/updmap-setup-kanji
@@ -0,0 +1 @@
+../../texmf-dist/scripts/jfontmaps/updmap-setup-kanji.pl \ No newline at end of file
diff --git a/Master/bin/i386-linux/updmap-setup-kanji b/Master/bin/i386-linux/updmap-setup-kanji
new file mode 120000
index 00000000000..4fa7fcc27b2
--- /dev/null
+++ b/Master/bin/i386-linux/updmap-setup-kanji
@@ -0,0 +1 @@
+../../texmf-dist/scripts/jfontmaps/updmap-setup-kanji.pl \ No newline at end of file
diff --git a/Master/bin/i386-netbsd/updmap-setup-kanji b/Master/bin/i386-netbsd/updmap-setup-kanji
new file mode 120000
index 00000000000..4fa7fcc27b2
--- /dev/null
+++ b/Master/bin/i386-netbsd/updmap-setup-kanji
@@ -0,0 +1 @@
+../../texmf-dist/scripts/jfontmaps/updmap-setup-kanji.pl \ No newline at end of file
diff --git a/Master/bin/i386-solaris/updmap-setup-kanji b/Master/bin/i386-solaris/updmap-setup-kanji
new file mode 120000
index 00000000000..4fa7fcc27b2
--- /dev/null
+++ b/Master/bin/i386-solaris/updmap-setup-kanji
@@ -0,0 +1 @@
+../../texmf-dist/scripts/jfontmaps/updmap-setup-kanji.pl \ No newline at end of file
diff --git a/Master/bin/mips-irix/updmap-setup-kanji b/Master/bin/mips-irix/updmap-setup-kanji
new file mode 120000
index 00000000000..4fa7fcc27b2
--- /dev/null
+++ b/Master/bin/mips-irix/updmap-setup-kanji
@@ -0,0 +1 @@
+../../texmf-dist/scripts/jfontmaps/updmap-setup-kanji.pl \ No newline at end of file
diff --git a/Master/bin/powerpc-aix/updmap-setup-kanji b/Master/bin/powerpc-aix/updmap-setup-kanji
new file mode 120000
index 00000000000..4fa7fcc27b2
--- /dev/null
+++ b/Master/bin/powerpc-aix/updmap-setup-kanji
@@ -0,0 +1 @@
+../../texmf-dist/scripts/jfontmaps/updmap-setup-kanji.pl \ No newline at end of file
diff --git a/Master/bin/powerpc-linux/updmap-setup-kanji b/Master/bin/powerpc-linux/updmap-setup-kanji
new file mode 120000
index 00000000000..4fa7fcc27b2
--- /dev/null
+++ b/Master/bin/powerpc-linux/updmap-setup-kanji
@@ -0,0 +1 @@
+../../texmf-dist/scripts/jfontmaps/updmap-setup-kanji.pl \ No newline at end of file
diff --git a/Master/bin/sparc-linux/updmap-setup-kanji b/Master/bin/sparc-linux/updmap-setup-kanji
new file mode 120000
index 00000000000..4fa7fcc27b2
--- /dev/null
+++ b/Master/bin/sparc-linux/updmap-setup-kanji
@@ -0,0 +1 @@
+../../texmf-dist/scripts/jfontmaps/updmap-setup-kanji.pl \ No newline at end of file
diff --git a/Master/bin/sparc-solaris/updmap-setup-kanji b/Master/bin/sparc-solaris/updmap-setup-kanji
new file mode 120000
index 00000000000..4fa7fcc27b2
--- /dev/null
+++ b/Master/bin/sparc-solaris/updmap-setup-kanji
@@ -0,0 +1 @@
+../../texmf-dist/scripts/jfontmaps/updmap-setup-kanji.pl \ No newline at end of file
diff --git a/Master/bin/universal-darwin/updmap-setup-kanji b/Master/bin/universal-darwin/updmap-setup-kanji
new file mode 120000
index 00000000000..4fa7fcc27b2
--- /dev/null
+++ b/Master/bin/universal-darwin/updmap-setup-kanji
@@ -0,0 +1 @@
+../../texmf-dist/scripts/jfontmaps/updmap-setup-kanji.pl \ No newline at end of file
diff --git a/Master/bin/win32/updmap-setup-kanji.exe b/Master/bin/win32/updmap-setup-kanji.exe
new file mode 100755
index 00000000000..5777d90a17a
--- /dev/null
+++ b/Master/bin/win32/updmap-setup-kanji.exe
Binary files differ
diff --git a/Master/bin/x86_64-darwin/updmap-setup-kanji b/Master/bin/x86_64-darwin/updmap-setup-kanji
new file mode 120000
index 00000000000..4fa7fcc27b2
--- /dev/null
+++ b/Master/bin/x86_64-darwin/updmap-setup-kanji
@@ -0,0 +1 @@
+../../texmf-dist/scripts/jfontmaps/updmap-setup-kanji.pl \ No newline at end of file
diff --git a/Master/bin/x86_64-linux/updmap-setup-kanji b/Master/bin/x86_64-linux/updmap-setup-kanji
new file mode 120000
index 00000000000..4fa7fcc27b2
--- /dev/null
+++ b/Master/bin/x86_64-linux/updmap-setup-kanji
@@ -0,0 +1 @@
+../../texmf-dist/scripts/jfontmaps/updmap-setup-kanji.pl \ No newline at end of file
diff --git a/Master/bin/x86_64-solaris/updmap-setup-kanji b/Master/bin/x86_64-solaris/updmap-setup-kanji
new file mode 120000
index 00000000000..4fa7fcc27b2
--- /dev/null
+++ b/Master/bin/x86_64-solaris/updmap-setup-kanji
@@ -0,0 +1 @@
+../../texmf-dist/scripts/jfontmaps/updmap-setup-kanji.pl \ No newline at end of file
diff --git a/Master/texmf-dist/doc/fonts/jfontmaps/updmap-otf.sh b/Master/texmf-dist/doc/fonts/jfontmaps/updmap-otf.sh
new file mode 100755
index 00000000000..0a188addd58
--- /dev/null
+++ b/Master/texmf-dist/doc/fonts/jfontmaps/updmap-otf.sh
@@ -0,0 +1,323 @@
+#!/bin/sh
+# updmap-otf: v0.9.1
+#
+# Copyright 2004-2006 by KOBAYASHI R. Taizo
+# Copyright 2011-2012 by PREINING Norbert
+#
+# WARNING: This file is NOT developed any more. TeX Live uses a version
+# rewritten in perl called updmap-setup-kanji, which is located
+# and developed in the same place as this file.
+#
+# For development see
+# http://www.tug.org/svn/texlive/trunk/Build/source/extra/jfontmaps/
+#
+# This file is licensed under GPL version 3 or any later version.
+# For copyright statements see end of file.
+#
+# 27 Jan 2012 by PREINING Norbert <preining@logic.at> v0.9.2
+# support IPA and IPAex fonts
+# improve and extended documentation
+# 11 Nov 2011 by PREINING Norbert <preining@logic.at> v0.9.1
+# use kpsewhich for finding fonts
+# use updmap-sys --setoption kanjiEmbed to select the font family
+# use current names of map files
+# use different font name for Kozuka font, as used in the map file
+# get state from updmap.cfg, not from some state file
+# 27 May 2006 by KOBAYASHI R. Taizo <tkoba965@mac.com> v0.9
+# use noEmbed.map instead of noEmbeddedFont.map
+# 10 Jun 2005 by KOBAYASHI R. Taizo <tkoba965@mac.com> v0.8
+# modified to use updmap-sys in teTeX3
+# 07 Nov 2004 by KOBAYASHI R. Taizo <tkoba965@mac.com> v0.7
+# do not echo back the message of updmap.
+# 17 Oct 2004 by KOBAYASHI R. Taizo <tkoba965@mac.com> v0.6
+# set hiragino map file if nofont is installed and arg is auto.
+# 04 Oct 2004 by KOBAYASHI R. Taizo <tkoba965@mac.com> v0.5
+# handl standby map files more strictly
+# 20 Sep 2004 by KOBAYASHI R. Taizo <tkoba965@mac.com> v0.4
+# hand over current status to map file installer
+# 19 Sep 2004 by KOBAYASHI R. Taizo <tkoba965@mac.com> v0.3
+# handl *-udvips.map in TEXMF/dvipdfm/config/otf/
+# 02 Mar 2004 by KOBAYASHI R. Taizo <tkoba@ike-dyn.ritsumei.ac.jp> v0.2
+# added noFont-udvips.map
+# 28 Feb 2004 by KOBAYASHI R. Taizo <tkoba@ike-dyn.ritsumei.ac.jp> v0.1
+
+
+###
+### Usage
+###
+
+Usage() {
+cat <<EOF
+ updmap-otf Front end to updmap.cfg configuration for Japanese fonts
+ as used in the otf package.
+
+ This script searches for some of the most common fonts
+ for embedding into pdfs by dvipdfmx.
+
+ Usage: updmap-otf {<fontname>|auto|nofont|status}
+
+ <fontname> set fonts as defined by the map file otf-<fontname>.map
+ if it exists.
+ auto: sets one of the following supported font families
+ automatically:
+ hiragino, morisawa, kozuka, ipaex, ipa
+ nofont: set no fonts are embedded
+ If your system does not have any of the supported font
+ families as specified above, this target is selected
+ automatically.
+ status: get information about current environment and usable font map
+
+EOF
+}
+
+#
+# representatives of support font families
+#
+hiragino_font=HiraMinPro-W3.otf
+morisawa_font=A-OTF-RyuminPro-Light.otf
+kozuka_font=KozMinPro-Regular.otf
+ipa_font=ipam.ttf
+ipaex_font=ipaexm.ttf
+
+
+###
+### Check Installed Font
+###
+
+CheckInstallFont() {
+ if kpsewhich $hiragino_font >/dev/null ; then
+ HIRAGINO=installed
+ else
+ HIRAGINO=""
+ fi
+
+ if kpsewhich $morisawa_font >/dev/null ; then
+ MORISAWA=installed
+ else
+ MORISAWA=""
+ fi
+
+ if kpsewhich $kozuka_font >/dev/null ; then
+ KOZUKA=installed
+ else
+ KOZUKA=""
+ fi
+
+ if kpsewhich $ipa_font >/dev/null ; then
+ IPA=installed
+ else
+ IPA=""
+ fi
+
+ if kpsewhich $ipaex_font >/dev/null ; then
+ IPAEX=installed
+ else
+ IPAEX=""
+ fi
+
+
+}
+
+###
+### GetStatus
+###
+
+GetStatus() {
+
+STATUS=$(grep ^kanjiEmbed $(kpsewhich updmap.cfg) | awk '{print$2}')
+
+if kpsewhich otf-$STATUS.map >/dev/null ; then
+ echo "CURRENT map file : otf-$STATUS.map"
+else
+ echo "WARNING: Currently selected map file cannot be found: otf-$STATUS.map"
+fi
+
+
+for MAPFILE in otf-hiragino.map otf-morisawa.map otf-kozuka.map otf-ipaex.map otf-ipa.map
+do
+ if [ "$MAPFILE" = "otf-$STATUS.map" ] ; then
+ continue
+ fi
+ mffound=`kpsewhich $MAPFILE`
+ if [ -n "$mffound" ] ; then
+ case "$MAPFILE" in
+ otf-hiragino.map)
+ if [ "$HIRAGINO" = "installed" ]; then
+ echo "Standby map file : $MAPFILE"
+ fi
+ ;;
+ otf-morisawa.map)
+ if [ "$MORISAWA" = "installed" ]; then
+ echo "Standby map file : $MAPFILE"
+ fi
+ ;;
+ otf-kozuka.map)
+ if [ "$KOZUKA" = "installed" ]; then
+ echo "Standby map file : $MAPFILE"
+ fi
+ ;;
+ otf-ipa.map)
+ if [ "$IPA" = "installed" ]; then
+ echo "Standby map file : $MAPFILE"
+ fi
+ ;;
+ otf-ipaex.map)
+ if [ "$IPAEX" = "installed" ]; then
+ echo "Standby map file : $MAPFILE"
+ fi
+ ;;
+ *)
+ echo "Should not happen!"
+ ;;
+ esac
+ fi
+done
+
+}
+
+###
+### Setup Map files
+###
+
+SetupMapFile() {
+
+MAPFILE=otf-$1.map
+
+if kpsewhich $MAPFILE >/dev/null ; then
+ echo "Setting up ... $MAPFILE"
+ updmap-sys -setoption kanjiEmbed $1
+ updmap-sys
+else
+ echo "NOT EXIST $MAPFILE"
+ return 1
+fi
+}
+
+###
+### MAIN
+###
+
+main() {
+
+# mktexlsr 2> /dev/null
+
+CheckInstallFont
+
+if [ $# != 1 ] ; then
+ eval Usage ${0##*/}
+ return -1
+fi
+
+case "$1" in
+ hiragino)
+ if [ "$HIRAGINO" = "installed" ]; then
+ SetupMapFile hiragino
+ else
+ main auto
+ fi
+ ;;
+ morisawa)
+ if [ "$MORISAWA" = "installed" ]; then
+ SetupMapFile morisawa
+ else
+ main auto
+ fi
+ ;;
+ kozuka)
+ if [ "$KOZUKA" = "installed" ]; then
+ SetupMapFile kozuka
+ else
+ main auto
+ fi
+ ;;
+ ipa)
+ if [ "$IPA" = "installed" ]; then
+ SetupMapFile ipa
+ else
+ main auto
+ fi
+ ;;
+ ipaex)
+ if [ "$IPAEX" = "installed" ]; then
+ SetupMapFile ipaex
+ else
+ main auto
+ fi
+ ;;
+ nofont)
+ SetupMapFile noEmbed
+ ;;
+ auto)
+ GetStatus
+ # first check if we have a status set and the font is installed
+ # in this case don't change anything, just make sure
+ if [ "$STATUS" = "morisawa" ] && [ "$MORISAWA" = "installed" ]; then
+ SetupMapFile morisawa
+ elif [ "$STATUS" = "kozuka" ] && [ "$KOZUKA" = "installed" ]; then
+ SetupMapFile kozuka
+ elif [ "$STATUS" = "hiragino" ] && [ "$HIRAGINO" = "installed" ]; then
+ SetupMapFile hiragino
+ elif [ "$STATUS" = "ipaex" ] && [ "$IPAEX" = "installed" ]; then
+ SetupMapFile ipaex
+ elif [ "$STATUS" = "ipa" ] && [ "$IPA" = "installed" ]; then
+ SetupMapFile ipa
+ else
+ if [ "$STATUS" = "noEmbed" ] || [ "$STATUS" = "" ]; then
+ : do nothing here, we dont have to warn
+ else
+ # some unknown setting is set up currently, overwrite
+ # but warn
+ echo "Previous setting $STATUS is unknown, replacing it!"
+ fi
+ # if we are in the noEmbed or nothing set case, but one
+ # of the three fonts hiragino/morisawa/kozuka are present
+ # then use them
+ if [ "$HIRAGINO" = "installed" ]; then
+ SetupMapFile hiragino
+ elif [ "$MORISAWA" = "installed" ]; then
+ SetupMapFile morisawa
+ elif [ "$KOZUKA" = "installed" ]; then
+ SetupMapFile kozuka
+ elif [ "$IPAEX" = "installed" ]; then
+ SetupMapFile ipaex
+ elif [ "$IPA" = "installed" ]; then
+ SetupMapFile ipa
+ else
+ SetupMapFile noEmbed
+ fi
+ fi
+ ;;
+ status)
+ GetStatus
+ return 0
+ ;;
+ *)
+ SetupMapFile $1
+ ;;
+esac
+}
+
+main $@
+
+#
+#
+# Copyright statements:
+#
+# KOBAYASHI Taizo
+# email to preining@logic.at
+# Message-Id: <20120130.162953.59640143170594580.tkoba@cc.kyushu-u.ac.jp>
+# Message-Id: <20120201.105639.625859878546968959.tkoba@cc.kyushu-u.ac.jp>
+# --------------------------------------------------------
+# copyright statement は簡単に以下で結構です。
+#
+# Copyright 2004-2006 by KOBAYASHI Taizo
+#
+# では
+# GPL version 3 or any later version
+#
+# --------------------------------------------------------
+#
+# PREINING Norbert
+# as author and maintainer of the current file
+# Licensed under GPL version 3 or any later version
+#
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka/otf-up-kozuka.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka/otf-up-kozuka.map
deleted file mode 100644
index ac91cf4d826..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka/otf-up-kozuka.map
+++ /dev/null
@@ -1,15 +0,0 @@
-%
-% otf-up-kozuka.map
-% map file to support Kozuka fonts in uptex
-% based on the patch of TANAKA Takuji
-% from uptex-1.00-20120115a
-uphminr-h UniJIS-UTF16-H KozMinPro-Regular.otf
-uphminr-v UniJIS-UTF16-V KozMinPro-Regular.otf
-uphgothr-h UniJIS-UTF16-H KozGoPro-Regular.otf
-uphgothr-v UniJIS-UTF16-V KozGoPro-Regular.otf
-uphminb-h UniJIS-UTF16-H KozMinPro-Bold.otf
-uphminb-v UniJIS-UTF16-V KozMinPro-Bold.otf
-uphgothb-h UniJIS-UTF16-H KozGoPro-Bold.otf
-uphgothb-v UniJIS-UTF16-V KozGoPro-Bold.otf
-uphmgothr-h UniJIS-UTF16-H KozGoPro-Heavy.otf
-uphmgothr-v UniJIS-UTF16-V KozGoPro-Heavy.otf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino/otf-hiragino.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/otf-hiragino.map
index 40917c42494..40917c42494 100644
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino/otf-hiragino.map
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/otf-hiragino.map
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka/otf-kozuka.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/otf-kozuka.map
index c4e945b6c3c..280a5a7d5f8 100644
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka/otf-kozuka.map
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/otf-kozuka.map
@@ -36,12 +36,12 @@ otf-cjmgr-v Identity-V KozGoPro-Heavy.otf
hmgothr-h H KozGoPro-Heavy.otf
hmgothr-v V KozGoPro-Heavy.otf
-otf-ujml-h UniJIS-UTF16-H KozMinPro-Light.otf
-otf-ujml-v UniJIS-UTF16-V KozMinPro-Light.otf
-otf-cjml-h Identity-H KozMinPro-Light.otf
-otf-cjml-v Identity-V KozMinPro-Light.otf
-hminl-h H KozMinPro-Light.otf
-hminl-v V KozMinPro-Light.otf
+otf-ujml-h UniJIS-UTF16-H KozGoPro-Light.otf
+otf-ujml-v UniJIS-UTF16-V KozGoPro-Light.otf
+otf-cjml-h Identity-H KozGoPro-Light.otf
+otf-cjml-v Identity-V KozGoPro-Light.otf
+hminl-h H KozGoPro-Light.otf
+hminl-v V KozGoPro-Light.otf
%
% JIS 2004
@@ -71,7 +71,7 @@ otf-ujmgrn-v UniJIS2004-UTF16-V KozGoPr6N-Heavy.otf
hmgothrn-h H KozGoPr6N-Heavy.otf
hmgothrn-v V KozGoPr6N-Heavy.otf
-otf-ujmln-h UniJIS2004-UTF16-H KozMinPr6N-Light.otf
-otf-ujmln-v UniJIS2004-UTF16-V KozMinPr6N-Light.otf
-hminln-h H KozMinPr6N-Light.otf
-hminln-v V KozMinPr6N-Light.otf
+otf-ujmln-h UniJIS2004-UTF16-H KozGoPro-Light.otf
+otf-ujmln-v UniJIS2004-UTF16-V KozGoPro-Light.otf
+hminln-h H KozGoPro-Light.otf
+hminln-v V KozGoPro-Light.otf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/morisawa/otf-morisawa.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/otf-morisawa.map
index 2dab843dc8c..2dab843dc8c 100644
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/morisawa/otf-morisawa.map
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/otf-morisawa.map
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino/otf-up-hiragino.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/otf-up-hiragino.map
index b92ea835f88..b92ea835f88 100644
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino/otf-up-hiragino.map
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/otf-up-hiragino.map
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/otf-up-kozuka.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/otf-up-kozuka.map
new file mode 100644
index 00000000000..caca9130d30
--- /dev/null
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/otf-up-kozuka.map
@@ -0,0 +1,15 @@
+%
+% otf-up-kozuka.map
+% map file to support Kozuka fonts in uptex
+% based on the patch of TANAKA Takuji
+% from uptex-1.00-20120115a
+uphminr-h UniJIS-UTF16-H KozMinPro-Regular-Acro.otf
+uphminr-v UniJIS-UTF16-V KozMinPro-Regular-Acro.otf
+uphgothr-h UniJIS-UTF16-H KozGoStd-Regular.otf
+uphgothr-v UniJIS-UTF16-V KozGoStd-Regular.otf
+uphminb-h UniJIS-UTF16-H KozMinStd-Bold.otf
+uphminb-v UniJIS-UTF16-V KozMinStd-Bold.otf
+uphgothb-h UniJIS-UTF16-H KozGoStd-Bold.otf
+uphgothb-v UniJIS-UTF16-V KozGoStd-Bold.otf
+uphmgothr-h UniJIS-UTF16-H KozGoStd-Heavy.otf
+uphmgothr-v UniJIS-UTF16-V KozGoStd-Heavy.otf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/morisawa/otf-up-morisawa.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/otf-up-morisawa.map
index 8c66911d355..8c66911d355 100644
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/morisawa/otf-up-morisawa.map
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/otf-up-morisawa.map
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino/ptex-hiragino-04.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ptex-hiragino-04.map
index 9de30b9c898..9de30b9c898 100644
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino/ptex-hiragino-04.map
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ptex-hiragino-04.map
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino/ptex-hiragino.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ptex-hiragino.map
index 54be2188e63..54be2188e63 100644
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino/ptex-hiragino.map
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ptex-hiragino.map
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka/ptex-kozuka-04.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ptex-kozuka-04.map
index c8d864310c5..c8d864310c5 100644
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka/ptex-kozuka-04.map
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ptex-kozuka-04.map
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka/ptex-kozuka.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ptex-kozuka.map
index d302b80955b..d302b80955b 100644
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka/ptex-kozuka.map
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ptex-kozuka.map
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/morisawa/ptex-morisawa-04.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ptex-morisawa-04.map
index 82f82dc786a..82f82dc786a 100644
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/morisawa/ptex-morisawa-04.map
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ptex-morisawa-04.map
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/morisawa/ptex-morisawa.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ptex-morisawa.map
index 1c2fa50fce8..1c2fa50fce8 100644
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/morisawa/ptex-morisawa.map
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ptex-morisawa.map
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino/uptex-hiragino-04.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/uptex-hiragino-04.map
index d3599199c2b..d3599199c2b 100644
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino/uptex-hiragino-04.map
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/uptex-hiragino-04.map
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino/uptex-hiragino.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/uptex-hiragino.map
index b9752e266c0..b9752e266c0 100644
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino/uptex-hiragino.map
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/uptex-hiragino.map
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka/uptex-kozuka-04.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/uptex-kozuka-04.map
index 63b13a9a015..63b13a9a015 100644
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka/uptex-kozuka-04.map
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/uptex-kozuka-04.map
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka/uptex-kozuka.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/uptex-kozuka.map
index 15ea7242917..15ea7242917 100644
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka/uptex-kozuka.map
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/uptex-kozuka.map
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/morisawa/uptex-morisawa-04.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/uptex-morisawa-04.map
index 5c67f915aa0..5c67f915aa0 100644
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/morisawa/uptex-morisawa-04.map
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/uptex-morisawa-04.map
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/morisawa/uptex-morisawa.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/uptex-morisawa.map
index ddd6bb82ba3..ddd6bb82ba3 100644
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/morisawa/uptex-morisawa.map
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/uptex-morisawa.map
diff --git a/Master/texmf-dist/scripts/jfontmaps/updmap-setup-kanji.pl b/Master/texmf-dist/scripts/jfontmaps/updmap-setup-kanji.pl
new file mode 100755
index 00000000000..3797d9c41be
--- /dev/null
+++ b/Master/texmf-dist/scripts/jfontmaps/updmap-setup-kanji.pl
@@ -0,0 +1,295 @@
+#!/usr/bin/env perl
+# updmap-setup-kanji: setup Japanese font embedding
+#
+# Copyright 2004-2006 by KOBAYASHI R. Taizo for the shell version (updmap-otf)
+# Copyright 2011-2012 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/
+#
+# 31 Jan 2012
+# rewrite in Perl, so that the script is usable under Windows
+# add command line options for help, dry-run, etc
+# support jis2004 via cmd line -jis2004
+# 27 Jan 2012 by PREINING Norbert <preining@logic.at> v0.9.2
+# support IPA and IPAex fonts
+# improve and extended documentation
+# 11 Nov 2011 by PREINING Norbert <preining@logic.at> v0.9.1
+# use kpsewhich for finding fonts
+# use updmap-sys --setoption kanjiEmbed to select the font family
+# use current names of map files
+# use different font name for Kozuka font, as used in the map file
+# get state from updmap.cfg, not from some state file
+# 27 May 2006 by KOBAYASHI R. Taizo <tkoba965@mac.com> v0.9
+# use noEmbed.map instead of noEmbeddedFont.map
+# 10 Jun 2005 by KOBAYASHI R. Taizo <tkoba965@mac.com> v0.8
+# modified to use updmap-sys in teTeX3
+# 07 Nov 2004 by KOBAYASHI R. Taizo <tkoba965@mac.com> v0.7
+# do not echo back the message of updmap.
+# 17 Oct 2004 by KOBAYASHI R. Taizo <tkoba965@mac.com> v0.6
+# set hiragino map file if nofont is installed and arg is auto.
+# 04 Oct 2004 by KOBAYASHI R. Taizo <tkoba965@mac.com> v0.5
+# handl standby map files more strictly
+# 20 Sep 2004 by KOBAYASHI R. Taizo <tkoba965@mac.com> v0.4
+# hand over current status to map file installer
+# 19 Sep 2004 by KOBAYASHI R. Taizo <tkoba965@mac.com> v0.3
+# handl *-udvips.map in TEXMF/dvipdfm/config/otf/
+# 02 Mar 2004 by KOBAYASHI R. Taizo <tkoba@ike-dyn.ritsumei.ac.jp> v0.2
+# added noFont-udvips.map
+# 28 Feb 2004 by KOBAYASHI R. Taizo <tkoba@ike-dyn.ritsumei.ac.jp> v0.1
+
+$^W = 1;
+use Getopt::Long qw(:config no_autoabbrev ignore_case_always);
+use strict;
+
+my $prg = "updmap-setup-kanji";
+my $version = '$Id: updmap-setup-kanji.pl 25259 2012-02-01 02:13:03Z preining $';
+
+my $updmap_real = "updmap-sys";
+my $updmap = $updmap_real;
+
+my $dry_run = 0;
+my $opt_help = 0;
+my $opt_jis = 0;
+
+if (! GetOptions(
+ "n|dry-run" => \$dry_run,
+ "h|help" => \$opt_help,
+ "jis2004" => \$opt_jis,
+ "version" => sub { print &version(); exit(0); }, ) ) {
+ die "Try \"$0 --help\" for more information.\n";
+}
+
+if ($dry_run) {
+ $updmap = "echo updmap-sys";
+}
+
+if ($opt_help) {
+ Usage();
+ exit 0;
+}
+
+#
+# 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",
+);
+my %available;
+
+
+main(@ARGV);
+
+sub version {
+ my $ret = sprintf "%s (perl) version %s\n", $prg, $version;
+ return $ret;
+}
+
+sub Usage {
+ my $usage = <<"EOF";
+ $prg Set up embedding of Japanese fonts via updmap.cfg.
+
+ This script searches for some of the most common fonts
+ for embedding into pdfs by dvipdfmx.
+
+ Usage: $prg {<fontname>|auto|nofont|status}
+
+ <fontname> embed fonts as defined by the map file otf-<fontname>.map
+ if it exists.
+ auto: embed one of the following supported font families
+ automatically:
+ hiragino, morisawa, kozuka, ipaex, ipa
+ nofont: embed no fonts (and rely on system fonts when displaying pdfs)
+ If your system does not have any of the supported font
+ families as specified above, this target is selected
+ automatically.
+ status: get information about current environment and usable font map
+
+EOF
+;
+ print $usage;
+ exit 0;
+}
+
+
+
+###
+### Check Installed Font
+###
+
+sub CheckInstallFont {
+ for my $k (keys %representatives) {
+ my $f = `kpsewhich $representatives{$k}`;
+ if (! $?) {
+ $available{$k} = chomp($f);
+ }
+ }
+}
+
+###
+### GetStatus
+###
+
+sub check_mapfile {
+ my $mapf = shift;
+ my $f = `kpsewhich $mapf 2>/dev/null`;
+ my $ret = $?;
+ if (wantarray) {
+ return (!$ret, $f);
+ } else {
+ return (!$ret);
+ }
+}
+
+sub GetStatus {
+ my $val = `$updmap_real --quiet --showoption kanjiEmbed`;
+ my $STATUS;
+ if ($val =~ m/^kanjiEmbed=(.*)( \()?/) {
+ $STATUS = $1;
+ $STATUS =~ s/\s*$//;
+ $STATUS =~ s/^"(.*)"$/\1/;
+ } else {
+ printf STDERR "Cannot find status of current kanjiEmbed setting via updmap-sys --showoption!\n";
+ exit 1;
+ }
+
+ if (check_mapfile("otf-$STATUS.map")) {
+ print "CURRENT map file : otf-$STATUS.map\n";
+ } else {
+ print "WARNING: Currently selected map file cannot be found: otf-$STATUS.map\n";
+ }
+
+ for my $k (sort keys %representatives) {
+ my $MAPFILE = "otf-$k.map";
+ next if ($MAPFILE eq "otf-$STATUS.map");
+ if (check_mapfile($MAPFILE)) {
+ if ($available{$k}) {
+ print "Standby map file : $MAPFILE\n";
+ }
+ }
+ }
+ return $STATUS;
+}
+
+###
+### Setup Map files
+###
+
+sub SetupMapFile {
+ my $rep = shift;
+ my $MAPFILE = "otf-$rep.map";
+ if (check_mapfile($MAPFILE)) {
+ print "Setting up ... $MAPFILE\n";
+ system("$updmap -setoption kanjiEmbed $rep");
+ if ($opt_jis) {
+ system("$updmap -setoption kanjiVariant -04");
+ } else {
+ system("$updmap -setoption kanjiVariant \"\"");
+ }
+ system("$updmap");
+ } else {
+ print "NOT EXIST $MAPFILE\n";
+ exit 1;
+ }
+}
+
+sub SetupReplacement {
+ my $rep = shift;
+ if (defined($representatives{$rep})) {
+ if ($available{$rep}) {
+ return SetupMapFile($rep);
+ } else {
+ printf STDERR "$rep not available, falling back to auto!\n";
+ return SetupReplacement("auto");
+ }
+ } else {
+ if ($rep eq "nofont") {
+ return SetupMapFile("noEmbed");
+ } elsif ($rep eq "auto") {
+ my $STATUS = GetStatus();
+ # first check if we have a status set and the font is installed
+ # in this case don't change anything, just make sure
+ if (defined($representatives{$STATUS}) && $available{$STATUS}) {
+ return SetupMapFile($STATUS);
+ } else {
+ if (!($STATUS eq "noEmbed" || $STATUS eq "")) {
+ # some unknown setting is set up currently, overwrite, but warn
+ print "Previous setting $STATUS is unknown, replacing it!\n"
+ }
+ # if we are in the noEmbed or nothing set case, but one
+ # of the three fonts hiragino/morisawa/kozuka are present
+ # then use them
+ for my $i (qw/hiragino morisawa kozuka ipaex ipa/) {
+ if ($available{$i}) {
+ return SetupMapFile($i);
+ }
+ }
+ # still here, no map file found!
+ return SetupMapFile("noEmbed");
+ }
+ } else {
+ # anything else is treated as a map file name
+ return SetupMapFile($rep);
+ }
+ }
+}
+
+###
+### MAIN
+###
+
+sub main {
+ my ($a, $b) = @_;
+
+ # mktexlsr 2> /dev/null
+
+ CheckInstallFont();
+
+ if (!defined($a) || defined($b)) {
+ Usage();
+ exit 1;
+ }
+
+ if ($a eq "status") {
+ GetStatus();
+ exit 0;
+ }
+
+ return SetupReplacement($a);
+}
+
+#
+#
+# Copyright statements:
+#
+# KOBAYASHI Taizo
+# email to preining@logic.at
+# Message-Id: <20120130.162953.59640143170594580.tkoba@cc.kyushu-u.ac.jp>
+# Message-Id: <20120201.105639.625859878546968959.tkoba@cc.kyushu-u.ac.jp>
+# --------------------------------------------------------
+# copyright statement は簡単に以下で結構です。
+#
+# Copyright 2004-2006 by KOBAYASHI Taizo
+#
+# では
+# GPL version 3 or any later version
+#
+# --------------------------------------------------------
+#
+# PREINING Norbert
+# as author and maintainer of the current file
+# Licensed under GPL version 3 or any later version
+#
+### Local Variables:
+### perl-indent-level: 2
+### tab-width: 2
+### indent-tabs-mode: nil
+### End:
+# vim: set tabstop=2 expandtab autoindent:
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index 351d37d1974..4d795e4d696 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -419,6 +419,7 @@ chomp ($Build = `cd $Master/../Build/source && pwd`);
'jasthesis', "die 'skipping, license is unknown'",
'javadoc', "die 'skipping, requires java and no source'",
'jflap2tikz', "die 'skipping, requires java'",
+ 'jfontmaps', "&MAKEflatten",
'jhep', "die 'skipping, probably nonfree license'",
'jj_game', "die 'skipping, requires acrotex'",
'jpgfdraw', "die 'skipping, requires java'",
@@ -1459,6 +1460,7 @@ $standardtex='\.(.bx|cfg|sty|clo|ldf|cls|def|fd|cmap|4ht)$';
'jadetex', 'jadetex',
'japanese', 'platex',
'japanese-otf', 'fonts',
+ 'jfontmaps', 'fonts',
'junicode', 'fonts',
'kixfont', 'fonts',
'knitting', 'fonts',
@@ -1981,6 +1983,7 @@ $standardmapdest = "fonts/map/dvips";
'adobemapping' => "fonts/cmap",
'arabxetex' => "fonts/misc/xetex/fontmapping",
'ipaex' => "fonts/map/dvipdfmx",
+ 'jfontmaps' => "fonts/map/dvipdfmx",
'xepersian' => "fonts/misc/xetex/fontmapping",
'xetex-devanagari' => "fonts/misc/xetex/fontmapping",
'xetex-itrans' => "fonts/misc/xetex/fontmapping",
@@ -2062,6 +2065,7 @@ $standardxmt='\.xmt';
'findhyph' => 'findhyph$',
'fragmaster' => 'fragmaster\.pl$',
'installfont' => 'installfont-tl',
+ 'jfontmaps' => 'updmap-setup-kanji\.pl',
'latex2man' => 'latex2man$',
'latexdiff' => 'latex(diff-so|diff-vc|revise)$',
'latexmk' => '\.pl$',
diff --git a/Master/tlpkg/tlpsrc/jfontmaps.tlpsrc b/Master/tlpkg/tlpsrc/jfontmaps.tlpsrc
index f05ffd89868..56775fc6eae 100644
--- a/Master/tlpkg/tlpsrc/jfontmaps.tlpsrc
+++ b/Master/tlpkg/tlpsrc/jfontmaps.tlpsrc
@@ -1,4 +1,2 @@
runpattern +d texmf-dist/fonts/map/dvipdfmx/jfontmaps
-#
-# disabled until the script is included
-#binpattern f bin/${ARCH}/updmap-setup-kanji
+binpattern f bin/${ARCH}/updmap-setup-kanji