new jfontmaps with renamed scripts

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

6 files changed, 197 insertions, 328 deletions

diff --git a/Master/texmf-dist/doc/fonts/jfontmaps/ChangeLog b/Master/texmf-dist/doc/fonts/jfontmaps/ChangeLog
index a4262995b38..88bc8d65ac3 100644
--- a/Master/texmf-dist/doc/fonts/jfontmaps/ChangeLog
+++ b/Master/texmf-dist/doc/fonts/jfontmaps/ChangeLog
@@ -1,3 +1,50 @@
+2013-04-08  Norbert Preining  <preining@logic.at>
+
+	* rebuild maps with new cmaps
+	* adapt kanji-setup-updmap.pl for new kozuka-pr6 family
+
+2013-04-08  Hironori Kitagawa  <h_kitagawa2001@yahoo.co.jp>
+
+	* new 2004-{H,V} map and code to generate them
+	* add kozuka-pr6 font package maps
+
+2013-04-05  Norbert Preining  <preining@logic.at>
+
+	* rename updmap-setup-kanji to kanji-config-updmap
+	  remove svn related information, adapt dev place
+
+2013-03-28  Norbert Preining  <preining@logic.at>
+
+	* remove IPA* 04 maps, they don't make any sense
+	* adapt the README file
+
+2013-03-28  Hironori Kitagawa  <h_kitagawa2001@yahoo.co.jp>
+
+	* add mkmap.lua script
+	* regenerate maps from mkmap script
+	* add maps for msmincho and msgothic fonts
+	* add noEmbed maps
+	* add examples
+
+2013-03-27  Norbert Preining  <preining@logic.at>
+
+	* add 04 variants for ipa(ex)
+	* rename -pro families according to the proper names:
+	  kozuka-pr6n, morisawa-pr6n, hiragino-pron
+	  adapt also updmap-setup-kanji.pl and README
+
+2013-03-27  Hironori Kitagawa  <h_kitagawa2001@yahoo.co.jp>
+
+	* Add entries for 'missing' gt/eb tfms.
+
+2013-03-26  Norbert Preining  <preining@logic.at>
+
+	* add cmap files from TANAKA Takuji for proper jis2004 support
+	* split families into normal and -pro
+	* use new cmap files for proper jis2004 support
+	* adapt scripts/updmap-setup-kanji.pl to work with new 
+	  families
+
 2012-06-19  Norbert Preining  <preining@logic.at>
 
 	* scripts/updmap-setup-kanji.pl: 
diff --git a/Master/texmf-dist/doc/fonts/jfontmaps/README b/Master/texmf-dist/doc/fonts/jfontmaps/README
index 5f00df45012..bfb04862f0d 100644
--- a/Master/texmf-dist/doc/fonts/jfontmaps/README
+++ b/Master/texmf-dist/doc/fonts/jfontmaps/README
@@ -1,8 +1,11 @@
 jfontmaps
 =========
 
+Current release: 20130410.0
+
 The files contained in this package contains font maps for dvipdfmx to
-make various Japanese fonts available for (u)ptex and related programs/formats.
+make various Japanese fonts available for (u)ptex and related programs
+and formats.
 
 The font maps were written by several people, including
   Hironori Kitagawa
@@ -10,16 +13,81 @@ The font maps were written by several people, including
   Saito Shuzaburo
   Norbert Preining
 and are now maintained in the tug.org subversion repository:
