update from CTAN

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

17 files changed, 485 insertions, 16 deletions

diff --git a/Master/texmf-dist/doc/fonts/japanese-otf/fontmap/ckt.map(for udvips) b/Master/texmf-dist/doc/fonts/japanese-otf/fontmap/ckt.map(for udvips)
new file mode 100644
index 00000000000..2f1e1715473
--- /dev/null
+++ b/Master/texmf-dist/doc/fonts/japanese-otf/fontmap/ckt.map(for udvips)
@@ -0,0 +1,26 @@
+%font from acrobat5
+otf-utmr-h MSungStd-Light-Acro-UniCNS-UCS2-H
+otf-utmr-v MSungStd-Light-Acro-UniCNS-UCS2-V
+otf-utgr-h MHei-Medium-UniCNS-UCS2-H
+otf-utgr-v MHei-Medium-UniCNS-UCS2-V
+otf-ucmr-h STSongStd-Light-Acro-UniGB-UCS2-H
+otf-ucmr-v STSongStd-Light-Acro-UniGB-UCS2-V
+otf-ucgr-h STHeiti-Regular-UniGB-UCS2-H
+otf-ucgr-v STHeiti-Regular-UniGB-UCS2-V
+otf-ukmr-h   HYSMyeongJoStd-Medium-Acro-UniKS-UCS2-H
+otf-ukmr-v   HYSMyeongJoStd-Medium-Acro-UniKS-UCS2-V
+otf-ukgr-h HYGoThic-Medium-UniKS-UCS2-H
+otf-ukgr-v HYGoThic-Medium-UniKS-UCS2-V
+
+otf-ctmr-h MSungStd-Light-Acro-Identity-H
+otf-ctmr-v MSungStd-Light-Acro-Identity-V
+otf-ctgr-h MHei-Medium-Identity-H
+otf-ctgr-v MHei-Medium-Identity-V
+otf-ccmr-h STSongStd-Light-Acro-Identity-H
+otf-ccmr-v STSongStd-Light-Acro-Identity-V
+otf-ccgr-h STHeiti-Regular-Identity-H
+otf-ccgr-v STHeiti-Regular-Identity-V
+otf-ckmr-h   HYSMyeongJoStd-Medium-Acro-Identity-H
+otf-ckmr-v   HYSMyeongJoStd-Medium-Acro-Identity-V
+otf-ckgr-h HYGoThic-Medium-Identity-H
+otf-ckgr-v HYGoThic-Medium-Identity-V
diff --git a/Master/texmf-dist/doc/fonts/japanese-otf/fontmap/cktx.map(for dvipdfmx) b/Master/texmf-dist/doc/fonts/japanese-otf/fontmap/cktx.map(for dvipdfmx)
new file mode 100644
index 00000000000..857bb5a51f3
--- /dev/null
+++ b/Master/texmf-dist/doc/fonts/japanese-otf/fontmap/cktx.map(for dvipdfmx)
@@ -0,0 +1,30 @@
+%font from acrobat5
+otf-ukmr-h   UniKS-UCS2-H  HYSMyeongJoStd-Medium-Acro
+otf-ukmr-v   UniKS-UCS2-V  HYSMyeongJoStd-Medium-Acro
+otf-ukgr-h  UniKS-UCS2-H HYGoThic-Medium
+otf-ukgr-v  UniKS-UCS2-V HYGoThic-Medium
+
+otf-ucmr-h   UniGB-UCS2-H STSongStd-Light-Acro
+otf-ucmr-v   UniGB-UCS2-V STSongStd-Light-Acro
+otf-ucgr-h UniGB-UCS2-H STHeiti-Regular
+otf-ucgr-v UniGB-UCS2-V STHeiti-Regular
+
+otf-utmr-h   UniCNS-UCS2-H MSungStd-Light-Acro
+otf-utmr-v   UniCNS-UCS2-V MSungStd-Light-Acro
+otf-utgr-h  UniCNS-UCS2-H MHei-Medium
+otf-utgr-v  UniCNS-UCS2-V MHei-Medium
+
+otf-ckmr-h   Identity-H  HYSMyeongJoStd-Medium-Acro
+otf-ckmr-v   Identity-V  HYSMyeongJoStd-Medium-Acro
+otf-ckgr-h  Identity-H HYGoThic-Medium
+otf-ckgr-v  Identity-V HYGoThic-Medium
+
+otf-ccmr-h   Identity-H STSongStd-Light-Acro
+otf-ccmr-v   Identity-V STSongStd-Light-Acro
+otf-ccgr-h Identity-H STHeiti-Regular
+otf-ccgr-v Identity-V STHeiti-Regular
+
+otf-ctmr-h   Identity-H MSungStd-Light-Acro
+otf-ctmr-v   Identity-V MSungStd-Light-Acro
+otf-ctgr-h  Identity-H MHei-Medium
+otf-ctgr-v  Identity-V MHei-Medium
diff --git a/Master/texmf-dist/doc/fonts/japanese-otf/fontmap/hiragino.map(for udvips) b/Master/texmf-dist/doc/fonts/japanese-otf/fontmap/hiragino.map(for udvips)
new file mode 100644
index 00000000000..07bf1dc1c9d
--- /dev/null
+++ b/Master/texmf-dist/doc/fonts/japanese-otf/fontmap/hiragino.map(for udvips)
@@ -0,0 +1,86 @@
+otf-ujmr-h	HiraMinPro-W3-UniJIS-UTF16-H
+otf-ujmr-v	HiraMinPro-W3-UniJIS-UTF16-V
+otf-cjmr-h	 HiraMinPro-W3-Identity-H
+otf-cjmr-v 	HiraMinPro-W3-Identity-V
+hminr-h HiraMinPro-W3-H
+hminr-v HiraMinPro-W3-V
+
+otf-ujgr-h	HiraKakuPro-W3-UniJIS-UTF16-H
+otf-ujgr-v	HiraKakuPro-W3-UniJIS-UTF16-V
+otf-cjgr-h 	HiraKakuPro-W3-Identity-H
+otf-cjgr-v 	HiraKakuPro-W3-Identity-V
+hgothr-h HiraKakuPro-W3-H
+hgothr-v HiraKakuPro-W3-V
+
+otf-ujmb-h	HiraMinPro-W6-UniJIS-UTF16-H
+otf-ujmb-v	HiraMinPro-W6-UniJIS-UTF16-V
+otf-cjmb-h	 HiraMinPro-W6-Identity-H
+otf-cjmb-v 	HiraMinPro-W6-Identity-V
+hminb-h HiraMinPro-W6-H
+hminb-v HiraMinPro-W6-V
+
+otf-cjgb-h 	HiraKakuPro-W6-Identity-H
+otf-cjgb-v 	HiraKakuPro-W6-Identity-V
+otf-ujgb-h	HiraKakuPro-W6-UniJIS-UTF16-H
+otf-ujgb-v	HiraKakuPro-W6-UniJIS-UTF16-V
+hgothb-h HiraKakuPro-W6-H
+hgothb-v HiraKakuPro-W6-V
+
+hgotheb-h HiraKakuStd-W8-H
+hgotheb-v HiraKakuStd-W8-V
+
+otf-ujmgr-h	HiraMaruPro-W4-UniJIS-UTF16-H
+otf-ujmgr-v	HiraMaruPro-W4-UniJIS-UTF16-V
+otf-cjmgr-h 	HiraMaruPro-W4-Identity-H
+otf-cjmgr-v 	HiraMaruPro-W4-Identity-V
+hmgothr-h HiraMaruPro-W4-H
+hmgothr-v HiraMaruPro-W4-V
+
+otf-ujml-h	HiraMinPro-W2-UniJIS-UTF16-H
+otf-ujml-v	HiraMinPro-W2-UniJIS-UTF16-V
+otf-cjml-h	 HiraMinPro-W2-Identity-H
+otf-cjml-v 	HiraMinPro-W2-Identity-V
+hminl-h HiraMinPro-W2-H
+hminl-v HiraMinPro-W2-V
+
+hiramin-w3-h HiraMinPro-W3-Identity-H
+hiramin-w6-h HiraMinPro-W6-Identity-H
+hirakaku-w3-h HiraKakuPro-W3-Identity-H
+hirakaku-w6-h HiraKakuPro-W6-Identity-H
+hiramaru-w4-h HiraMaruPro-W4-Identity-H
+hiramin-w3-v HiraMinPro-W3-Identity-V
+hiramin-w6-v HiraMinPro-W6-Identity-V
+hirakaku-w3-v HiraKakuPro-W3-Identity-V
+hirakaku-w6-v HiraKakuPro-W6-Identity-V
+hiramaru-w4-v HiraMaruPro-W4-Identity-V
+
+%for JIS X 0213:2004
+otf-ujmrn-h    HiraMinProN-W3-UniJIS2004-UTF16-H
+otf-ujmrn-v    HiraMinProN-W3-UniJIS2004-UTF16-V
+hminrn-h    HiraMinProN-W3-H
+hminrn-v    HiraMinProN-W3-V
+
+otf-ujgrn-h    HiraKakuProN-W3-UniJIS2004-UTF16-H
+otf-ujgrn-v    HiraKakuProN-W3-UniJIS2004-UTF16-V
+hgothrn-h    HiraKakuProN-W3-H
+hgothrn-v    HiraKakuProN-W3-V
+
+otf-ujmbn-h    HiraMinProN-W6-UniJIS2004-UTF16-H
+otf-ujmbn-v    HiraMinProN-W6-UniJIS2004-UTF16-V
+hminbn-h    HiraMinProN-W6-H
+hminbn-v    HiraMinProN-W6-V
+
+otf-ujgbn-h    HiraKakuProN-W6-UniJIS2004-UTF16-H
+otf-ujgbn-v    HiraKakuProN-W6-UniJIS2004-UTF16-V
+hgothbn-h    HiraKakuProN-W6-H
+hgothbn-v    HiraKakuProN-W6-V
+
+otf-ujmgrn-h    HiraMaruProN-W4-UniJIS2004-UTF16-H
+otf-ujmgrn-v    HiraMaruProN-W4-UniJIS2004-UTF16-V
+hmgothrn-h    HiraMaruProN-W4-H
+hmgothrn-v    HiraMaruProN-W4-V
+
+otf-ujmln-h    HiraMinProN-W2-UniJIS2004-UTF16-H
+otf-ujmln-v    HiraMinProN-W2-UniJIS2004-UTF16-V
+hminln-h    HiraMinProN-W2-H
+hminln-v    HiraMinProN-W2-V
diff --git a/Master/texmf-dist/doc/fonts/japanese-otf/fontmap/hiraginox.map(for dvipdfmx) b/Master/texmf-dist/doc/fonts/japanese-otf/fontmap/hiraginox.map(for dvipdfmx)
new file mode 100644
index 00000000000..7e95234c2c9
--- /dev/null
+++ b/Master/texmf-dist/doc/fonts/japanese-otf/fontmap/hiraginox.map(for dvipdfmx)
@@ -0,0 +1,86 @@
+otf-ujmr-h      UniJIS-UTF16-H        HiraMinPro-W3
+otf-ujmr-v      UniJIS-UTF16-V        HiraMinPro-W3
+otf-cjmr-h       Identity-H      HiraMinPro-W3
+otf-cjmr-v       Identity-V  HiraMinPro-W3
+hminr-h   H HiraMinPro-W3
+hminr-v V HiraMinPro-W3
+
+otf-ujgr-h    UniJIS-UTF16-H       HiraKakuPro-W3
+otf-ujgr-v    UniJIS-UTF16-V       HiraKakuPro-W3
+otf-cjgr-h     Identity-H     HiraKakuPro-W3
+otf-cjgr-v     Identity-V HiraKakuPro-W3
+hgothr-h   H HiraKakuPro-W3
+hgothr-v V HiraKakuPro-W3
+
+otf-ujmb-h      UniJIS-UTF16-H    HiraMinPro-W6
+otf-ujmb-v      UniJIS-UTF16-V    HiraMinPro-W6
+otf-cjmb-h  Identity-H HiraMinPro-W6
+otf-cjmb-v  Identity-V HiraMinPro-W6
+hminb-h   H HiraMinPro-W6
+hminb-v V HiraMinPro-W6
+
+otf-ujgb-h    UniJIS-UTF16-H    HiraKakuPro-W6
+otf-ujgb-v    UniJIS-UTF16-V    HiraKakuPro-W6
+otf-cjgb-h  Identity-H HiraKakuPro-W6
+otf-cjgb-v  Identity-V HiraKakuPro-W6
+hgothb-h   H HiraKakuPro-W6
+hgothb-v V HiraKakuPro-W6
+
+hgotheb-h H HiraKakuStd-W8
+hgotheb-v V HiraKakuStd-W8
+
+otf-ujmgr-h    UniJIS-UTF16-H       HiraMaruPro-W4
+otf-ujmgr-v    UniJIS-UTF16-V       HiraMaruPro-W4
+otf-cjmgr-h     Identity-H     HiraMaruPro-W4
+otf-cjmgr-v     Identity-V HiraMaruPro-W4
+hmgothr-h    H HiraMaruPro-W4
+hmgothr-v  V HiraMaruPro-W4
+
+otf-ujml-h      UniJIS-UTF16-H        HiraMinPro-W2
+otf-ujml-v      UniJIS-UTF16-V        HiraMinPro-W2
+otf-cjml-h       Identity-H      HiraMinPro-W2
+otf-cjml-v       Identity-V  HiraMinPro-W2
+hminl-h   H HiraMinPro-W2
+hminl-v V HiraMinPro-W2
+
+hiramin-w3-h Identity-H HiraMinPro-W3
+hiramin-w6-h Identity-H HiraMinPro-W6
+hirakaku-w3-h Identity-H HiraKakuPro-W3
+hirakaku-w6-h Identity-H HiraKakuPro-W6
+hiramaru-w4-h Identity-H HiraMaruPro-W4
+hiramin-w3-v Identity-V HiraMinPro-W3
+hiramin-w6-v Identity-V HiraMinPro-W6
+hirakaku-w3-v Identity-V HiraKakuPro-W3
+hirakaku-w6-v Identity-V HiraKakuPro-W6
+hiramaru-w4-v Identity-V HiraMaruPro-W4
+
+%for JIS X 0213:2004
+otf-ujmrn-h      UniJIS2004-UTF16-H        HiraMinProN-W3
+otf-ujmrn-v      UniJIS2004-UTF16-V        HiraMinProN-W3
+hminrn-h   H HiraMinProN-W3
+hminrn-v V HiraMinProN-W3
+
+otf-ujgrn-h    UniJIS2004-UTF16-H       HiraKakuProN-W3
+otf-ujgrn-v    UniJIS2004-UTF16-V       HiraKakuProN-W3
+hgothrn-h   H HiraKakuProN-W3
+hgothrn-v V HiraKakuProN-W3
+
+otf-ujmbn-h      UniJIS2004-UTF16-H    HiraMinProN-W6
+otf-ujmbn-v      UniJIS2004-UTF16-V    HiraMinProN-W6
+hminbn-h   H HiraMinProN-W6
+hminbn-v V HiraMinProN-W6
+
+otf-ujgbn-h    UniJIS2004-UTF16-H    HiraKakuProN-W6
+otf-ujgbn-v    UniJIS2004-UTF16-V    HiraKakuProN-W6
+hgothbn-h   H HiraKakuProN-W6
+hgothbn-v V HiraKakuProN-W6
+
+otf-ujmgrn-h    UniJIS2004-UTF16-H       HiraMaruProN-W4
+otf-ujmgrn-v    UniJIS2004-UTF16-V       HiraMaruProN-W4
+hmgothrn-h    H HiraMaruProN-W4
+hmgothrn-v  V HiraMaruProN-W4
+
+otf-ujmln-h      UniJIS2004-UTF16-H        HiraMinProN-W2
+otf-ujmln-v      UniJIS2004-UTF16-V        HiraMinProN-W2
+hminln-h   H HiraMinProN-W2
+hminln-v V HiraMinProN-W2
diff --git a/Master/texmf-dist/doc/fonts/japanese-otf/fontmap/kozuka.map b/Master/texmf-dist/doc/fonts/japanese-otf/fontmap/kozuka.map
new file mode 100644
index 00000000000..629d9a584d0
--- /dev/null
+++ b/Master/texmf-dist/doc/fonts/japanese-otf/fontmap/kozuka.map
@@ -0,0 +1,51 @@
+otf-ujmr-h      KozMinPro-Regular-Acro-UniJIS-UTF16-H
+otf-ujmr-v      KozMinPro-Regular-Acro-UniJIS-UTF16-V
+otf-cjmr-h      KozMinPro-Regular-Acro-Identity-H
+otf-cjmr-v      KozMinPro-Regular-Acro-Identity-V
+hminr-h         KozMinPro-Regular-Acro-H
+hminr-v         KozMinPro-Regular-Acro-V
+
+otf-ujgr-h      KozGoStd-Regular-UniJIS-UTF16-H
+otf-ujgr-v      KozGoStd-Regular-UniJIS-UTF16-V
+otf-cjgr-h      KozGoStd-Regular-Identity-H
+otf-cjgr-v      KozGoStd-Regular-Identity-V
+hgothr-h        KozGoStd-Regular-H
+hgothr-v        KozGoStd-Regular-V
+
+otf-ujmb-h      KozMinStd-Bold-UniJIS-UTF16-H
+otf-ujmb-v      KozMinStd-Bold-UniJIS-UTF16-V
+otf-cjmb-h      KozMinStd-Bold-Identity-H
+otf-cjmb-v      KozMinStd-Bold-Identity-V
+hminb-h         KozMinStd-Bold-H
+hminb-v         KozMinStd-Bold-V
+
+otf-cjgb-h      KozGoStd-Bold-Identity-H
+otf-cjgb-v      KozGoStd-Bold-Identity-V
+otf-ujgb-h      KozGoStd-Bold-UniJIS-UTF16-H
+otf-ujgb-v      KozGoStd-Bold-UniJIS-UTF16-V
+hgothb-h        KozGoStd-Bold-H
+hgothb-v        KozGoStd-Bold-V
+
+otf-ujmgr-h     KozGoStd-Heavy-UniJIS-UTF16-H
+otf-ujmgr-v     KozGoStd-Heavy-UniJIS-UTF16-V
+otf-cjmgr-h     KozGoStd-Heavy-Identity-H
+otf-cjmgr-v     KozGoStd-Heavy-Identity-V
+hmgothr-h       KozGoStd-Heavy-H
+hmgothr-v       KozGoStd-Heavy-V
+
+%
+%for Adobe Reader 7
+%
+otf-ujmr-h      KozMinProVI-Regular-UniJIS-UTF16-H
+otf-ujmr-v      KozMinProVI-Regular-UniJIS-UTF16-V
+otf-cjmr-h      KozMinProVI-Regular-Identity-H
+otf-cjmr-v      KozMinProVI-Regular-Identity-V
+hminr-h         KozMinProVI-Regular-H
+hminr-v         KozMinProVI-Regular-V
+
+otf-ujgr-h      KozGoPro-Medium-UniJIS-UTF16-H
+otf-ujgr-v      KozGoPro-Medium-UniJIS-UTF16-V
+otf-cjgr-h      KozGoPro-Medium-Identity-H
+otf-cjgr-v      KozGoPro-Medium-Identity-V
+hgothr-h        KozGoPro-Medium-H
+hgothr-v        KozGoPro-Medium-V
diff --git a/Master/texmf-dist/doc/fonts/japanese-otf/fontmap/kozukax.map b/Master/texmf-dist/doc/fonts/japanese-otf/fontmap/kozukax.map
new file mode 100644
index 00000000000..36406a8fca3
--- /dev/null
+++ b/Master/texmf-dist/doc/fonts/japanese-otf/fontmap/kozukax.map
@@ -0,0 +1,52 @@
+otf-ujmr-h    UniJIS-UTF16-H KozMinPro-Regular-Acro.otf
+otf-ujmr-v    UniJIS-UTF16-V KozMinPro-Regular-Acro.otf
+otf-cjmr-h    Identity-H KozMinPro-Regular-Acro.otf
+otf-cjmr-v    Identity-V KozMinPro-Regular-Acro.otf
+hminr-h       H KozMinPro-Regular-Acro.otf
+hminr-v       V KozMinPro-Regular-Acro.otf
+
+otf-ujgr-h    UniJIS-UTF16-H KozGoStd-Regular.otf
+otf-ujgr-v    UniJIS-UTF16-V KozGoStd-Regular.otf
+otf-cjgr-h    Identity-H KozGoStd-Regular.otf
+otf-cjgr-v    Identity-V KozGoStd-Regular.otf
+hgothr-h      H KozGoStd-Regular.otf
+hgothr-v      V KozGoStd-Regular.otf
+
+otf-ujmb-h    UniJIS-UTF16-H KozMinStd-Bold.otf
+otf-ujmb-v    UniJIS-UTF16-V KozMinStd-Bold.otf
+otf-cjmb-h    Identity-H KozMinStd-Bold.otf
+otf-cjmb-v    Identity-V KozMinStd-Bold.otf
+hminb-h       H KozMinStd-Bold.otf
+hminb-v       V KozMinStd-Bold.otf
+
+otf-cjgb-h    Identity-H KozGoStd-Bold.otf
+otf-cjgb-v    Identity-V KozGoStd-Bold.otf
+otf-ujgb-h    UniJIS-UTF16-H KozGoStd-Bold.otf
+otf-ujgb-v    UniJIS-UTF16-V KozGoStd-Bold.otf
+hgothb-h      H KozGoStd-Bold.otf
+hgothb-v      V KozGoStd-Bold.otf
+
+otf-ujmgr-h   UniJIS-UTF16-H KozGoStd-Heavy.otf
+otf-ujmgr-v   UniJIS-UTF16-V KozGoStd-Heavy.otf
+otf-cjmgr-h   Identity-H KozGoStd-Heavy.otf
+otf-cjmgr-v   Identity-V KozGoStd-Heavy.otf
+hmgothr-h     H KozGoStd-Heavy.otf
+hmgothr-v     V KozGoStd-Heavy.otf
+
+
+%
+%for Adobe Reader 7
+%
+otf-ujmr-h    UniJIS-UTF16-H KozMinProVI-Regular.otf
+otf-ujmr-v    UniJIS-UTF16-V KozMinProVI-Regular.otf
+otf-cjmr-h    Identity-H KozMinProVI-Regular.otf
+otf-cjmr-v    Identity-V KozMinProVI-Regular.otf
+hminr-h       H KozMinProVI-Regular.otf
+hminr-v       V KozMinProVI-Regular.otf
+
+otf-ujgr-h    UniJIS-UTF16-H KozGoPro-Medium.otf
+otf-ujgr-v    UniJIS-UTF16-V KozGoPro-Medium.otf
+otf-cjgr-h    Identity-H KozGoPro-Medium.otf
+otf-cjgr-v    Identity-V KozGoPro-Medium.otf
+hgothr-h      H KozGoPro-Medium.otf
+hgothr-v      V KozGoPro-Medium.otf
diff --git a/Master/texmf-dist/doc/fonts/japanese-otf/fontmap/morisawa.map(for udvips) b/Master/texmf-dist/doc/fonts/japanese-otf/fontmap/morisawa.map(for udvips)
new file mode 100644
index 00000000000..57bf3caee7f
--- /dev/null
+++ b/Master/texmf-dist/doc/fonts/japanese-otf/fontmap/morisawa.map(for udvips)
@@ -0,0 +1,34 @@
+otf-ujmr-h	RyuminPro-Light-UniJIS-UTF16-H
+otf-ujmr-v	RyuminPro-Light-UniJIS-UTF16-V
+otf-cjmr-h	 RyuminPro-Light-Identity-H
+otf-cjmr-v 	RyuminPro-Light-Identity-V
+hminr-h RyuminPro-Light-H
+hminr-v RyuminPro-Light-V
+
+otf-ujgr-h	GothicBBBPro-Medium-UniJIS-UTF16-H
+otf-ujgr-v	GothicBBBPro-Medium-UniJIS-UTF16-V
+otf-cjgr-h 	GothicBBBPro-Medium-Identity-H
+otf-cjgr-v 	GothicBBBPro-Medium-Identity-V
+hgothr-h GothicBBBPro-Medium-H
+hgothr-v GothicBBBPro-Medium-V
+
+otf-ujmb-h	FutoMinA101Pro-Bold-UniJIS-UTF16-H
+otf-ujmb-v	FutoMinA101Pro-Bold-UniJIS-UTF16-V
+otf-cjmb-h	 FutoMinA101Pro-Bold-Identity-H
+otf-cjmb-v 	FutoMinA101Pro-Bold-Identity-V
+hminb-h FutoMinA101Pro-Bold-H
+hminb-v FutoMinA101Pro-Bold-V
+
+otf-cjgb-h 	FutoGoB101Pro-Bold-Identity-H
+otf-cjgb-v 	FutoGoB101Pro-Bold-Identity-V
+otf-ujgb-h	FutoGoB101Pro-Bold-UniJIS-UTF16-H
+otf-ujgb-v	FutoGoB101Pro-Bold-UniJIS-UTF16-V
+hgothb-h FutoGoB101Pro-Bold-H
+hgothb-v FutoGoB101Pro-Bold-V
+
+otf-ujmgr-h	Jun101Pro-Light-UniJIS-UTF16-H
+otf-ujmgr-v	Jun101Pro-Light-UniJIS-UTF16-V
+otf-cjmgr-h 	Jun101Pro-Light-Identity-H
+otf-cjmgr-v 	Jun101Pro-Light-Identity-V
+hmgothr-h Jun101Pro-Light-H
+hmgothr-v Jun101Pro-Light-V
diff --git a/Master/texmf-dist/doc/fonts/japanese-otf/fontmap/morisawax.map(for dvipdfmx) b/Master/texmf-dist/doc/fonts/japanese-otf/fontmap/morisawax.map(for dvipdfmx)
new file mode 100644
index 00000000000..c9f534ff98a
--- /dev/null
+++ b/Master/texmf-dist/doc/fonts/japanese-otf/fontmap/morisawax.map(for dvipdfmx)
@@ -0,0 +1,34 @@
+otf-ujmr-h    UniJIS-UTF16-H    A-OTF-RyuminPro-Light.otf
+otf-ujmr-v    UniJIS-UTF16-V    A-OTF-RyuminPro-Light.otf
+otf-cjmr-h    Identity-H    A-OTF-RyuminPro-Light.otf
+otf-cjmr-v    Identity-V    A-OTF-RyuminPro-Light.otf
+hminr-h    H    A-OTF-RyuminPro-Light.otf
+hminr-v    V    A-OTF-RyuminPro-Light.otf
+
+otf-ujgr-h    UniJIS-UTF16-H    A-OTF-GothicBBBPro-Medium.otf
+otf-ujgr-v    UniJIS-UTF16-V    A-OTF-GothicBBBPro-Medium.otf
+otf-cjgr-h    Identity-H    A-OTF-GothicBBBPro-Medium.otf
+otf-cjgr-v    Identity-V    A-OTF-GothicBBBPro-Medium.otf
+hgothr-h    H    A-OTF-GothicBBBPro-Medium.otf
+hgothr-v    V    A-OTF-GothicBBBPro-Medium.otf
+
+otf-ujmb-h    UniJIS-UTF16-H    A-OTF-FutoMinA101Pro-Bold.otf
+otf-ujmb-v    UniJIS-UTF16-V    A-OTF-FutoMinA101Pro-Bold.otf
+otf-cjmb-h    Identity-H    A-OTF-FutoMinA101Pro-Bold.otf
+otf-cjmb-v    Identity-V    A-OTF-FutoMinA101Pro-Bold.otf
+hminb-h    H    A-OTF-FutoMinA101Pro-Bold.otf
+hminb-v    V    A-OTF-FutoMinA101Pro-Bold.otf
+
+otf-ujgb-h    UniJIS-UTF16-H    A-OTF-FutoGoB101Pro-Bold.otf
+otf-ujgb-v    UniJIS-UTF16-V    A-OTF-FutoGoB101Pro-Bold.otf
+otf-cjgb-h    Identity-H    A-OTF-FutoGoB101Pro-Bold.otf
+otf-cjgb-v    Identity-V    A-OTF-FutoGoB101Pro-Bold.otf
+hgothb-h    H    A-OTF-FutoGoB101Pro-Bold.otf
+hgothb-v    V    A-OTF-FutoGoB101Pro-Bold.otf
+
+otf-ujmgr-h    UniJIS-UTF16-H    A-OTF-Jun101Pro-Light.otf
+otf-ujmgr-v    UniJIS-UTF16-V    A-OTF-Jun101Pro-Light.otf
+otf-cjmgr-h    Identity-H    A-OTF-Jun101Pro-Light.otf
+otf-cjmgr-v    Identity-V    A-OTF-Jun101Pro-Light.otf
+hmgothr-h    H    A-OTF-Jun101Pro-Light.otf
+hmgothr-v    V    A-OTF-Jun101Pro-Light.otf
diff --git a/Master/texmf-dist/doc/fonts/japanese-otf/fontmap/vfontmap.txt b/Master/texmf-dist/doc/fonts/japanese-otf/fontmap/vfontmap.txt
new file mode 100644
index 00000000000..ddbe7b6d927
--- /dev/null
+++ b/Master/texmf-dist/doc/fonts/japanese-otf/fontmap/vfontmap.txt
@@ -0,0 +1,57 @@
+#  Ž€UTF font (needed --with-vflib=vf2ft)
+unijmin-h /usr/local/share/texmf/dvipdfm/CIDFont/HiraMinPro-W3.otf unicode
+unijmin-v /usr/local/share/texmf/dvipdfm/CIDFont/HiraMinPro-W3.otf unicode
+unijgoth-h /usr/local/share/texmf/dvipdfm/CIDFont/HiraKakuPro-W6.otf unicode
+unijgoth-v /usr/local/share/texmf/dvipdfm/CIDFont/HiraKakuPro-W6.otf unicode
+hmr /usr/local/share/texmf/dvipdfm/CIDFont/HiraMinPro-W3.otf
+hmrv /usr/local/share/texmf/dvipdfm/CIDFont/HiraMinPro-W3.otf
+hkb /usr/local/share/texmf/dvipdfm/CIDFont/HiraKakuPro-W6.otf
+hkbv /usr/local/share/texmf/dvipdfm/CIDFont/HiraKakuPro-W6.otf
+
+#  Ž€CID font (needed --with-vflib=vf2ft)
+cidmin-h /usr/local/share/texmf/dvipdfm/CIDFont/HiraMinPro-W3.otf adobejapan
+cidmin-v /usr/local/share/texmf/dvipdfm/CIDFont/HiraMinPro-W3.otf adobejapan
+cidgoth-h /usr/local/share/texmf/dvipdfm/CIDFont/HiraKakuPro-W6.otf adobejapan
+cidgoth-v /usr/local/share/texmf/dvipdfm/CIDFont/HiraKakuPro-W6.otf adobejapan
+
+otf-ujmr-h /usr/local/share/texmf/dvipdfm/CIDFont/HiraMinPro-W3.otf unicode
+otf-ujmr-v /usr/local/share/texmf/dvipdfm/CIDFont/HiraMinPro-W3.otf unicode
+otf-cjmr-h /usr/local/share/texmf/dvipdfm/CIDFont/HiraMinPro-W3.otf adobejapan
+otf-cjmr-v /usr/local/share/texmf/dvipdfm/CIDFont/HiraMinPro-W3.otf adobejapan
+hminr-h /usr/local/share/texmf/dvipdfm/CIDFont/HiraMinPro-W3.otf
+hminr-v /usr/local/share/texmf/dvipdfm/CIDFont/HiraMinPro-W3.otf
+
+otf-ujgr-h /usr/local/share/texmf/dvipdfm/CIDFont/HiraKakuPro-W3.otf unicode
+otf-ujgr-v /usr/local/share/texmf/dvipdfm/CIDFont/HiraKakuPro-W3.otf unicode
+otf-cjgr-h /usr/local/share/texmf/dvipdfm/CIDFont/HiraKakuPro-W3.otf adobejapan
+otf-cjgr-v /usr/local/share/texmf/dvipdfm/CIDFont/HiraKakuPro-W3.otf adobejapan
+hgothr-h /usr/local/share/texmf/dvipdfm/CIDFont/HiraKakuPro-W3.otf
+hgothr-v /usr/local/share/texmf/dvipdfm/CIDFont/HiraKakuPro-W3.otf
+
+otf-ujmb-h /usr/local/share/texmf/dvipdfm/CIDFont/HiraMinPro-W6.otf unicode
+otf-ujmb-v /usr/local/share/texmf/dvipdfm/CIDFont/HiraMinPro-W6.otf unicode
+otf-cjmb-h /usr/local/share/texmf/dvipdfm/CIDFont/HiraMinPro-W6.otf adobejapan
+otf-cjmb-v /usr/local/share/texmf/dvipdfm/CIDFont/HiraMinPro-W6.otf adobejapan
+hminb-h /usr/local/share/texmf/dvipdfm/CIDFont/HiraMinPro-W6.otf
+hminb-v /usr/local/share/texmf/dvipdfm/CIDFont/HiraMinPro-W6.otf
+
+otf-ujgb-h /usr/local/share/texmf/dvipdfm/CIDFont/HiraKakuPro-W6.otf unicode
+otf-ujgb-v /usr/local/share/texmf/dvipdfm/CIDFont/HiraKakuPro-W6.otf unicode
+otf-cjgb-h /usr/local/share/texmf/dvipdfm/CIDFont/HiraKakuPro-W6.otf adobejapan
+otf-cjgb-v /usr/local/share/texmf/dvipdfm/CIDFont/HiraKakuPro-W6.otf adobejapan
+hgothb-h /usr/local/share/texmf/dvipdfm/CIDFont/HiraKakuPro-W6.otf
+hgothb-v /usr/local/share/texmf/dvipdfm/CIDFont/HiraKakuPro-W6.otf
+
+otf-ujmgr-h /usr/local/share/texmf/dvipdfm/CIDFont/HiraMaruPro-W4.otf unicode
+otf-ujmgr-v /usr/local/share/texmf/dvipdfm/CIDFont/HiraMaruPro-W4.otf unicode
+otf-cjmgr-h /usr/local/share/texmf/dvipdfm/CIDFont/HiraMaruPro-W4.otf adobejapan
+otf-cjmgr-v /usr/local/share/texmf/dvipdfm/CIDFont/HiraMaruPro-W4.otf adobejapan
+hmgothr-h /usr/local/share/texmf/dvipdfm/CIDFont/HiraMaruPro-W4.otf
+hmgothr-v /usr/local/share/texmf/dvipdfm/CIDFont/HiraMaruPro-W4.otf
+
+otf-ukmr-h /usr/local/share/texmf/dvipdfm/CIDFont/HYSMyeongJoStd-Medium-Acro.otf unicode
+otf-ukmr-v /usr/local/share/texmf/dvipdfm/CIDFont/HYSMyeongJoStd-Medium-Acro.otf unicode
+otf-ucmr-h /usr/local/share/texmf/dvipdfm/CIDFont/STSongStd-Light-Acro.otf unicode
+otf-ucmr-v /usr/local/share/texmf/dvipdfm/CIDFont/STSongStd-Light-Acro.otf unicode
+otf-utmr-h /usr/local/share/texmf/dvipdfm/CIDFont/MSungStd-Light-Acro.otf unicode
+otf-utmr-v /usr/local/share/texmf/dvipdfm/CIDFont/MSungStd-Light-Acro.otf unicode
diff --git a/Master/texmf-dist/doc/fonts/japanese-otf/readme.en.txt b/Master/texmf-dist/doc/fonts/japanese-otf/readme.en.txt
index b8b6797b289..406d312ee71 100644
--- a/Master/texmf-dist/doc/fonts/japanese-otf/readme.en.txt
+++ b/Master/texmf-dist/doc/fonts/japanese-otf/readme.en.txt
@@ -7,16 +7,22 @@ This package is originally named "otf", but for the sake of not
 choosing to general names on CTAN (and in TeX Live) it will be
 called "japanese-otf". This change has been discussed with
 the author of the package, Saito Shuzaburo. The version of
