summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Master/texmf-dist/doc/fonts/japanese-otf-uptex/00otf-uptex.txt45
-rw-r--r--Master/texmf-dist/doc/fonts/japanese-otf-uptex/COPYRIGHT2
-rw-r--r--Master/texmf-dist/doc/fonts/japanese-otf-uptex/README10
-rw-r--r--Master/texmf-dist/doc/fonts/japanese-otf-uptex/test/uplatex/Makefile31
-rw-r--r--Master/texmf-dist/doc/fonts/japanese-otf-uptex/test/uplatex/upjis2004.tex158
-rw-r--r--Master/texmf-dist/source/fonts/japanese-otf-uptex/patch/otfbeta_uptex-0.12.patch (renamed from Master/texmf-dist/source/fonts/japanese-otf-uptex/patch/otfbeta_uptex-0.10.patch)279
-rwxr-xr-xMaster/texmf-dist/source/fonts/japanese-otf-uptex/script/mkutfvf_sp.pl4
-rwxr-xr-xMaster/texmf-dist/source/fonts/japanese-otf-uptex/umakeotf144
-rwxr-xr-xMaster/texmf-dist/source/fonts/japanese-otf-uptex/umakeotf_brsg110
-rwxr-xr-xMaster/texmf-dist/source/fonts/japanese-otf-uptex/umakeotf_jis04113
-rwxr-xr-xMaster/texmf-dist/source/fonts/japanese-otf-uptex/umkjvf22
-rw-r--r--Master/texmf-dist/tex/platex/japanese-otf-uptex/mlutf.sty2
-rw-r--r--Master/texmf-dist/tex/platex/japanese-otf-uptex/otf.sty10
13 files changed, 747 insertions, 183 deletions
diff --git a/Master/texmf-dist/doc/fonts/japanese-otf-uptex/00otf-uptex.txt b/Master/texmf-dist/doc/fonts/japanese-otf-uptex/00otf-uptex.txt
index a37437e8d19..d0cd423b329 100644
--- a/Master/texmf-dist/doc/fonts/japanese-otf-uptex/00otf-uptex.txt
+++ b/Master/texmf-dist/doc/fonts/japanese-otf-uptex/00otf-uptex.txt
@@ -1,5 +1,5 @@
[ Title ]
-otfbeta-uptex (japanese-otf-uptex) Ver.0.11 2012/07/09
+otfbeta-uptex (japanese-otf-uptex) Ver.0.12 2013/06/02
[ Abstract ]
@@ -13,6 +13,7 @@ It requires upTeX-0.20 or later.
00otf-uptex.txt : this file
umakeotf : script to make vf, tfm
umakeotf_brsg : script to make vf, tfm for burasage option
+umakeotf_jis04 : script to make vf, tfm for jis2004 option
umkjvf : mkjvf with unicode support
basepl/ubase-h.pl : unicode version of base-h.pl
@@ -43,8 +44,24 @@ COPYRIGHT : copyright notice of this package.
[ Status ]
Beta version.
Proportional kana is not supported yet.
-Combination of jis2004 and ucs option is not supported yet
- because Adobe standard CMap "UniJIS2004-UTF16-H", etc. will be effective.
+
+
+[ About jis2004 option ]
+otfbeta-uptex (japanese-otf-uptex) Ver.0.12 or later supports
+combination of "jis2004" and "uplatex" option.
+If you run the script "umakeotf_jis04", tfm and vf for jis2004 will be generated.
+They cousumes about 36.1 Mbytes in total.
+You will get expected results by mapping the new fonts
+ up{,brsg}{nml,exp}{minr,gothr,minb,gothb,mgothr,minl,gotheb}n-{h,v}.tfm
+to Adobe standard CMap "UniJIS2004-UTF16-{H,V}".
+
+If you do not use "jis2004" option, you can delete tfm and vf:
+ up{,brsg}{nml,exp}{minr,gothr,minb,gothb,mgothr,minl,gotheb}n-{h,v}.{tfm,vf}
+
+Instead of using "jis2004" option,
+you can get same result by mapping conventional fonts
+ up{,brsg}{nml,exp}{minr,gothr,minb,gothb,mgothr,minl,gotheb}-{h,v}.tfm
+to Adobe standard CMap "UniJIS2004-UTF16-{H,V}".
[ History ]
@@ -179,4 +196,26 @@ Combination of jis2004 and ucs option is not supported yet
The new code is written by ZR san.
test/uplatex/uotftest-utf8.tex ::
Revise.
+2013.06.02 Ver0.12
+ ## Thank Kitagawa san for helpful reports.
+ script/mktfm_sp.pl, script/mkutfvf_sp.pl, umakeotf, umakeotf_bsrg, umkjvf ::
+ Support Gothic/ExtraBold (gt/eb).
+ script/mkutfvf_sp.pl ::
+ Refer an environment variable OVP2OVF to set ovp2ovf command.
+ umakeotf_jis04 ::
+ Add. The script generates vf and tfm for jis2004 option on uplatex.
+ The vf and tfm consume about 36.1 Mbytes in total.
+ fontmap/hiragino.map(for udvips), fontmap/hiraginox.map(for dvipdfmx) ::
+ Add jis2004 entry.
+ umkjvf ::
+ Revise comment.
+ umakeotf, umakeotf_bsrg ::
+ Clean up.
+ sty/otf.sty, sty/mlutf.sty ::
+ Add jis2004 entry.
+ Increment version number.
+ patch/*.patch::
+ Revise.
+ test/uplatex/upjis2004.tex, test/uplatex/Makefile::
+ Add new test.
diff --git a/Master/texmf-dist/doc/fonts/japanese-otf-uptex/COPYRIGHT b/Master/texmf-dist/doc/fonts/japanese-otf-uptex/COPYRIGHT
index 2e0ad994277..91fee2d6f66 100644
--- a/Master/texmf-dist/doc/fonts/japanese-otf-uptex/COPYRIGHT
+++ b/Master/texmf-dist/doc/fonts/japanese-otf-uptex/COPYRIGHT
@@ -1,5 +1,5 @@
Copyright (C) 2003--2010 SAITO Shuzaburo and INOUE Koichi
-Copyright (C) 2007--2012 TANAKA Takuji
+Copyright (C) 2007--2013 TANAKA Takuji
All rights reserved.
Redistribution and use in source and binary forms, with or without
diff --git a/Master/texmf-dist/doc/fonts/japanese-otf-uptex/README b/Master/texmf-dist/doc/fonts/japanese-otf-uptex/README
index cd2087c7821..dda342b34f6 100644
--- a/Master/texmf-dist/doc/fonts/japanese-otf-uptex/README
+++ b/Master/texmf-dist/doc/fonts/japanese-otf-uptex/README
@@ -3,7 +3,7 @@ README
From 00otf-uptex.txt:
[ Title ]
-otfbeta-uptex (japanese-otf-uptex) Ver.0.11 2012/07/09
+otfbeta-uptex (japanese-otf-uptex) Ver.0.12 2013/06/02
[ Abstract ]
@@ -21,15 +21,11 @@ For copyright and licensing, please see COPYRIGHT
The original source has been downloaded from
http://homepage3.nifty.com/ttk/comp/tex/uptex.html
as
- http://homepage3.nifty.com/ttk/comp/tex/otfbeta-uptex-0.11.tar.xz
-
-The (included) patch
- otf-script-gteb.diff
-from Hironori Kitagawa to support gteb font series was applied.
+ http://homepage3.nifty.com/ttk/comp/tex/otfbeta-uptex-0.12.tar.xz
After that the scripts run and the generated tfm and vf files included.
The scripts were run with the env variable OVP2OVF=wovp2ovf
Norbert Preining <preining@logic.at>
-2013-04-12
+2013-11-20
diff --git a/Master/texmf-dist/doc/fonts/japanese-otf-uptex/test/uplatex/Makefile b/Master/texmf-dist/doc/fonts/japanese-otf-uptex/test/uplatex/Makefile
index b53e128f189..872b8e1eb80 100644
--- a/Master/texmf-dist/doc/fonts/japanese-otf-uptex/test/uplatex/Makefile
+++ b/Master/texmf-dist/doc/fonts/japanese-otf-uptex/test/uplatex/Makefile
@@ -6,12 +6,13 @@ DVIPS = dvips
DVIPDFMX = dvipdfmx
PDVITYPE = pdvitype
-all: uplatex-otf platex-otf uplatex-sp platex-sp uplatex-article platex-article uplatex-brsg platex-brsg
+all: otf sp art bsrg jis04
otf: uplatex-otf platex-otf
sp: uplatex-sp platex-sp
art: uplatex-article platex-article
brsg: uplatex-brsg platex-brsg
+jis04: uplatex-jis04 platex-jis04
uplatex-otf:
for opt in default deluxe expert bold noreplace; do \
@@ -91,5 +92,33 @@ platex-brsg:
done \
done
+uplatex-jis04:
+ for opt in default expert; do \
+ for brsg in br oi; do \
+ for jis in 00 04; do \
+ $(UPLATEX) "\def\option{$$opt}\def\burasage{$$brsg}\def\jisvar{$$jis}\def\class{ujarticle}\input" upjis2004.tex ; \
+ mv upjis2004.dvi upjis2004-$$opt-$$brsg-$$jis-h-uplatex.dvi ; \
+ $(DVIPDFMX) upjis2004-$$opt-$$brsg-$$jis-h-uplatex.dvi ; \
+ $(UPLATEX) "\def\option{$$opt}\def\burasage{$$brsg}\def\jisvar{$$jis}\def\class{utarticle}\input" upjis2004.tex ; \
+ mv upjis2004.dvi upjis2004-$$opt-$$brsg-$$jis-v-uplatex.dvi ; \
+ $(DVIPDFMX) upjis2004-$$opt-$$brsg-$$jis-v-uplatex.dvi ; \
+ done \
+ done \
+ done
+
+platex-jis04:
+ for opt in default expert; do \
+ for brsg in br oi; do \
+ for jis in 00 04; do \
+ $(PLATEX) "\def\option{$$opt}\def\burasage{$$brsg}\def\jisvar{$$jis}\def\class{jarticle}\input" upjis2004.tex ; \
+ mv upjis2004.dvi upjis2004-$$opt-$$brsg-$$jis-h-platex.dvi ; \
+ $(DVIPDFMX) upjis2004-$$opt-$$brsg-$$jis-h-platex.dvi ; \
+ $(PLATEX) "\def\option{$$opt}\def\burasage{$$brsg}\def\jisvar{$$jis}\def\class{tarticle}\input" upjis2004.tex ; \
+ mv upjis2004.dvi upjis2004-$$opt-$$brsg-$$jis-v-platex.dvi ; \
+ $(DVIPDFMX) upjis2004-$$opt-$$brsg-$$jis-v-platex.dvi ; \
+ done \
+ done \
+ done
+
clean:
rm *.aux *.log *.dvi *.pdf
diff --git a/Master/texmf-dist/doc/fonts/japanese-otf-uptex/test/uplatex/upjis2004.tex b/Master/texmf-dist/doc/fonts/japanese-otf-uptex/test/uplatex/upjis2004.tex
new file mode 100644
index 00000000000..65a235f946d
--- /dev/null
+++ b/Master/texmf-dist/doc/fonts/japanese-otf-uptex/test/uplatex/upjis2004.tex
@@ -0,0 +1,158 @@
+% -*- coding: utf-8 -*-
+\newif\ifuptexmode\uptexmodefalse
+\ifnum\jis"2121="3000 \uptexmodetrue\fi
+
+\makeatletter
+
+\def\@opt@{deluxe}
+\def\@default{default}
+\def\@br@{br}
+\def\@newjis@{04}
+
+\ifuptexmode
+ \edef\@opt@{uplatex,\@opt@}
+\fi
+
+\ifx\option\@undefined
+ \def\option{default}
+\fi
+\ifx\option\@default
+\else
+ \edef\@opt@{\option,\@opt@}
+\fi
+
+\ifx\burasage\@br@
+ \edef\@opt@{\@opt@,burasage}
+ \def\burasage{yes}
+\else
+ \def\burasage{no}
+\fi
+
+\ifx\jisvar\@newjis@
+ \edef\@opt@{\@opt@,jis2004}
+ \def\jisvar{2004}
+\else
+ \def\jisvar{conventional}
+\fi
+
+\ifx\class\@undefined
+ \ifuptexmode
+ \def\class{ujarticle}
+ \else
+ \def\class{jarticle}
+ \fi
+\fi
+
+\documentclass[a4paper,titlepage,draft]{\class}
+%\documentclass[a4paper,titlepage,draft,landscape]{\class}
+
+\usepackage[\@opt@]{otf}
+
+\makeatother
+
+\usepackage{redeffont}
+\parindent 0zw
+\pagestyle{empty}
+%\parskip \baselineskip
+\makeatletter
+\ifx\rubyfamily\@undefined\let\rubyfamily=\relax\fi
+\ifx\mgfamily\@undefined\let\mgfamily=\relax\fi
+\makeatother
+
+\def\testglyph{%
+逢芦飴溢茨鰯淫迂厩噂餌襖迦牙廻恢晦蟹葛鞄
+釜翰翫徽祇汲灸笈卿饗僅喰櫛屑粂祁隙倦捲牽
+鍵諺巷梗膏鵠甑叉榊薩鯖錆鮫餐杓灼酋楯薯藷
+哨鞘杖蝕訊逗摺撰煎煽穿箭詮噌遡揃遜腿蛸辿
+樽歎註瀦捗槌鎚辻挺鄭擢溺兎堵屠賭瀞遁謎灘
+楢禰牌這秤駁箸叛挽誹樋稗逼謬豹廟瀕斧蔽瞥
+蔑篇娩鞭庖蓬鱒迄儲餅籾爺鑓愈猷漣煉簾榔冤
+叟咬嘲囀徘扁棘橙狡甕甦疼祟竈筵篝腱艘芒虔
+蜃蠅訝靄靱騙鴉
+\ifuptexmode
+ 俱剝吞噓姸屛幷瘦繫摯懲蘒譿悞煒驊夆暵屢
+\fi
+}
+\def\testutf{%
+\UTF{9022}\UTF{82A6}\UTF{98F4}\UTF{6EA2}\UTF{8328}\UTF{9C2F}\UTF{6DEB}\UTF{8FC2}\UTF{53A9}\UTF{5642}%
+\UTF{990C}\UTF{8956}\UTF{8FE6}\UTF{7259}\UTF{5EFB}\UTF{6062}\UTF{6666}\UTF{87F9}\UTF{845B}\UTF{9784}%
+\UTF{91DC}\UTF{7FF0}\UTF{7FEB}\UTF{5FBD}\UTF{7947}\UTF{6C72}\UTF{7078}\UTF{7B08}\UTF{537F}\UTF{9957}%
+\UTF{50C5}\UTF{55B0}\UTF{6ADB}\UTF{5C51}\UTF{7C82}\UTF{7941}\UTF{9699}\UTF{5026}\UTF{6372}\UTF{727D}%
+\UTF{9375}\UTF{8AFA}\UTF{5DF7}\UTF{6897}\UTF{818F}\UTF{9D60}\UTF{7511}\UTF{53C9}\UTF{698A}\UTF{85A9}%
+\UTF{9BD6}\UTF{9306}\UTF{9BAB}\UTF{9910}\UTF{6753}\UTF{707C}\UTF{914B}\UTF{696F}\UTF{85AF}\UTF{85F7}%
+\UTF{54E8}\UTF{9798}\UTF{6756}\UTF{8755}\UTF{8A0A}\UTF{9017}\UTF{647A}\UTF{64B0}\UTF{714E}\UTF{717D}%
+\UTF{7A7F}\UTF{7BAD}\UTF{8A6E}\UTF{564C}\UTF{9061}\UTF{63C3}\UTF{905C}\UTF{817F}\UTF{86F8}\UTF{8FBF}%
+\UTF{6A3D}\UTF{6B4E}\UTF{8A3B}\UTF{7026}\UTF{6357}\UTF{69CC}\UTF{939A}\UTF{8FBB}\UTF{633A}\UTF{912D}%
+\UTF{64E2}\UTF{6EBA}\UTF{514E}\UTF{5835}\UTF{5C60}\UTF{8CED}\UTF{701E}\UTF{9041}\UTF{8B0E}\UTF{7058}%
+\UTF{6962}\UTF{79B0}\UTF{724C}\UTF{9019}\UTF{79E4}\UTF{99C1}\UTF{7BB8}\UTF{53DB}\UTF{633D}\UTF{8AB9}%
+\UTF{6A0B}\UTF{7A17}\UTF{903C}\UTF{8B2C}\UTF{8C79}\UTF{5EDF}\UTF{7015}\UTF{65A7}\UTF{853D}\UTF{77A5}%
+\UTF{8511}\UTF{7BC7}\UTF{5A29}\UTF{97AD}\UTF{5E96}\UTF{84EC}\UTF{9C52}\UTF{8FC4}\UTF{5132}\UTF{9905}%
+\UTF{7C7E}\UTF{723A}\UTF{9453}\UTF{6108}\UTF{7337}\UTF{6F23}\UTF{7149}\UTF{7C3E}\UTF{6994}\UTF{51A4}%
+\UTF{53DF}\UTF{54AC}\UTF{5632}\UTF{56C0}\UTF{5F98}\UTF{6241}\UTF{68D8}\UTF{6A59}\UTF{72E1}\UTF{7515}%
+\UTF{7526}\UTF{75BC}\UTF{795F}\UTF{7AC8}\UTF{7B75}\UTF{7BDD}\UTF{8171}\UTF{8258}\UTF{8292}\UTF{8654}%
+\UTF{8703}\UTF{8805}\UTF{8A1D}\UTF{9744}\UTF{9771}\UTF{9A19}\UTF{9D09}%
+\UTF{4FF1}\UTF{525D}\UTF{541E}\UTF{5653}\UTF{59F8}\UTF{5C5B}\UTF{5E77}\UTF{7626}\UTF{7E6B}\UTF{646F}%
+\UTF{FA40}\UTF{FA20}\UTF{8B7F}\UTF{609E}\UTF{7152}\UTF{9A4A}\UTF{5906}\UTF{66B5}\UTF{5C62}}
+
+\begin{document}
+class: \texttt{\class}\\
+option: \texttt{\option}\\
+burasage: \texttt{\burasage}\\
+jis version: \texttt{\jisvar}\\
+
+[mc/m]
+
+\testglyph
+
+\testutf
+
+{\bfseries%
+[mc/bx]
+
+\testglyph
+
+\testutf
+}
+
+{\gtfamily
+[gt/m]
+
+\testglyph
+
+\testutf
+
+{\bfseries%
+[gt/bx]
+
+\testglyph
+
+\testutf
+}}
+
+{\mgfamily
+[mg/m]
+
+\testglyph
+
+\testutf
+}
+
+%%% extra font
+{\ltseries%
+[mc/lt]
+
+\testglyph
+
+\testutf
+}
+
+{\gtfamily
+{\ebseries%
+[gt/eb]
+
+\testglyph
+
+\testutf
+}}
+
+\end{document}
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.12.patch
index b636427e64f..34a3fd0764c 100644
--- 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.12.patch
@@ -1,6 +1,6 @@
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
++++ otfbeta/fontmap/hiragino.map(for udvips) 2013-06-02 15:49:35 +0900
@@ -4,6 +4,8 @@
otf-cjmr-v HiraMinPro-W3-Identity-V
hminr-h HiraMinPro-W3-H
@@ -60,9 +60,50 @@ diff -urN otfbeta.orig/fontmap/hiragino.map(for udvips) otfbeta/fontmap/hiragino
hiramin-w3-h HiraMinPro-W3-Identity-H
hiramin-w6-h HiraMinPro-W6-Identity-H
+@@ -59,28 +73,40 @@
+ otf-ujmrn-v HiraMinProN-W3-UniJIS2004-UTF16-V
+ hminrn-h HiraMinProN-W3-H
+ hminrn-v HiraMinProN-W3-V
++uphminrn-h HiraMinPro-W3-UniJIS2004-UTF16-H
++uphminrn-v HiraMinPro-W3-UniJIS2004-UTF16-V
+
+ otf-ujgrn-h HiraKakuProN-W3-UniJIS2004-UTF16-H
+ otf-ujgrn-v HiraKakuProN-W3-UniJIS2004-UTF16-V
+ hgothrn-h HiraKakuProN-W3-H
+ hgothrn-v HiraKakuProN-W3-V
++uphgothrn-h HiraKakuProN-W3-UniJIS2004-UTF16-H
++uphgothrn-v HiraKakuProN-W3-UniJIS2004-UTF16-V
+
+ otf-ujmbn-h HiraMinProN-W6-UniJIS2004-UTF16-H
+ otf-ujmbn-v HiraMinProN-W6-UniJIS2004-UTF16-V
+ hminbn-h HiraMinProN-W6-H
+ hminbn-v HiraMinProN-W6-V
++uphminbn-h HiraMinProN-W6-UniJIS2004-UTF16-H
++uphminbn-v HiraMinProN-W6-UniJIS2004-UTF16-V
+
+ otf-ujgbn-h HiraKakuProN-W6-UniJIS2004-UTF16-H
+ otf-ujgbn-v HiraKakuProN-W6-UniJIS2004-UTF16-V
+ hgothbn-h HiraKakuProN-W6-H
+ hgothbn-v HiraKakuProN-W6-V
++uphgothbn-h HiraKakuProN-W6-UniJIS2004-UTF16-H
++uphgothbn-v HiraKakuProN-W6-UniJIS2004-UTF16-V
+
+ otf-ujmgrn-h HiraMaruProN-W4-UniJIS2004-UTF16-H
+ otf-ujmgrn-v HiraMaruProN-W4-UniJIS2004-UTF16-V
+ hmgothrn-h HiraMaruProN-W4-H
+ hmgothrn-v HiraMaruProN-W4-V
++uphmgothrn-h HiraMaruProN-W4-UniJIS2004-UTF16-H
++uphmgothrn-v HiraMaruProN-W4-UniJIS2004-UTF16-V
+
+ otf-ujmln-h HiraMinProN-W2-UniJIS2004-UTF16-H
+ otf-ujmln-v HiraMinProN-W2-UniJIS2004-UTF16-V
+ hminln-h HiraMinProN-W2-H
+ hminln-v HiraMinProN-W2-V
++uphminln-h HiraMinProN-W2-UniJIS2004-UTF16-H
++uphminln-v HiraMinProN-W2-UniJIS2004-UTF16-V
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
++++ otfbeta/fontmap/hiraginox.map(for dvipdfmx) 2013-06-02 15:43:07 +0900
@@ -4,6 +4,8 @@
otf-cjmr-v Identity-V HiraMinPro-W3
hminr-h H HiraMinPro-W3
@@ -122,6 +163,47 @@ diff -urN otfbeta.orig/fontmap/hiraginox.map(for dvipdfmx) otfbeta/fontmap/hirag
hiramin-w3-h Identity-H HiraMinPro-W3
hiramin-w6-h Identity-H HiraMinPro-W6
+@@ -59,28 +73,40 @@
+ otf-ujmrn-v UniJIS2004-UTF16-V HiraMinProN-W3
+ hminrn-h H HiraMinProN-W3
+ hminrn-v V HiraMinProN-W3
++uphminrn-h UniJIS2004-UTF16-H HiraMinProN-W3
++uphminrn-v UniJIS2004-UTF16-V HiraMinProN-W3
+
+ otf-ujgrn-h UniJIS2004-UTF16-H HiraKakuProN-W3
+ otf-ujgrn-v UniJIS2004-UTF16-V HiraKakuProN-W3
+ hgothrn-h H HiraKakuProN-W3
+ hgothrn-v V HiraKakuProN-W3
++uphgothrn-h UniJIS2004-UTF16-H HiraKakuProN-W3
++uphgothrn-v UniJIS2004-UTF16-V HiraKakuProN-W3
+
+ otf-ujmbn-h UniJIS2004-UTF16-H HiraMinProN-W6
+ otf-ujmbn-v UniJIS2004-UTF16-V HiraMinProN-W6
+ hminbn-h H HiraMinProN-W6
+ hminbn-v V HiraMinProN-W6
++uphminbn-h UniJIS2004-UTF16-H HiraMinProN-W6
++uphminbn-v UniJIS2004-UTF16-V HiraMinProN-W6
+
+ otf-ujgbn-h UniJIS2004-UTF16-H HiraKakuProN-W6
+ otf-ujgbn-v UniJIS2004-UTF16-V HiraKakuProN-W6
+ hgothbn-h H HiraKakuProN-W6
+ hgothbn-v V HiraKakuProN-W6
++uphgothbn-h UniJIS2004-UTF16-H HiraKakuProN-W6
++uphgothbn-v UniJIS2004-UTF16-V HiraKakuProN-W6
+
+ otf-ujmgrn-h UniJIS2004-UTF16-H HiraMaruProN-W4
+ otf-ujmgrn-v UniJIS2004-UTF16-V HiraMaruProN-W4
+ hmgothrn-h H HiraMaruProN-W4
+ hmgothrn-v V HiraMaruProN-W4
++uphmgothrn-h UniJIS2004-UTF16-H HiraMaruProN-W4
++uphmgothrn-v UniJIS2004-UTF16-V HiraMaruProN-W4
+
+ otf-ujmln-h UniJIS2004-UTF16-H HiraMinProN-W2
+ otf-ujmln-v UniJIS2004-UTF16-V HiraMinProN-W2
+ hminln-h H HiraMinProN-W2
+ hminln-v V HiraMinProN-W2
++uphminln-h UniJIS2004-UTF16-H HiraMinProN-W2
++uphminln-v UniJIS2004-UTF16-V HiraMinProN-W2
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
@@ -358,14 +440,29 @@ diff -urN otfbeta.orig/fontmap/vfontmap.txt otfbeta/fontmap/vfontmap.txt
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
++++ otfbeta/sty/mlutf.sty 2013-05-25 18:24:54 +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]
++\ProvidesPackage{mlutf}[2004/04/17 v1.1.2 psitau, u0.12 ttk]
%force catcode of \" be 12
\count@\catcode`\"
\catcode`\"=12
+@@ -27,10 +27,10 @@
+ %end of changing catcode of \"
+ \gdef\Redefine@MLUTF{%
+ \@ifpackageloaded{hyperref}{%
+- \def\hyper@UTFC##1{\ifHy@pdfstring\0x##1\else\csname UTFC \endcsname{##1}\fi}
+- \def\hyper@UTFK##1{\ifHy@pdfstring\0x##1\else\csname UTFK \endcsname{##1}\fi}
+- \def\hyper@UTFT##1{\ifHy@pdfstring\0x##1\else\csname UTFT \endcsname{##1}\fi}
+- \def\hyper@UTFM##1{\ifHy@pdfstring\0x##1\else\csname UTFM \endcsname{##1}\fi}
++ \def\hyper@UTFC##1{\ifHy@pdfstring\hyper@UTF@{##1}\else\csname UTFC \endcsname{##1}\fi}
++ \def\hyper@UTFK##1{\ifHy@pdfstring\hyper@UTF@{##1}\else\csname UTFK \endcsname{##1}\fi}
++ \def\hyper@UTFT##1{\ifHy@pdfstring\hyper@UTF@{##1}\else\csname UTFT \endcsname{##1}\fi}
++ \def\hyper@UTFM##1{\ifHy@pdfstring\hyper@UTF@{##1}\else\csname UTFM \endcsname{##1}\fi}
+ \def\UTFC{\protect\hyper@UTFC}
+ \def\UTFK{\protect\hyper@UTFK}
+ \def\UTFT{\protect\hyper@UTFT}
@@ -45,14 +45,14 @@
\Declare@FontShape{utfk}{bx}{0123456789abcdef}{utfkgr}
\DeclareKanjiFamily{\otf@JYn}{utfc}{}
@@ -389,15 +486,159 @@ diff -urN otfbeta.orig/sty/mlutf.sty otfbeta/sty/mlutf.sty
\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
++++ otfbeta/sty/otf.sty 2013-06-02 09:30:31 +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]
++\ProvidesPackage{otf}[2012/04/11 v1.7b5 psitau, u0.12 ttk]
%for processing options
\newif\if@kana \@kanafalse
\newif\if@macro \@macrotrue
-@@ -67,7 +67,9 @@
+@@ -57,9 +57,142 @@
+ }
+ \fi
+ \gdef\Redefine@UTF{\@ifpackageloaded{hyperref}{%
+- \def\hyper@UTF##1{\ifHy@pdfstring\0x##1\else\csname UTF \endcsname{##1}\fi}
++ \def\hyper@UTF##1{\ifHy@pdfstring\hyper@UTF@{##1}\else\csname UTF \endcsname{##1}\fi}
+ \def\UTF{\protect\hyper@UTF}}{}
+ }
++% support surrogate pair in \hyper@UTF@{} by ZR-san
++\def\otf@end{\otf@end@}
++\def\otf@mark{\otf@mark@}
++\def\otf@triexpandafter{%
++ \expandafter\expandafter\expandafter
++}
++\begingroup \catcode`\|=0
++\gdef\otf@cond#1|fi{%
++ #1\expandafter\@firstoftwo
++ |else \expandafter\@secondoftwo
++ |fi
++}
++\endgroup
++\def\otf@next#1#2#3#4#5{%
++ \@namedef{otf@qh/#1#2}{#3}%
++ \@namedef{otf@hq/#3}{#1#2}%
++ \@namedef{otf@lhq/#4#5}{#1#2}%
++}
++\@for\otf@x:={%
++ 00001,01102,02203,03304,10405,11506,12607,13708,%
++ 20809,2190A,22A0B,23B0C,30C0D,31D0E,32E0F,33F10}\do{%
++ \expandafter\otf@next\otf@x
++}
++\def\otf@next#1{%
++ \lowercase{\def\otf@y{#1}}%
++ \@namedef{otf@hd/#1}{#1}%
++ \@namedef{otf@hd/\otf@y}{#1}%
++}
++\@tfor\otf@x:=0123456789ABCDEF\do{%
++ \expandafter\otf@next\otf@x
++}
++\def\hyper@UTF@#1{%
++ \expandafter\otf@hy@utf@pre@a#1\relax{}\otf@mark\otf@end
++}
++\def\otf@hy@utf@pre@a{%
++ \expandafter\otf@hy@utf@pre@b\romannumeral-`>%
++}
++\def\otf@hy@utf@pre@b#1#{%
++ \otf@cond \ifx\otf@end#1\otf@end \fi{%
++ \otf@hy@utf@bombout
++ }{%
++ \otf@hy@utf@pre@c#1%
++ }%
++}
++\def\otf@hy@utf@pre@c#1{%
++ \otf@cond \ifx#1\relax \fi{%
++ \otf@hy@utf@pre@end
++ }{%
++ \otf@triexpandafter\otf@hy@utf@pre@d
++ \csname otf@hd/\string#1\endcsname
++ }%
++}
++\def\otf@hy@utf@pre@d#1{%
++ \otf@cond \ifx#1\relax \fi{%
++ \otf@hy@utf@bombout
++ }{%
++ \otf@hy@utf@pre@e#1%
++ }%
++}
++\def\otf@hy@utf@pre@e#1#2\otf@mark#3\otf@end{%
++ \otf@cond \if 0#1\fi{%
++ \otf@cond \ifx\otf@end#3\otf@end \fi{%
++ \otf@hy@utf@pre@f{#2}{#3}%
++ }{%
++ \otf@hy@utf@pre@f{#2}{#3#1}%
++ }%
++ }{%
++ \otf@hy@utf@pre@f{#2}{#3#1}%
++ }%
++}
++\def\otf@hy@utf@pre@f#1#2{%
++ \otf@hy@utf@pre@a#1\otf@mark#2\otf@end
++}
++\def\otf@hy@utf@pre@end#1\otf@mark#2\otf@end{%
++ \otf@cond \ifx\otf@end#1\otf@end \fi{%
++ \otf@hy@utf@sw{#2}%
++ }{%
++ \otf@hy@utf@error
++ }%
++}
++\def\otf@hy@utf@bombout#1\otf@end{%
++ \otf@hy@utf@error
++}
++
++\def\otf@hy@utf@sw#1{%
++ \otf@cond \ifnum"0#1>"10FFFF \fi{%
++ \otf@hy@utf@error
++ }{%
++ \otf@hy@utf@sw@a{#1}%
++ }%
++}
++\def\otf@hy@utf@sw@a#1{%
++ \otf@cond \ifnum"0#1>"FFFF \fi{%
++ \otf@hy@utf@big#1"000000\otf@end
++ }{%
++ \otf@hy@utf@small#1"0000\otf@end
++ }%
++}
++\def\otf@hy@utf@small#1#2#3#4#5#6\otf@end{%
++ \otf@hy@utf@small@a#1#2#3#4#5\otf@end
++}
++\def\otf@hy@utf@small@a#1"#2\otf@end{%
++ \otf@hy@utf@unit{#2#1}%
++}
++\def\otf@hy@utf@big#1#2#3#4#5#6#7#8\otf@end{%
++ \otf@hy@utf@big@a#1#2#3#4#5#6#7\otf@end
++}
++\def\otf@hy@utf@big@a#1"#2\otf@end{%
++ \otf@hy@utf@big@b#2#1\otf@end
++}
++\def\otf@hy@utf@big@b#1#2#3#4{%
++ \otf@triexpandafter\otf@hy@utf@big@c
++ \csname otf@lhq/#1#2\otf@triexpandafter\endcsname
++ \csname otf@hq/#3\otf@triexpandafter\endcsname
++ \csname otf@hq/#4\endcsname
++}
++\def\otf@hy@utf@big@c#1#2#3#4#5#6{%
++ \otf@triexpandafter\otf@hy@utf@big@d
++ \csname otf@qh/2#1\otf@triexpandafter\endcsname
++ \csname otf@qh/#2#3\otf@triexpandafter\endcsname
++ \csname otf@qh/#4#5\otf@triexpandafter\endcsname
++ \csname otf@qh/3#6\endcsname
++}
++\def\otf@hy@utf@big@d#1#2#3#4#5\otf@end{%
++ \otf@hy@utf@unit{D#1#2#3}%
++ \otf@hy@utf@unit{D#4#5}%
++}
++\def\otf@hy@utf@error{%
++ \otf@hy@utf@unit{FFFD}%
++}
++\def\otf@hy@utf@unit#1{%
++ \0x#1%
++}
+ \AtBeginDocument{\Redefine@UTF}
+ %internal macros
+ %macros by iNOUE Koich!
+@@ -67,7 +200,9 @@
\newcommand\put@character{%
\@tempcntb=\@tempcnta
\divide\@tempcntb by "1000
@@ -408,7 +649,27 @@ diff -urN otfbeta.orig/sty/otf.sty otfbeta/sty/otf.sty
\selectfont%
\multiply\@tempcntb by "1000
\advance\@tempcnta by -\@tempcntb
-@@ -280,34 +282,34 @@
+@@ -254,6 +389,8 @@
+ \DeclareFontShape{\otf@JTn}{rubymg}{m}{n}{<-> s * [\utf@sc@le] \otf@pfx@ rubymgothr-v}{}
+ \DeclareFontShape{\otf@JYn}{hmc}{l}{n}{<-> s * [\utf@sc@le] \otf@pfx@ \brsg@pfx@ expminl\nlck@sfx@-h}{}
+ \DeclareFontShape{\otf@JTn}{hmc}{l}{n}{<-> s * [\utf@sc@le] \otf@pfx@ \brsg@pfx@ expminl\nlck@sfx@-v}{}
++ \DeclareFontShape{\otf@JYn}{hgt}{eb}{n}{<-> s * [\utf@sc@le] \otf@pfx@ \brsg@pfx@ expgotheb\nlck@sfx@-h}{}
++ \DeclareFontShape{\otf@JTn}{hgt}{eb}{n}{<-> s * [\utf@sc@le] \otf@pfx@ \brsg@pfx@ expgotheb\nlck@sfx@-v}{}
+ \DeclareFontShape{\otf@JYn}{ruby}{l}{n}{<-> s * [\utf@sc@le] \otf@pfx@ rubyminl-h}{}
+ \DeclareFontShape{\otf@JTn}{ruby}{l}{n}{<-> s * [\utf@sc@le] \otf@pfx@ rubyminl-v}{}
+ \else
+@@ -262,8 +399,8 @@
+ \DeclareFontShape{\otf@JYn}{hmc}{l}{n}{<-> s * [\utf@sc@le] \otf@pfx@ nmlminl\nlck@sfx@-h}{}
+ \DeclareFontShape{\otf@JTn}{hmc}{l}{n}{<-> s * [\utf@sc@le] \otf@pfx@ nmlminl\nlck@sfx@-v}{}
+ \fi
+- \DeclareFontShape{\otf@JYn}{hgt}{eb}{n}{<-> s * [\utf@sc@le] \otf@pfx@ \brsg@pfx@ nmlgotheb-h}{}
+- \DeclareFontShape{\otf@JTn}{hgt}{eb}{n}{<-> s * [\utf@sc@le] \otf@pfx@ \brsg@pfx@ nmlgotheb-v}{}
++ \DeclareFontShape{\otf@JYn}{hgt}{eb}{n}{<-> s * [\utf@sc@le] \otf@pfx@ \brsg@pfx@ nmlgotheb\nlck@sfx@-h}{}
++ \DeclareFontShape{\otf@JTn}{hgt}{eb}{n}{<-> s * [\utf@sc@le] \otf@pfx@ \brsg@pfx@ nmlgotheb\nlck@sfx@-v}{}
+ \DeclareFontShape{\otf@JYn}{hmc}{m}{prp}{<-> s * [\utf@sc@le] \otf@pfx@ phiraminw3-h}{}
+ \DeclareFontShape{\otf@JYn}{hmc}{bx}{prp}{<-> s * [\utf@sc@le] \otf@pfx@ phiraminw6-h}{}
+ \DeclareFontShape{\otf@JYn}{hgt}{m}{prp}{<-> s * [\utf@sc@le] \otf@pfx@ phirakakuw3-h}{}
+@@ -280,34 +417,36 @@
\DeclareKanjiFamily{\otf@JTn}{utfj}{}
\DeclareKanjiFamily{\otf@JYn}{cidj}{}
\DeclareKanjiFamily{\otf@JTn}{cidj}{}
@@ -430,6 +691,8 @@ diff -urN otfbeta.orig/sty/otf.sty otfbeta/sty/otf.sty
- \Declare@FontShape{utfjg}{bx}{0123456789abcdef}{utfjgb\nlck@sfx@}
+ \Declare@FontShape{utfjg}{bx}{0123456789abcdefjklmnopqrstuvz}{utfjgb\nlck@sfx@}
\Declare@FontShape{cidjg}{bx}{012345}{cidjgb}
++ \Declare@FontShape{utfjg}{eb}{0123456789abcdefjklmnopqrstuvz}{utfjgb\nlck@sfx@}
++ \Declare@FontShape{cidjg}{eb}{012345}{cidjgb}
\DeclareKanjiFamily{\otf@JYn}{utfjmg}{}
\DeclareKanjiFamily{\otf@JTn}{utfjmg}{}
\DeclareKanjiFamily{\otf@JYn}{cidjmg}{}
diff --git a/Master/texmf-dist/source/fonts/japanese-otf-uptex/script/mkutfvf_sp.pl b/Master/texmf-dist/source/fonts/japanese-otf-uptex/script/mkutfvf_sp.pl
index 65b549480f2..e574eb56325 100755
--- a/Master/texmf-dist/source/fonts/japanese-otf-uptex/script/mkutfvf_sp.pl
+++ b/Master/texmf-dist/source/fonts/japanese-otf-uptex/script/mkutfvf_sp.pl
@@ -18,7 +18,9 @@ This software is a part of otfbeta-uptex (a.k.a. japanese-otf-uptex).
use script::MakeSPList;
-$ovp2ovf = 'ovp2ovf' if (!defined($ovp2ovf)); # option -ovp2ovf
+if (!defined($ovp2ovf)) { ## check option '-ovp2ovf=????'
+ $ovp2ovf = defined($ENV{'OVP2OVF'}) ? $ENV{'OVP2OVF'} : 'ovp2ovf';
+}
$multi=3;
opendir(OVP, "ovp") || mkdir("ovp",0755) || die "cannot mkdir ovp";
diff --git a/Master/texmf-dist/source/fonts/japanese-otf-uptex/umakeotf b/Master/texmf-dist/source/fonts/japanese-otf-uptex/umakeotf
index bdbd5006a06..452b781e666 100755
--- a/Master/texmf-dist/source/fonts/japanese-otf-uptex/umakeotf
+++ b/Master/texmf-dist/source/fonts/japanese-otf-uptex/umakeotf
@@ -1,107 +1,75 @@
#!/bin/sh
+#
+# This script is a part of otfbeta-uptex (a.k.a. japanese-otf-uptex).
+#
+
#OVP2OVF='omfonts -ovp2ovf'
-OVP2OVF='wovp2ovf'
-export OVP2OVF
+#OVP2OVF='wovp2ovf'
+#export OVP2OVF
if test ! -d tfm; then
mkdir tfm
fi
+
+
echo "making tfm ..."
-#perl script/mktfm.pl
-uppltotf -kanji=uptex basepl/ubase-h.pl tfm/upnmlminr-h.tfm
-uppltotf -kanji=uptex basepl/ubase-v.pl tfm/upnmlminr-v.tfm
-uppltotf -kanji=uptex basepl/ubase-h.pl tfm/upnmlgothr-h.tfm
-uppltotf -kanji=uptex basepl/ubase-v.pl tfm/upnmlgothr-v.tfm
-uppltotf -kanji=uptex basepl/ubase-h.pl tfm/upnmlminb-h.tfm
-uppltotf -kanji=uptex basepl/ubase-v.pl tfm/upnmlminb-v.tfm
-uppltotf -kanji=uptex basepl/ubase-h.pl tfm/upnmlgothb-h.tfm
-uppltotf -kanji=uptex basepl/ubase-v.pl tfm/upnmlgothb-v.tfm
-uppltotf -kanji=uptex basepl/ubase-h.pl tfm/upnmlmgothr-h.tfm
-uppltotf -kanji=uptex basepl/ubase-v.pl tfm/upnmlmgothr-v.tfm
-uppltotf -kanji=uptex basepl/ubase-h.pl tfm/upexpminr-h.tfm
-uppltotf -kanji=uptex basepl/ubase-v.pl tfm/upexpminr-v.tfm
-uppltotf -kanji=uptex basepl/ubase-h.pl tfm/upexpgothr-h.tfm
-uppltotf -kanji=uptex basepl/ubase-v.pl tfm/upexpgothr-v.tfm
-uppltotf -kanji=uptex basepl/ubase-h.pl tfm/upexpminb-h.tfm
-uppltotf -kanji=uptex basepl/ubase-v.pl tfm/upexpminb-v.tfm
-uppltotf -kanji=uptex basepl/ubase-h.pl tfm/upexpgothb-h.tfm
-uppltotf -kanji=uptex basepl/ubase-v.pl tfm/upexpgothb-v.tfm
-uppltotf -kanji=uptex basepl/ubase-h.pl tfm/upexpmgothr-h.tfm
-uppltotf -kanji=uptex basepl/ubase-v.pl tfm/upexpmgothr-v.tfm
-uppltotf -kanji=uptex basepl/ubase-v.pl tfm/uprubyminr-v.tfm
-uppltotf -kanji=uptex basepl/ubase-h.pl tfm/uprubyminr-h.tfm
-uppltotf -kanji=uptex basepl/ubase-h.pl tfm/uprubygothr-h.tfm
-uppltotf -kanji=uptex basepl/ubase-v.pl tfm/uprubygothr-v.tfm
-uppltotf -kanji=uptex basepl/ubase-v.pl tfm/uprubyminb-v.tfm
-uppltotf -kanji=uptex basepl/ubase-h.pl tfm/uprubyminb-h.tfm
-uppltotf -kanji=uptex basepl/ubase-h.pl tfm/uprubygothb-h.tfm
-uppltotf -kanji=uptex basepl/ubase-v.pl tfm/uprubygothb-v.tfm
-uppltotf -kanji=uptex basepl/ubase-h.pl tfm/uprubymgothr-h.tfm
-uppltotf -kanji=uptex basepl/ubase-v.pl tfm/uprubymgothr-v.tfm
+for series in nml exp ruby
+do
+for face in minr gothr minb gothb mgothr
+do
+uppltotf -kanji=uptex basepl/ubase-h.pl tfm/up${series}${face}-h.tfm
+uppltotf -kanji=uptex basepl/ubase-v.pl tfm/up${series}${face}-v.tfm
+done
+done
#for extra fonts
-uppltotf -kanji=uptex basepl/ubase-h.pl tfm/upnmlgotheb-h.tfm
-uppltotf -kanji=uptex basepl/ubase-v.pl tfm/upnmlgotheb-v.tfm
-uppltotf -kanji=uptex basepl/ubase-h.pl tfm/upexpgotheb-h.tfm
-uppltotf -kanji=uptex basepl/ubase-v.pl tfm/upexpgotheb-v.tfm
-uppltotf -kanji=uptex basepl/ubase-v.pl tfm/uprubygotheb-v.tfm
-uppltotf -kanji=uptex basepl/ubase-h.pl tfm/uprubygotheb-h.tfm
-uppltotf -kanji=uptex basepl/ubase-h.pl tfm/upnmlminl-h.tfm
-uppltotf -kanji=uptex basepl/ubase-v.pl tfm/upnmlminl-v.tfm
-uppltotf -kanji=uptex basepl/ubase-h.pl tfm/upexpminl-h.tfm
-uppltotf -kanji=uptex basepl/ubase-v.pl tfm/upexpminl-v.tfm
-uppltotf -kanji=uptex basepl/ubase-v.pl tfm/uprubyminl-v.tfm
-uppltotf -kanji=uptex basepl/ubase-h.pl tfm/uprubyminl-h.tfm
+for series in nml exp ruby
+do
+for face in gotheb minl
+do
+uppltotf -kanji=uptex basepl/ubase-h.pl tfm/up${series}${face}-h.tfm
+uppltotf -kanji=uptex basepl/ubase-v.pl tfm/up${series}${face}-v.tfm
+done
+done
+
+
echo "making vf (wait a while)..."
-perl script/mkutfvf_sp.pl
-./umkjvf -ucs -sp 1 -cq upnmlminr-h uphminr-h
-./umkjvf -ucs -sp 1 -cm -cp upnmlminr-v uphminr-v
-./umkjvf -ucs -sp 1 -cq upnmlgothr-h uphgothr-h
-./umkjvf -ucs -sp 1 -cm -cp upnmlgothr-v uphgothr-v
-./umkjvf -ucs -sp 1 -cq upnmlminb-h uphminb-h
-./umkjvf -ucs -sp 1 -cm -cp upnmlminb-v uphminb-v
-./umkjvf -ucs -sp 1 -cq upnmlgothb-h uphgothb-h
-./umkjvf -ucs -sp 1 -cm -cp upnmlgothb-v uphgothb-v
-./umkjvf -ucs -sp 1 -cq upnmlmgothr-h uphmgothr-h
-./umkjvf -ucs -sp 1 -cm -cp upnmlmgothr-v uphmgothr-v
+for face in minr gothr minb gothb mgothr
+do
+./umkjvf -ucs -sp 1 -cq upnml${face}-h uph${face}-h
+./umkjvf -ucs -sp 1 -cm -cp upnml${face}-v uph${face}-v
+done
#extra fonts
-./umkjvf -ucs -sp 1 -cq upnmlgotheb-h uphgotheb-h
-./umkjvf -ucs -sp 1 -cm -cp upnmlgotheb-v uphgotheb-v
-./umkjvf -ucs -sp 1 -cq upnmlminl-h uphminl-h
-./umkjvf -ucs -sp 1 -cm -cp upnmlminl-v uphminl-v
+for face in gotheb minl
+do
+./umkjvf -ucs -sp 1 -cq upnml${face}-h uph${face}-h
+./umkjvf -ucs -sp 1 -cm -cp upnml${face}-v uph${face}-v
+done
+
echo "making alt. kana ..."
-./umkjvf -ucs -sp 1 -cq -expert upexpminr-h uphminr-h cidjminr
-./umkjvf -ucs -sp 1 -cm -cp -expert upexpminr-v uphminr-v cidjminr
-./umkjvf -ucs -sp 1 -cq -expert upexpgothr-h uphgothr-h cidjgothr
-./umkjvf -ucs -sp 1 -cm -cp -expert upexpgothr-v uphgothr-v cidjgothr
-./umkjvf -ucs -sp 1 -cq -expert upexpminb-h uphminb-h cidjminb
-./umkjvf -ucs -sp 1 -cm -cp -expert upexpminb-v uphminb-v cidjminb
-./umkjvf -ucs -sp 1 -cq -expert upexpgothb-h uphgothb-h cidjgothb
-./umkjvf -ucs -sp 1 -cm -cp -expert upexpgothb-v uphgothb-v cidjgothb
-./umkjvf -ucs -sp 1 -cq -expert upexpmgothr-h uphmgothr-h cidjmgothr
-./umkjvf -ucs -sp 1 -cm -cp -expert upexpmgothr-v uphmgothr-v cidjmgothr
-./umkjvf -ucs -sp 1 -cq -ruby uprubyminr-h uphminr-h cidjminr
-./umkjvf -ucs -sp 1 -cm -cp -ruby uprubyminr-v uphminr-v cidjminr
-./umkjvf -ucs -sp 1 -cq -ruby uprubygothr-h uphgothr-h cidjgothr
-./umkjvf -ucs -sp 1 -cm -cp -ruby uprubygothr-v uphgothr-v cidjgothr
-./umkjvf -ucs -sp 1 -cq -ruby uprubyminb-h uphminb-h cidjminb
-./umkjvf -ucs -sp 1 -cm -cp -ruby uprubyminb-v uphminb-v cidjminb
-./umkjvf -ucs -sp 1 -cq -ruby uprubygothb-h uphgothb-h cidjgothb
-./umkjvf -ucs -sp 1 -cm -cp -ruby uprubygothb-v uphgothb-v cidjgothb
-./umkjvf -ucs -sp 1 -cq -ruby uprubymgothr-h uphmgothr-h cidjmgothr
-./umkjvf -ucs -sp 1 -cm -cp -ruby uprubymgothr-v uphmgothr-v cidjmgothr
-./umkjvf -ucs -sp 1 -cq -expert upexpminl-h uphminl-h cidjminl
-./umkjvf -ucs -sp 1 -cm -cp -expert upexpminl-v uphminl-v cidjminl
-./umkjvf -ucs -sp 1 -cq -ruby uprubyminl-h uphminl-h cidjminl
-./umkjvf -ucs -sp 1 -cm -cp -ruby uprubyminl-v uphminl-v cidjminl
-./umkjvf -ucs -sp 1 -cq -expert upexpgotheb-h uphgotheb-h cidjgotheb
-./umkjvf -ucs -sp 1 -cm -cp -expert upexpgotheb-v uphgotheb-v cidjgotheb
-./umkjvf -ucs -sp 1 -cq -ruby uprubygotheb-h uphgotheb-h cidjgotheb
-./umkjvf -ucs -sp 1 -cm -cp -ruby uprubygotheb-v uphgotheb-v cidjgotheb
+for face in minr gothr minb gothb mgothr
+do
+./umkjvf -ucs -sp 1 -cq -expert upexp${face}-h uph${face}-h cidj${face}
+./umkjvf -ucs -sp 1 -cm -cp -expert upexp${face}-v uph${face}-v cidj${face}
+./umkjvf -ucs -sp 1 -cq -ruby upruby${face}-h uph${face}-h cidj${face}
+./umkjvf -ucs -sp 1 -cm -cp -ruby upruby${face}-v uph${face}-v cidj${face}
+done
+#extra fonts
+for face in gotheb minl
+do
+./umkjvf -ucs -sp 1 -cq -expert upexp${face}-h uph${face}-h cidj${face}
+./umkjvf -ucs -sp 1 -cm -cp -expert upexp${face}-v uph${face}-v cidj${face}
+./umkjvf -ucs -sp 1 -cq -ruby upruby${face}-h uph${face}-h cidj${face}
+./umkjvf -ucs -sp 1 -cm -cp -ruby upruby${face}-v uph${face}-v cidj${face}
+done
+
+
echo "making tfm for supplementary plane ..."
perl script/mktfm_sp.pl
echo "making vf for supplementary plane ..."
perl script/mkutfvf_sp.pl
+
+
echo "finishing ..."
if test ! -d vf; then
mkdir vf
diff --git a/Master/texmf-dist/source/fonts/japanese-otf-uptex/umakeotf_brsg b/Master/texmf-dist/source/fonts/japanese-otf-uptex/umakeotf_brsg
index f143b77fe43..cb0f49a1b00 100755
--- a/Master/texmf-dist/source/fonts/japanese-otf-uptex/umakeotf_brsg
+++ b/Master/texmf-dist/source/fonts/japanese-otf-uptex/umakeotf_brsg
@@ -1,70 +1,62 @@
#!/bin/sh
+#
+# This script is a part of otfbeta-uptex (a.k.a. japanese-otf-uptex).
+#
+
#OVP2OVF='omfonts -ovp2ovf'
-OVP2OVF='wovp2ovf'
-export 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/upbrsgexpgotheb-h.tfm
-uppltotf -kanji=uptex basepl/ubrsg-v.pl tfm/upbrsgexpgotheb-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 -cm -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 upbrsgexpgotheb-h uphgotheb-h cidjgotheb
-./umkjvf -ucs -sp 1 -sage -cm -cp -expert upbrsgexpgotheb-v uphgotheb-v cidjgotheb
-./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 "making tfm for burasage ..."
+for series in nml exp
+do
+for face in minr gothr minb gothb mgothr
+do
+uppltotf -kanji=uptex basepl/ubrsg-h.pl tfm/upbrsg${series}${face}-h.tfm
+uppltotf -kanji=uptex basepl/ubrsg-v.pl tfm/upbrsg${series}${face}-v.tfm
+done
+done
+#extra fonts
+for series in nml exp
+do
+for face in gotheb minl
+do
+uppltotf -kanji=uptex basepl/ubrsg-h.pl tfm/upbrsg${series}${face}-h.tfm
+uppltotf -kanji=uptex basepl/ubrsg-v.pl tfm/upbrsg${series}${face}-v.tfm
+done
+done
+
+
+echo "making vf for burasage ..."
+for face in minr gothr minb gothb mgothr
+do
+./umkjvf -ucs -sp 1 -sage -cq upbrsgnml${face}-h uph${face}-h
+./umkjvf -ucs -sp 1 -sage -cm -cp upbrsgnml${face}-v uph${face}-v
+done
+#extra fonts
+for face in gotheb minl
+do
+./umkjvf -ucs -sp 1 -sage -cq upbrsgnml${face}-h uph${face}-h
+./umkjvf -ucs -sp 1 -sage -cm -cp upbrsgnml${face}-v uph${face}-v
+done
+for face in minr gothr minb gothb mgothr
+do
+./umkjvf -ucs -sp 1 -sage -cq -expert upbrsgexp${face}-h uph${face}-h cidj${face}
+./umkjvf -ucs -sp 1 -sage -cm -cp -expert upbrsgexp${face}-v uph${face}-v cidj${face}
+done
+#extra fonts
+for face in gotheb minl
+do
+./umkjvf -ucs -sp 1 -sage -cq -expert upbrsgexp${face}-h uph${face}-h cidj${face}
+./umkjvf -ucs -sp 1 -sage -cm -cp -expert upbrsgexp${face}-v uph${face}-v cidj${face}
+done
+
echo "finishing ..."
if test ! -d vf; then
diff --git a/Master/texmf-dist/source/fonts/japanese-otf-uptex/umakeotf_jis04 b/Master/texmf-dist/source/fonts/japanese-otf-uptex/umakeotf_jis04
new file mode 100755
index 00000000000..75d43601600
--- /dev/null
+++ b/Master/texmf-dist/source/fonts/japanese-otf-uptex/umakeotf_jis04
@@ -0,0 +1,113 @@
+#!/bin/sh
+
+#
+# This script is a part of otfbeta-uptex (a.k.a. japanese-otf-uptex).
+#
+
+#OVP2OVF="../../../omfonts -ovp2ovf"
+#OVP2OVF='wovp2ovf'
+#export OVP2OVF
+
+if test ! -d tfm; then
+mkdir tfm
+fi
+
+
+echo "making tfm for jis2004 ..."
+for series in nml exp
+do
+for face in minr gothr minb gothb mgothr
+do
+uppltotf -kanji=uptex basepl/ubase-h.pl tfm/up${series}${face}n-h.tfm
+uppltotf -kanji=uptex basepl/ubase-v.pl tfm/up${series}${face}n-v.tfm
+done
+done
+#for extra fonts
+for series in nml exp
+do
+for face in gotheb minl
+do
+uppltotf -kanji=uptex basepl/ubase-h.pl tfm/up${series}${face}n-h.tfm
+uppltotf -kanji=uptex basepl/ubase-v.pl tfm/up${series}${face}n-v.tfm
+done
+done
+
+
+echo "making tfm for burasage & jis2004 ..."
+for series in nml exp
+do
+for face in minr gothr minb gothb mgothr
+do
+uppltotf -kanji=uptex basepl/ubrsg-h.pl tfm/upbrsg${series}${face}n-h.tfm
+uppltotf -kanji=uptex basepl/ubrsg-v.pl tfm/upbrsg${series}${face}n-v.tfm
+done
+done
+#for extra fonts
+for series in nml exp
+do
+for face in gotheb minl
+do
+uppltotf -kanji=uptex basepl/ubrsg-h.pl tfm/upbrsg${series}${face}n-h.tfm
+uppltotf -kanji=uptex basepl/ubrsg-v.pl tfm/upbrsg${series}${face}n-v.tfm
+done
+done
+
+
+echo "making vf for jis2004 ..."
+for face in minr gothr minb gothb mgothr
+do
+./umkjvf -ucs -sp 1 -cq upnml${face}n-h uph${face}n-h
+./umkjvf -ucs -sp 1 -cm -cp upnml${face}n-v uph${face}n-v
+done
+#extra fonts
+for face in gotheb minl
+do
+./umkjvf -ucs -sp 1 -cq upnml${face}n-h uph${face}n-h
+./umkjvf -ucs -sp 1 -cm -cp upnml${face}n-v uph${face}n-v
+done
+
+for face in minr gothr minb gothb mgothr
+do
+./umkjvf -ucs -sp 1 -cq -expert upexp${face}n-h uph${face}n-h cidj${face}
+./umkjvf -ucs -sp 1 -cm -cp -expert upexp${face}n-v uph${face}n-v cidj${face}
+done
+#extra fonts
+for face in gotheb minl
+do
+./umkjvf -ucs -sp 1 -cq -expert upexp${face}n-h uph${face}n-h cidj${face}
+./umkjvf -ucs -sp 1 -cm -cp -expert upexp${face}n-v uph${face}n-v cidj${face}
+done
+
+
+echo "making vf for burasage & jis2004 ..."
+for face in minr gothr minb gothb mgothr
+do
+./umkjvf -ucs -sp 1 -sage -cq upbrsgnml${face}n-h uph${face}n-h
+./umkjvf -ucs -sp 1 -sage -cm -cp upbrsgnml${face}n-v uph${face}n-v
+done
+#extra fonts
+for face in gotheb minl
+do
+./umkjvf -ucs -sp 1 -sage -cq upbrsgnml${face}n-h uph${face}n-h
+./umkjvf -ucs -sp 1 -sage -cm -cp upbrsgnml${face}n-v uph${face}n-v
+done
+
+for face in minr gothr minb gothb mgothr
+do
+./umkjvf -ucs -sp 1 -sage -cq -expert upbrsgexp${face}n-h uph${face}n-h cidj${face}
+./umkjvf -ucs -sp 1 -sage -cm -cp -expert upbrsgexp${face}n-v uph${face}n-v cidj${face}
+done
+#extra fonts
+for face in gotheb minl
+do
+./umkjvf -ucs -sp 1 -sage -cq -expert upbrsgexp${face}n-h uph${face}n-h cidj${face}
+./umkjvf -ucs -sp 1 -sage -cm -cp -expert upbrsgexp${face}n-v uph${face}n-v cidj${face}
+done
+
+
+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 ee88ff50e2a..a9ed37a2c81 100755
--- a/Master/texmf-dist/source/fonts/japanese-otf-uptex/umkjvf
+++ b/Master/texmf-dist/source/fonts/japanese-otf-uptex/umkjvf
@@ -440,7 +440,7 @@ sub make_tfm {
#### dfn of sub sub rtns ###
##############################
sub print_help {
- print "This is umkjvf version 0.10 (2012/4/21) by ttk\n";
+ print "This is umkjvf version 0.12 (2013/6/02) by ttk\n";
print "Based on mkjvf version 1.0b21 (2010/3/25) by psitau\n";
print "Usage: umkjvf [option] <TFMfile> <PSfontTFM> [<PSfontTFM>]\n";
print " -b <number> baseline shift\n";
@@ -569,12 +569,12 @@ sub get_face{
$face="cidjmb";
}elsif($kanji_font =~ /hgothb/){
$face="cidjgb";
- }elsif($kanji_font =~ /hgotheb/){
- $face="cidjge";
}elsif($kanji_font =~ /hmgothr/){
$face="cidjmgr";
}elsif($kanji_font =~ /hminl/){
$face="cidjml";
+ }elsif($kanji_font =~ /hgotheb/){
+ $face="cidjge";
}
}
}
@@ -1174,11 +1174,11 @@ sub is_ucs_jpn_range{
}
__END__
-0xFF5F: JIS X 0213 1-02-54 ϤťС졼
-0x3018: JIS X 0213 1-02-56 Ϥŵó
-0x3016: JIS X 0213 1-02-58 Ϥ᤹դ()
-0x301D: JIS X 0213 1-13-64 Ϥ֥ߥ˥塼
-0xFF60: JIS X 0213 1-02-55 ťС졼
-0x3019: JIS X 0213 1-02-57 ŵó
-0x3017: JIS X 0213 1-02-59 ꤹդ()
-0x301F: JIS X 0213 1-13-65 ֥ߥ˥塼
+0xFF5F: JIS X 0213 1-02-54 FULLWIDTH LEFT WHITE PARENTHESIS 始め二重バーレーン
+0x3018: JIS X 0213 1-02-56 LEFT WHITE TORTOISE SHELL BRACKET 始め二重亀甲括弧
+0x3016: JIS X 0213 1-02-58 LEFT WHITE LENTICULAR BRACKET 始めすみ付き括弧(白)
+0x301D: JIS X 0213 1-13-64 REVERSED DOUBLE PRIME QUOTATION MARK 始めダブルミニュート
+0xFF60: JIS X 0213 1-02-55 FULLWIDTH RIGHT WHITE PARENTHESIS 終わり二重バーレーン
+0x3019: JIS X 0213 1-02-57 RIGHT WHITE TORTOISE SHELL BRACKET 終わり二重亀甲括弧
+0x3017: JIS X 0213 1-02-59 RIGHT WHITE LENTICULAR BRACKET 終わりすみ付き括弧(白)
+0x301F: JIS X 0213 1-13-65 LOW DOUBLE PRIME QUOTATION MARK 終わりダブルミニュート
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 441931fc6b2..077153c39f9 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.11 ttk]
+\ProvidesPackage{mlutf}[2004/04/17 v1.1.2 psitau, u0.12 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 14e879e44d9..1e6a0faf9a9 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.11 ttk]
+\ProvidesPackage{otf}[2012/04/11 v1.7b5 psitau, u0.12 ttk]
%for processing options
\newif\if@kana \@kanafalse
\newif\if@macro \@macrotrue
@@ -389,6 +389,8 @@
\DeclareFontShape{\otf@JTn}{rubymg}{m}{n}{<-> s * [\utf@sc@le] \otf@pfx@ rubymgothr-v}{}
\DeclareFontShape{\otf@JYn}{hmc}{l}{n}{<-> s * [\utf@sc@le] \otf@pfx@ \brsg@pfx@ expminl\nlck@sfx@-h}{}
\DeclareFontShape{\otf@JTn}{hmc}{l}{n}{<-> s * [\utf@sc@le] \otf@pfx@ \brsg@pfx@ expminl\nlck@sfx@-v}{}
+ \DeclareFontShape{\otf@JYn}{hgt}{eb}{n}{<-> s * [\utf@sc@le] \otf@pfx@ \brsg@pfx@ expgotheb\nlck@sfx@-h}{}
+ \DeclareFontShape{\otf@JTn}{hgt}{eb}{n}{<-> s * [\utf@sc@le] \otf@pfx@ \brsg@pfx@ expgotheb\nlck@sfx@-v}{}
\DeclareFontShape{\otf@JYn}{ruby}{l}{n}{<-> s * [\utf@sc@le] \otf@pfx@ rubyminl-h}{}
\DeclareFontShape{\otf@JTn}{ruby}{l}{n}{<-> s * [\utf@sc@le] \otf@pfx@ rubyminl-v}{}
\else
@@ -397,8 +399,8 @@
\DeclareFontShape{\otf@JYn}{hmc}{l}{n}{<-> s * [\utf@sc@le] \otf@pfx@ nmlminl\nlck@sfx@-h}{}
\DeclareFontShape{\otf@JTn}{hmc}{l}{n}{<-> s * [\utf@sc@le] \otf@pfx@ nmlminl\nlck@sfx@-v}{}
\fi
- \DeclareFontShape{\otf@JYn}{hgt}{eb}{n}{<-> s * [\utf@sc@le] \otf@pfx@ \brsg@pfx@ nmlgotheb-h}{}
- \DeclareFontShape{\otf@JTn}{hgt}{eb}{n}{<-> s * [\utf@sc@le] \otf@pfx@ \brsg@pfx@ nmlgotheb-v}{}
+ \DeclareFontShape{\otf@JYn}{hgt}{eb}{n}{<-> s * [\utf@sc@le] \otf@pfx@ \brsg@pfx@ nmlgotheb\nlck@sfx@-h}{}
+ \DeclareFontShape{\otf@JTn}{hgt}{eb}{n}{<-> s * [\utf@sc@le] \otf@pfx@ \brsg@pfx@ nmlgotheb\nlck@sfx@-v}{}
\DeclareFontShape{\otf@JYn}{hmc}{m}{prp}{<-> s * [\utf@sc@le] \otf@pfx@ phiraminw3-h}{}
\DeclareFontShape{\otf@JYn}{hmc}{bx}{prp}{<-> s * [\utf@sc@le] \otf@pfx@ phiraminw6-h}{}
\DeclareFontShape{\otf@JYn}{hgt}{m}{prp}{<-> s * [\utf@sc@le] \otf@pfx@ phirakakuw3-h}{}
@@ -429,6 +431,8 @@
\Declare@FontShape{cidjg}{m}{012345}{cidjgr}
\Declare@FontShape{utfjg}{bx}{0123456789abcdefjklmnopqrstuvz}{utfjgb\nlck@sfx@}
\Declare@FontShape{cidjg}{bx}{012345}{cidjgb}
+ \Declare@FontShape{utfjg}{eb}{0123456789abcdefjklmnopqrstuvz}{utfjgb\nlck@sfx@}
+ \Declare@FontShape{cidjg}{eb}{012345}{cidjgb}
\DeclareKanjiFamily{\otf@JYn}{utfjmg}{}
\DeclareKanjiFamily{\otf@JTn}{utfjmg}{}
\DeclareKanjiFamily{\otf@JYn}{cidjmg}{}