From 74e624196144ae218a63a4c35672fc7a0e7b18dc Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Mon, 23 Apr 2012 23:52:46 +0000 Subject: japanese-otf-uptex 0.10 (24Apr) fix ctan2tds for new script name git-svn-id: svn://tug.org/texlive/trunk@26114 c570f23f-e606-0410-a88d-b1316a301751 --- .../doc/fonts/japanese-otf-uptex/00otf-uptex.txt | 32 +- .../texmf-dist/doc/fonts/japanese-otf-uptex/README | 12 +- .../doc/fonts/japanese-otf-uptex/readme.txt | 210 ---------- .../fonts/japanese-otf-uptex/test/uplatex/Makefile | 44 +- .../test/uplatex/uotftest-utf8.tex | 26 +- .../japanese-otf-uptex/test/uplatex/upbrsgtest.tex | 293 +++++++++++++ .../public/japanese-otf-uptex/upbrsgexpgothb-h.tfm | Bin 0 -> 904 bytes .../public/japanese-otf-uptex/upbrsgexpgothb-v.tfm | Bin 0 -> 612 bytes .../public/japanese-otf-uptex/upbrsgexpgothr-h.tfm | Bin 0 -> 904 bytes .../public/japanese-otf-uptex/upbrsgexpgothr-v.tfm | Bin 0 -> 612 bytes .../japanese-otf-uptex/upbrsgexpmgothr-h.tfm | Bin 0 -> 904 bytes .../japanese-otf-uptex/upbrsgexpmgothr-v.tfm | Bin 0 -> 612 bytes .../public/japanese-otf-uptex/upbrsgexpminb-h.tfm | Bin 0 -> 904 bytes .../public/japanese-otf-uptex/upbrsgexpminb-v.tfm | Bin 0 -> 612 bytes .../public/japanese-otf-uptex/upbrsgexpminl-h.tfm | Bin 0 -> 904 bytes .../public/japanese-otf-uptex/upbrsgexpminl-v.tfm | Bin 0 -> 612 bytes .../public/japanese-otf-uptex/upbrsgexpminr-h.tfm | Bin 0 -> 904 bytes .../public/japanese-otf-uptex/upbrsgexpminr-v.tfm | Bin 0 -> 612 bytes .../public/japanese-otf-uptex/upbrsgnmlgothb-h.tfm | Bin 0 -> 904 bytes .../public/japanese-otf-uptex/upbrsgnmlgothb-v.tfm | Bin 0 -> 612 bytes .../japanese-otf-uptex/upbrsgnmlgotheb-h.tfm | Bin 0 -> 904 bytes .../japanese-otf-uptex/upbrsgnmlgotheb-v.tfm | Bin 0 -> 612 bytes .../public/japanese-otf-uptex/upbrsgnmlgothr-h.tfm | Bin 0 -> 904 bytes .../public/japanese-otf-uptex/upbrsgnmlgothr-v.tfm | Bin 0 -> 612 bytes .../japanese-otf-uptex/upbrsgnmlmgothr-h.tfm | Bin 0 -> 904 bytes .../japanese-otf-uptex/upbrsgnmlmgothr-v.tfm | Bin 0 -> 612 bytes .../public/japanese-otf-uptex/upbrsgnmlminb-h.tfm | Bin 0 -> 904 bytes .../public/japanese-otf-uptex/upbrsgnmlminb-v.tfm | Bin 0 -> 612 bytes .../public/japanese-otf-uptex/upbrsgnmlminl-h.tfm | Bin 0 -> 904 bytes .../public/japanese-otf-uptex/upbrsgnmlminl-v.tfm | Bin 0 -> 612 bytes .../public/japanese-otf-uptex/upbrsgnmlminr-h.tfm | Bin 0 -> 904 bytes .../public/japanese-otf-uptex/upbrsgnmlminr-v.tfm | Bin 0 -> 612 bytes .../public/japanese-otf-uptex/upbrsgexpgothb-h.vf | Bin 0 -> 651228 bytes .../public/japanese-otf-uptex/upbrsgexpgothb-v.vf | Bin 0 -> 651252 bytes .../public/japanese-otf-uptex/upbrsgexpgothr-h.vf | Bin 0 -> 651228 bytes .../public/japanese-otf-uptex/upbrsgexpgothr-v.vf | Bin 0 -> 651252 bytes .../public/japanese-otf-uptex/upbrsgexpmgothr-h.vf | Bin 0 -> 651232 bytes .../public/japanese-otf-uptex/upbrsgexpmgothr-v.vf | Bin 0 -> 651260 bytes .../public/japanese-otf-uptex/upbrsgexpminb-h.vf | Bin 0 -> 651228 bytes .../public/japanese-otf-uptex/upbrsgexpminb-v.vf | Bin 0 -> 651252 bytes .../public/japanese-otf-uptex/upbrsgexpminl-h.vf | Bin 0 -> 651228 bytes .../public/japanese-otf-uptex/upbrsgexpminl-v.vf | Bin 0 -> 651252 bytes .../public/japanese-otf-uptex/upbrsgexpminr-h.vf | Bin 0 -> 651228 bytes .../public/japanese-otf-uptex/upbrsgexpminr-v.vf | Bin 0 -> 651252 bytes .../public/japanese-otf-uptex/upbrsgnmlgothb-h.vf | Bin 0 -> 650984 bytes .../public/japanese-otf-uptex/upbrsgnmlgothb-v.vf | Bin 0 -> 651012 bytes .../public/japanese-otf-uptex/upbrsgnmlgotheb-h.vf | Bin 0 -> 650980 bytes .../public/japanese-otf-uptex/upbrsgnmlgotheb-v.vf | Bin 0 -> 650956 bytes .../public/japanese-otf-uptex/upbrsgnmlgothr-h.vf | Bin 0 -> 650984 bytes .../public/japanese-otf-uptex/upbrsgnmlgothr-v.vf | Bin 0 -> 651012 bytes .../public/japanese-otf-uptex/upbrsgnmlmgothr-h.vf | Bin 0 -> 650988 bytes .../public/japanese-otf-uptex/upbrsgnmlmgothr-v.vf | Bin 0 -> 651012 bytes .../public/japanese-otf-uptex/upbrsgnmlminb-h.vf | Bin 0 -> 650984 bytes .../public/japanese-otf-uptex/upbrsgnmlminb-v.vf | Bin 0 -> 651008 bytes .../public/japanese-otf-uptex/upbrsgnmlminl-h.vf | Bin 0 -> 650984 bytes .../public/japanese-otf-uptex/upbrsgnmlminl-v.vf | Bin 0 -> 651008 bytes .../public/japanese-otf-uptex/upbrsgnmlminr-h.vf | Bin 0 -> 650984 bytes .../public/japanese-otf-uptex/upbrsgnmlminr-v.vf | Bin 0 -> 651008 bytes .../fonts/japanese-otf-uptex/basepl/ubrsg-h.pl | 163 ++++++++ .../fonts/japanese-otf-uptex/basepl/ubrsg-v.pl | 138 +++++++ .../patch/otfbeta_uptex-0.09.patch | 453 --------------------- .../patch/otfbeta_uptex-0.10.patch | 453 +++++++++++++++++++++ .../source/fonts/japanese-otf-uptex/umakeotf | 5 + .../source/fonts/japanese-otf-uptex/umakeotf_brsg | 70 ++++ .../source/fonts/japanese-otf-uptex/umkjvf | 11 +- .../tex/platex/japanese-otf-uptex/mlutf.sty | 2 +- .../tex/platex/japanese-otf-uptex/otf.sty | 2 +- Master/tlpkg/libexec/ctan2tds | 2 +- 68 files changed, 1221 insertions(+), 695 deletions(-) delete mode 100644 Master/texmf-dist/doc/fonts/japanese-otf-uptex/readme.txt create mode 100644 Master/texmf-dist/doc/fonts/japanese-otf-uptex/test/uplatex/upbrsgtest.tex create mode 100644 Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpgothb-h.tfm create mode 100644 Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpgothb-v.tfm create mode 100644 Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpgothr-h.tfm create mode 100644 Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpgothr-v.tfm create mode 100644 Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpmgothr-h.tfm create mode 100644 Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpmgothr-v.tfm create mode 100644 Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpminb-h.tfm create mode 100644 Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpminb-v.tfm create mode 100644 Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpminl-h.tfm create mode 100644 Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpminl-v.tfm create mode 100644 Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpminr-h.tfm create mode 100644 Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpminr-v.tfm create mode 100644 Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlgothb-h.tfm create mode 100644 Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlgothb-v.tfm create mode 100644 Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlgotheb-h.tfm create mode 100644 Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlgotheb-v.tfm create mode 100644 Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlgothr-h.tfm create mode 100644 Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlgothr-v.tfm create mode 100644 Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlmgothr-h.tfm create mode 100644 Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlmgothr-v.tfm create mode 100644 Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlminb-h.tfm create mode 100644 Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlminb-v.tfm create mode 100644 Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlminl-h.tfm create mode 100644 Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlminl-v.tfm create mode 100644 Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlminr-h.tfm create mode 100644 Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlminr-v.tfm create mode 100644 Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/upbrsgexpgothb-h.vf create mode 100644 Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/upbrsgexpgothb-v.vf create mode 100644 Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/upbrsgexpgothr-h.vf create mode 100644 Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/upbrsgexpgothr-v.vf create mode 100644 Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/upbrsgexpmgothr-h.vf create mode 100644 Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/upbrsgexpmgothr-v.vf create mode 100644 Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/upbrsgexpminb-h.vf create mode 100644 Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/upbrsgexpminb-v.vf create mode 100644 Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/upbrsgexpminl-h.vf create mode 100644 Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/upbrsgexpminl-v.vf create mode 100644 Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/upbrsgexpminr-h.vf create mode 100644 Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/upbrsgexpminr-v.vf create mode 100644 Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/upbrsgnmlgothb-h.vf create mode 100644 Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/upbrsgnmlgothb-v.vf create mode 100644 Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/upbrsgnmlgotheb-h.vf create mode 100644 Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/upbrsgnmlgotheb-v.vf create mode 100644 Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/upbrsgnmlgothr-h.vf create mode 100644 Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/upbrsgnmlgothr-v.vf create mode 100644 Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/upbrsgnmlmgothr-h.vf create mode 100644 Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/upbrsgnmlmgothr-v.vf create mode 100644 Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/upbrsgnmlminb-h.vf create mode 100644 Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/upbrsgnmlminb-v.vf create mode 100644 Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/upbrsgnmlminl-h.vf create mode 100644 Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/upbrsgnmlminl-v.vf create mode 100644 Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/upbrsgnmlminr-h.vf create mode 100644 Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/upbrsgnmlminr-v.vf create mode 100644 Master/texmf-dist/source/fonts/japanese-otf-uptex/basepl/ubrsg-h.pl create mode 100644 Master/texmf-dist/source/fonts/japanese-otf-uptex/basepl/ubrsg-v.pl delete mode 100644 Master/texmf-dist/source/fonts/japanese-otf-uptex/patch/otfbeta_uptex-0.09.patch create mode 100644 Master/texmf-dist/source/fonts/japanese-otf-uptex/patch/otfbeta_uptex-0.10.patch create mode 100755 Master/texmf-dist/source/fonts/japanese-otf-uptex/umakeotf_brsg 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 ef7bdc36e7c..874ba3afb45 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,10 +1,10 @@ [ Title ] -otfbeta-uptex (japanese-otf-uptex) Ver.0.09 2012/02/18 +otfbeta-uptex (japanese-otf-uptex) Ver.0.10 2012/04/21 [ Abstract ] This is a package for upLaTeX support of -japanese-otf package "otfbeta (v1.7b4 2012/1/22)" by psitau-san +japanese-otf package "otfbeta (v1.7b5 2012/4/11)" by psitau-san ( http://psitau.kitunebi.com/otf.html ) It requires upTeX-0.20 or later. @@ -12,10 +12,13 @@ It requires upTeX-0.20 or later. [ Contents ] 00otf-uptex.txt : this file umakeotf : script to make vf, tfm +umakeotf_brsg : script to make vf, tfm for burasage option umkjvf : mkjvf with unicode support basepl/ubase-h.pl : unicode version of base-h.pl basepl/ubase-v.pl : unicode version of base-v.pl +basepl/ubrsg-h.pl : unicode version of brsg-h.pl +basepl/ubrsg-v.pl : unicode version of brsg-v.pl script/mkutf32list.pl : perl script making lists of characters on supplementary planes. script/MakeSPList.pm : perl module making data of characters on supplementary planes. @@ -27,9 +30,9 @@ script/sp_list_t.txt : a list of characters on supplementary planes in UniGB-UTF script/sp_list_k.txt : a list of characters on supplementary planes in UniKS-UTF32. sty/otf.sty : basic style file -sty/mlutf.sty : style file for option multi +sty/mlutf.sty : style file for multi option -test/uplatex : test samples. +test/uplatex/* : test samples. patch/*.patch : patch for original style files sty/*.sty and fontmap files fontmap/* in otfbeta.zip @@ -42,7 +45,6 @@ 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. -Combination of burasage and ucs option is not tested yet, and vf is not generated. [ History ] @@ -149,4 +151,24 @@ Combination of burasage and ucs option is not tested yet, and vf is not generate Add. patch/*.patch:: Revise. +2012.04.21 Ver0.10 + For "otfbeta (v1.7b5 2012/04/11)", upTeX in TeXLive svn r24922 or later + Enhance: support burasage on uplatex. + umakeotf_brsg, basepl/ubrsg-{h,v}.pl :: + Add. The files generate vf and tfm for burasage on uplatex. + The vf and tfm consume about 16.7 Mbytes in total. + umkjvf :: + Refer an environment variable OVP2OVF to set ovp2ovf command. + umakeotf :: + Revise. + sty/otf.sty :: + Adopt otf.sty [2012/04/11 v1.7b5 psitau] in otfbeta (v1.7b5 2012/4/11). + sty/mlutf.sty :: + Update version number. + test/uplatex/upbrsgtest.tex :: + Add. + test/uplatex/Makefile, test/uplatex/uotftest-utf8.tex :: + Revise. + patch/*.patch:: + Revise. diff --git a/Master/texmf-dist/doc/fonts/japanese-otf-uptex/README b/Master/texmf-dist/doc/fonts/japanese-otf-uptex/README index ab105e20c68..42ee4f0d414 100644 --- a/Master/texmf-dist/doc/fonts/japanese-otf-uptex/README +++ b/Master/texmf-dist/doc/fonts/japanese-otf-uptex/README @@ -3,12 +3,12 @@ README From 00otf-uptex.txt: [ Title ] -otfbeta-uptex (japanese-otf-uptex) Ver.0.09 2012/02/18 +otfbeta-uptex (japanese-otf-uptex) Ver.0.10 2012/04/21 [ Abstract ] This is a package for upLaTeX support of -japanese-otf package "otfbeta (v1.7b4 2012/1/22)" by psitau-san +japanese-otf package "otfbeta (v1.7b5 2012/4/11)" by psitau-san ( http://psitau.kitunebi.com/otf.html ) It requires upTeX-0.20 or later. @@ -21,11 +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.09.tar.xz + http://homepage3.nifty.com/ttk/comp/tex/otfbeta-uptex-0.10.tar.xz After that the scripts run and the generated tfm and vf files included. -The only changes made was to automatically run wovf2ovp instead of -ovf2ovp. +The scripts were run with the env variable OVP2OVF=wovp2ovf Norbert Preining -2012-02-21 +2012-04-23 + diff --git a/Master/texmf-dist/doc/fonts/japanese-otf-uptex/readme.txt b/Master/texmf-dist/doc/fonts/japanese-otf-uptex/readme.txt deleted file mode 100644 index 854c9e4f44a..00000000000 --- a/Master/texmf-dist/doc/fonts/japanese-otf-uptex/readme.txt +++ /dev/null @@ -1,210 +0,0 @@ -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$@$H3Nl9g!$(B2011$BG/(B12$B7n0J9_$N(BVersion$B$G$7$?$i$&$^$/$$$-$^$9!%(B -$B!&(Bopl2ofm$B!'(BWEB$BHG$N$b$N$@$H3Nl9g!$(B2011$BG/(B12$B7n0J9_$N(BVersion$B$G$7$?$i$&$^$/$$$-$^$9!%(B -$B!&(Bperl -$B!&(Bppltotf - -$B!Z%$%s%9%H!<%k![(B -$B#1!K%7%'%k%9%/%j%W%H(Bmakeotf$B$rl=j$K0\F0$5$;$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$rl9g!$(Bckt.map(for udvips), ckt.map(for dvipdfmx)$B$K(B -$B!!!!=q$+$l$?%(%s%H%j$rDI2C$7$F2<$5$$!%(B -$B!!!!(BDistiller$B$N!V%U%)%s%H$N>l=j!W$K(BMSungStd-Light-Acro$B$J$I$,F~$C$F$$$k%U%)%k%@$rDI2C$9$l$P!$(B -$B!!!!HKqs;z!$4JBN;z!$%O%s%0%k$J$I$bKd$a9~$a$^$9!JL@D+BN$N$_!K!%(B - -$B%"%8%"%s%U%)%s%H%Q%C%/$O2<5-$N(BURL$B$+$iF~ gt/m$B$KBeBX$5$l$F$$$?$+$i$G$9!%F1MM$N7k2L$rF@$k$?$a$K$O(B\bfseries$B$r(B\gtfamily\bfseries -$B$KJQ99$9$kI,MW$,$"$j$^$9!%$3$l$r9T$&$?$a$N%9%?%$%k%U%!%$%k$,(Bredeffont.sty$B$G$9!%(Bdeluxe$B%*%W%7%g%s$r;HMQ$9$k$H$-$O!$(B -$B$3$N%9%?%$%k%U%!%$%k$rFI$_9~$s$G$/$@$5$$!%!J<+F0$G$OFI$_9~$^$l$^$;$s!K(B -redeffont.sty$B$G$O!$8+=P$7$,(Bgt/bx$B$K3d$jEv$F$i$l$F$$$k%U%)%s%H$K$J$j$^$9!%$3$l$rNc$($P(Bgt/m$B$K$7$?$$>l9g!$(B\headfont$B$r(B -$B=q$-49$($k$3$H$G2DG=$G$9!%%W%j%"%s%V%k$G(B -\let\headfont=\gtfamily -$B$H$7$F$/$@$5$$!%(B - -multi$B$r;XDj$9$k$H!$(BUnicode$B$N4A;z$NItJ,$r4JBN;z!$HKqs;z!$D+A/8l$N$=$l$>$l$N%U%)%s%H$rMxMQ$9$k$3$H$,(B -$B=PPT$^$9!%4JBN;z$O(B\UTFC$B$r!$HKqs;z$O(B\UTFT$B$r!$D+A/8l$O(B\UTFK$B$r!$$=$l$>$l;H$$$^$9!%(B -$B!J;DG0Fc$i!$(Bdeluxe$B%*%W%7%g%s$r;XDj$7$F$b!$8z2L$O5Z$S$^$;$s!K(B -$B$^$?!$(B\UTFM$B$rMQ$$$k$H!$$b$7F|K\8l$N%U%)%s%H$K%0%j%U$,$J$$>l9g!$HKqs;z!d4JBN;z!d%O%s%0%k$N=gHV$G(B -$B%0%j%U$,$J$$$+$rD4$Y!$2?$l$+$K%0%j%U$,$"$k>l9g!$$=$N%U%)%s%H$N%0%j%U$,MQ$$$i$l$^$9!%(B -CID$B$K$h$k;XDj$O!$4JBN;z$O(B\CIDC$B$r!$HKqs;z$O(B\CIDT$B$r!$D+A/8l$O(B\CIDK$B$r!$$=$l$>$l;H$$$^$9!%(B - -$B!ZCm0U![(Botf.sty$B$O%G%U%)%k%H$NL@D+BN!$%4%7%C%/BN$rCV$-49$($^$9!%(B -$B!~(Bgt/m$B$r$I$N$h$&$KCV$-49$($k$+$rJQ99$9$k%*%W%7%g%s$,(Bbold$B%*%W%7%g%s$G$9!%%G%U%)%k%H$G$O(Bgt/m$B$K$O(B -$B%l%.%e%i!<$N%4%7%C%/$r3d$jEv$F$^$9$,!$(Bbold$B%*%W%7%g%s$r;XDj$9$k$H%\!<%k%I$N%4%7%C%/$r3d$jEv$F$^$9!%(B - -$B!~(Bnoreplace$B$r;XDj$9$k$H!$%G%U%)%k%H$NL@D+BN!$%4%7%C%/BN$rCV$-49$($J$$$h$&$K$J$j$^$9!%(B -$B$?$@$7!$(Bdeluxe, expert$B%*%W%7%g%s$,;XDj$5$l$k$H(Bnoreplace$B$OL58z$K$J$j$^$9!%(B - -\usepackage[deluxe, expert, multi]{otf} -$B$G%*%W%7%g%s$,A4$FM-8z$K$J$j$^$9!%!J%U%)%s%H$N(Bshape$B$,$?$/$5$sDj5A$5$lL5BL$,A}$($^$9!%!K(B - -$B!~(Bburasage$B%*%W%7%g%s$,;XDj$5$l$k$H!$$V$i2<$2AH$r$9$k$h$&$K$J$j$^$9!%C"$7!$$A$g$&$I9TKv$KMh$?6gFIE@$OA43QL>$N%U%)%s%H$K%k%SMQ$+$J!$=DAH!?2#AH@lMQ$+$J$r3d$jEv$F$?(BVF$B$r:n@.2DG=(B -$B!&%^%C%T%s%0$N%+%9%?%^%$%:$,Hf3SE*4JC1(B -$B$G$9!%(BTFM$B$r$A$c$s$HFI$_9~$^$J$$$N$G!$@8@.=PMh$k$N$O(BJIS TFM$B%Y!<%9$G$9!$(Bmin10$B$N$h$&$JJ#;($J(B -$BJ8;zI}$K$OBP1~$7$F$$$^$;$s!%(B - -$B!Z;HMQ5vBz![(B -$BK\%Q%C%1!<%8$N%$%s%9%H!<%k$^$?$O;HMQ$K4XO"$7$F;HMQ@\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&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$reED$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) -$B!&(Bmkjvf$B$+$i:n@.$5$l$k(BVF$B$,!$?7$7$$(Bovp2ovf (ver. 2.1)$B$G:n$C$?>l9g!$>eev1.7b1(2010/3/27) -$B!&$V$i2<$2AH$KBP1~(B[otf.sty, makeotf, mkjvf, brsg-h.pl$B$*$h$S(Bbrsg-v.pl$BDI2C(B, brsgtest.tex$B$NDI2C(B] -$B!&(BJIS X 0213:2004$B$N;z7A2~@5$KBP1~(B -$B!!(B[otf.sty, makeotf, mkjvf, hiragino.map(for udvips), hiraginox.map(for dvipdfmx), jis2004.tex$B$NDI2C(B] -v1.5.6-->v1.5.6.1(2010/3/26) -$B!&(Bmkutfvf.pl$B$K(Bspeed up patch$B$rE,MQ$,>ev1.5.6(2010/3/22) -$B!&%7%'%k%9%/%j%W%HFb$N(Bpltotf$B$r(Bppltotf$B$KJQ99(B[makeotf] -$B!&(BWindows$BMQ$N%P%C%A%U%!%$%k(B(mkotf.bat)$B$r:o=|(B -$B!&?7$7$$(Bovp2ovf, opl2ofm$B$G(Bovf, ofm$B$,:n@.$G$-$k$h$&$K(BOFMLEVEL$B%(%s%H%j$rDI2C(B -$B!!(B[mkvpkana.pl, mkutfvf.pl, mkcidvf.pl, mkpkana.pl, mkcidofm.pl, mkaltutfvf.pl, -$B!!(Bmkmlcidvf.pl, mkpropofm.pl, mkjvf] -$B!&(Bmkutfvf.pl$B$KEZBl9g$NDj5A$r=$@5(B[otf.sty] -v1.5.4-->v1.5.5(2010/3/20) -$B!&%/%i%9%U%!%$%k$N%*%W%7%g%s$K$F(Bdisablejfam$B;HMQ;~$NIT6q9g$r=$@5(B[otf.sty] -v1.5.3-->v1.5.4(2007/3/19) -$B!&=D=q$-MQ$N(BOFM$B$N%a%H%j%C%/$,4V0c$C$F$$$?$N$r=$@5(B[mkcidofm.pl] -v1.5.2.1-->v1.5.3(2006/9/6) -$B!&%W%m%]!<%7%g%J%k2>L>MQ(Btfm$B$N:n@.J}K!$,$*$+$7$+$C$?$N$r=$@5(B[mkotf, mkotf.bat] -v1.5.1-->v1.5.2.1(2005/12/31) -$B!&%^%/%m=8$N=$@5(B(\ajSlanted$B$H(B\ajSlanted*$B$NDj5A$NF~$l49$((B)[ajmacros.sty] -v1.5.1-->v1.5.2(2005/5/11) -$B!&=D=q$-(BCID$BMQ$N(BVF, OFM$B$N%a%H%j%C%/$,$*$+$7$+$C$?$N$r=$@5(B[mkcidvf.pl, mkofm.pl] -v1.5-->v1.5.1(2005/1/27) -$B!&%^%/%m=8$N=$@5(B[ajmacros.sty] -v1.3.4-->v1.5(2005/1/16) -$B!&(BAdobe-Japan1-6$B$KBP1~(B[otf.sty, ajmacros.sty, mktfm.pl, mkcidvf.pl, mkcidofm.pl, kozuka.map, kozukax.map] -v1.3.3-->v1.3.4(2004/8/17) -$B!&(Bajmacros.sty$B$rFI$_9~$^$J$$%*%W%7%g%s$r(Bnomacros$B$K=$@5(B[otf.sty] -v1.3.2-->v1.3.3(2004/4/17) -$B!&(B"$B$N(Bcatcode$B$r6/@)E*$K(B12$B$K$9$k$h$&$KJQ99(B[otf.sty, mlcid.sty, mlutf.sty] -v1.3.1.1-->v1.3.2(2004/3/5) -$B!&%^%/%m=8$K9g;z%^%/%m$NDI2C(B[ajmacros.sty] -v1.3.1-->v1.3.1.1(2004/2/25) -$B!&(BVF$B@8@.%9%/%j%W%H$r=$@5(B[mkutfvf.pl, mkcidvf.pl, mkaltutfvf.pl, mkmlcidvf.pl, mkjvf, mkotf.bat] -v1.3.0-->v1.3.1(2004/2/18) -$B!&(BCVS$BHG$N(Bdvipdfmx$B$KBP1~$9$k$?$a(BOFM$B%U%!%$%k$r:n@.$9$k$h$&$K$7$?(B[makeotf, mkotf.bat, mkofm.pl, mkofm2.pl] -$B!&%W%m%]!<%7%g%J%k2>L>$N(BVF$B$rJQ99(B[mkpkana.pl, mkvpkana.pl] -$B!&>e5-$NJQ99$K$h$j!$%^%C%W%U%!%$%k$r%(%s%H%j$rDI2C(B[hiraginox.map(for dvipdfmx), hiragino.map(for udvips)] -v1.1.6-->v1.3.0(2004/2/7) -$B!&L@D+BN!$%4%7%C%/BN$NCV$-49$(MQ$N%U%)%s%H$N%U%!%_%j$r(Bmc, gt$B$+$i(Bhmc, hgt$B$KJQ99(B[otf.sty] -v1.1.5-->v1.1.6(2004/2/2) -$B!&=D=q$-MQ%W%m%]!<%7%g%J%k2>L>$NDI2C(B[mkotf, mkotf.bat, mkvpkana.pl, tfm, vf, otf.sty] -v1.1.4-->v1.1.5(2004/1/19) -$B!&(Bredeffont.sty$B$N(BJIS X 0213$B%Q%C%1!<%8$KBP$9$kBP1~(B[redeffont.sty] -$B!&%U%)%s%HDj5AMQ$NFbIt%^%/%m$N!J0f>e9@0l;a$K$h$k!K2~NI(B[otf.sty] -v1.1.3-->v1.1.4(2003/12/19) -$B!&%U%)%s%HDj5AMQ$NFbIt%^%/%m$N!J0f>e9@0l;a$K$h$k!K2~NI(B[otf.sty, mlotf.sty, mlcid.sty] -$B!&(Bdvipdfmx$BMQ$N%U%)%s%H%^%C%W%U%!%$%k$r(B20031207$BHG$N$b$N$KJQ99(B[$B3Fv1.1.3(2003/12/17) -$B!&(BCID$B$K$h$k;XDj$rB?8@8l$KBP1~$5$;$^$7$?!J$H$j$"$($:!$A4$FA43QI}$K$7$F$$$^$9!K(B -$B!!(B[makeotf, mkotf.bat, mktfm.pl, mkmlcidvf.pl, tfm, vf, mlcid.sty, fontmap] -v1.1.1-->v1.1.2(2003/11/27) -$B!&%W%m%]!<%7%g%J%k2>L>MQ$N(BJFM, VF$B$r(BOTF$B%Q%C%1!<%8I8=`$N%a%H%j%C%/$K=`5r$9$k$h$&$K$7$?(B[mkpkana.pl, tfm, vf] -v1.1-->v1.1.1(2003/11/25) -$B!&(Bredeffont.sty$B$K$*$$$F(B{j, t}book.cls$B$r;H$C$?>l9g$K%3%s%Q%$%k$G$-$J$+$C$?IT6q9g$r=$@5(B[redeffont.sty] -v1.1b8-->v1.1(2003/11/17) -$B!&4]%4%7%C%/$N%U%!%_%j!<$K@Z$jBX$($k(B\textmg$B%3%^%s%I$rDI2C(B[otf.sty] -v1.1b8-->v1.1b9, v1.0.4-->v1.0.5(2003/11/3) -$B!&%U%)%s%HL>$rv1.1b8, v1.0.3-->v1.0.4(2003/11/2) -$B!&(Bredeffont.sty$B$G(B\headfont$B$r:FDj5A$7$F$b!$@5$7$/CV$-JQ$o$i$J$+$C$?IT6q9g$r=$@5(B[redeffont.sty] -v1.1b6-->v1.1b7(2003/10/31) -$B!&=DAH$_MQ$N(BVF$B$G%3%s%^!$%T%j%*%I$r6gFIE@$KJQ99$9$k5!G=$N=$@5(B[mkjvf, vf] -v1.1b5-->v1.1b6(2003/10/27) -$B!&(Bnmlminr-v$B$J$I$G%_%K%e!<%H$X$NJQ49$N:]$N%U%)%s%HL>$rv1.1b5(2003/10/27) -$B!&(Bproperty list files$B$NJ8;z%3!<%I$r(BJIS$B$KJQ99(B[basepl] -$B=DAH$_MQ$N(BVF$B$G%/%)!<%F!<%7%g%s%^!<%/$r%_%K%e!<%H$KJQ99$9$k5!G=$N=$@5(B[mkjvf, vf] -v1.1b3-->v1.1b4(2003/10/25) -$B!&=DAH$_MQ$N(BVF$B$G%/%)!<%F!<%7%g%s%^!<%/$r%_%K%e!<%H$KJQ99$9$k5!G=$N=$@5(B[mkjvf, vf] -$B!&=DAH$_MQ$N(BVF$B$G%3%s%^!$%T%j%*%I$r6gFIE@$KJQ99(B[mkjvf, vf] -v1.1b2-->v1.1b3(2003/10/25) -$B!&(Bmkjvf$B$r>.2>L>$,:n@.$G$-$k$h$&$KJQ99(B[mkjvf] -v1.1b-->v1.1b2(2003/10/24) -$B!&=DAH$_MQ$N(BVF$B$G%/%)!<%F!<%7%g%s%^!<%/$r%_%K%e!<%H$KJQ99(B[mkjvf, vf] -v1.0.2-->v1.1b(2003/10/22) -$B!&(BJFM$B$K$*$$$F(B0.962216$BG\$7$F$$$?$N$r%9%?%$%k%U%!%$%kB&$G%9%1!<%k$9$k$h$&$K=$@5(B[mkjvf, vf, tfm] -$B!&B?8@8lMQ$N%U%)%s%H$,(Bjsclasses$B$KBP1~$7$o$9$l$F$$$?$N$r=$@5(B[mlutf.sty] -$B!&(Bextrafonts$B$rv1.0.2(2003/9/03) -$B!&2#!?eTAH@lMQ2>L>!$$*$h$S%k%S@lMQ2>L>$,=L>.$5$l$F$7$^$C$F$$$?%P%0$r=$@5!%(B[mkjvf, vf] -v1.0-->v1.0.1(2003/8/18) -$B!&%/%)!<%F!<%7%g%s%^!<%/$,$:$l$k%P%0$r=$@5!%(B[mkjvf, vf] -v1.0b5-->v1.0(2003/5/1) -$B!&(Bwindows$BMQ$N%P%C%A%U%!%$%k$NL>>N$rJQ99(B -$B!&(Bmkjvf$B$r:G?7$NJ*$K%"%C%W%G!<%H(B -v1.0b4-->v1.0b5(2003/3/25) -$B!&(Bhyperref.sty$B$,FI$_9~$^$l$F$$$k>l9g!$(B\UTF$B%3%^%s%I$J$I$G;XDj$5$l$?J8;z$KBP$7$F(Boutline$B%U%!%$%k$X$N(B -$B!!=q$-=P$7$,(B\0xXXXX$B$H$$$&7A$G=q$-=P$5$l$k$h$&$K$J$j$^$7$?!%(B[ajmacros.sty, otf.sty, mlutf.sty] -v1.0b3-->v1.0b4(2003/3/25) -$B!&(Bhyperref.sty$B$,FI$_9~$^$l$F$$$k>l9g$NJQ99$rv1.0b3(2003/3/24) -$B!&(Bhyperref.sty$B$,FI$_9~$^$l$F$$$k>l9g!$(B\UTF{XXXX}$B$G;XDj$5$l$?ItJ,$r(B -$B!!(B$XXXX$B$H$$$&7A<0$G(Boutline$B%U%!%$%k$K=q$-=P$9$h$&$KJQ99(B[otf.sty] -$B!&(B\UTFM$B%3%^%s%I$r?7@_!$(B\UTFM$BMQ$N(BVF, TFM$B$r@8@.$9$k$h$&$K$7$^$7$?!%(B -$B!!$=$l$KH<$$!$%U%)%s%H%^%C%W$NNc$rJQ99$7$^$7$?!%(B[mlutf.sty, vf, tfm, fontmap] -$B!&(Bhyperref.sty$B$,FI$_9~$^$l$F$$$k>l9g!$(B\ajVar$B$,(Bout$B%U%!%$%k$K=q$-=P$5$l$k$H$-(B -$B!!0z?t$,=q$-=P$5$l$k$h$&$K$J$j$^$7$?!%(B[ajmacro.sty] -v1.0b1-->v1.0b2(2003/3/17) -$B!&(Bmkutfvf.pl$B$N%P%0$r=$@5!%F|K\8l0J30$K$OI,MW$J$$(BVF$B$^$G:n@.$7$F$$$^$7$?!%(B[mkutfvf.pl] -v1.0b0-->v1.0b1(2003/3/17) -$B!&(Bmkjvf$B$NM>J,$J%3!<%I$r>C5n(B[mkjvf] 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 fcc767882cb..b53e128f189 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 @@ -1,15 +1,17 @@ UPTEX = uptex PTEX = ptex UPLATEX = uplatex -PLATEX = platex +PLATEX = platex -kanji=utf8 DVIPS = dvips DVIPDFMX = dvipdfmx PDVITYPE = pdvitype -all: uplatex-otf platex-otf uplatex-sp platex-sp +all: uplatex-otf platex-otf uplatex-sp platex-sp uplatex-article platex-article uplatex-brsg platex-brsg otf: uplatex-otf platex-otf sp: uplatex-sp platex-sp +art: uplatex-article platex-article +brsg: uplatex-brsg platex-brsg uplatex-otf: for opt in default deluxe expert bold noreplace; do \ @@ -51,5 +53,43 @@ platex-sp: $(DVIPDFMX) uotf-sp-$$opt-v-platex.dvi ; \ done +uplatex-article: + for opt in noreplace; do \ + $(UPLATEX) "\def\option{$$opt}\def\class{article}\input" uotftest-utf8.tex ; \ + mv uotftest-utf8.dvi uotftest-$$opt-a-uplatex.dvi ; \ + $(DVIPDFMX) uotftest-$$opt-a-uplatex.dvi ; \ + done + +platex-article: + for opt in noreplace; do \ + $(PLATEX) "\def\option{$$opt}\def\class{article}\input" uotftest-utf8.tex ; \ + mv uotftest-utf8.dvi uotftest-$$opt-a-platex.dvi ; \ + $(DVIPDFMX) uotftest-$$opt-a-platex.dvi ; \ + done + +uplatex-brsg: + for opt in default expert; do \ + for burasage in br oi; do \ + $(UPLATEX) "\def\option{$$opt}\def\burasage{$$burasage}\def\class{ujbook}\input" upbrsgtest.tex ; \ + mv upbrsgtest.dvi upbrsgtest-$$opt-$$burasage-h-uplatex.dvi ; \ + $(DVIPDFMX) upbrsgtest-$$opt-$$burasage-h-uplatex.dvi ; \ + $(UPLATEX) "\def\option{$$opt}\def\burasage{$$burasage}\def\class{utbook}\input" upbrsgtest.tex ; \ + mv upbrsgtest.dvi upbrsgtest-$$opt-$$burasage-v-uplatex.dvi ; \ + $(DVIPDFMX) upbrsgtest-$$opt-$$burasage-v-uplatex.dvi ; \ + done \ + done + +platex-brsg: + for opt in default expert; do \ + for burasage in br oi; do \ + $(PLATEX) "\def\option{$$opt}\def\burasage{$$burasage}\def\class{jbook}\input" upbrsgtest.tex ; \ + mv upbrsgtest.dvi upbrsgtest-$$opt-$$burasage-h-platex.dvi ; \ + $(DVIPDFMX) upbrsgtest-$$opt-$$burasage-h-platex.dvi ; \ + $(PLATEX) "\def\option{$$opt}\def\burasage{$$burasage}\def\class{tbook}\input" upbrsgtest.tex ; \ + mv upbrsgtest.dvi upbrsgtest-$$opt-$$burasage-v-platex.dvi ; \ + $(DVIPDFMX) upbrsgtest-$$opt-$$burasage-v-platex.dvi ; \ + done \ + done + clean: rm *.aux *.log *.dvi *.pdf diff --git a/Master/texmf-dist/doc/fonts/japanese-otf-uptex/test/uplatex/uotftest-utf8.tex b/Master/texmf-dist/doc/fonts/japanese-otf-uptex/test/uplatex/uotftest-utf8.tex index 6d8e9153343..b7c8a5f5f54 100644 --- a/Master/texmf-dist/doc/fonts/japanese-otf-uptex/test/uplatex/uotftest-utf8.tex +++ b/Master/texmf-dist/doc/fonts/japanese-otf-uptex/test/uplatex/uotftest-utf8.tex @@ -1,3 +1,7 @@ +% -*- coding: utf-8 -*- +\newif\ifuptexmode\uptexmodefalse +\ifnum\jis"2121="3000 \uptexmodetrue\fi + \makeatletter \def\@opt@{multi} @@ -14,23 +18,21 @@ \edef\@opt@{\option,\@opt@} \fi -\def\baseshift{-.12zh} -\ifx\class\@tarticle\def\baseshift{-.5zh}\fi -\ifx\class\@utarticle\def\baseshift{-.5zh}\fi - \ifx\class\@undefined - \def\class{jarticle} -\fi -\ifx\class\@jarticle -\else - \ifx\class\@tarticle + \ifuptexmode + \def\class{ujarticle} \else - \edef\@opt@{uplatex,\@opt@} + \def\class{jarticle} \fi \fi -\newif\ifuptexmode\uptexmodefalse -\ifnum\jis"2121="3000 \uptexmodetrue\fi +\def\baseshift{-.12zh} +\ifx\class\@tarticle\def\baseshift{-.5zh}\fi +\ifx\class\@utarticle\def\baseshift{-.5zh}\fi + +\ifuptexmode + \edef\@opt@{uplatex,\@opt@} +\fi \documentclass[a4paper,titlepage, draft]{\class} %\documentclass[a4paper,titlepage, draft,landscape]{\class} diff --git a/Master/texmf-dist/doc/fonts/japanese-otf-uptex/test/uplatex/upbrsgtest.tex b/Master/texmf-dist/doc/fonts/japanese-otf-uptex/test/uplatex/upbrsgtest.tex new file mode 100644 index 00000000000..e901822def7 --- /dev/null +++ b/Master/texmf-dist/doc/fonts/japanese-otf-uptex/test/uplatex/upbrsgtest.tex @@ -0,0 +1,293 @@ +% -*- coding: utf-8 -*- +\newif\ifuptexmode\uptexmodefalse +\ifnum\jis"2121="3000 \uptexmodetrue\fi + +\makeatletter + +\def\@opt@{deluxe} +\def\@default{default} +\def\@br@{br} + +\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\class\@undefined + \ifuptexmode + \def\class{utbook} + \else + \def\class{tbook} + \fi +\fi + +\documentclass[twocolumn]{\class} +\usepackage[\@opt@]{otf} + +\makeatother + +\textwidth 13zw +\columnsep 3zw +\columnseprule 1pt +\linewidth 5zw +\parindent 0zw +\pagestyle{empty} +%\parskip \baselineskip +\begin{document} +class: \texttt{\class}\\ +option: \texttt{\option}\\ +burasage: \texttt{\burasage} + +□□□□◆□□□□◆□□□□◆□□□□◆, +□□□□◆□□□□◆□□□□◆□□□□◆. + +□□,□□,□□□□◆,□□,□□. + +□□,□□,□□□□◆,□□□□. + +□□□□◆,□□.□□□□□□◆. + +□□□□◆。」「□□◆ + +\newpage + +\textgt{タイプ別の、組み合わせ。} + +□ああ□ + +□あ(□ + +□あ)□ + +□あ・□ + +□あ。□ + +□あ―□ + +□あ?□ + +□あ、□ + +□(あ□ + +□((□ + +□()□ + +□(・□ + +□(。□ + +□(―□ + +□(?□ + +□(、□ + +□)あ□ + +□)(□ + +□))□ + +□)・□ + +□)。□ + +□)―□ + +□)?□ + +□)、□ + +□・あ□ + +□・(□ + +□・)□ + +□・・□ + +□・。□ + +□・―□ + +□・?□ + +□・、□ + +□。あ□ + +□。(□ + +□。)□ + +□。・□ + +□。。□ + +□。―□ + +□。?□ + +□。、□ + +□―あ□ + +□―(□ + +□―)□ + +□―・□ + +□―。□ + +□――□ + +□―?□ + +□―、□ + +□?あ□ + +□?(□ + +□?)□ + +□?・□ + +□?。□ + +□?―□ + +□??□ + +□?、□ + +□、あ□ + +□、(□ + +□、)□ + +□、・□ + +□、。□ + +□、―□ + +□、?□ + +□、、□ + +\newpage +{\bfseries% +[mc/bx] + +□□□□◆□□□□◆□□□□◆□□□□◆, +□□□□◆□□□□◆□□□□◆□□□□◆. + +□□,□□,□□□□◆,□□,□□. + +□□,□□,□□□□◆,□□□□. + +□□□□◆,□□.□□□□□□◆. + +□□□□◆。」「□□◆ +} + +\if0 +{\ltseries% +[mc/l] + +□□□□◆□□□□◆□□□□◆□□□□◆, +□□□□◆□□□□◆□□□□◆□□□□◆. + +□□,□□,□□□□◆,□□,□□. + +□□,□□,□□□□◆,□□□□. + +□□□□◆,□□.□□□□□□◆. + +□□□□◆。」「□□◆ +} +\fi + +{\gtfamily +[gt/m] + +□□□□◆□□□□◆□□□□◆□□□□◆, +□□□□◆□□□□◆□□□□◆□□□□◆. + +□□,□□,□□□□◆,□□,□□. + +□□,□□,□□□□◆,□□□□. + +□□□□◆,□□.□□□□□□◆. + +□□□□◆。」「□□◆ + +{\bfseries% +[gt/bx] + +□□□□◆□□□□◆□□□□◆□□□□◆, +□□□□◆□□□□◆□□□□◆□□□□◆. + +□□,□□,□□□□◆,□□,□□. + +□□,□□,□□□□◆,□□□□. + +□□□□◆,□□.□□□□□□◆. + +□□□□◆。」「□□◆ +} + +\if0 +{\ebseries% +[gt/eb] + +□□□□◆□□□□◆□□□□◆□□□□◆, +□□□□◆□□□□◆□□□□◆□□□□◆. + +□□,□□,□□□□◆,□□,□□. + +□□,□□,□□□□◆,□□□□. + +□□□□◆,□□.□□□□□□◆. + +□□□□◆。」「□□◆ +} +\fi +} + +{\mgfamily +[mg/m] + +□□□□◆□□□□◆□□□□◆□□□□◆, +□□□□◆□□□□◆□□□□◆□□□□◆. + +□□,□□,□□□□◆,□□,□□. + +□□,□□,□□□□◆,□□□□. + +□□□□◆,□□.□□□□□□◆. + +□□□□◆。」「□□◆ +} + +\end{document} diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpgothb-h.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpgothb-h.tfm new file mode 100644 index 00000000000..504d6874d94 Binary files /dev/null and b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpgothb-h.tfm differ diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpgothb-v.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpgothb-v.tfm new file mode 100644 index 00000000000..4e8a85bd351 Binary files /dev/null and b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpgothb-v.tfm differ diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpgothr-h.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpgothr-h.tfm new file mode 100644 index 00000000000..504d6874d94 Binary files /dev/null and b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpgothr-h.tfm differ diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpgothr-v.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpgothr-v.tfm new file mode 100644 index 00000000000..4e8a85bd351 Binary files /dev/null and b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpgothr-v.tfm differ diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpmgothr-h.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpmgothr-h.tfm new file mode 100644 index 00000000000..504d6874d94 Binary files /dev/null and b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpmgothr-h.tfm differ diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpmgothr-v.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpmgothr-v.tfm new file mode 100644 index 00000000000..4e8a85bd351 Binary files /dev/null and b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpmgothr-v.tfm differ diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpminb-h.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpminb-h.tfm new file mode 100644 index 00000000000..504d6874d94 Binary files /dev/null and b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpminb-h.tfm differ diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpminb-v.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpminb-v.tfm new file mode 100644 index 00000000000..4e8a85bd351 Binary files /dev/null and b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpminb-v.tfm differ diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpminl-h.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpminl-h.tfm new file mode 100644 index 00000000000..504d6874d94 Binary files /dev/null and b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpminl-h.tfm differ diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpminl-v.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpminl-v.tfm new file mode 100644 index 00000000000..4e8a85bd351 Binary files /dev/null and b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpminl-v.tfm differ diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpminr-h.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpminr-h.tfm new file mode 100644 index 00000000000..504d6874d94 Binary files /dev/null and b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpminr-h.tfm differ diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpminr-v.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpminr-v.tfm new file mode 100644 index 00000000000..4e8a85bd351 Binary files /dev/null and b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpminr-v.tfm differ diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlgothb-h.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlgothb-h.tfm new file mode 100644 index 00000000000..504d6874d94 Binary files /dev/null and b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlgothb-h.tfm differ diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlgothb-v.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlgothb-v.tfm new file mode 100644 index 00000000000..4e8a85bd351 Binary files /dev/null and b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlgothb-v.tfm differ diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlgotheb-h.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlgotheb-h.tfm new file mode 100644 index 00000000000..504d6874d94 Binary files /dev/null and b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlgotheb-h.tfm differ diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlgotheb-v.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlgotheb-v.tfm new file mode 100644 index 00000000000..4e8a85bd351 Binary files /dev/null and b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlgotheb-v.tfm differ diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlgothr-h.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlgothr-h.tfm new file mode 100644 index 00000000000..504d6874d94 Binary files /dev/null and b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlgothr-h.tfm differ diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlgothr-v.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlgothr-v.tfm new file mode 100644 index 00000000000..4e8a85bd351 Binary files /dev/null and b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlgothr-v.tfm differ diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlmgothr-h.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlmgothr-h.tfm new file mode 100644 index 00000000000..504d6874d94 Binary files /dev/null and b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlmgothr-h.tfm differ diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlmgothr-v.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlmgothr-v.tfm new file mode 100644 index 00000000000..4e8a85bd351 Binary files /dev/null and b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlmgothr-v.tfm differ diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlminb-h.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlminb-h.tfm new file mode 100644 index 00000000000..504d6874d94 Binary files /dev/null and b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlminb-h.tfm differ diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlminb-v.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlminb-v.tfm new file mode 100644 index 00000000000..4e8a85bd351 Binary files /dev/null and b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlminb-v.tfm differ diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlminl-h.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlminl-h.tfm new file mode 100644 index 00000000000..504d6874d94 Binary files /dev/null and b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlminl-h.tfm differ diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlminl-v.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlminl-v.tfm new file mode 100644 index 00000000000..4e8a85bd351 Binary files /dev/null and b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlminl-v.tfm differ diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlminr-h.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlminr-h.tfm new file mode 100644 index 00000000000..504d6874d94 Binary files /dev/null and b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlminr-h.tfm differ diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlminr-v.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlminr-v.tfm new file mode 100644 index 00000000000..4e8a85bd351 Binary files /dev/null and b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlminr-v.tfm differ diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/upbrsgexpgothb-h.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/upbrsgexpgothb-h.vf new file mode 100644 index 00000000000..87ee9838215 Binary files /dev/null and b/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/upbrsgexpgothb-h.vf differ diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/upbrsgexpgothb-v.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/upbrsgexpgothb-v.vf new file mode 100644 index 00000000000..b30f22d956e Binary files /dev/null and b/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/upbrsgexpgothb-v.vf differ diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/upbrsgexpgothr-h.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/upbrsgexpgothr-h.vf new file mode 100644 index 00000000000..9385c068067 Binary files /dev/null and b/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/upbrsgexpgothr-h.vf differ diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/upbrsgexpgothr-v.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/upbrsgexpgothr-v.vf new file mode 100644 index 00000000000..7b28557c1fd Binary files /dev/null and b/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/upbrsgexpgothr-v.vf differ diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/upbrsgexpmgothr-h.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/upbrsgexpmgothr-h.vf new file mode 100644 index 00000000000..5746a8526f9 Binary files /dev/null and b/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/upbrsgexpmgothr-h.vf differ diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/upbrsgexpmgothr-v.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/upbrsgexpmgothr-v.vf new file mode 100644 index 00000000000..58f4df2227f Binary files /dev/null and b/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/upbrsgexpmgothr-v.vf differ diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/upbrsgexpminb-h.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/upbrsgexpminb-h.vf new file mode 100644 index 00000000000..9f166b7cf9b Binary files /dev/null and b/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/upbrsgexpminb-h.vf differ diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/upbrsgexpminb-v.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/upbrsgexpminb-v.vf new file mode 100644 index 00000000000..344b78bbce8 Binary files /dev/null and b/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/upbrsgexpminb-v.vf differ diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/upbrsgexpminl-h.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/upbrsgexpminl-h.vf new file mode 100644 index 00000000000..d5889d6d2eb Binary files /dev/null and b/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/upbrsgexpminl-h.vf differ diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/upbrsgexpminl-v.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/upbrsgexpminl-v.vf new file mode 100644 index 00000000000..71dc2b862e7 Binary files /dev/null and b/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/upbrsgexpminl-v.vf differ diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/upbrsgexpminr-h.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/upbrsgexpminr-h.vf new file mode 100644 index 00000000000..0e4c82e2f8f Binary files /dev/null and b/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/upbrsgexpminr-h.vf differ diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/upbrsgexpminr-v.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/upbrsgexpminr-v.vf new file mode 100644 index 00000000000..9174074a2bb Binary files /dev/null and b/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/upbrsgexpminr-v.vf differ diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/upbrsgnmlgothb-h.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/upbrsgnmlgothb-h.vf new file mode 100644 index 00000000000..7068e43f1fa Binary files /dev/null and b/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/upbrsgnmlgothb-h.vf differ diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/upbrsgnmlgothb-v.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/upbrsgnmlgothb-v.vf new file mode 100644 index 00000000000..c6d8037535a Binary files /dev/null and b/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/upbrsgnmlgothb-v.vf differ diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/upbrsgnmlgotheb-h.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/upbrsgnmlgotheb-h.vf new file mode 100644 index 00000000000..2982f0c3297 Binary files /dev/null and b/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/upbrsgnmlgotheb-h.vf differ diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/upbrsgnmlgotheb-v.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/upbrsgnmlgotheb-v.vf new file mode 100644 index 00000000000..d0b57b580b2 Binary files /dev/null and b/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/upbrsgnmlgotheb-v.vf differ diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/upbrsgnmlgothr-h.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/upbrsgnmlgothr-h.vf new file mode 100644 index 00000000000..19712635102 Binary files /dev/null and b/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/upbrsgnmlgothr-h.vf differ diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/upbrsgnmlgothr-v.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/upbrsgnmlgothr-v.vf new file mode 100644 index 00000000000..ff1552b370f Binary files /dev/null and b/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/upbrsgnmlgothr-v.vf differ diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/upbrsgnmlmgothr-h.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/upbrsgnmlmgothr-h.vf new file mode 100644 index 00000000000..a403711acf4 Binary files /dev/null and b/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/upbrsgnmlmgothr-h.vf differ diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/upbrsgnmlmgothr-v.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/upbrsgnmlmgothr-v.vf new file mode 100644 index 00000000000..9a3e470deac Binary files /dev/null and b/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/upbrsgnmlmgothr-v.vf differ diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/upbrsgnmlminb-h.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/upbrsgnmlminb-h.vf new file mode 100644 index 00000000000..0e069b638e0 Binary files /dev/null and b/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/upbrsgnmlminb-h.vf differ diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/upbrsgnmlminb-v.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/upbrsgnmlminb-v.vf new file mode 100644 index 00000000000..3bb4427a76e Binary files /dev/null and b/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/upbrsgnmlminb-v.vf differ diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/upbrsgnmlminl-h.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/upbrsgnmlminl-h.vf new file mode 100644 index 00000000000..144d59b5d25 Binary files /dev/null and b/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/upbrsgnmlminl-h.vf differ diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/upbrsgnmlminl-v.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/upbrsgnmlminl-v.vf new file mode 100644 index 00000000000..a36f499610e Binary files /dev/null and b/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/upbrsgnmlminl-v.vf differ diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/upbrsgnmlminr-h.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/upbrsgnmlminr-h.vf new file mode 100644 index 00000000000..53009e0cad8 Binary files /dev/null and b/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/upbrsgnmlminr-h.vf differ diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/upbrsgnmlminr-v.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/upbrsgnmlminr-v.vf new file mode 100644 index 00000000000..4ce0a75e905 Binary files /dev/null and b/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/upbrsgnmlminr-v.vf differ diff --git a/Master/texmf-dist/source/fonts/japanese-otf-uptex/basepl/ubrsg-h.pl b/Master/texmf-dist/source/fonts/japanese-otf-uptex/basepl/ubrsg-h.pl new file mode 100644 index 00000000000..f365ce89922 --- /dev/null +++ b/Master/texmf-dist/source/fonts/japanese-otf-uptex/basepl/ubrsg-h.pl @@ -0,0 +1,163 @@ +(COMMENT THIS IS A KANJI FORMAT FILE) +(FAMILY OTF KANJI) +(FACE F MRR) +(CODINGSCHEME TEX KANJI TEXT) +(DESIGNSIZE R 10.0) +(COMMENT DESIGNSIZE IS IN POINTS) +(COMMENT OTHER SIZES ARE MULTIPLES OF DESIGNSIZE) +(CHECKSUM O 0) +(SEVENBITSAFEFLAG TRUE) +(FONTDIMEN + (SLANT R 0.0) + (SPACE R 0.0) + (STRETCH R 0.1) + (SHRINK R 0.0) + (XHEIGHT R 1.0) + (QUAD R 1.0) + (EXTRASPACE R 0.25) + (EXTRASTRETCH R 0.2) + (EXTRASHRINK R 0.125) + ) +(GLUEKERN + (LABEL O 0) + (GLUE O 1 R 0.5 R 0.0 R 0.5) + (GLUE O 3 R 0.25 R 0.0 R 0.25) + (STOP) + (LABEL O 1) + (GLUE O 3 R 0.25 R 0.0 R 0.25) + (STOP) + (LABEL O 2) + (GLUE O 0 R 0.5 R 0.0 R 0.5) + (GLUE O 1 R 0.5 R 0.0 R 0.5) + (GLUE O 3 R 0.25 R 0.0 R 0.25) + (GLUE O 5 R 0.5 R 0.0 R 0.5) + (GLUE O 6 R 0.5 R 0.0 R 0.5) + (GLUE O 7 R 0.5 R 0.0 R 0.5) + (STOP) + (LABEL O 3) + (GLUE O 0 R 0.25 R 0.0 R 0.25) + (GLUE O 1 R 0.25 R 0.0 R 0.25) + (GLUE O 2 R 0.25 R 0.0 R 0.25) + (GLUE O 3 R 0.5 R 0.0 R 0.25) + (GLUE O 4 R 0.25 R 0.0 R 0.25) + (GLUE O 5 R 0.25 R 0.0 R 0.25) + (GLUE O 6 R 0.25 R 0.0 R 0.25) + (GLUE O 7 R 0.25 R 0.0 R 0.25) + (GLUE D 8 R 0.25 R 0.0 R 0.25) + (STOP) + (LABEL O 4) + (GLUE O 0 R 1.0 R 0.0 R 0.0) + (GLUE O 1 R 1.0 R 0.0 R 0.0) + (GLUE O 2 R 0.5 R 0.0 R 0.0) + (GLUE O 3 R 1.25 R 0.0 R 0.75) + (GLUE O 4 R 1.0 R 0.0 R 0.5) + (GLUE O 5 R 1.0 R 0.0 R 0.0) + (GLUE O 6 R 1.0 R 0.0 R 0.0) + (GLUE O 7 R 0.5 R 0.0 R 0.0) + (GLUE D 8 R 1.0 R 0.0 R 0.5) + (STOP) + (LABEL O 5) + (GLUE O 1 R 0.5 R 0.0 R 0.5) + (GLUE O 3 R 0.25 R 0.0 R 0.25) + (KRN O 5 R 0.0) + (STOP) + (LABEL O 6) + (GLUE O 0 R 0.5 R 0.0 R 0.5) + (GLUE O 1 R 0.5 R 0.0 R 0.5) + (GLUE O 3 R 0.25 R 0.0 R 0.25) + (GLUE O 7 R 0.5 R 0.0 R 0.5) + (STOP) + (LABEL O 7) + (GLUE O 1 R 0.5 R 0.0 R 0.5) + (GLUE O 3 R 0.25 R 0.0 R 0.25) + (STOP) + (LABEL D 8) + (GLUE O 0 R 1.0 R 0.0 R 0.5) + (GLUE O 1 R 1.0 R 0.0 R 0.5) + (GLUE O 2 R 0.5 R 0.0 R 0.0) + (GLUE O 3 R 1.25 R 0.0 R 0.75) + (GLUE O 4 R 1.0 R 0.0 R 0.5) + (GLUE O 5 R 1.0 R 0.0 R 0.5) + (GLUE O 6 R 1.0 R 0.0 R 0.5) + (GLUE O 7 R 0.5 R 0.0 R 0.0) + (GLUE D 8 R 1.0 R 0.0 R 0.5) + (STOP) + ) +(CHARSINTYPE O 1 + ‘ “ ( 〔 [ { 〈 《 「 『 【 + UFF5F U3018 U3016 U301D + ) +(CHARSINTYPE O 2 + ’ ” ) 〕 ] } 〉 》 」 』 】 + UFF60 U3019 U3017 U301F + ) +(CHARSINTYPE O 3 + ・ : ; + ) +(CHARSINTYPE O 4 + 。 . + ) +(CHARSINTYPE O 5 + — ― … ‥ + ) +(CHARSINTYPE O 6 + ? ! + ) +(CHARSINTYPE O 7 + UFF61 UFF62 UFF63 UFF64 UFF65 UFF66 UFF67 + UFF68 UFF69 UFF6A UFF6B UFF6C UFF6D UFF6E UFF6F + UFF70 UFF71 UFF72 UFF73 UFF74 UFF75 UFF76 UFF77 + UFF78 UFF79 UFF7A UFF7B UFF7C UFF7D UFF7E UFF7F + UFF80 UFF81 UFF82 UFF83 UFF84 UFF85 UFF86 UFF87 + UFF88 UFF89 UFF8A UFF8B UFF8C UFF8D UFF8E UFF8F + UFF90 UFF91 UFF92 UFF93 UFF94 UFF95 UFF96 UFF97 + UFF98 UFF99 UFF9A UFF9B UFF9C UFF9D UFF9E UFF9F + ) +(CHARSINTYPE D 8 + 、 , + ) +(TYPE O 0 + (CHARWD R 1.0) + (CHARHT R 0.88) + (CHARDP R 0.12) + ) +(TYPE O 1 + (CHARWD R 0.5) + (CHARHT R 0.88) + (CHARDP R 0.12) + ) +(TYPE O 2 + (CHARWD R 0.5) + (CHARHT R 0.88) + (CHARDP R 0.12) + ) +(TYPE O 3 + (CHARWD R 0.5) + (CHARHT R 0.88) + (CHARDP R 0.12) + ) +(TYPE O 4 + (CHARWD R 0) + (CHARHT R 0.88) + (CHARDP R 0.12) + ) +(TYPE O 5 + (CHARWD R 1.0) + (CHARHT R 0.88) + (CHARDP R 0.12) + ) +(TYPE O 6 + (CHARWD R 1.0) + (CHARHT R 0.88) + (CHARDP R 0.12) + ) +(TYPE O 7 + (CHARWD R 0.5) + (CHARHT R 0.88) + (CHARDP R 0.12) + ) +(TYPE D 8 + (CHARWD R 0) + (CHARHT R 0.88) + (CHARDP R 0.12) + ) diff --git a/Master/texmf-dist/source/fonts/japanese-otf-uptex/basepl/ubrsg-v.pl b/Master/texmf-dist/source/fonts/japanese-otf-uptex/basepl/ubrsg-v.pl new file mode 100644 index 00000000000..61336e5eed1 --- /dev/null +++ b/Master/texmf-dist/source/fonts/japanese-otf-uptex/basepl/ubrsg-v.pl @@ -0,0 +1,138 @@ +(COMMENT THIS IS A KANJI FORMAT FILE) +(DIRECTION TATE) +(FAMILY OTF KANJI) +(FACE F MRR) +(CODINGSCHEME TEX KANJI TEXT) +(DESIGNSIZE R 10.0) +(COMMENT DESIGNSIZE IS IN POINTS) +(COMMENT OTHER SIZES ARE MULTIPLES OF DESIGNSIZE) +(CHECKSUM O 0) +(SEVENBITSAFEFLAG TRUE) +(FONTDIMEN + (SLANT R 0.0) + (SPACE R 0.0) + (STRETCH R 0.1) + (SHRINK R 0.0) + (XHEIGHT R 1.0) + (QUAD R 1.0) + (EXTRASPACE R 0.25) + (EXTRASTRETCH R 0.2) + (EXTRASHRINK R 0.125) + ) +(GLUEKERN + (LABEL O 0) + (GLUE O 1 R 0.5 R 0.0 R 0.5) + (GLUE O 3 R 0.25 R 0.0 R 0.25) + (STOP) + (LABEL O 1) + (GLUE O 3 R 0.25 R 0.0 R 0.25) + (STOP) + (LABEL O 2) + (GLUE O 0 R 0.5 R 0.0 R 0.5) + (GLUE O 1 R 0.5 R 0.0 R 0.5) + (GLUE O 3 R 0.25 R 0.0 R 0.25) + (GLUE O 5 R 0.5 R 0.0 R 0.5) + (STOP) + (LABEL O 3) + (GLUE O 0 R 0.25 R 0.0 R 0.25) + (GLUE O 1 R 0.25 R 0.0 R 0.25) + (GLUE O 2 R 0.25 R 0.0 R 0.25) + (GLUE O 3 R 0.5 R 0.0 R 0.25) + (GLUE O 4 R 0.25 R 0.0 R 0.25) + (GLUE O 5 R 0.25 R 0.0 R 0.25) + (GLUE O 7 R 0.25 R 0.0 R 0.25) + (STOP) + (LABEL O 4) + (GLUE O 0 R 1.0 R 0.0 R 0.0) + (GLUE O 1 R 1.0 R 0.0 R 0.0) + (GLUE O 2 R 0.5 R 0.0 R 0.0) + (GLUE O 3 R 1.25 R 0.0 R 0.75) + (GLUE O 4 R 1.0 R 0.0 R 0.5) + (GLUE O 5 R 1.0 R 0.0 R 0.0) + (GLUE O 6 R 1.0 R 0.0 R 0.0) + (GLUE O 7 R 1.0 R 0.0 R 0.5) + (STOP) + (LABEL O 5) + (GLUE O 1 R 0.5 R 0.0 R 0.5) + (GLUE O 3 R 0.25 R 0.0 R 0.25) + (KRN O 5 R 0.0) + (STOP) + (LABEL O 6) + (GLUE O 0 R 1.0 R 0.0 R 0.5) + (GLUE O 1 R 0.5 R 0.0 R 0.5) + (GLUE O 3 R 0.25 R 0.0 R 0.25) + (STOP) + (LABEL O 7) + (GLUE O 0 R 1.0 R 0.0 R 0.5) + (GLUE O 1 R 1.0 R 0.0 R 0.5) + (GLUE O 2 R 0.5 R 0.0 R 0.0) + (GLUE O 3 R 1.25 R 0.0 R 0.75) + (GLUE O 4 R 1.0 R 0.0 R 0.5) + (GLUE O 5 R 1.0 R 0.0 R 0.5) + (GLUE O 6 R 1.0 R 0.0 R 0.5) + (GLUE O 7 R 1.0 R 0.0 R 0.5) + (STOP) + ) +(CHARSINTYPE O 1 + ‘ “ ( 〔 [ { 〈 《 「 『 【 + UFF5F U3018 U3016 U301D + ) +(CHARSINTYPE O 2 + ’ ” ) 〕 ] } 〉 》 」 』 】 + UFF60 U3019 U3017 U301F + ) +(CHARSINTYPE O 3 + ・ : ; + ) +(CHARSINTYPE O 4 + 。 . + ) +(CHARSINTYPE O 5 + — ― … ‥ + ) +(CHARSINTYPE O 6 + ? ! + ) +(CHARSINTYPE O 7 + 、 , + ) +(TYPE O 0 + (CHARWD R 1.0) + (CHARHT R 0.5) + (CHARDP R 0.5) + ) +(TYPE O 1 + (CHARWD R 0.5) + (CHARHT R 0.5) + (CHARDP R 0.5) + ) +(TYPE O 2 + (CHARWD R 0.5) + (CHARHT R 0.5) + (CHARDP R 0.5) + ) +(TYPE O 3 + (CHARWD R 0.5) + (CHARHT R 0.5) + (CHARDP R 0.5) + ) +(TYPE O 4 + (CHARWD R 0) + (CHARHT R 0.5) + (CHARDP R 0.5) + ) +(TYPE O 5 + (CHARWD R 1.0) + (CHARHT R 0.5) + (CHARDP R 0.5) + ) +(TYPE O 6 + (CHARWD R 1.0) + (CHARHT R 0.5) + (CHARDP R 0.5) + ) +(TYPE O 7 + (CHARWD R 0) + (CHARHT R 0.5) + (CHARDP R 0.5) + ) diff --git a/Master/texmf-dist/source/fonts/japanese-otf-uptex/patch/otfbeta_uptex-0.09.patch b/Master/texmf-dist/source/fonts/japanese-otf-uptex/patch/otfbeta_uptex-0.09.patch deleted file mode 100644 index 83d5f3c827f..00000000000 --- a/Master/texmf-dist/source/fonts/japanese-otf-uptex/patch/otfbeta_uptex-0.09.patch +++ /dev/null @@ -1,453 +0,0 @@ -diff -urN otfbeta.orig/fontmap/hiragino.map(for udvips) otfbeta/fontmap/hiragino.map(for udvips) ---- otfbeta.orig/fontmap/hiragino.map(for udvips) 2010-03-27 09:38:48 +0900 -+++ otfbeta/fontmap/hiragino.map(for udvips) 2012-01-01 16:47:01 +0900 -@@ -4,6 +4,8 @@ - otf-cjmr-v HiraMinPro-W3-Identity-V - hminr-h HiraMinPro-W3-H - hminr-v HiraMinPro-W3-V -+uphminr-h HiraMinPro-W3-UniJIS-UTF16-H -+uphminr-v HiraMinPro-W3-UniJIS-UTF16-V - - otf-ujgr-h HiraKakuPro-W3-UniJIS-UTF16-H - otf-ujgr-v HiraKakuPro-W3-UniJIS-UTF16-V -@@ -11,6 +13,8 @@ - otf-cjgr-v HiraKakuPro-W3-Identity-V - hgothr-h HiraKakuPro-W3-H - hgothr-v HiraKakuPro-W3-V -+uphgothr-h HiraKakuPro-W3-UniJIS-UTF16-H -+uphgothr-v HiraKakuPro-W3-UniJIS-UTF16-V - - otf-ujmb-h HiraMinPro-W6-UniJIS-UTF16-H - otf-ujmb-v HiraMinPro-W6-UniJIS-UTF16-V -@@ -18,6 +22,8 @@ - otf-cjmb-v HiraMinPro-W6-Identity-V - hminb-h HiraMinPro-W6-H - hminb-v HiraMinPro-W6-V -+uphminb-h HiraMinPro-W6-UniJIS-UTF16-H -+uphminb-v HiraMinPro-W6-UniJIS-UTF16-V - - otf-cjgb-h HiraKakuPro-W6-Identity-H - otf-cjgb-v HiraKakuPro-W6-Identity-V -@@ -25,9 +31,13 @@ - otf-ujgb-v HiraKakuPro-W6-UniJIS-UTF16-V - hgothb-h HiraKakuPro-W6-H - hgothb-v HiraKakuPro-W6-V -+uphgothb-h HiraKakuPro-W6-UniJIS-UTF16-H -+uphgothb-v HiraKakuPro-W6-UniJIS-UTF16-V - - hgotheb-h HiraKakuStd-W8-H - hgotheb-v HiraKakuStd-W8-V -+uphgotheb-h HiraKakuStd-W8-UniJIS-UTF16-H -+uphgotheb-v HiraKakuStd-W8-UniJIS-UTF16-V - - otf-ujmgr-h HiraMaruPro-W4-UniJIS-UTF16-H - otf-ujmgr-v HiraMaruPro-W4-UniJIS-UTF16-V -@@ -35,6 +45,8 @@ - otf-cjmgr-v HiraMaruPro-W4-Identity-V - hmgothr-h HiraMaruPro-W4-H - hmgothr-v HiraMaruPro-W4-V -+uphmgothr-h HiraMaruPro-W4-UniJIS-UTF16-H -+uphmgothr-v HiraMaruPro-W4-UniJIS-UTF16-V - - otf-ujml-h HiraMinPro-W2-UniJIS-UTF16-H - otf-ujml-v HiraMinPro-W2-UniJIS-UTF16-V -@@ -42,6 +54,8 @@ - otf-cjml-v HiraMinPro-W2-Identity-V - hminl-h HiraMinPro-W2-H - hminl-v HiraMinPro-W2-V -+uphminl-h HiraMinPro-W2-UniJIS-UTF16-H -+uphminl-v HiraMinPro-W2-UniJIS-UTF16-V - - hiramin-w3-h HiraMinPro-W3-Identity-H - hiramin-w6-h HiraMinPro-W6-Identity-H -diff -urN otfbeta.orig/fontmap/hiraginox.map(for dvipdfmx) otfbeta/fontmap/hiraginox.map(for dvipdfmx) ---- otfbeta.orig/fontmap/hiraginox.map(for dvipdfmx) 2010-03-27 09:39:08 +0900 -+++ otfbeta/fontmap/hiraginox.map(for dvipdfmx) 2012-01-01 16:47:01 +0900 -@@ -4,6 +4,8 @@ - otf-cjmr-v Identity-V HiraMinPro-W3 - hminr-h H HiraMinPro-W3 - hminr-v V HiraMinPro-W3 -+uphminr-h UniJIS-UTF16-H HiraMinPro-W3 -+uphminr-v UniJIS-UTF16-V HiraMinPro-W3 - - otf-ujgr-h UniJIS-UTF16-H HiraKakuPro-W3 - otf-ujgr-v UniJIS-UTF16-V HiraKakuPro-W3 -@@ -11,6 +13,8 @@ - otf-cjgr-v Identity-V HiraKakuPro-W3 - hgothr-h H HiraKakuPro-W3 - hgothr-v V HiraKakuPro-W3 -+uphgothr-h UniJIS-UTF16-H HiraKakuPro-W3 -+uphgothr-v UniJIS-UTF16-V HiraKakuPro-W3 - - otf-ujmb-h UniJIS-UTF16-H HiraMinPro-W6 - otf-ujmb-v UniJIS-UTF16-V HiraMinPro-W6 -@@ -18,6 +22,8 @@ - otf-cjmb-v Identity-V HiraMinPro-W6 - hminb-h H HiraMinPro-W6 - hminb-v V HiraMinPro-W6 -+uphminb-h UniJIS-UTF16-H HiraMinPro-W6 -+uphminb-v UniJIS-UTF16-V HiraMinPro-W6 - - otf-ujgb-h UniJIS-UTF16-H HiraKakuPro-W6 - otf-ujgb-v UniJIS-UTF16-V HiraKakuPro-W6 -@@ -25,9 +31,13 @@ - otf-cjgb-v Identity-V HiraKakuPro-W6 - hgothb-h H HiraKakuPro-W6 - hgothb-v V HiraKakuPro-W6 -+uphgothb-h UniJIS-UTF16-H HiraKakuPro-W6 -+uphgothb-v UniJIS-UTF16-V HiraKakuPro-W6 - - hgotheb-h H HiraKakuStd-W8 - hgotheb-v V HiraKakuStd-W8 -+uphgotheb-h UniJIS-UTF16-H HiraKakuStd-W8 -+uphgotheb-v UniJIS-UTF16-V HiraKakuStd-W8 - - otf-ujmgr-h UniJIS-UTF16-H HiraMaruPro-W4 - otf-ujmgr-v UniJIS-UTF16-V HiraMaruPro-W4 -@@ -35,6 +45,8 @@ - otf-cjmgr-v Identity-V HiraMaruPro-W4 - hmgothr-h H HiraMaruPro-W4 - hmgothr-v V HiraMaruPro-W4 -+uphmgothr-h UniJIS-UTF16-H HiraMaruPro-W4 -+uphmgothr-v UniJIS-UTF16-V HiraMaruPro-W4 - - otf-ujml-h UniJIS-UTF16-H HiraMinPro-W2 - otf-ujml-v UniJIS-UTF16-V HiraMinPro-W2 -@@ -42,6 +54,8 @@ - otf-cjml-v Identity-V HiraMinPro-W2 - hminl-h H HiraMinPro-W2 - hminl-v V HiraMinPro-W2 -+uphminl-h UniJIS-UTF16-H HiraMinPro-W2 -+uphminl-v UniJIS-UTF16-V HiraMinPro-W2 - - hiramin-w3-h Identity-H HiraMinPro-W3 - hiramin-w6-h Identity-H HiraMinPro-W6 -diff -urN otfbeta.orig/fontmap/kozuka.map otfbeta/fontmap/kozuka.map ---- otfbeta.orig/fontmap/kozuka.map 2004-12-23 23:56:18 +0900 -+++ otfbeta/fontmap/kozuka.map 2012-01-01 16:52:24 +0900 -@@ -4,6 +4,8 @@ - otf-cjmr-v KozMinPro-Regular-Acro-Identity-V - hminr-h KozMinPro-Regular-Acro-H - hminr-v KozMinPro-Regular-Acro-V -+uphminr-h KozMinPro-Regular-Acro-UniJIS-UTF16-H -+uphminr-v KozMinPro-Regular-Acro-UniJIS-UTF16-V - - otf-ujgr-h KozGoStd-Regular-UniJIS-UTF16-H - otf-ujgr-v KozGoStd-Regular-UniJIS-UTF16-V -@@ -11,6 +13,8 @@ - otf-cjgr-v KozGoStd-Regular-Identity-V - hgothr-h KozGoStd-Regular-H - hgothr-v KozGoStd-Regular-V -+uphgothr-h KozGoStd-Regular-UniJIS-UTF16-H -+uphgothr-v KozGoStd-Regular-UniJIS-UTF16-V - - otf-ujmb-h KozMinStd-Bold-UniJIS-UTF16-H - otf-ujmb-v KozMinStd-Bold-UniJIS-UTF16-V -@@ -18,6 +22,8 @@ - otf-cjmb-v KozMinStd-Bold-Identity-V - hminb-h KozMinStd-Bold-H - hminb-v KozMinStd-Bold-V -+uphminb-h KozMinStd-Bold-UniJIS-UTF16-H -+uphminb-v KozMinStd-Bold-UniJIS-UTF16-V - - otf-cjgb-h KozGoStd-Bold-Identity-H - otf-cjgb-v KozGoStd-Bold-Identity-V -@@ -25,6 +31,8 @@ - otf-ujgb-v KozGoStd-Bold-UniJIS-UTF16-V - hgothb-h KozGoStd-Bold-H - hgothb-v KozGoStd-Bold-V -+uphgothb-h KozGoStd-Bold-UniJIS-UTF16-H -+uphgothb-v KozGoStd-Bold-UniJIS-UTF16-V - - otf-ujmgr-h KozGoStd-Heavy-UniJIS-UTF16-H - otf-ujmgr-v KozGoStd-Heavy-UniJIS-UTF16-V -@@ -32,6 +40,8 @@ - otf-cjmgr-v KozGoStd-Heavy-Identity-V - hmgothr-h KozGoStd-Heavy-H - hmgothr-v KozGoStd-Heavy-V -+uphmgothr-h KozGoStd-Heavy-UniJIS-UTF16-H -+uphmgothr-v KozGoStd-Heavy-UniJIS-UTF16-V - - % - %for Adobe Reader 7 -diff -urN otfbeta.orig/fontmap/kozukax.map otfbeta/fontmap/kozukax.map ---- otfbeta.orig/fontmap/kozukax.map 2004-12-23 23:54:40 +0900 -+++ otfbeta/fontmap/kozukax.map 2012-01-01 16:52:55 +0900 -@@ -4,6 +4,8 @@ - otf-cjmr-v Identity-V KozMinPro-Regular-Acro.otf - hminr-h H KozMinPro-Regular-Acro.otf - hminr-v V KozMinPro-Regular-Acro.otf -+uphminr-h UniJIS-UTF16-H KozMinPro-Regular-Acro.otf -+uphminr-v UniJIS-UTF16-V KozMinPro-Regular-Acro.otf - - otf-ujgr-h UniJIS-UTF16-H KozGoStd-Regular.otf - otf-ujgr-v UniJIS-UTF16-V KozGoStd-Regular.otf -@@ -11,6 +13,8 @@ - otf-cjgr-v Identity-V KozGoStd-Regular.otf - hgothr-h H KozGoStd-Regular.otf - hgothr-v V KozGoStd-Regular.otf -+uphgothr-h UniJIS-UTF16-H KozGoStd-Regular.otf -+uphgothr-v UniJIS-UTF16-V KozGoStd-Regular.otf - - otf-ujmb-h UniJIS-UTF16-H KozMinStd-Bold.otf - otf-ujmb-v UniJIS-UTF16-V KozMinStd-Bold.otf -@@ -18,6 +22,8 @@ - otf-cjmb-v Identity-V KozMinStd-Bold.otf - hminb-h H KozMinStd-Bold.otf - hminb-v V KozMinStd-Bold.otf -+uphminb-h UniJIS-UTF16-H KozMinStd-Bold.otf -+uphminb-v UniJIS-UTF16-V KozMinStd-Bold.otf - - otf-cjgb-h Identity-H KozGoStd-Bold.otf - otf-cjgb-v Identity-V KozGoStd-Bold.otf -@@ -25,6 +31,8 @@ - otf-ujgb-v UniJIS-UTF16-V KozGoStd-Bold.otf - hgothb-h H KozGoStd-Bold.otf - hgothb-v V KozGoStd-Bold.otf -+uphgothb-h UniJIS-UTF16-H KozGoStd-Bold.otf -+uphgothb-v UniJIS-UTF16-V KozGoStd-Bold.otf - - otf-ujmgr-h UniJIS-UTF16-H KozGoStd-Heavy.otf - otf-ujmgr-v UniJIS-UTF16-V KozGoStd-Heavy.otf -@@ -32,6 +40,8 @@ - otf-cjmgr-v Identity-V KozGoStd-Heavy.otf - hmgothr-h H KozGoStd-Heavy.otf - hmgothr-v V KozGoStd-Heavy.otf -+uphmgothr-h UniJIS-UTF16-H KozGoStd-Heavy.otf -+uphmgothr-v UniJIS-UTF16-V KozGoStd-Heavy.otf - - - % -diff -urN otfbeta.orig/fontmap/morisawa.map(for udvips) otfbeta/fontmap/morisawa.map(for udvips) ---- otfbeta.orig/fontmap/morisawa.map(for udvips) 2003-12-16 23:43:02 +0900 -+++ otfbeta/fontmap/morisawa.map(for udvips) 2012-01-01 16:47:01 +0900 -@@ -4,6 +4,8 @@ - otf-cjmr-v RyuminPro-Light-Identity-V - hminr-h RyuminPro-Light-H - hminr-v RyuminPro-Light-V -+uphminr-h RyuminPro-Light-UniJIS-UTF16-H -+uphminr-v RyuminPro-Light-UniJIS-UTF16-V - - otf-ujgr-h GothicBBBPro-Medium-UniJIS-UTF16-H - otf-ujgr-v GothicBBBPro-Medium-UniJIS-UTF16-V -@@ -11,6 +13,8 @@ - otf-cjgr-v GothicBBBPro-Medium-Identity-V - hgothr-h GothicBBBPro-Medium-H - hgothr-v GothicBBBPro-Medium-V -+uphgothr-h GothicBBBPro-Medium-UniJIS-UTF16-H -+uphgothr-v GothicBBBPro-Medium-UniJIS-UTF16-V - - otf-ujmb-h FutoMinA101Pro-Bold-UniJIS-UTF16-H - otf-ujmb-v FutoMinA101Pro-Bold-UniJIS-UTF16-V -@@ -18,6 +22,8 @@ - otf-cjmb-v FutoMinA101Pro-Bold-Identity-V - hminb-h FutoMinA101Pro-Bold-H - hminb-v FutoMinA101Pro-Bold-V -+uphminb-h FutoMinA101Pro-Bold-UniJIS-UTF16-H -+uphminb-v FutoMinA101Pro-Bold-UniJIS-UTF16-V - - otf-cjgb-h FutoGoB101Pro-Bold-Identity-H - otf-cjgb-v FutoGoB101Pro-Bold-Identity-V -@@ -25,6 +31,8 @@ - otf-ujgb-v FutoGoB101Pro-Bold-UniJIS-UTF16-V - hgothb-h FutoGoB101Pro-Bold-H - hgothb-v FutoGoB101Pro-Bold-V -+uphgothb-h FutoGoB101Pro-Bold-UniJIS-UTF16-H -+uphgothb-v FutoGoB101Pro-Bold-UniJIS-UTF16-V - - otf-ujmgr-h Jun101Pro-Light-UniJIS-UTF16-H - otf-ujmgr-v Jun101Pro-Light-UniJIS-UTF16-V -@@ -32,3 +40,5 @@ - otf-cjmgr-v Jun101Pro-Light-Identity-V - hmgothr-h Jun101Pro-Light-H - hmgothr-v Jun101Pro-Light-V -+uphmgothr-h Jun101Pro-Light-UniJIS-UTF16-H -+uphmgothr-v Jun101Pro-Light-UniJIS-UTF16-V -diff -urN otfbeta.orig/fontmap/morisawax.map(for dvipdfmx) otfbeta/fontmap/morisawax.map(for dvipdfmx) ---- otfbeta.orig/fontmap/morisawax.map(for dvipdfmx) 2004-08-17 21:35:30 +0900 -+++ otfbeta/fontmap/morisawax.map(for dvipdfmx) 2012-01-01 16:47:01 +0900 -@@ -4,6 +4,8 @@ - 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 -+uphminr-h UniJIS-UTF16-H A-OTF-RyuminPro-Light.otf -+uphminr-v UniJIS-UTF16-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 -@@ -11,6 +13,8 @@ - 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 -+uphgothr-h UniJIS-UTF16-H A-OTF-GothicBBBPro-Medium.otf -+uphgothr-v UniJIS-UTF16-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 -@@ -18,6 +22,8 @@ - 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 -+uphminb-h UniJIS-UTF16-H A-OTF-FutoMinA101Pro-Bold.otf -+uphminb-v UniJIS-UTF16-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 -@@ -25,6 +31,8 @@ - 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 -+uphgothb-h UniJIS-UTF16-H A-OTF-FutoGoB101Pro-Bold.otf -+uphgothb-v UniJIS-UTF16-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 -@@ -32,3 +40,5 @@ - 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 -+uphmgothr-h UniJIS-UTF16-H A-OTF-Jun101Pro-Light.otf -+uphmgothr-v UniJIS-UTF16-V A-OTF-Jun101Pro-Light.otf -diff -urN otfbeta.orig/fontmap/vfontmap.txt otfbeta/fontmap/vfontmap.txt ---- otfbeta.orig/fontmap/vfontmap.txt 2003-11-10 19:23:12 +0900 -+++ otfbeta/fontmap/vfontmap.txt 2012-01-01 16:47:01 +0900 -@@ -20,6 +20,8 @@ - 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 -+uphminr-h /usr/local/share/texmf/dvipdfm/CIDFont/HiraMinPro-W3.otf unicode -+uphminr-v /usr/local/share/texmf/dvipdfm/CIDFont/HiraMinPro-W3.otf unicode - - 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 -@@ -27,6 +29,8 @@ - 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 -+uphgothr-h /usr/local/share/texmf/dvipdfm/CIDFont/HiraKakuPro-W3.otf unicode -+uphgothr-v /usr/local/share/texmf/dvipdfm/CIDFont/HiraKakuPro-W3.otf unicode - - 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 -@@ -34,6 +38,8 @@ - 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 -+uphminb-h /usr/local/share/texmf/dvipdfm/CIDFont/HiraMinPro-W6.otf unicode -+uphminb-v /usr/local/share/texmf/dvipdfm/CIDFont/HiraMinPro-W6.otf unicode - - 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 -@@ -41,6 +47,8 @@ - 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 -+uphgothb-h /usr/local/share/texmf/dvipdfm/CIDFont/HiraKakuPro-W6.otf unicode -+uphgothb-v /usr/local/share/texmf/dvipdfm/CIDFont/HiraKakuPro-W6.otf unicode - - 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 -@@ -48,6 +56,8 @@ - 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 -+uphmgothr-h /usr/local/share/texmf/dvipdfm/CIDFont/HiraMaruPro-W4.otf unicode -+uphmgothr-v /usr/local/share/texmf/dvipdfm/CIDFont/HiraMaruPro-W4.otf unicode - - 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 -diff -urN otfbeta.orig/sty/mlutf.sty otfbeta/sty/mlutf.sty ---- otfbeta.orig/sty/mlutf.sty 2010-03-22 14:50:54 +0900 -+++ otfbeta/sty/mlutf.sty 2012-02-15 23:48:15 +0900 -@@ -1,5 +1,5 @@ - \NeedsTeXFormat{pLaTeX2e} --\ProvidesPackage{mlutf}[2004/04/17 v1.1.2 psitau] -+\ProvidesPackage{mlutf}[2004/04/17 v1.1.2 psitau, u0.09 ttk] - %force catcode of \" be 12 - \count@\catcode`\" - \catcode`\"=12 -@@ -45,14 +45,14 @@ - \Declare@FontShape{utfk}{bx}{0123456789abcdef}{utfkgr} - \DeclareKanjiFamily{\otf@JYn}{utfc}{} - \DeclareKanjiFamily{\otf@JTn}{utfc}{} --\Declare@FontShape{utfc}{m}{0123456789abcdef}{utfcmr} --\Declare@FontShape{utfc}{bx}{0123456789abcdef}{utfcgr} -+\Declare@FontShape{utfc}{m}{0123456789abcdefjklmnopqrstuvz}{utfcmr} -+\Declare@FontShape{utfc}{bx}{0123456789abcdefjklmnopqrstuvz}{utfcgr} - \DeclareKanjiFamily{\otf@JYn}{utft}{} - \DeclareKanjiFamily{\otf@JTn}{utft}{} --\Declare@FontShape{utft}{m}{0123456789abcdef}{utftmr} --\Declare@FontShape{utft}{bx}{0123456789abcdef}{utftgr} -+\Declare@FontShape{utft}{m}{0123456789abcdefjklmnopqrstuvz}{utftmr} -+\Declare@FontShape{utft}{bx}{0123456789abcdefjklmnopqrstuvz}{utftgr} - \DeclareKanjiFamily{\otf@JYn}{utf}{} - \DeclareKanjiFamily{\otf@JTn}{utf}{} --\Declare@FontShape{utf}{m}{0123456789abcdef}{utfmr} --\Declare@FontShape{utf}{bx}{0123456789abcdef}{utfgr} -+\Declare@FontShape{utf}{m}{0123456789abcdefjklmnopqrstuvz}{utfmr} -+\Declare@FontShape{utf}{bx}{0123456789abcdefjklmnopqrstuvz}{utfgr} - \endinput -diff -urN otfbeta.orig/sty/otf.sty otfbeta/sty/otf.sty ---- otfbeta.orig/sty/otf.sty 2010-03-27 11:13:54 +0900 -+++ otfbeta/sty/otf.sty 2012-02-15 23:48:12 +0900 -@@ -1,5 +1,5 @@ - \NeedsTeXFormat{pLaTeX2e} --\ProvidesPackage{otf}[2010/03/25 v1.7b1 psitau] -+\ProvidesPackage{otf}[2010/03/25 v1.7b1 psitau, u0.09 ttk] - %for processing options - \newif\if@kana \@kanafalse - \newif\if@macro \@macrotrue -@@ -67,7 +67,9 @@ - \newcommand\put@character{% - \@tempcntb=\@tempcnta - \divide\@tempcntb by "1000 -- \kanjishape{\ifcase\@tempcntb0\or1\or2\or3\or4\or5\or6\or7\or8\or9\or a\or b\or c\or d\or e\or f\fi}% -+ \kanjishape{\ifcase\@tempcntb0\or1\or2\or3\or4\or5\or6\or7\or8\or9\or a\or b\or c\or d\or e\or f\or -+ \or \or \or \or \or \or \or \or \or \or \or g\or \or h\or i\or j\or -+ k\or l\or m\or n\or o\or p\or q\or r\or s\or t\or u\or v\or w\or x\or y\or z\fi}% - \selectfont% - \multiply\@tempcntb by "1000 - \advance\@tempcnta by -\@tempcntb -@@ -278,34 +280,34 @@ - \DeclareKanjiFamily{\otf@JTn}{utfj}{} - \DeclareKanjiFamily{\otf@JYn}{cidj}{} - \DeclareKanjiFamily{\otf@JTn}{cidj}{} --\Declare@FontShape{utfj}{m}{0123456789abcdef}{utfjmr\nlck@sfx@} -+\Declare@FontShape{utfj}{m}{0123456789abcdefjklmnopqrstuvz}{utfjmr\nlck@sfx@} - \Declare@FontShape{cidj}{m}{012345}{cidjmr} - %definition of other utf/cid fonts - \if@deluxe -- \Declare@FontShape{utfj}{bx}{0123456789abcdef}{utfjmb\nlck@sfx@} -+ \Declare@FontShape{utfj}{bx}{0123456789abcdefjklmnopqrstuvz}{utfjmb\nlck@sfx@} - \Declare@FontShape{cidj}{bx}{012345}{cidjmb} - \DeclareKanjiFamily{\otf@JYn}{utfjg}{} - \DeclareKanjiFamily{\otf@JTn}{utfjg}{} - \DeclareKanjiFamily{\otf@JYn}{cidjg}{} - \DeclareKanjiFamily{\otf@JTn}{cidjg}{} -- \Declare@FontShape{utfjg}{m}{0123456789abcdef}{utfjgr\nlck@sfx@} -+ \Declare@FontShape{utfjg}{m}{0123456789abcdefjklmnopqrstuvz}{utfjgr\nlck@sfx@} - \Declare@FontShape{cidjg}{m}{012345}{cidjgr} -- \Declare@FontShape{utfjg}{bx}{0123456789abcdef}{utfjgb\nlck@sfx@} -+ \Declare@FontShape{utfjg}{bx}{0123456789abcdefjklmnopqrstuvz}{utfjgb\nlck@sfx@} - \Declare@FontShape{cidjg}{bx}{012345}{cidjgb} - \DeclareKanjiFamily{\otf@JYn}{utfjmg}{} - \DeclareKanjiFamily{\otf@JTn}{utfjmg}{} - \DeclareKanjiFamily{\otf@JYn}{cidjmg}{} - \DeclareKanjiFamily{\otf@JTn}{cidjmg}{} -- \Declare@FontShape{utfjmg}{m}{0123456789abcdef}{utfjmgr\nlck@sfx@} -+ \Declare@FontShape{utfjmg}{m}{0123456789abcdefjklmnopqrstuvz}{utfjmgr\nlck@sfx@} - \Declare@FontShape{cidjmg}{m}{012345}{cidjmgr} -- \Declare@FontShape{utfj}{l}{0123456789abcdef}{utfjml\nlck@sfx@} -+ \Declare@FontShape{utfj}{l}{0123456789abcdefjklmnopqrstuvz}{utfjml\nlck@sfx@} - \Declare@FontShape{cidj}{l}{012345}{cidjml} - \else - \if@bold -- \Declare@FontShape{utfj}{bx}{0123456789abcdef}{utfjgb\nlck@sfx@} -+ \Declare@FontShape{utfj}{bx}{0123456789abcdefjklmnopqrstuvz}{utfjgb\nlck@sfx@} - \Declare@FontShape{cidj}{bx}{012345}{cidjgb} - \else -- \Declare@FontShape{utfj}{bx}{0123456789abcdef}{utfjgr\nlck@sfx@} -+ \Declare@FontShape{utfj}{bx}{0123456789abcdefjklmnopqrstuvz}{utfjgr\nlck@sfx@} - \Declare@FontShape{cidj}{bx}{012345}{cidjgr} - \fi - \fi diff --git a/Master/texmf-dist/source/fonts/japanese-otf-uptex/patch/otfbeta_uptex-0.10.patch b/Master/texmf-dist/source/fonts/japanese-otf-uptex/patch/otfbeta_uptex-0.10.patch new file mode 100644 index 00000000000..b636427e64f --- /dev/null +++ b/Master/texmf-dist/source/fonts/japanese-otf-uptex/patch/otfbeta_uptex-0.10.patch @@ -0,0 +1,453 @@ +diff -urN otfbeta.orig/fontmap/hiragino.map(for udvips) otfbeta/fontmap/hiragino.map(for udvips) +--- otfbeta.orig/fontmap/hiragino.map(for udvips) 2010-03-27 09:38:48 +0900 ++++ otfbeta/fontmap/hiragino.map(for udvips) 2012-01-01 16:47:01 +0900 +@@ -4,6 +4,8 @@ + otf-cjmr-v HiraMinPro-W3-Identity-V + hminr-h HiraMinPro-W3-H + hminr-v HiraMinPro-W3-V ++uphminr-h HiraMinPro-W3-UniJIS-UTF16-H ++uphminr-v HiraMinPro-W3-UniJIS-UTF16-V + + otf-ujgr-h HiraKakuPro-W3-UniJIS-UTF16-H + otf-ujgr-v HiraKakuPro-W3-UniJIS-UTF16-V +@@ -11,6 +13,8 @@ + otf-cjgr-v HiraKakuPro-W3-Identity-V + hgothr-h HiraKakuPro-W3-H + hgothr-v HiraKakuPro-W3-V ++uphgothr-h HiraKakuPro-W3-UniJIS-UTF16-H ++uphgothr-v HiraKakuPro-W3-UniJIS-UTF16-V + + otf-ujmb-h HiraMinPro-W6-UniJIS-UTF16-H + otf-ujmb-v HiraMinPro-W6-UniJIS-UTF16-V +@@ -18,6 +22,8 @@ + otf-cjmb-v HiraMinPro-W6-Identity-V + hminb-h HiraMinPro-W6-H + hminb-v HiraMinPro-W6-V ++uphminb-h HiraMinPro-W6-UniJIS-UTF16-H ++uphminb-v HiraMinPro-W6-UniJIS-UTF16-V + + otf-cjgb-h HiraKakuPro-W6-Identity-H + otf-cjgb-v HiraKakuPro-W6-Identity-V +@@ -25,9 +31,13 @@ + otf-ujgb-v HiraKakuPro-W6-UniJIS-UTF16-V + hgothb-h HiraKakuPro-W6-H + hgothb-v HiraKakuPro-W6-V ++uphgothb-h HiraKakuPro-W6-UniJIS-UTF16-H ++uphgothb-v HiraKakuPro-W6-UniJIS-UTF16-V + + hgotheb-h HiraKakuStd-W8-H + hgotheb-v HiraKakuStd-W8-V ++uphgotheb-h HiraKakuStd-W8-UniJIS-UTF16-H ++uphgotheb-v HiraKakuStd-W8-UniJIS-UTF16-V + + otf-ujmgr-h HiraMaruPro-W4-UniJIS-UTF16-H + otf-ujmgr-v HiraMaruPro-W4-UniJIS-UTF16-V +@@ -35,6 +45,8 @@ + otf-cjmgr-v HiraMaruPro-W4-Identity-V + hmgothr-h HiraMaruPro-W4-H + hmgothr-v HiraMaruPro-W4-V ++uphmgothr-h HiraMaruPro-W4-UniJIS-UTF16-H ++uphmgothr-v HiraMaruPro-W4-UniJIS-UTF16-V + + otf-ujml-h HiraMinPro-W2-UniJIS-UTF16-H + otf-ujml-v HiraMinPro-W2-UniJIS-UTF16-V +@@ -42,6 +54,8 @@ + otf-cjml-v HiraMinPro-W2-Identity-V + hminl-h HiraMinPro-W2-H + hminl-v HiraMinPro-W2-V ++uphminl-h HiraMinPro-W2-UniJIS-UTF16-H ++uphminl-v HiraMinPro-W2-UniJIS-UTF16-V + + hiramin-w3-h HiraMinPro-W3-Identity-H + hiramin-w6-h HiraMinPro-W6-Identity-H +diff -urN otfbeta.orig/fontmap/hiraginox.map(for dvipdfmx) otfbeta/fontmap/hiraginox.map(for dvipdfmx) +--- otfbeta.orig/fontmap/hiraginox.map(for dvipdfmx) 2010-03-27 09:39:08 +0900 ++++ otfbeta/fontmap/hiraginox.map(for dvipdfmx) 2012-01-01 16:47:01 +0900 +@@ -4,6 +4,8 @@ + otf-cjmr-v Identity-V HiraMinPro-W3 + hminr-h H HiraMinPro-W3 + hminr-v V HiraMinPro-W3 ++uphminr-h UniJIS-UTF16-H HiraMinPro-W3 ++uphminr-v UniJIS-UTF16-V HiraMinPro-W3 + + otf-ujgr-h UniJIS-UTF16-H HiraKakuPro-W3 + otf-ujgr-v UniJIS-UTF16-V HiraKakuPro-W3 +@@ -11,6 +13,8 @@ + otf-cjgr-v Identity-V HiraKakuPro-W3 + hgothr-h H HiraKakuPro-W3 + hgothr-v V HiraKakuPro-W3 ++uphgothr-h UniJIS-UTF16-H HiraKakuPro-W3 ++uphgothr-v UniJIS-UTF16-V HiraKakuPro-W3 + + otf-ujmb-h UniJIS-UTF16-H HiraMinPro-W6 + otf-ujmb-v UniJIS-UTF16-V HiraMinPro-W6 +@@ -18,6 +22,8 @@ + otf-cjmb-v Identity-V HiraMinPro-W6 + hminb-h H HiraMinPro-W6 + hminb-v V HiraMinPro-W6 ++uphminb-h UniJIS-UTF16-H HiraMinPro-W6 ++uphminb-v UniJIS-UTF16-V HiraMinPro-W6 + + otf-ujgb-h UniJIS-UTF16-H HiraKakuPro-W6 + otf-ujgb-v UniJIS-UTF16-V HiraKakuPro-W6 +@@ -25,9 +31,13 @@ + otf-cjgb-v Identity-V HiraKakuPro-W6 + hgothb-h H HiraKakuPro-W6 + hgothb-v V HiraKakuPro-W6 ++uphgothb-h UniJIS-UTF16-H HiraKakuPro-W6 ++uphgothb-v UniJIS-UTF16-V HiraKakuPro-W6 + + hgotheb-h H HiraKakuStd-W8 + hgotheb-v V HiraKakuStd-W8 ++uphgotheb-h UniJIS-UTF16-H HiraKakuStd-W8 ++uphgotheb-v UniJIS-UTF16-V HiraKakuStd-W8 + + otf-ujmgr-h UniJIS-UTF16-H HiraMaruPro-W4 + otf-ujmgr-v UniJIS-UTF16-V HiraMaruPro-W4 +@@ -35,6 +45,8 @@ + otf-cjmgr-v Identity-V HiraMaruPro-W4 + hmgothr-h H HiraMaruPro-W4 + hmgothr-v V HiraMaruPro-W4 ++uphmgothr-h UniJIS-UTF16-H HiraMaruPro-W4 ++uphmgothr-v UniJIS-UTF16-V HiraMaruPro-W4 + + otf-ujml-h UniJIS-UTF16-H HiraMinPro-W2 + otf-ujml-v UniJIS-UTF16-V HiraMinPro-W2 +@@ -42,6 +54,8 @@ + otf-cjml-v Identity-V HiraMinPro-W2 + hminl-h H HiraMinPro-W2 + hminl-v V HiraMinPro-W2 ++uphminl-h UniJIS-UTF16-H HiraMinPro-W2 ++uphminl-v UniJIS-UTF16-V HiraMinPro-W2 + + hiramin-w3-h Identity-H HiraMinPro-W3 + hiramin-w6-h Identity-H HiraMinPro-W6 +diff -urN otfbeta.orig/fontmap/kozuka.map otfbeta/fontmap/kozuka.map +--- otfbeta.orig/fontmap/kozuka.map 2004-12-23 23:56:18 +0900 ++++ otfbeta/fontmap/kozuka.map 2012-01-01 16:52:24 +0900 +@@ -4,6 +4,8 @@ + otf-cjmr-v KozMinPro-Regular-Acro-Identity-V + hminr-h KozMinPro-Regular-Acro-H + hminr-v KozMinPro-Regular-Acro-V ++uphminr-h KozMinPro-Regular-Acro-UniJIS-UTF16-H ++uphminr-v KozMinPro-Regular-Acro-UniJIS-UTF16-V + + otf-ujgr-h KozGoStd-Regular-UniJIS-UTF16-H + otf-ujgr-v KozGoStd-Regular-UniJIS-UTF16-V +@@ -11,6 +13,8 @@ + otf-cjgr-v KozGoStd-Regular-Identity-V + hgothr-h KozGoStd-Regular-H + hgothr-v KozGoStd-Regular-V ++uphgothr-h KozGoStd-Regular-UniJIS-UTF16-H ++uphgothr-v KozGoStd-Regular-UniJIS-UTF16-V + + otf-ujmb-h KozMinStd-Bold-UniJIS-UTF16-H + otf-ujmb-v KozMinStd-Bold-UniJIS-UTF16-V +@@ -18,6 +22,8 @@ + otf-cjmb-v KozMinStd-Bold-Identity-V + hminb-h KozMinStd-Bold-H + hminb-v KozMinStd-Bold-V ++uphminb-h KozMinStd-Bold-UniJIS-UTF16-H ++uphminb-v KozMinStd-Bold-UniJIS-UTF16-V + + otf-cjgb-h KozGoStd-Bold-Identity-H + otf-cjgb-v KozGoStd-Bold-Identity-V +@@ -25,6 +31,8 @@ + otf-ujgb-v KozGoStd-Bold-UniJIS-UTF16-V + hgothb-h KozGoStd-Bold-H + hgothb-v KozGoStd-Bold-V ++uphgothb-h KozGoStd-Bold-UniJIS-UTF16-H ++uphgothb-v KozGoStd-Bold-UniJIS-UTF16-V + + otf-ujmgr-h KozGoStd-Heavy-UniJIS-UTF16-H + otf-ujmgr-v KozGoStd-Heavy-UniJIS-UTF16-V +@@ -32,6 +40,8 @@ + otf-cjmgr-v KozGoStd-Heavy-Identity-V + hmgothr-h KozGoStd-Heavy-H + hmgothr-v KozGoStd-Heavy-V ++uphmgothr-h KozGoStd-Heavy-UniJIS-UTF16-H ++uphmgothr-v KozGoStd-Heavy-UniJIS-UTF16-V + + % + %for Adobe Reader 7 +diff -urN otfbeta.orig/fontmap/kozukax.map otfbeta/fontmap/kozukax.map +--- otfbeta.orig/fontmap/kozukax.map 2004-12-23 23:54:40 +0900 ++++ otfbeta/fontmap/kozukax.map 2012-01-01 16:52:55 +0900 +@@ -4,6 +4,8 @@ + otf-cjmr-v Identity-V KozMinPro-Regular-Acro.otf + hminr-h H KozMinPro-Regular-Acro.otf + hminr-v V KozMinPro-Regular-Acro.otf ++uphminr-h UniJIS-UTF16-H KozMinPro-Regular-Acro.otf ++uphminr-v UniJIS-UTF16-V KozMinPro-Regular-Acro.otf + + otf-ujgr-h UniJIS-UTF16-H KozGoStd-Regular.otf + otf-ujgr-v UniJIS-UTF16-V KozGoStd-Regular.otf +@@ -11,6 +13,8 @@ + otf-cjgr-v Identity-V KozGoStd-Regular.otf + hgothr-h H KozGoStd-Regular.otf + hgothr-v V KozGoStd-Regular.otf ++uphgothr-h UniJIS-UTF16-H KozGoStd-Regular.otf ++uphgothr-v UniJIS-UTF16-V KozGoStd-Regular.otf + + otf-ujmb-h UniJIS-UTF16-H KozMinStd-Bold.otf + otf-ujmb-v UniJIS-UTF16-V KozMinStd-Bold.otf +@@ -18,6 +22,8 @@ + otf-cjmb-v Identity-V KozMinStd-Bold.otf + hminb-h H KozMinStd-Bold.otf + hminb-v V KozMinStd-Bold.otf ++uphminb-h UniJIS-UTF16-H KozMinStd-Bold.otf ++uphminb-v UniJIS-UTF16-V KozMinStd-Bold.otf + + otf-cjgb-h Identity-H KozGoStd-Bold.otf + otf-cjgb-v Identity-V KozGoStd-Bold.otf +@@ -25,6 +31,8 @@ + otf-ujgb-v UniJIS-UTF16-V KozGoStd-Bold.otf + hgothb-h H KozGoStd-Bold.otf + hgothb-v V KozGoStd-Bold.otf ++uphgothb-h UniJIS-UTF16-H KozGoStd-Bold.otf ++uphgothb-v UniJIS-UTF16-V KozGoStd-Bold.otf + + otf-ujmgr-h UniJIS-UTF16-H KozGoStd-Heavy.otf + otf-ujmgr-v UniJIS-UTF16-V KozGoStd-Heavy.otf +@@ -32,6 +40,8 @@ + otf-cjmgr-v Identity-V KozGoStd-Heavy.otf + hmgothr-h H KozGoStd-Heavy.otf + hmgothr-v V KozGoStd-Heavy.otf ++uphmgothr-h UniJIS-UTF16-H KozGoStd-Heavy.otf ++uphmgothr-v UniJIS-UTF16-V KozGoStd-Heavy.otf + + + % +diff -urN otfbeta.orig/fontmap/morisawa.map(for udvips) otfbeta/fontmap/morisawa.map(for udvips) +--- otfbeta.orig/fontmap/morisawa.map(for udvips) 2003-12-16 23:43:02 +0900 ++++ otfbeta/fontmap/morisawa.map(for udvips) 2012-01-01 16:47:01 +0900 +@@ -4,6 +4,8 @@ + otf-cjmr-v RyuminPro-Light-Identity-V + hminr-h RyuminPro-Light-H + hminr-v RyuminPro-Light-V ++uphminr-h RyuminPro-Light-UniJIS-UTF16-H ++uphminr-v RyuminPro-Light-UniJIS-UTF16-V + + otf-ujgr-h GothicBBBPro-Medium-UniJIS-UTF16-H + otf-ujgr-v GothicBBBPro-Medium-UniJIS-UTF16-V +@@ -11,6 +13,8 @@ + otf-cjgr-v GothicBBBPro-Medium-Identity-V + hgothr-h GothicBBBPro-Medium-H + hgothr-v GothicBBBPro-Medium-V ++uphgothr-h GothicBBBPro-Medium-UniJIS-UTF16-H ++uphgothr-v GothicBBBPro-Medium-UniJIS-UTF16-V + + otf-ujmb-h FutoMinA101Pro-Bold-UniJIS-UTF16-H + otf-ujmb-v FutoMinA101Pro-Bold-UniJIS-UTF16-V +@@ -18,6 +22,8 @@ + otf-cjmb-v FutoMinA101Pro-Bold-Identity-V + hminb-h FutoMinA101Pro-Bold-H + hminb-v FutoMinA101Pro-Bold-V ++uphminb-h FutoMinA101Pro-Bold-UniJIS-UTF16-H ++uphminb-v FutoMinA101Pro-Bold-UniJIS-UTF16-V + + otf-cjgb-h FutoGoB101Pro-Bold-Identity-H + otf-cjgb-v FutoGoB101Pro-Bold-Identity-V +@@ -25,6 +31,8 @@ + otf-ujgb-v FutoGoB101Pro-Bold-UniJIS-UTF16-V + hgothb-h FutoGoB101Pro-Bold-H + hgothb-v FutoGoB101Pro-Bold-V ++uphgothb-h FutoGoB101Pro-Bold-UniJIS-UTF16-H ++uphgothb-v FutoGoB101Pro-Bold-UniJIS-UTF16-V + + otf-ujmgr-h Jun101Pro-Light-UniJIS-UTF16-H + otf-ujmgr-v Jun101Pro-Light-UniJIS-UTF16-V +@@ -32,3 +40,5 @@ + otf-cjmgr-v Jun101Pro-Light-Identity-V + hmgothr-h Jun101Pro-Light-H + hmgothr-v Jun101Pro-Light-V ++uphmgothr-h Jun101Pro-Light-UniJIS-UTF16-H ++uphmgothr-v Jun101Pro-Light-UniJIS-UTF16-V +diff -urN otfbeta.orig/fontmap/morisawax.map(for dvipdfmx) otfbeta/fontmap/morisawax.map(for dvipdfmx) +--- otfbeta.orig/fontmap/morisawax.map(for dvipdfmx) 2004-08-17 21:35:30 +0900 ++++ otfbeta/fontmap/morisawax.map(for dvipdfmx) 2012-01-01 16:47:01 +0900 +@@ -4,6 +4,8 @@ + 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 ++uphminr-h UniJIS-UTF16-H A-OTF-RyuminPro-Light.otf ++uphminr-v UniJIS-UTF16-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 +@@ -11,6 +13,8 @@ + 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 ++uphgothr-h UniJIS-UTF16-H A-OTF-GothicBBBPro-Medium.otf ++uphgothr-v UniJIS-UTF16-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 +@@ -18,6 +22,8 @@ + 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 ++uphminb-h UniJIS-UTF16-H A-OTF-FutoMinA101Pro-Bold.otf ++uphminb-v UniJIS-UTF16-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 +@@ -25,6 +31,8 @@ + 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 ++uphgothb-h UniJIS-UTF16-H A-OTF-FutoGoB101Pro-Bold.otf ++uphgothb-v UniJIS-UTF16-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 +@@ -32,3 +40,5 @@ + 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 ++uphmgothr-h UniJIS-UTF16-H A-OTF-Jun101Pro-Light.otf ++uphmgothr-v UniJIS-UTF16-V A-OTF-Jun101Pro-Light.otf +diff -urN otfbeta.orig/fontmap/vfontmap.txt otfbeta/fontmap/vfontmap.txt +--- otfbeta.orig/fontmap/vfontmap.txt 2003-11-10 19:23:12 +0900 ++++ otfbeta/fontmap/vfontmap.txt 2012-01-01 16:47:01 +0900 +@@ -20,6 +20,8 @@ + 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 ++uphminr-h /usr/local/share/texmf/dvipdfm/CIDFont/HiraMinPro-W3.otf unicode ++uphminr-v /usr/local/share/texmf/dvipdfm/CIDFont/HiraMinPro-W3.otf unicode + + 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 +@@ -27,6 +29,8 @@ + 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 ++uphgothr-h /usr/local/share/texmf/dvipdfm/CIDFont/HiraKakuPro-W3.otf unicode ++uphgothr-v /usr/local/share/texmf/dvipdfm/CIDFont/HiraKakuPro-W3.otf unicode + + 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 +@@ -34,6 +38,8 @@ + 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 ++uphminb-h /usr/local/share/texmf/dvipdfm/CIDFont/HiraMinPro-W6.otf unicode ++uphminb-v /usr/local/share/texmf/dvipdfm/CIDFont/HiraMinPro-W6.otf unicode + + 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 +@@ -41,6 +47,8 @@ + 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 ++uphgothb-h /usr/local/share/texmf/dvipdfm/CIDFont/HiraKakuPro-W6.otf unicode ++uphgothb-v /usr/local/share/texmf/dvipdfm/CIDFont/HiraKakuPro-W6.otf unicode + + 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 +@@ -48,6 +56,8 @@ + 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 ++uphmgothr-h /usr/local/share/texmf/dvipdfm/CIDFont/HiraMaruPro-W4.otf unicode ++uphmgothr-v /usr/local/share/texmf/dvipdfm/CIDFont/HiraMaruPro-W4.otf unicode + + 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 +diff -urN otfbeta.orig/sty/mlutf.sty otfbeta/sty/mlutf.sty +--- otfbeta.orig/sty/mlutf.sty 2010-03-22 14:50:54 +0900 ++++ otfbeta/sty/mlutf.sty 2012-04-15 07:53:43 +0900 +@@ -1,5 +1,5 @@ + \NeedsTeXFormat{pLaTeX2e} +-\ProvidesPackage{mlutf}[2004/04/17 v1.1.2 psitau] ++\ProvidesPackage{mlutf}[2004/04/17 v1.1.2 psitau, u0.10 ttk] + %force catcode of \" be 12 + \count@\catcode`\" + \catcode`\"=12 +@@ -45,14 +45,14 @@ + \Declare@FontShape{utfk}{bx}{0123456789abcdef}{utfkgr} + \DeclareKanjiFamily{\otf@JYn}{utfc}{} + \DeclareKanjiFamily{\otf@JTn}{utfc}{} +-\Declare@FontShape{utfc}{m}{0123456789abcdef}{utfcmr} +-\Declare@FontShape{utfc}{bx}{0123456789abcdef}{utfcgr} ++\Declare@FontShape{utfc}{m}{0123456789abcdefjklmnopqrstuvz}{utfcmr} ++\Declare@FontShape{utfc}{bx}{0123456789abcdefjklmnopqrstuvz}{utfcgr} + \DeclareKanjiFamily{\otf@JYn}{utft}{} + \DeclareKanjiFamily{\otf@JTn}{utft}{} +-\Declare@FontShape{utft}{m}{0123456789abcdef}{utftmr} +-\Declare@FontShape{utft}{bx}{0123456789abcdef}{utftgr} ++\Declare@FontShape{utft}{m}{0123456789abcdefjklmnopqrstuvz}{utftmr} ++\Declare@FontShape{utft}{bx}{0123456789abcdefjklmnopqrstuvz}{utftgr} + \DeclareKanjiFamily{\otf@JYn}{utf}{} + \DeclareKanjiFamily{\otf@JTn}{utf}{} +-\Declare@FontShape{utf}{m}{0123456789abcdef}{utfmr} +-\Declare@FontShape{utf}{bx}{0123456789abcdef}{utfgr} ++\Declare@FontShape{utf}{m}{0123456789abcdefjklmnopqrstuvz}{utfmr} ++\Declare@FontShape{utf}{bx}{0123456789abcdefjklmnopqrstuvz}{utfgr} + \endinput +diff -urN otfbeta.orig/sty/otf.sty otfbeta/sty/otf.sty +--- otfbeta.orig/sty/otf.sty 2012-04-11 13:08:12 +0900 ++++ otfbeta/sty/otf.sty 2012-04-15 07:51:44 +0900 +@@ -1,5 +1,5 @@ + \NeedsTeXFormat{pLaTeX2e} +-\ProvidesPackage{otf}[2012/04/11 v1.7b5 psitau] ++\ProvidesPackage{otf}[2012/04/11 v1.7b5 psitau, u0.10 ttk] + %for processing options + \newif\if@kana \@kanafalse + \newif\if@macro \@macrotrue +@@ -67,7 +67,9 @@ + \newcommand\put@character{% + \@tempcntb=\@tempcnta + \divide\@tempcntb by "1000 +- \kanjishape{\ifcase\@tempcntb0\or1\or2\or3\or4\or5\or6\or7\or8\or9\or a\or b\or c\or d\or e\or f\fi}% ++ \kanjishape{\ifcase\@tempcntb0\or1\or2\or3\or4\or5\or6\or7\or8\or9\or a\or b\or c\or d\or e\or f\or ++ \or \or \or \or \or \or \or \or \or \or \or g\or \or h\or i\or j\or ++ k\or l\or m\or n\or o\or p\or q\or r\or s\or t\or u\or v\or w\or x\or y\or z\fi}% + \selectfont% + \multiply\@tempcntb by "1000 + \advance\@tempcnta by -\@tempcntb +@@ -280,34 +282,34 @@ + \DeclareKanjiFamily{\otf@JTn}{utfj}{} + \DeclareKanjiFamily{\otf@JYn}{cidj}{} + \DeclareKanjiFamily{\otf@JTn}{cidj}{} +-\Declare@FontShape{utfj}{m}{0123456789abcdef}{utfjmr\nlck@sfx@} ++\Declare@FontShape{utfj}{m}{0123456789abcdefjklmnopqrstuvz}{utfjmr\nlck@sfx@} + \Declare@FontShape{cidj}{m}{012345}{cidjmr} + %definition of other utf/cid fonts + \if@deluxe +- \Declare@FontShape{utfj}{bx}{0123456789abcdef}{utfjmb\nlck@sfx@} ++ \Declare@FontShape{utfj}{bx}{0123456789abcdefjklmnopqrstuvz}{utfjmb\nlck@sfx@} + \Declare@FontShape{cidj}{bx}{012345}{cidjmb} + \DeclareKanjiFamily{\otf@JYn}{utfjg}{} + \DeclareKanjiFamily{\otf@JTn}{utfjg}{} + \DeclareKanjiFamily{\otf@JYn}{cidjg}{} + \DeclareKanjiFamily{\otf@JTn}{cidjg}{} +- \Declare@FontShape{utfjg}{m}{0123456789abcdef}{utfjgr\nlck@sfx@} ++ \Declare@FontShape{utfjg}{m}{0123456789abcdefjklmnopqrstuvz}{utfjgr\nlck@sfx@} + \Declare@FontShape{cidjg}{m}{012345}{cidjgr} +- \Declare@FontShape{utfjg}{bx}{0123456789abcdef}{utfjgb\nlck@sfx@} ++ \Declare@FontShape{utfjg}{bx}{0123456789abcdefjklmnopqrstuvz}{utfjgb\nlck@sfx@} + \Declare@FontShape{cidjg}{bx}{012345}{cidjgb} + \DeclareKanjiFamily{\otf@JYn}{utfjmg}{} + \DeclareKanjiFamily{\otf@JTn}{utfjmg}{} + \DeclareKanjiFamily{\otf@JYn}{cidjmg}{} + \DeclareKanjiFamily{\otf@JTn}{cidjmg}{} +- \Declare@FontShape{utfjmg}{m}{0123456789abcdef}{utfjmgr\nlck@sfx@} ++ \Declare@FontShape{utfjmg}{m}{0123456789abcdefjklmnopqrstuvz}{utfjmgr\nlck@sfx@} + \Declare@FontShape{cidjmg}{m}{012345}{cidjmgr} +- \Declare@FontShape{utfj}{l}{0123456789abcdef}{utfjml\nlck@sfx@} ++ \Declare@FontShape{utfj}{l}{0123456789abcdefjklmnopqrstuvz}{utfjml\nlck@sfx@} + \Declare@FontShape{cidj}{l}{012345}{cidjml} + \else + \if@bold +- \Declare@FontShape{utfj}{bx}{0123456789abcdef}{utfjgb\nlck@sfx@} ++ \Declare@FontShape{utfj}{bx}{0123456789abcdefjklmnopqrstuvz}{utfjgb\nlck@sfx@} + \Declare@FontShape{cidj}{bx}{012345}{cidjgb} + \else +- \Declare@FontShape{utfj}{bx}{0123456789abcdef}{utfjgr\nlck@sfx@} ++ \Declare@FontShape{utfj}{bx}{0123456789abcdefjklmnopqrstuvz}{utfjgr\nlck@sfx@} + \Declare@FontShape{cidj}{bx}{012345}{cidjgr} + \fi + \fi diff --git a/Master/texmf-dist/source/fonts/japanese-otf-uptex/umakeotf b/Master/texmf-dist/source/fonts/japanese-otf-uptex/umakeotf index e9f9b24d6d6..c0a35164518 100755 --- a/Master/texmf-dist/source/fonts/japanese-otf-uptex/umakeotf +++ b/Master/texmf-dist/source/fonts/japanese-otf-uptex/umakeotf @@ -1,4 +1,9 @@ #!/bin/sh + +#OVP2OVF='omfonts -ovp2ovf' +#OVP2OVF='wovp2ovf' +#export OVP2OVF + if test ! -d tfm; then mkdir tfm fi diff --git a/Master/texmf-dist/source/fonts/japanese-otf-uptex/umakeotf_brsg b/Master/texmf-dist/source/fonts/japanese-otf-uptex/umakeotf_brsg new file mode 100755 index 00000000000..ef1d2ecc20e --- /dev/null +++ b/Master/texmf-dist/source/fonts/japanese-otf-uptex/umakeotf_brsg @@ -0,0 +1,70 @@ +#!/bin/sh + +#OVP2OVF='omfonts -ovp2ovf' +#OVP2OVF='wovp2ovf' +#export OVP2OVF + +if test ! -d tfm; then +mkdir tfm +fi + +echo "making tfm/vf for burasage ..." +uppltotf -kanji=uptex basepl/ubrsg-h.pl tfm/upbrsgnmlminr-h.tfm +uppltotf -kanji=uptex basepl/ubrsg-v.pl tfm/upbrsgnmlminr-v.tfm +uppltotf -kanji=uptex basepl/ubrsg-h.pl tfm/upbrsgnmlgothr-h.tfm +uppltotf -kanji=uptex basepl/ubrsg-v.pl tfm/upbrsgnmlgothr-v.tfm +uppltotf -kanji=uptex basepl/ubrsg-h.pl tfm/upbrsgnmlminb-h.tfm +uppltotf -kanji=uptex basepl/ubrsg-v.pl tfm/upbrsgnmlminb-v.tfm +uppltotf -kanji=uptex basepl/ubrsg-h.pl tfm/upbrsgnmlgothb-h.tfm +uppltotf -kanji=uptex basepl/ubrsg-v.pl tfm/upbrsgnmlgothb-v.tfm +uppltotf -kanji=uptex basepl/ubrsg-h.pl tfm/upbrsgnmlmgothr-h.tfm +uppltotf -kanji=uptex basepl/ubrsg-v.pl tfm/upbrsgnmlmgothr-v.tfm +uppltotf -kanji=uptex basepl/ubrsg-h.pl tfm/upbrsgexpminr-h.tfm +uppltotf -kanji=uptex basepl/ubrsg-v.pl tfm/upbrsgexpminr-v.tfm +uppltotf -kanji=uptex basepl/ubrsg-h.pl tfm/upbrsgexpgothr-h.tfm +uppltotf -kanji=uptex basepl/ubrsg-v.pl tfm/upbrsgexpgothr-v.tfm +uppltotf -kanji=uptex basepl/ubrsg-h.pl tfm/upbrsgexpminb-h.tfm +uppltotf -kanji=uptex basepl/ubrsg-v.pl tfm/upbrsgexpminb-v.tfm +uppltotf -kanji=uptex basepl/ubrsg-h.pl tfm/upbrsgexpgothb-h.tfm +uppltotf -kanji=uptex basepl/ubrsg-v.pl tfm/upbrsgexpgothb-v.tfm +uppltotf -kanji=uptex basepl/ubrsg-h.pl tfm/upbrsgexpmgothr-h.tfm +uppltotf -kanji=uptex basepl/ubrsg-v.pl tfm/upbrsgexpmgothr-v.tfm +uppltotf -kanji=uptex basepl/ubrsg-h.pl tfm/upbrsgnmlgotheb-h.tfm +uppltotf -kanji=uptex basepl/ubrsg-v.pl tfm/upbrsgnmlgotheb-v.tfm +uppltotf -kanji=uptex basepl/ubrsg-h.pl tfm/upbrsgnmlminl-h.tfm +uppltotf -kanji=uptex basepl/ubrsg-v.pl tfm/upbrsgnmlminl-v.tfm +uppltotf -kanji=uptex basepl/ubrsg-h.pl tfm/upbrsgexpminl-h.tfm +uppltotf -kanji=uptex basepl/ubrsg-v.pl tfm/upbrsgexpminl-v.tfm +./umkjvf -ucs -sp 1 -sage -cq upbrsgnmlminr-h uphminr-h +./umkjvf -ucs -sp 1 -sage -cm -cp upbrsgnmlminr-v uphminr-v +./umkjvf -ucs -sp 1 -sage -cq upbrsgnmlgothr-h uphgothr-h +./umkjvf -ucs -sp 1 -sage -cm -cp upbrsgnmlgothr-v uphgothr-v +./umkjvf -ucs -sp 1 -sage -cq upbrsgnmlminb-h uphminb-h +./umkjvf -ucs -sp 1 -sage -cm -cp upbrsgnmlminb-v uphminb-v +./umkjvf -ucs -sp 1 -sage -cq upbrsgnmlgothb-h uphgothb-h +./umkjvf -ucs -sp 1 -sage -cm -cp upbrsgnmlgothb-v uphgothb-v +./umkjvf -ucs -sp 1 -sage -cq upbrsgnmlmgothr-h uphmgothr-h +./umkjvf -ucs -sp 1 -sage -cm -cp upbrsgnmlmgothr-v uphmgothr-v +./umkjvf -ucs -sp 1 -sage -cq upbrsgnmlgotheb-h uphgotheb-h +./umkjvf -ucs -sp 1 -sage -cp upbrsgnmlgotheb-v uphgotheb-v +./umkjvf -ucs -sp 1 -sage -cq upbrsgnmlminl-h uphminl-h +./umkjvf -ucs -sp 1 -sage -cm -cp upbrsgnmlminl-v uphminl-v +./umkjvf -ucs -sp 1 -sage -cq -expert upbrsgexpminr-h uphminr-h cidjminr +./umkjvf -ucs -sp 1 -sage -cm -cp -expert upbrsgexpminr-v uphminr-v cidjminr +./umkjvf -ucs -sp 1 -sage -cq -expert upbrsgexpgothr-h uphgothr-h cidjgothr +./umkjvf -ucs -sp 1 -sage -cm -cp -expert upbrsgexpgothr-v uphgothr-v cidjgothr +./umkjvf -ucs -sp 1 -sage -cq -expert upbrsgexpminb-h uphminb-h cidjminb +./umkjvf -ucs -sp 1 -sage -cm -cp -expert upbrsgexpminb-v uphminb-v cidjminb +./umkjvf -ucs -sp 1 -sage -cq -expert upbrsgexpgothb-h uphgothb-h cidjgothb +./umkjvf -ucs -sp 1 -sage -cm -cp -expert upbrsgexpgothb-v uphgothb-v cidjgothb +./umkjvf -ucs -sp 1 -sage -cq -expert upbrsgexpmgothr-h uphmgothr-h cidjmgothr +./umkjvf -ucs -sp 1 -sage -cm -cp -expert upbrsgexpmgothr-v uphmgothr-v cidjmgothr +./umkjvf -ucs -sp 1 -sage -cq -expert upbrsgexpminl-h uphminl-h cidjminl +./umkjvf -ucs -sp 1 -sage -cm -cp -expert upbrsgexpminl-v uphminl-v cidjminl + +echo "finishing ..." +if test ! -d vf; then +mkdir vf +fi +mv *.vf vf/ +mv *.tfm tfm/ diff --git a/Master/texmf-dist/source/fonts/japanese-otf-uptex/umkjvf b/Master/texmf-dist/source/fonts/japanese-otf-uptex/umkjvf index f832af37de8..7106ed9ef1b 100755 --- a/Master/texmf-dist/source/fonts/japanese-otf-uptex/umkjvf +++ b/Master/texmf-dist/source/fonts/japanese-otf-uptex/umkjvf @@ -391,9 +391,12 @@ sub make_vf { close(OVP); exit if $debug_mode; - if ($ovp2ovf eq '') { - $ovp2ovf = 'wovp2ovf'; # use ovp2ovf WEB version in TeXLive svn r24922 or later if you use SP - }else{ + + $ovp2ovf = 'ovp2ovf'; # use ovp2ovf WEB version in TeXLive svn r24922 or later if you use SP + if (defined($ENV{'OVP2OVF'})) { + $ovp2ovf = $ENV{'OVP2OVF'}; + } + if ($ovp2ovf_command ne '') { $ovp2ovf = $ovp2ovf_command; } system("$ovp2ovf $tfm_name.ovp $tfm_name.vf $tfm_name.ofm"); @@ -437,7 +440,7 @@ sub make_tfm { #### dfn of sub sub rtns ### ############################## sub print_help { - print "This is umkjvf version 0.09 (2012/2/18) by ttk\n"; + print "This is umkjvf version 0.10 (2012/4/21) by ttk\n"; print "Based on mkjvf version 1.0b21 (2010/3/25) by psitau\n"; print "Usage: umkjvf [option] []\n"; print " -b baseline shift\n"; diff --git a/Master/texmf-dist/tex/platex/japanese-otf-uptex/mlutf.sty b/Master/texmf-dist/tex/platex/japanese-otf-uptex/mlutf.sty index 5ee0ecb5371..427c73167e7 100644 --- a/Master/texmf-dist/tex/platex/japanese-otf-uptex/mlutf.sty +++ b/Master/texmf-dist/tex/platex/japanese-otf-uptex/mlutf.sty @@ -1,5 +1,5 @@ \NeedsTeXFormat{pLaTeX2e} -\ProvidesPackage{mlutf}[2004/04/17 v1.1.2 psitau, u0.09 ttk] +\ProvidesPackage{mlutf}[2004/04/17 v1.1.2 psitau, u0.10 ttk] %force catcode of \" be 12 \count@\catcode`\" \catcode`\"=12 diff --git a/Master/texmf-dist/tex/platex/japanese-otf-uptex/otf.sty b/Master/texmf-dist/tex/platex/japanese-otf-uptex/otf.sty index 022322437aa..cc504f3ab75 100644 --- a/Master/texmf-dist/tex/platex/japanese-otf-uptex/otf.sty +++ b/Master/texmf-dist/tex/platex/japanese-otf-uptex/otf.sty @@ -1,5 +1,5 @@ \NeedsTeXFormat{pLaTeX2e} -\ProvidesPackage{otf}[2012/04/11 v1.7b5 psitau, u0.09 ttk] +\ProvidesPackage{otf}[2012/04/11 v1.7b5 psitau, u0.10 ttk] %for processing options \newif\if@kana \@kanafalse \newif\if@macro \@macrotrue diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds index 20c84335098..6849bf5b092 100755 --- a/Master/tlpkg/libexec/ctan2tds +++ b/Master/tlpkg/libexec/ctan2tds @@ -4146,7 +4146,7 @@ sub MAKEjapaneseotf { &SYSTEM ("$MV script $dstdir/") if (-d "script"); &SYSTEM ("$MV patch $dstdir/") if (-d "patch"); &SYSTEM ("$MV *mkjvf $dstdir/"); - &SYSTEM ("$MV *makeotf $dstdir/"); + &SYSTEM ("$MV *makeotf* $dstdir/"); } sub MAKEIEEEtran { -- cgit v1.2.3