-the package used is "otfbeta.zip".
+the package used is 
+	otfbeta.zip 2012/1/22 v1.7b4
+
+The original source has been downloaded from
+	http://psitau.kitunebi.com/otf.html
+as
+	http://psitau.kitunebi.com/otfbeta.zip
 
 This package provides advanced typesetting options for platex and 
 friends.
 
-As uploaded to CTAN this package does not contain vf/tfm/ofm files,
-but they can be generated with the script
-	makeotf
-These generated files are included in the TeX Live package for 
-japanese-otf.
+After downloading the script makeotf has been run and the generated
+vf/tfm/ofm files have been included in the upload to CTAN.
+
+Furthermore, the map file as used in TeX Live was added in the directory
+TeXLive-maps.
 
 The contents of this package is under the license given in the 
 COPYRIGHT file, which is more or less BSD license.
@@ -25,4 +31,4 @@ The map files in this package are originally written by Hironori Kitagawa
 and in public domain.
 
 Norbert Preining
-2011-11-03
+2012-01-06
diff --git a/Master/texmf-dist/doc/fonts/japanese-otf/readme.txt b/Master/texmf-dist/doc/fonts/japanese-otf/readme.txt
index 1189abdaa69..854c9e4f44a 100755
--- a/Master/texmf-dist/doc/fonts/japanese-otf/readme.txt
+++ b/Master/texmf-dist/doc/fonts/japanese-otf/readme.txt
@@ -1,12 +1,12 @@
-OTF$B%Q%C%1!<%83+H/HG!J(Bv1.7b3 2011/10/28$B!K(B
+OTF$B%Q%C%1!<%83+H/HG!J(Bv1.7b5 2012/4/11$B!K(B
 $Bc7F#=$;0O:(B
 
 $B!Z%i%$%;%s%9![(B
 $B=$@5(B BSD$B$H$7$^$9!%(B
 
 $B!ZI,MW$JJ*![(B
-$B!&(Bovp2ovf$B!'(BWEB$BHG$N$b$N$@$H3N<B$K$&$^$/$$$-$^$9!%(BC$BHG$G$b$&$^$/$$$/$+$b$7$l$^$;$s!%(B
-$B!&(Bopl2ofm$B!'(BWEB$BHG$N$b$N$@$H3N<B$K$&$^$/$$$-$^$9!%(BC$BHG$G$b$&$^$/$$$/$+$b$7$l$^$;$s!%(B
+$B!&(Bovp2ovf$B!'(BWEB$BHG$N$b$N$@$H3N<B$K$&$^$/$$$-$^$9!%(BC$BHG$N>l9g!$(B2011$BG/(B12$B7n0J9_$N(BVersion$B$G$7$?$i$&$^$/$$$-$^$9!%(B
+$B!&(Bopl2ofm$B!'(BWEB$BHG$N$b$N$@$H3N<B$K$&$^$/$$$-$^$9!%(BC$BHG$N>l9g!$(B2011$BG/(B12$B7n0J9_$N(BVersion$B$G$7$?$i$&$^$/$$$-$^$9!%(B
 $B!&(Bperl
 $B!&(Bppltotf
 
@@ -16,7 +16,7 @@ OTF$B%Q%C%1!<%83+H/HG!J(Bv1.7b3 2011/10/28$B!K(B
 
 $B#2!K=hM}$,=*$o$k$HF1$83,AX$K(Bvf, tfm, ofm$B$H$$$&%U%)%k%@$,:n@.$5$l$^$9!%E,@Z$J>l=j$K0\F0$5$;$F$/$@$5$$!%(B
 
-$B#3!K%9%?%$%k%U%!%$%k$rE,Ev$J>l=j$K0\F0$5$;$F$/$@$5$$!%I,MW$,M-$l$P!$(Bmktexlsr$B$r<B9T$7$F$/$@$5$$!%(B
+$B#3!K(Bsty$B%U%!%$%kEy$rE,Ev$J>l=j$K0\F0$5$;$F$/$@$5$$!%I,MW$,M-$l$P!$(Bmktexlsr$B$r<B9T$7$F$/$@$5$$!%(B
 
 $B#4!K(Bdivps$B$N%^%C%W%U%!%$%k$K!JNc$($P!K(Bhiragino.map(for udvips)$B$K=q$+$l$?%(%s%H%j$rDI2C$7$^$9!%(B
 
@@ -84,13 +84,20 @@ makejvf$B$H$N0c$$$O!$(B
 
 $B!Z;HMQ5vBz![(B
 $BK\%Q%C%1!<%8$N%$%s%9%H!<%k$^$?$O;HMQ$K4XO"$7$F;HMQ<T$KD>@\E*$^$?$O4V@\E*$KH/@8$9$k0l@Z$NB;32(B
-$B!J%O!<%I%&%'%"!"B>$N%=%U%H%&%'%"$NGKB;!"IT6q9gEy$r4^$`!#$^$?!"DL>oB;32!"FCJLB;32!"7k2LB;32$r(B
-$BLd$o$J$$!K$*$h$SBh;0<T$+$i$J$5$l$k@A5a$K$D$$$FCx:n8"<T$O0l@Z@UG$$rIiC4$7$^$;$s!#(B
-$BK\%Q%C%1!<%8$r;HMQ$7$FF@$i$l$k7k2L$O!">&MQ!"Hs>&MQ$K4X$o$i$:L5=~$G;HMQ$9$k$3$H$,2DG=$G$9!#(B
-$B<+8J@UG$$G;HMQ$7$F$/$@$5$$!#K\%Q%C%1!<%8$r;HMQ$7$?>l9g!">e5-$N5-:\;v9`$KF10U$7$?$b$N$H8+$J$7(B
-$B$^$9!#(B
+$B!J%O!<%I%&%'%"!$B>$N%=%U%H%&%'%"$NGKB;!$IT6q9gEy$r4^$`!%$^$?!$DL>oB;32!$FCJLB;32!$7k2LB;32$r(B
+$BLd$o$J$$!K$*$h$SBh;0<T$+$i$J$5$l$k@A5a$K$D$$$FCx:n8"<T$O0l@Z@UG$$rIiC4$7$^$;$s!%(B
+$BK\%Q%C%1!<%8$r;HMQ$7$FF@$i$l$k7k2L$O!$>&MQ!$Hs>&MQ$K4X$o$i$:L5=~$G;HMQ$9$k$3$H$,2DG=$G$9!%(B
+$B<+8J@UG$$G;HMQ$7$F$/$@$5$$!%K\%Q%C%1!<%8$r;HMQ$7$?>l9g!$>e5-$N5-:\;v9`$KF10U$7$?$b$N$H8+$J$7(B
+$B$^$9!%(B
 
 $B!ZJQ99MzNr![(B
+v1.7b4-->v1.7b5(2012/4/11)
+$B!&(Bnoreplace$B%*%W%7%g%s;HMQ;~$G!$(B\if@enablejfam$B$,Dj5A$5$l$F$$$J$$>l9g!$%(%i!<$H$J$kIT6q9g$r=$@5!%(B
+$B!!(BZ.R.$B$5$s$K$h$k=$@5$r<h$j9~$^$;$F$$$?$@$-$^$7$?!J>eED$5$s!$A0ED$5$s!$;3K\$5$s!$(BZ.R.$B$5$s$"$j$,$H$&$4$6$$$^$9!K!%(B
+$B!!(B[otf.sty]
+v1.7b3-->v1.7b4(2012/1/22)
+$B!&9uLZM52p$5$s$K$h$k!$D+A/8l$NAHHG$9$k$?$a$NJd=u%U%!%$%k$NDI2C!%>\$7$/$O(Bhttp://ptetexwin.sourceforge.jp/jkexample/$B$r;2>H$N$3$H!%(B
+$B!!(B[otf-hangul.dfu$B$NDI2C(B, koreanexample.tex$B$NDI2C(B]
 v1.7b1-->v1.7b3(2011/10/28)
 $B!&=$@5(B BSD$B%i%$%;%s%9$rE,MQ(B[COPYRIGHT$B$NDI2C(B]
 v1.7b1-->v1.7b2(2010/7/30)
diff --git a/Master/texmf-dist/source/fonts/japanese-otf/test/brsgtest.tex b/Master/texmf-dist/doc/fonts/japanese-otf/test/brsgtest.tex
index 7b812f4bcf5..7b812f4bcf5 100755..100644
--- a/Master/texmf-dist/source/fonts/japanese-otf/test/brsgtest.tex
+++ b/Master/texmf-dist/doc/fonts/japanese-otf/test/brsgtest.tex
diff --git a/Master/texmf-dist/source/fonts/japanese-otf/test/jis2004.tex b/Master/texmf-dist/doc/fonts/japanese-otf/test/jis2004.tex
index 8842d51b0a4..8842d51b0a4 100755..100644
--- a/Master/texmf-dist/source/fonts/japanese-otf/test/jis2004.tex
+++ b/Master/texmf-dist/doc/fonts/japanese-otf/test/jis2004.tex
diff --git a/Master/texmf-dist/source/fonts/japanese-otf/test/koreanexample.tex b/Master/texmf-dist/doc/fonts/japanese-otf/test/koreanexample.tex
index cf2b8ade3a2..cf2b8ade3a2 100644
--- a/Master/texmf-dist/source/fonts/japanese-otf/test/koreanexample.tex
+++ b/Master/texmf-dist/doc/fonts/japanese-otf/test/koreanexample.tex
diff --git a/Master/texmf-dist/source/fonts/japanese-otf/test/otftest.tex b/Master/texmf-dist/doc/fonts/japanese-otf/test/otftest.tex
index 57bee19e106..57bee19e106 100755..100644
--- a/Master/texmf-dist/source/fonts/japanese-otf/test/otftest.tex
+++ b/Master/texmf-dist/doc/fonts/japanese-otf/test/otftest.tex
diff --git a/Master/texmf-dist/source/fonts/japanese-otf/test/pkanatest.tex b/Master/texmf-dist/doc/fonts/japanese-otf/test/pkanatest.tex
index dda71ea41f9..dda71ea41f9 100755..100644
--- a/Master/texmf-dist/source/fonts/japanese-otf/test/pkanatest.tex
+++ b/Master/texmf-dist/doc/fonts/japanese-otf/test/pkanatest.tex
diff --git a/Master/texmf-dist/source/fonts/japanese-otf/test/pkanatest2.tex b/Master/texmf-dist/doc/fonts/japanese-otf/test/pkanatest2.tex
index 79c0107fe37..79c0107fe37 100755..100644
--- a/Master/texmf-dist/source/fonts/japanese-otf/test/pkanatest2.tex
+++ b/Master/texmf-dist/doc/fonts/japanese-otf/test/pkanatest2.tex