update japanese-otf-uptex, missing part of the fonts part

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

5 files changed, 234 insertions, 12 deletions

diff --git a/Master/texmf-dist/doc/fonts/japanese-otf-uptex/00otf-uptex.txt b/Master/texmf-dist/doc/fonts/japanese-otf-uptex/00otf-uptex.txt
index a37437e8d19..d0cd423b329 100644
--- a/Master/texmf-dist/doc/fonts/japanese-otf-uptex/00otf-uptex.txt
+++ b/Master/texmf-dist/doc/fonts/japanese-otf-uptex/00otf-uptex.txt
@@ -1,5 +1,5 @@
 [ Title ]
-otfbeta-uptex (japanese-otf-uptex) Ver.0.11  2012/07/09
+otfbeta-uptex (japanese-otf-uptex) Ver.0.12  2013/06/02
 
 
 [ Abstract ]
@@ -13,6 +13,7 @@ It requires upTeX-0.20 or later.
 00otf-uptex.txt : this file
 umakeotf : script to make vf, tfm
 umakeotf_brsg : script to make vf, tfm for burasage option
+umakeotf_jis04 : script to make vf, tfm for jis2004 option
 umkjvf : mkjvf with unicode support
 
 basepl/ubase-h.pl : unicode version of base-h.pl
@@ -43,8 +44,24 @@ COPYRIGHT : copyright notice of this package.
 [ Status ]
 Beta version.
 Proportional kana is not supported yet.
-Combination of jis2004 and ucs option is not supported yet
-  because Adobe standard CMap "UniJIS2004-UTF16-H", etc. will be effective.
+
+
+[ About jis2004 option ]
+otfbeta-uptex (japanese-otf-uptex) Ver.0.12 or later supports
+combination of "jis2004" and "uplatex" option.
+If you run the script "umakeotf_jis04", tfm and vf for jis2004 will be generated.
+They cousumes about 36.1 Mbytes in total.
+You will get expected results by mapping the new fonts
+  up{,brsg}{nml,exp}{minr,gothr,minb,gothb,mgothr,minl,gotheb}n-{h,v}.tfm
+to Adobe standard CMap "UniJIS2004-UTF16-{H,V}".
+
+If you do not use "jis2004" option, you can delete tfm and vf:
+  up{,brsg}{nml,exp}{minr,gothr,minb,gothb,mgothr,minl,gotheb}n-{h,v}.{tfm,vf}
+
+Instead of using "jis2004" option,
+you can get same result by mapping conventional fonts
+  up{,brsg}{nml,exp}{minr,gothr,minb,gothb,mgothr,minl,gotheb}-{h,v}.tfm
+to Adobe standard CMap "UniJIS2004-UTF16-{H,V}".
 
 
 [ History ]
@@ -179,4 +196,26 @@ Combination of jis2004 and ucs option is not supported yet
     The new code is written by ZR san.
   test/uplatex/uotftest-utf8.tex ::
     Revise.