-  svn://tug.org/texlive/trunk/Build/source/extra/jfontmaps
+  https://git.gitorious.org/tlptexlive/jfontmaps.git
+
+Families, support, and necessary font files
+===========================================
+This package does *not* ship any of the fonts mentioned, but only
+map files for dvipdfmx. You have to obtain the fonts separately.
+For ipa and ipaex the respective fonts a shipped in TeX Live
+and are available for free.
+
+O: kanjiVariant '-04' is supported.
+P: We have '-04' maps, but fonts lack some glyphs
+X: We don't have '-04' maps.
+4: no -04 maps, but all glyphs have automatically JIS2004
+
+O noEmbed
+    (no font needed for dvipdfmx)
+
+X ms
+    msmincho.ttc
+    msgothic.ttc
+
+4 ipa
+    ipam.ttf
+    ipag.ttf
+
+4 ipaex
+    ipaexm.ttf
+    ipaexg.ttf
+
+O? hiragino
+    HiraMinPro-W2.otf
+    HiraMinPro-W3.otf
+    HiraMinPro-W6.otf
+    HiraKakuPro-W6.otf
+    HiraKakuStd-W8.otf
+    HiraMaruPro-W4.otf
+
+O hiragino-pron
+    same with ProN/StdN instead of Pro/Std
+
+P kozuka
+    KozMinPro-Light.otf
+    KozMinPro-Regular.otf
+    KozMinPro-Bold.otf
+    KozGoPro-Light.otf
+    KozGoPro-Medium.otf
+    KozGoPro-Bold.otf
+    KozGoPro-Heavy.otf
+
+O kozuka-pr6n
+    same with Pr6N instead of Pro
+
+O kozuka-pr6
+    same with ProVI instead of Pro
+
+P morisawa
+    A-OTF-FutoGoB101Pro-Bold.otf
+    A-OTF-FutoMinA101Pro-Bold.otf
+    A-OTF-GothicBBBPro-Medium.otf
+    A-OTF-Jun101Pro-Light.otf
+    A-OTF-MidashiGoPro-MB31.otf
+    A-OTF-RyuminPro-Light.otf
+
+O morisawa-pr6n
+    same with Pr6N instead of Pro
+
 
 Copyright/License
 =================
-All the map files are under Public Domain.
+All the (c)map files are under Public Domain.
 
 The (deprecated) file updmap-otf.sh and the (in perl rewritten version)
-updmap-setup-kanji.pl are licensed under the following terms:
+kanji-config-updmap.pl are licensed under the following terms:
   Copyright 2004-2006 by KOBAYASHI Taizo
-  Copyright 2011-2012 by PREINING Norbert
+  Copyright 2011-2013 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/examples/otf-sample-04.tex b/Master/texmf-dist/doc/fonts/jfontmaps/examples/otf-sample-04.tex
new file mode 100644
index 00000000000..e9cbada9ac4
--- /dev/null
+++ b/Master/texmf-dist/doc/fonts/jfontmaps/examples/otf-sample-04.tex
@@ -0,0 +1,25 @@
+  \documentclass{jsarticle}
+  \usepackage[jis2004,deluxe]{otf}
+\begin{document}
+\def\R{\par\noindent%
+  \vbox{\LARGE\hsize=20zw\noindent\kanjiskip=0pt
+  １２３４５６７８９０１２３４５６７８９０
+  逢芦飴溢茨鰯淫迂厩噂餌襖迦牙廻恢晦蟹葛鞄
+  釜翰翫徽祇汲灸笈卿饗僅喰櫛屑粂祁隙倦捲牽
+  鍵諺巷梗膏鵠甑叉榊薩鯖錆鮫餐杓灼酋楯薯藷
+  哨鞘杖蝕訊逗摺撰煎煽穿箭詮噌遡揃遜腿蛸辿
+  樽歎註瀦捗槌鎚辻挺鄭擢溺兎堵屠賭瀞遁謎灘
+  楢禰牌這秤駁箸叛挽誹樋稗逼謬豹廟瀕斧蔽瞥
+  蔑篇娩鞭庖蓬鱒迄儲餅籾爺鑓愈猷漣煉簾榔屢
+  冤叟咬嘲囀徘扁棘橙狡甕甦疼祟竈筵篝腱艘芒
+  虔蜃蠅訝靄靱騙鴉}}
+
+\kanjifamily{hmc}\kanjiseries{l}\selectfont \R（明朝，細）
+\kanjifamily{hmc}\kanjiseries{m}\selectfont \R（明朝，中）
+\kanjifamily{hmc}\kanjiseries{bx}\selectfont \R（明朝，太）
+\kanjifamily{hgt}\kanjiseries{m}\selectfont \R（ゴチ，中）
+\kanjifamily{hgt}\kanjiseries{bx}\selectfont \R（ゴチ，太）
+\kanjifamily{hgt}\kanjiseries{eb}\selectfont \R（ゴチ，極太）
+\kanjifamily{mg}\kanjiseries{m}\selectfont \R（丸ゴ）
+
+\end{document}
\ No newline at end of file
diff --git a/Master/texmf-dist/doc/fonts/jfontmaps/examples/otf-sample.tex b/Master/texmf-dist/doc/fonts/jfontmaps/examples/otf-sample.tex
new file mode 100644
index 00000000000..4aae663ee11
--- /dev/null
+++ b/Master/texmf-dist/doc/fonts/jfontmaps/examples/otf-sample.tex
@@ -0,0 +1,33 @@
+\ifdefined\ucs
+  \documentclass[uplatex]{jsarticle}
+  \usepackage[uplatex,deluxe]{otf}
+\else
+  \documentclass{jsarticle}
+  \usepackage[deluxe]{otf}
+\fi
+\begin{document}
+\def\R{\par\noindent%
+  \vbox{\LARGE\hsize=20zw\noindent\kanjiskip=0pt
+  １２３４５６７８９０１２３４５６７８９０
+  逢芦飴溢茨鰯淫迂厩噂餌襖迦牙廻恢晦蟹葛鞄
+  釜翰翫徽祇汲灸笈卿饗僅喰櫛屑粂祁隙倦捲牽
+  鍵諺巷梗膏鵠甑叉榊薩鯖錆鮫餐杓灼酋楯薯藷
+  哨鞘杖蝕訊逗摺撰煎煽穿箭詮噌遡揃遜腿蛸辿
+  樽歎註瀦捗槌鎚辻挺鄭擢溺兎堵屠賭瀞遁謎灘
+  楢禰牌這秤駁箸叛挽誹樋稗逼謬豹廟瀕斧蔽瞥
+  蔑篇娩鞭庖蓬鱒迄儲餅籾爺鑓愈猷漣煉簾榔屢
+  冤叟咬嘲囀徘扁棘橙狡甕甦疼祟竈筵篝腱艘芒
+  虔蜃蠅訝靄靱騙鴉}}
+
+\kanjifamily{hmc}\kanjiseries{l}\selectfont \R（明朝，細）
+\kanjifamily{hmc}\kanjiseries{m}\selectfont \R（明朝，中）
+\kanjifamily{hmc}\kanjiseries{bx}\selectfont \R（明朝，太）
+\kanjifamily{hgt}\kanjiseries{m}\selectfont \R（ゴチ，中）
+\kanjifamily{hgt}\kanjiseries{bx}\selectfont \R（ゴチ，太）
+%\kanjifamily{hgt}\kanjiseries{eb}\selectfont \R（ゴチ，極太）
+% uplatex オプション時に dvipdfmx で
+% ** ERROR ** Unable to find TFM file "0-h".
+% というエラーが出る．
+\kanjifamily{mg}\kanjiseries{m}\selectfont \R（丸ゴ）
+
+\end{document}
\ No newline at end of file
diff --git a/Master/texmf-dist/doc/fonts/jfontmaps/examples/ptex-sample.tex b/Master/texmf-dist/doc/fonts/jfontmaps/examples/ptex-sample.tex
new file mode 100644
index 00000000000..961631414be
--- /dev/null
+++ b/Master/texmf-dist/doc/fonts/jfontmaps/examples/ptex-sample.tex
@@ -0,0 +1,19 @@
+\ifdefined\ucs
+  \documentclass[uplatex]{jsarticle}
+\else
+  \documentclass{jsarticle}
+\fi
+\begin{document}
+\LARGE
+\vbox{\hsize=20zw\noindent\kanjiskip=0pt
+１２３４５６７８９０１２３４５６７８９０
+逢芦飴溢茨鰯淫迂厩噂餌襖迦牙廻恢晦蟹葛鞄
+釜翰翫徽祇汲灸笈卿饗僅喰櫛屑粂祁隙倦捲牽
+鍵諺巷梗膏鵠甑叉榊薩鯖錆鮫餐杓灼酋楯薯藷
+哨鞘杖蝕訊逗摺撰煎煽穿箭詮噌遡揃遜腿蛸辿
+樽歎註瀦捗槌鎚辻挺鄭擢溺兎堵屠賭瀞遁謎灘
+楢禰牌這秤駁箸叛挽誹樋稗逼謬豹廟瀕斧蔽瞥
+蔑篇娩鞭庖蓬鱒迄儲餅籾爺鑓愈猷漣煉簾榔屢
+冤叟咬嘲囀徘扁棘橙狡甕甦疼祟竈筵篝腱艘芒
+虔蜃蠅訝靄靱騙鴉}
+\end{document}
\ 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
deleted file mode 100755
index 0a188addd58..00000000000
--- a/Master/texmf-dist/doc/fonts/jfontmaps/updmap-otf.sh
+++ /dev/null
@@ -1,323 +0,0 @@
-#!/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
-#