+2013.06.02 Ver0.12
+  ## Thank Kitagawa san for helpful reports.
+  script/mktfm_sp.pl, script/mkutfvf_sp.pl, umakeotf, umakeotf_bsrg, umkjvf ::
+    Support Gothic/ExtraBold (gt/eb).
+  script/mkutfvf_sp.pl ::
+    Refer an environment variable OVP2OVF to set ovp2ovf command.
+  umakeotf_jis04 ::
+    Add. The script generates vf and tfm for jis2004 option on uplatex.
+    The vf and tfm consume about 36.1 Mbytes in total.
+  fontmap/hiragino.map(for udvips), fontmap/hiraginox.map(for dvipdfmx) ::
+    Add jis2004 entry.
+  umkjvf ::
+    Revise comment.
+  umakeotf, umakeotf_bsrg ::
+    Clean up.
+  sty/otf.sty, sty/mlutf.sty ::
+    Add jis2004 entry.
+    Increment version number.
+  patch/*.patch::
+    Revise.
+  test/uplatex/upjis2004.tex, test/uplatex/Makefile::
+    Add new test.
 
diff --git a/Master/texmf-dist/doc/fonts/japanese-otf-uptex/COPYRIGHT b/Master/texmf-dist/doc/fonts/japanese-otf-uptex/COPYRIGHT
index 2e0ad994277..91fee2d6f66 100644
--- a/Master/texmf-dist/doc/fonts/japanese-otf-uptex/COPYRIGHT
+++ b/Master/texmf-dist/doc/fonts/japanese-otf-uptex/COPYRIGHT
@@ -1,5 +1,5 @@
 Copyright (C) 2003--2010 SAITO Shuzaburo and INOUE Koichi
-Copyright (C) 2007--2012 TANAKA Takuji
+Copyright (C) 2007--2013 TANAKA Takuji
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/Master/texmf-dist/doc/fonts/japanese-otf-uptex/README b/Master/texmf-dist/doc/fonts/japanese-otf-uptex/README
index cd2087c7821..dda342b34f6 100644
--- a/Master/texmf-dist/doc/fonts/japanese-otf-uptex/README
+++ b/Master/texmf-dist/doc/fonts/japanese-otf-uptex/README
@@ -3,7 +3,7 @@ README
 
 From 00otf-uptex.txt:
 [ Title ]
-otfbeta-uptex (japanese-otf-uptex) Ver.0.11  2012/07/09
+otfbeta-uptex (japanese-otf-uptex) Ver.0.12  2013/06/02
 
 
 [ Abstract ]
@@ -21,15 +21,11 @@ For copyright and licensing, please see COPYRIGHT
 The original source has been downloaded from
 	http://homepage3.nifty.com/ttk/comp/tex/uptex.html
 as
-	http://homepage3.nifty.com/ttk/comp/tex/otfbeta-uptex-0.11.tar.xz
-
-The (included) patch
-	otf-script-gteb.diff
-from Hironori Kitagawa to support gteb font series was applied.
+	http://homepage3.nifty.com/ttk/comp/tex/otfbeta-uptex-0.12.tar.xz
 
 After that the scripts run and the generated tfm and vf files included.
 The scripts were run with the env variable OVP2OVF=wovp2ovf
 
 Norbert Preining <preining@logic.at>
-2013-04-12
+2013-11-20
 
diff --git a/Master/texmf-dist/doc/fonts/japanese-otf-uptex/test/uplatex/Makefile b/Master/texmf-dist/doc/fonts/japanese-otf-uptex/test/uplatex/Makefile
index b53e128f189..872b8e1eb80 100644
--- a/Master/texmf-dist/doc/fonts/japanese-otf-uptex/test/uplatex/Makefile
+++ b/Master/texmf-dist/doc/fonts/japanese-otf-uptex/test/uplatex/Makefile
@@ -6,12 +6,13 @@ DVIPS = dvips
 DVIPDFMX = dvipdfmx
 PDVITYPE = pdvitype
 
-all: uplatex-otf platex-otf uplatex-sp platex-sp uplatex-article platex-article uplatex-brsg platex-brsg
+all: otf sp art bsrg jis04
 
 otf: uplatex-otf platex-otf
 sp: uplatex-sp platex-sp
 art: uplatex-article platex-article
 brsg: uplatex-brsg platex-brsg
+jis04: uplatex-jis04 platex-jis04
 
 uplatex-otf:
 	for opt in default deluxe expert bold noreplace; do \
@@ -91,5 +92,33 @@ platex-brsg:
 	done \
 	done
 
+uplatex-jis04:
+	for opt in default expert; do \
+	for brsg in br oi; do \
+	for jis in 00 04; do \
+		$(UPLATEX) "\def\option{$$opt}\def\burasage{$$brsg}\def\jisvar{$$jis}\def\class{ujarticle}\input" upjis2004.tex ; \
+		mv upjis2004.dvi upjis2004-$$opt-$$brsg-$$jis-h-uplatex.dvi ; \
+		$(DVIPDFMX) upjis2004-$$opt-$$brsg-$$jis-h-uplatex.dvi ; \
+		$(UPLATEX) "\def\option{$$opt}\def\burasage{$$brsg}\def\jisvar{$$jis}\def\class{utarticle}\input" upjis2004.tex ; \
+		mv upjis2004.dvi upjis2004-$$opt-$$brsg-$$jis-v-uplatex.dvi ; \
+		$(DVIPDFMX) upjis2004-$$opt-$$brsg-$$jis-v-uplatex.dvi ; \
+	done \
+	done \
+	done
+
+platex-jis04:
+	for opt in default expert; do \
+	for brsg in br oi; do \
+	for jis in 00 04; do \
+		$(PLATEX) "\def\option{$$opt}\def\burasage{$$brsg}\def\jisvar{$$jis}\def\class{jarticle}\input" upjis2004.tex ; \
+		mv upjis2004.dvi upjis2004-$$opt-$$brsg-$$jis-h-platex.dvi ; \
+		$(DVIPDFMX) upjis2004-$$opt-$$brsg-$$jis-h-platex.dvi ; \
+		$(PLATEX) "\def\option{$$opt}\def\burasage{$$brsg}\def\jisvar{$$jis}\def\class{tarticle}\input" upjis2004.tex ; \
+		mv upjis2004.dvi upjis2004-$$opt-$$brsg-$$jis-v-platex.dvi ; \
+		$(DVIPDFMX) upjis2004-$$opt-$$brsg-$$jis-v-platex.dvi ; \
+	done \
+	done \
+	done
+
 clean:
 	rm *.aux *.log *.dvi *.pdf
diff --git a/Master/texmf-dist/doc/fonts/japanese-otf-uptex/test/uplatex/upjis2004.tex b/Master/texmf-dist/doc/fonts/japanese-otf-uptex/test/uplatex/upjis2004.tex
new file mode 100644
index 00000000000..65a235f946d
--- /dev/null
+++ b/Master/texmf-dist/doc/fonts/japanese-otf-uptex/test/uplatex/upjis2004.tex
@@ -0,0 +1,158 @@
+% -*- coding: utf-8 -*-
+\newif\ifuptexmode\uptexmodefalse
+\ifnum\jis"2121="3000 \uptexmodetrue\fi
+
+\makeatletter
+
+\def\@opt@{deluxe}
+\def\@default{default}
+\def\@br@{br}
+\def\@newjis@{04}
+
+\ifuptexmode
+ \edef\@opt@{uplatex,\@opt@}
+\fi
+
+\ifx\option\@undefined
+ \def\option{default}
+\fi
+\ifx\option\@default
+\else
+ \edef\@opt@{\option,\@opt@}
+\fi
+
+\ifx\burasage\@br@
+ \edef\@opt@{\@opt@,burasage}
+ \def\burasage{yes}
+\else
+ \def\burasage{no}
+\fi
+
+\ifx\jisvar\@newjis@
+ \edef\@opt@{\@opt@,jis2004}
+ \def\jisvar{2004}
+\else
+ \def\jisvar{conventional}
+\fi
+
+\ifx\class\@undefined
+ \ifuptexmode
+  \def\class{ujarticle}
+ \else
+  \def\class{jarticle}
+ \fi
+\fi
+
+\documentclass[a4paper,titlepage,draft]{\class}
+%\documentclass[a4paper,titlepage,draft,landscape]{\class}
+
+\usepackage[\@opt@]{otf}
+
+\makeatother
+
+\usepackage{redeffont}
+\parindent 0zw
+\pagestyle{empty}
+%\parskip \baselineskip
+\makeatletter
+\ifx\rubyfamily\@undefined\let\rubyfamily=\relax\fi
+\ifx\mgfamily\@undefined\let\mgfamily=\relax\fi
+\makeatother
+
+\def\testglyph{%
+逢芦飴溢茨鰯淫迂厩噂餌襖迦牙廻恢晦蟹葛鞄
+釜翰翫徽祇汲灸笈卿饗僅喰櫛屑粂祁隙倦捲牽
+鍵諺巷梗膏鵠甑叉榊薩鯖錆鮫餐杓灼酋楯薯藷
+哨鞘杖蝕訊逗摺撰煎煽穿箭詮噌遡揃遜腿蛸辿
+樽歎註瀦捗槌鎚辻挺鄭擢溺兎堵屠賭瀞遁謎灘
+楢禰牌這秤駁箸叛挽誹樋稗逼謬豹廟瀕斧蔽瞥
+蔑篇娩鞭庖蓬鱒迄儲餅籾爺鑓愈猷漣煉簾榔冤
+叟咬嘲囀徘扁棘橙狡甕甦疼祟竈筵篝腱艘芒虔
+蜃蠅訝靄靱騙鴉
+\ifuptexmode
+ 俱剝吞噓姸屛幷瘦繫摯懲蘒譿悞煒驊夆暵屢
+\fi
+}
+\def\testutf{%
+\UTF{9022}\UTF{82A6}\UTF{98F4}\UTF{6EA2}\UTF{8328}\UTF{9C2F}\UTF{6DEB}\UTF{8FC2}\UTF{53A9}\UTF{5642}%
+\UTF{990C}\UTF{8956}\UTF{8FE6}\UTF{7259}\UTF{5EFB}\UTF{6062}\UTF{6666}\UTF{87F9}\UTF{845B}\UTF{9784}%
+\UTF{91DC}\UTF{7FF0}\UTF{7FEB}\UTF{5FBD}\UTF{7947}\UTF{6C72}\UTF{7078}\UTF{7B08}\UTF{537F}\UTF{9957}%
+\UTF{50C5}\UTF{55B0}\UTF{6ADB}\UTF{5C51}\UTF{7C82}\UTF{7941}\UTF{9699}\UTF{5026}\UTF{6372}\UTF{727D}%
+\UTF{9375}\UTF{8AFA}\UTF{5DF7}\UTF{6897}\UTF{818F}\UTF{9D60}\UTF{7511}\UTF{53C9}\UTF{698A}\UTF{85A9}%
+\UTF{9BD6}\UTF{9306}\UTF{9BAB}\UTF{9910}\UTF{6753}\UTF{707C}\UTF{914B}\UTF{696F}\UTF{85AF}\UTF{85F7}%
+\UTF{54E8}\UTF{9798}\UTF{6756}\UTF{8755}\UTF{8A0A}\UTF{9017}\UTF{647A}\UTF{64B0}\UTF{714E}\UTF{717D}%
+\UTF{7A7F}\UTF{7BAD}\UTF{8A6E}\UTF{564C}\UTF{9061}\UTF{63C3}\UTF{905C}\UTF{817F}\UTF{86F8}\UTF{8FBF}%
+\UTF{6A3D}\UTF{6B4E}\UTF{8A3B}\UTF{7026}\UTF{6357}\UTF{69CC}\UTF{939A}\UTF{8FBB}\UTF{633A}\UTF{912D}%
+\UTF{64E2}\UTF{6EBA}\UTF{514E}\UTF{5835}\UTF{5C60}\UTF{8CED}\UTF{701E}\UTF{9041}\UTF{8B0E}\UTF{7058}%
+\UTF{6962}\UTF{79B0}\UTF{724C}\UTF{9019}\UTF{79E4}\UTF{99C1}\UTF{7BB8}\UTF{53DB}\UTF{633D}\UTF{8AB9}%
+\UTF{6A0B}\UTF{7A17}\UTF{903C}\UTF{8B2C}\UTF{8C79}\UTF{5EDF}\UTF{7015}\UTF{65A7}\UTF{853D}\UTF{77A5}%
+\UTF{8511}\UTF{7BC7}\UTF{5A29}\UTF{97AD}\UTF{5E96}\UTF{84EC}\UTF{9C52}\UTF{8FC4}\UTF{5132}\UTF{9905}%
+\UTF{7C7E}\UTF{723A}\UTF{9453}\UTF{6108}\UTF{7337}\UTF{6F23}\UTF{7149}\UTF{7C3E}\UTF{6994}\UTF{51A4}%
+\UTF{53DF}\UTF{54AC}\UTF{5632}\UTF{56C0}\UTF{5F98}\UTF{6241}\UTF{68D8}\UTF{6A59}\UTF{72E1}\UTF{7515}%
+\UTF{7526}\UTF{75BC}\UTF{795F}\UTF{7AC8}\UTF{7B75}\UTF{7BDD}\UTF{8171}\UTF{8258}\UTF{8292}\UTF{8654}%
+\UTF{8703}\UTF{8805}\UTF{8A1D}\UTF{9744}\UTF{9771}\UTF{9A19}\UTF{9D09}%
+\UTF{4FF1}\UTF{525D}\UTF{541E}\UTF{5653}\UTF{59F8}\UTF{5C5B}\UTF{5E77}\UTF{7626}\UTF{7E6B}\UTF{646F}%
+\UTF{FA40}\UTF{FA20}\UTF{8B7F}\UTF{609E}\UTF{7152}\UTF{9A4A}\UTF{5906}\UTF{66B5}\UTF{5C62}}
+
+\begin{document}
+class: \texttt{\class}\\
+option: \texttt{\option}\\
+burasage: \texttt{\burasage}\\
+jis version: \texttt{\jisvar}\\
+
+[mc/m]
+
+\testglyph
+
+\testutf
+
+{\bfseries%
+[mc/bx]
+
+\testglyph
+
+\testutf
+}
+
+{\gtfamily
+[gt/m]
+
+\testglyph
+
+\testutf
+
+{\bfseries%
+[gt/bx]
+
+\testglyph
+
+\testutf
+}}
+
+{\mgfamily
+[mg/m]
+
+\testglyph
+
+\testutf
+}
+
+%%% extra font
+{\ltseries%
+[mc/lt]
+
+\testglyph
+
+\testutf
+}
+
+{\gtfamily
+{\ebseries%
+[gt/eb]
+
+\testglyph
+
+\testutf
+}}
+
+\end{document}