diff options
| author | Norbert Preining <preining@logic.at> | 2012-02-20 15:32:33 +0000 |
|---|---|---|
| committer | Norbert Preining <preining@logic.at> | 2012-02-20 15:32:33 +0000 |
| commit | 7a098c96ea590aa07db0ba411669058184f0f2e6 (patch) | |
| tree | 2118042392b5c932633daf347209c379b6aa3ffc /Master/texmf-dist/source/fonts/japanese-otf-uptex | |
| parent | 2e8121eaa74ac73aad2c7cfd4ef0eab4281e8d36 (diff) | |
update japanese-otf-uptex 0.09
git-svn-id: svn://tug.org/texlive/trunk@25438 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/fonts/japanese-otf-uptex')
25 files changed, 1031 insertions, 1103 deletions
diff --git a/Master/texmf-dist/source/fonts/japanese-otf-uptex/basepl/ubase-h.pl b/Master/texmf-dist/source/fonts/japanese-otf-uptex/basepl/ubase-h.pl index d9bafd5e747..50f3311d3ab 100644 --- a/Master/texmf-dist/source/fonts/japanese-otf-uptex/basepl/ubase-h.pl +++ b/Master/texmf-dist/source/fonts/japanese-otf-uptex/basepl/ubase-h.pl @@ -69,24 +69,24 @@ (STOP) ) (CHARSINTYPE O 1 - $B!F(B $B!H(B $B!J(B $B!L(B $B!N(B $B!P(B $B!R(B $B!T(B $B!V(B $B!X(B $B!Z(B + ‘ “ （ 〔 ［ ｛ 〈 《 「 『 【 UFF5F U3018 U3016 U301D ) (CHARSINTYPE O 2 - $B!"(B $B!$(B $B!G(B $B!I(B $B!K(B $B!M(B $B!O(B $B!Q(B $B!S(B $B!U(B $B!W(B $B!Y(B $B![(B + 、 ， ’ ” ） 〕 ］ ｝ 〉 》 」 』 】 UFF60 U3019 U3017 U301F ) (CHARSINTYPE O 3 - $B!&(B $B!'(B $B!((B + ・ ： ； ) (CHARSINTYPE O 4 - $B!#(B $B!%(B + 。 ． ) (CHARSINTYPE O 5 - $B!=(B $B!D(B $B!E(B + — ― … ‥ ) (CHARSINTYPE O 6 - $B!)(B $B!*(B + ？ ！ ) (CHARSINTYPE O 7 UFF61 UFF62 UFF63 UFF64 UFF65 UFF66 UFF67 diff --git a/Master/texmf-dist/source/fonts/japanese-otf-uptex/basepl/ubase-v.pl b/Master/texmf-dist/source/fonts/japanese-otf-uptex/basepl/ubase-v.pl index 76154f5e808..4686d526feb 100644 --- a/Master/texmf-dist/source/fonts/japanese-otf-uptex/basepl/ubase-v.pl +++ b/Master/texmf-dist/source/fonts/japanese-otf-uptex/basepl/ubase-v.pl @@ -59,24 +59,24 @@ (STOP) ) (CHARSINTYPE O 1 - $B!F(B $B!H(B $B!J(B $B!L(B $B!N(B $B!P(B $B!R(B $B!T(B $B!V(B $B!X(B $B!Z(B + ‘ “ （ 〔 ［ ｛ 〈 《 「 『 【 UFF5F U3018 U3016 U301D ) (CHARSINTYPE O 2 - $B!"(B $B!$(B $B!G(B $B!I(B $B!K(B $B!M(B $B!O(B $B!Q(B $B!S(B $B!U(B $B!W(B $B!Y(B $B![(B + 、 ， ’ ” ） 〕 ］ ｝ 〉 》 」 』 】 UFF60 U3019 U3017 U301F ) (CHARSINTYPE O 3 - $B!&(B $B!'(B $B!((B + ・ ： ； ) (CHARSINTYPE O 4 - $B!#(B $B!%(B + 。 ． ) (CHARSINTYPE O 5 - $B!=(B $B!D(B $B!E(B + — ― … ‥ ) (CHARSINTYPE O 6 - $B!)(B $B!*(B + ？ ！ ) (TYPE O 0 (CHARWD R 1.0) diff --git a/Master/texmf-dist/source/fonts/japanese-otf-uptex/fontmap/ckt.map(for udvips) b/Master/texmf-dist/source/fonts/japanese-otf-uptex/fontmap/ckt.map(for udvips) deleted file mode 100644 index 2f1e1715473..00000000000 --- a/Master/texmf-dist/source/fonts/japanese-otf-uptex/fontmap/ckt.map(for udvips) +++ /dev/null @@ -1,26 +0,0 @@ -%font from acrobat5 -otf-utmr-h MSungStd-Light-Acro-UniCNS-UCS2-H -otf-utmr-v MSungStd-Light-Acro-UniCNS-UCS2-V -otf-utgr-h MHei-Medium-UniCNS-UCS2-H -otf-utgr-v MHei-Medium-UniCNS-UCS2-V -otf-ucmr-h STSongStd-Light-Acro-UniGB-UCS2-H -otf-ucmr-v STSongStd-Light-Acro-UniGB-UCS2-V -otf-ucgr-h STHeiti-Regular-UniGB-UCS2-H -otf-ucgr-v STHeiti-Regular-UniGB-UCS2-V -otf-ukmr-h HYSMyeongJoStd-Medium-Acro-UniKS-UCS2-H -otf-ukmr-v HYSMyeongJoStd-Medium-Acro-UniKS-UCS2-V -otf-ukgr-h HYGoThic-Medium-UniKS-UCS2-H -otf-ukgr-v HYGoThic-Medium-UniKS-UCS2-V - -otf-ctmr-h MSungStd-Light-Acro-Identity-H -otf-ctmr-v MSungStd-Light-Acro-Identity-V -otf-ctgr-h MHei-Medium-Identity-H -otf-ctgr-v MHei-Medium-Identity-V -otf-ccmr-h STSongStd-Light-Acro-Identity-H -otf-ccmr-v STSongStd-Light-Acro-Identity-V -otf-ccgr-h STHeiti-Regular-Identity-H -otf-ccgr-v STHeiti-Regular-Identity-V -otf-ckmr-h HYSMyeongJoStd-Medium-Acro-Identity-H -otf-ckmr-v HYSMyeongJoStd-Medium-Acro-Identity-V -otf-ckgr-h HYGoThic-Medium-Identity-H -otf-ckgr-v HYGoThic-Medium-Identity-V diff --git a/Master/texmf-dist/source/fonts/japanese-otf-uptex/fontmap/cktx.map(for dvipdfmx) b/Master/texmf-dist/source/fonts/japanese-otf-uptex/fontmap/cktx.map(for dvipdfmx) deleted file mode 100644 index 857bb5a51f3..00000000000 --- a/Master/texmf-dist/source/fonts/japanese-otf-uptex/fontmap/cktx.map(for dvipdfmx) +++ /dev/null @@ -1,30 +0,0 @@ -%font from acrobat5 -otf-ukmr-h UniKS-UCS2-H HYSMyeongJoStd-Medium-Acro -otf-ukmr-v UniKS-UCS2-V HYSMyeongJoStd-Medium-Acro -otf-ukgr-h UniKS-UCS2-H HYGoThic-Medium -otf-ukgr-v UniKS-UCS2-V HYGoThic-Medium - -otf-ucmr-h UniGB-UCS2-H STSongStd-Light-Acro -otf-ucmr-v UniGB-UCS2-V STSongStd-Light-Acro -otf-ucgr-h UniGB-UCS2-H STHeiti-Regular -otf-ucgr-v UniGB-UCS2-V STHeiti-Regular - -otf-utmr-h UniCNS-UCS2-H MSungStd-Light-Acro -otf-utmr-v UniCNS-UCS2-V MSungStd-Light-Acro -otf-utgr-h UniCNS-UCS2-H MHei-Medium -otf-utgr-v UniCNS-UCS2-V MHei-Medium - -otf-ckmr-h Identity-H HYSMyeongJoStd-Medium-Acro -otf-ckmr-v Identity-V HYSMyeongJoStd-Medium-Acro -otf-ckgr-h Identity-H HYGoThic-Medium -otf-ckgr-v Identity-V HYGoThic-Medium - -otf-ccmr-h Identity-H STSongStd-Light-Acro -otf-ccmr-v Identity-V STSongStd-Light-Acro -otf-ccgr-h Identity-H STHeiti-Regular -otf-ccgr-v Identity-V STHeiti-Regular - -otf-ctmr-h Identity-H MSungStd-Light-Acro -otf-ctmr-v Identity-V MSungStd-Light-Acro -otf-ctgr-h Identity-H MHei-Medium -otf-ctgr-v Identity-V MHei-Medium diff --git a/Master/texmf-dist/source/fonts/japanese-otf-uptex/fontmap/hiragino.map(for udvips) b/Master/texmf-dist/source/fonts/japanese-otf-uptex/fontmap/hiragino.map(for udvips) deleted file mode 100644 index 9b8cb0b6622..00000000000 --- a/Master/texmf-dist/source/fonts/japanese-otf-uptex/fontmap/hiragino.map(for udvips) +++ /dev/null @@ -1,100 +0,0 @@ -otf-ujmr-h HiraMinPro-W3-UniJIS-UTF16-H -otf-ujmr-v HiraMinPro-W3-UniJIS-UTF16-V -otf-cjmr-h HiraMinPro-W3-Identity-H -otf-cjmr-v HiraMinPro-W3-Identity-V -hminr-h HiraMinPro-W3-H -hminr-v HiraMinPro-W3-V -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 -otf-cjgr-h HiraKakuPro-W3-Identity-H -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 -otf-cjmb-h HiraMinPro-W6-Identity-H -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 -otf-ujgb-h HiraKakuPro-W6-UniJIS-UTF16-H -otf-ujgb-v HiraKakuPro-W6-UniJIS-UTF16-V -hgothb-h HiraKakuPro-W6-H -hgothb-v HiraKakuPro-W6-V -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 -otf-cjmgr-h HiraMaruPro-W4-Identity-H -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 -otf-cjml-h HiraMinPro-W2-Identity-H -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 -hirakaku-w3-h HiraKakuPro-W3-Identity-H -hirakaku-w6-h HiraKakuPro-W6-Identity-H -hiramaru-w4-h HiraMaruPro-W4-Identity-H -hiramin-w3-v HiraMinPro-W3-Identity-V -hiramin-w6-v HiraMinPro-W6-Identity-V -hirakaku-w3-v HiraKakuPro-W3-Identity-V -hirakaku-w6-v HiraKakuPro-W6-Identity-V -hiramaru-w4-v HiraMaruPro-W4-Identity-V - -%for JIS X 0213:2004 -otf-ujmrn-h HiraMinProN-W3-UniJIS2004-UTF16-H -otf-ujmrn-v HiraMinProN-W3-UniJIS2004-UTF16-V -hminrn-h HiraMinProN-W3-H -hminrn-v HiraMinProN-W3-V - -otf-ujgrn-h HiraKakuProN-W3-UniJIS2004-UTF16-H -otf-ujgrn-v HiraKakuProN-W3-UniJIS2004-UTF16-V -hgothrn-h HiraKakuProN-W3-H -hgothrn-v HiraKakuProN-W3-V - -otf-ujmbn-h HiraMinProN-W6-UniJIS2004-UTF16-H -otf-ujmbn-v HiraMinProN-W6-UniJIS2004-UTF16-V -hminbn-h HiraMinProN-W6-H -hminbn-v HiraMinProN-W6-V - -otf-ujgbn-h HiraKakuProN-W6-UniJIS2004-UTF16-H -otf-ujgbn-v HiraKakuProN-W6-UniJIS2004-UTF16-V -hgothbn-h HiraKakuProN-W6-H -hgothbn-v HiraKakuProN-W6-V - -otf-ujmgrn-h HiraMaruProN-W4-UniJIS2004-UTF16-H -otf-ujmgrn-v HiraMaruProN-W4-UniJIS2004-UTF16-V -hmgothrn-h HiraMaruProN-W4-H -hmgothrn-v HiraMaruProN-W4-V - -otf-ujmln-h HiraMinProN-W2-UniJIS2004-UTF16-H -otf-ujmln-v HiraMinProN-W2-UniJIS2004-UTF16-V -hminln-h HiraMinProN-W2-H -hminln-v HiraMinProN-W2-V diff --git a/Master/texmf-dist/source/fonts/japanese-otf-uptex/fontmap/hiraginox.map(for dvipdfmx) b/Master/texmf-dist/source/fonts/japanese-otf-uptex/fontmap/hiraginox.map(for dvipdfmx) deleted file mode 100644 index 1dd6cb922d4..00000000000 --- a/Master/texmf-dist/source/fonts/japanese-otf-uptex/fontmap/hiraginox.map(for dvipdfmx) +++ /dev/null @@ -1,100 +0,0 @@ -otf-ujmr-h UniJIS-UTF16-H HiraMinPro-W3 -otf-ujmr-v UniJIS-UTF16-V HiraMinPro-W3 -otf-cjmr-h Identity-H HiraMinPro-W3 -otf-cjmr-v Identity-V HiraMinPro-W3 -hminr-h H HiraMinPro-W3 -hminr-v V HiraMinPro-W3 -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 -otf-cjgr-h Identity-H HiraKakuPro-W3 -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 -otf-cjmb-h Identity-H HiraMinPro-W6 -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 -otf-cjgb-h Identity-H HiraKakuPro-W6 -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 -otf-cjmgr-h Identity-H HiraMaruPro-W4 -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 -otf-cjml-h Identity-H HiraMinPro-W2 -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 -hirakaku-w3-h Identity-H HiraKakuPro-W3 -hirakaku-w6-h Identity-H HiraKakuPro-W6 -hiramaru-w4-h Identity-H HiraMaruPro-W4 -hiramin-w3-v Identity-V HiraMinPro-W3 -hiramin-w6-v Identity-V HiraMinPro-W6 -hirakaku-w3-v Identity-V HiraKakuPro-W3 -hirakaku-w6-v Identity-V HiraKakuPro-W6 -hiramaru-w4-v Identity-V HiraMaruPro-W4 - -%for JIS X 0213:2004 -otf-ujmrn-h UniJIS2004-UTF16-H HiraMinProN-W3 -otf-ujmrn-v UniJIS2004-UTF16-V HiraMinProN-W3 -hminrn-h H HiraMinProN-W3 -hminrn-v V HiraMinProN-W3 - -otf-ujgrn-h UniJIS2004-UTF16-H HiraKakuProN-W3 -otf-ujgrn-v UniJIS2004-UTF16-V HiraKakuProN-W3 -hgothrn-h H HiraKakuProN-W3 -hgothrn-v V HiraKakuProN-W3 - -otf-ujmbn-h UniJIS2004-UTF16-H HiraMinProN-W6 -otf-ujmbn-v UniJIS2004-UTF16-V HiraMinProN-W6 -hminbn-h H HiraMinProN-W6 -hminbn-v V HiraMinProN-W6 - -otf-ujgbn-h UniJIS2004-UTF16-H HiraKakuProN-W6 -otf-ujgbn-v UniJIS2004-UTF16-V HiraKakuProN-W6 -hgothbn-h H HiraKakuProN-W6 -hgothbn-v V HiraKakuProN-W6 - -otf-ujmgrn-h UniJIS2004-UTF16-H HiraMaruProN-W4 -otf-ujmgrn-v UniJIS2004-UTF16-V HiraMaruProN-W4 -hmgothrn-h H HiraMaruProN-W4 -hmgothrn-v V HiraMaruProN-W4 - -otf-ujmln-h UniJIS2004-UTF16-H HiraMinProN-W2 -otf-ujmln-v UniJIS2004-UTF16-V HiraMinProN-W2 -hminln-h H HiraMinProN-W2 -hminln-v V HiraMinProN-W2 diff --git a/Master/texmf-dist/source/fonts/japanese-otf-uptex/fontmap/kozuka.map b/Master/texmf-dist/source/fonts/japanese-otf-uptex/fontmap/kozuka.map deleted file mode 100644 index 8628a2b4b66..00000000000 --- a/Master/texmf-dist/source/fonts/japanese-otf-uptex/fontmap/kozuka.map +++ /dev/null @@ -1,61 +0,0 @@ -otf-ujmr-h KozMinPro-Regular-Acro-UniJIS-UTF16-H -otf-ujmr-v KozMinPro-Regular-Acro-UniJIS-UTF16-V -otf-cjmr-h KozMinPro-Regular-Acro-Identity-H -otf-cjmr-v KozMinPro-Regular-Acro-Identity-V -hminr-h KozMinPro-Regular-Acro-H -hminr-v KozMinPro-Regular-Acro-V -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 -otf-cjgr-h KozGoStd-Regular-Identity-H -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 -otf-cjmb-h KozMinStd-Bold-Identity-H -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 -otf-ujgb-h KozGoStd-Bold-UniJIS-UTF16-H -otf-ujgb-v KozGoStd-Bold-UniJIS-UTF16-V -hgothb-h KozGoStd-Bold-H -hgothb-v KozGoStd-Bold-V -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 -otf-cjmgr-h KozGoStd-Heavy-Identity-H -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 -% -otf-ujmr-h KozMinProVI-Regular-UniJIS-UTF16-H -otf-ujmr-v KozMinProVI-Regular-UniJIS-UTF16-V -otf-cjmr-h KozMinProVI-Regular-Identity-H -otf-cjmr-v KozMinProVI-Regular-Identity-V -hminr-h KozMinProVI-Regular-H -hminr-v KozMinProVI-Regular-V - -otf-ujgr-h KozGoPro-Medium-UniJIS-UTF16-H -otf-ujgr-v KozGoPro-Medium-UniJIS-UTF16-V -otf-cjgr-h KozGoPro-Medium-Identity-H -otf-cjgr-v KozGoPro-Medium-Identity-V -hgothr-h KozGoPro-Medium-H -hgothr-v KozGoPro-Medium-V diff --git a/Master/texmf-dist/source/fonts/japanese-otf-uptex/fontmap/kozukax.map b/Master/texmf-dist/source/fonts/japanese-otf-uptex/fontmap/kozukax.map deleted file mode 100644 index 5193f9e1965..00000000000 --- a/Master/texmf-dist/source/fonts/japanese-otf-uptex/fontmap/kozukax.map +++ /dev/null @@ -1,62 +0,0 @@ -otf-ujmr-h UniJIS-UTF16-H KozMinPro-Regular-Acro.otf -otf-ujmr-v UniJIS-UTF16-V KozMinPro-Regular-Acro.otf -otf-cjmr-h Identity-H KozMinPro-Regular-Acro.otf -otf-cjmr-v Identity-V KozMinPro-Regular-Acro.otf -hminr-h H KozMinPro-Regular-Acro.otf -hminr-v V KozMinPro-Regular-Acro.otf -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 -otf-cjgr-h Identity-H KozGoStd-Regular.otf -otf-cjgr-v Identity-V KozGoStd-Regular.otf -hgothr-h H KozGoStd-Regular.otf -hgothr-v V KozGoStd-Regular.otf -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 -otf-cjmb-h Identity-H KozMinStd-Bold.otf -otf-cjmb-v Identity-V KozMinStd-Bold.otf -hminb-h H KozMinStd-Bold.otf -hminb-v V KozMinStd-Bold.otf -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 -otf-ujgb-h UniJIS-UTF16-H KozGoStd-Bold.otf -otf-ujgb-v UniJIS-UTF16-V KozGoStd-Bold.otf -hgothb-h H KozGoStd-Bold.otf -hgothb-v V KozGoStd-Bold.otf -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 -otf-cjmgr-h Identity-H KozGoStd-Heavy.otf -otf-cjmgr-v Identity-V KozGoStd-Heavy.otf -hmgothr-h H KozGoStd-Heavy.otf -hmgothr-v V KozGoStd-Heavy.otf -uphmgothr-h UniJIS-UTF16-H KozGoStd-Heavy.otf -uphmgothr-v UniJIS-UTF16-V KozGoStd-Heavy.otf - - -% -%for Adobe Reader 7 -% -otf-ujmr-h UniJIS-UTF16-H KozMinProVI-Regular.otf -otf-ujmr-v UniJIS-UTF16-V KozMinProVI-Regular.otf -otf-cjmr-h Identity-H KozMinProVI-Regular.otf -otf-cjmr-v Identity-V KozMinProVI-Regular.otf -hminr-h H KozMinProVI-Regular.otf -hminr-v V KozMinProVI-Regular.otf - -otf-ujgr-h UniJIS-UTF16-H KozGoPro-Medium.otf -otf-ujgr-v UniJIS-UTF16-V KozGoPro-Medium.otf -otf-cjgr-h Identity-H KozGoPro-Medium.otf -otf-cjgr-v Identity-V KozGoPro-Medium.otf -hgothr-h H KozGoPro-Medium.otf -hgothr-v V KozGoPro-Medium.otf diff --git a/Master/texmf-dist/source/fonts/japanese-otf-uptex/fontmap/morisawa.map(for udvips) b/Master/texmf-dist/source/fonts/japanese-otf-uptex/fontmap/morisawa.map(for udvips) deleted file mode 100644 index 5f1312c0558..00000000000 --- a/Master/texmf-dist/source/fonts/japanese-otf-uptex/fontmap/morisawa.map(for udvips) +++ /dev/null @@ -1,44 +0,0 @@ -otf-ujmr-h RyuminPro-Light-UniJIS-UTF16-H -otf-ujmr-v RyuminPro-Light-UniJIS-UTF16-V -otf-cjmr-h RyuminPro-Light-Identity-H -otf-cjmr-v RyuminPro-Light-Identity-V -hminr-h RyuminPro-Light-H -hminr-v RyuminPro-Light-V -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 -otf-cjgr-h GothicBBBPro-Medium-Identity-H -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 -otf-cjmb-h FutoMinA101Pro-Bold-Identity-H -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 -otf-ujgb-h FutoGoB101Pro-Bold-UniJIS-UTF16-H -otf-ujgb-v FutoGoB101Pro-Bold-UniJIS-UTF16-V -hgothb-h FutoGoB101Pro-Bold-H -hgothb-v FutoGoB101Pro-Bold-V -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 -otf-cjmgr-h Jun101Pro-Light-Identity-H -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 --git a/Master/texmf-dist/source/fonts/japanese-otf-uptex/fontmap/morisawax.map(for dvipdfmx) b/Master/texmf-dist/source/fonts/japanese-otf-uptex/fontmap/morisawax.map(for dvipdfmx) deleted file mode 100644 index add0fac72bd..00000000000 --- a/Master/texmf-dist/source/fonts/japanese-otf-uptex/fontmap/morisawax.map(for dvipdfmx) +++ /dev/null @@ -1,44 +0,0 @@ -otf-ujmr-h UniJIS-UTF16-H A-OTF-RyuminPro-Light.otf -otf-ujmr-v UniJIS-UTF16-V A-OTF-RyuminPro-Light.otf -otf-cjmr-h Identity-H A-OTF-RyuminPro-Light.otf -otf-cjmr-v Identity-V A-OTF-RyuminPro-Light.otf -hminr-h H A-OTF-RyuminPro-Light.otf -hminr-v V A-OTF-RyuminPro-Light.otf -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 -otf-cjgr-h Identity-H A-OTF-GothicBBBPro-Medium.otf -otf-cjgr-v Identity-V A-OTF-GothicBBBPro-Medium.otf -hgothr-h H A-OTF-GothicBBBPro-Medium.otf -hgothr-v V A-OTF-GothicBBBPro-Medium.otf -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 -otf-cjmb-h Identity-H A-OTF-FutoMinA101Pro-Bold.otf -otf-cjmb-v Identity-V A-OTF-FutoMinA101Pro-Bold.otf -hminb-h H A-OTF-FutoMinA101Pro-Bold.otf -hminb-v V A-OTF-FutoMinA101Pro-Bold.otf -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 -otf-cjgb-h Identity-H A-OTF-FutoGoB101Pro-Bold.otf -otf-cjgb-v Identity-V A-OTF-FutoGoB101Pro-Bold.otf -hgothb-h H A-OTF-FutoGoB101Pro-Bold.otf -hgothb-v V A-OTF-FutoGoB101Pro-Bold.otf -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 -otf-cjmgr-h Identity-H A-OTF-Jun101Pro-Light.otf -otf-cjmgr-v Identity-V A-OTF-Jun101Pro-Light.otf -hmgothr-h H A-OTF-Jun101Pro-Light.otf -hmgothr-v V A-OTF-Jun101Pro-Light.otf -uphmgothr-h UniJIS-UTF16-H A-OTF-Jun101Pro-Light.otf -uphmgothr-v UniJIS-UTF16-V A-OTF-Jun101Pro-Light.otf diff --git a/Master/texmf-dist/source/fonts/japanese-otf-uptex/fontmap/vfontmap.txt b/Master/texmf-dist/source/fonts/japanese-otf-uptex/fontmap/vfontmap.txt deleted file mode 100644 index 21551a0d0e6..00000000000 --- a/Master/texmf-dist/source/fonts/japanese-otf-uptex/fontmap/vfontmap.txt +++ /dev/null @@ -1,67 +0,0 @@ -# UTF font (needed --with-vflib=vf2ft) -unijmin-h /usr/local/share/texmf/dvipdfm/CIDFont/HiraMinPro-W3.otf unicode -unijmin-v /usr/local/share/texmf/dvipdfm/CIDFont/HiraMinPro-W3.otf unicode -unijgoth-h /usr/local/share/texmf/dvipdfm/CIDFont/HiraKakuPro-W6.otf unicode -unijgoth-v /usr/local/share/texmf/dvipdfm/CIDFont/HiraKakuPro-W6.otf unicode -hmr /usr/local/share/texmf/dvipdfm/CIDFont/HiraMinPro-W3.otf -hmrv /usr/local/share/texmf/dvipdfm/CIDFont/HiraMinPro-W3.otf -hkb /usr/local/share/texmf/dvipdfm/CIDFont/HiraKakuPro-W6.otf -hkbv /usr/local/share/texmf/dvipdfm/CIDFont/HiraKakuPro-W6.otf - -# CID font (needed --with-vflib=vf2ft) -cidmin-h /usr/local/share/texmf/dvipdfm/CIDFont/HiraMinPro-W3.otf adobejapan -cidmin-v /usr/local/share/texmf/dvipdfm/CIDFont/HiraMinPro-W3.otf adobejapan -cidgoth-h /usr/local/share/texmf/dvipdfm/CIDFont/HiraKakuPro-W6.otf adobejapan -cidgoth-v /usr/local/share/texmf/dvipdfm/CIDFont/HiraKakuPro-W6.otf adobejapan - -otf-ujmr-h /usr/local/share/texmf/dvipdfm/CIDFont/HiraMinPro-W3.otf unicode -otf-ujmr-v /usr/local/share/texmf/dvipdfm/CIDFont/HiraMinPro-W3.otf unicode -otf-cjmr-h /usr/local/share/texmf/dvipdfm/CIDFont/HiraMinPro-W3.otf adobejapan -otf-cjmr-v /usr/local/share/texmf/dvipdfm/CIDFont/HiraMinPro-W3.otf adobejapan -hminr-h /usr/local/share/texmf/dvipdfm/CIDFont/HiraMinPro-W3.otf -hminr-v /usr/local/share/texmf/dvipdfm/CIDFont/HiraMinPro-W3.otf -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 -otf-cjgr-h /usr/local/share/texmf/dvipdfm/CIDFont/HiraKakuPro-W3.otf adobejapan -otf-cjgr-v /usr/local/share/texmf/dvipdfm/CIDFont/HiraKakuPro-W3.otf adobejapan -hgothr-h /usr/local/share/texmf/dvipdfm/CIDFont/HiraKakuPro-W3.otf -hgothr-v /usr/local/share/texmf/dvipdfm/CIDFont/HiraKakuPro-W3.otf -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 -otf-cjmb-h /usr/local/share/texmf/dvipdfm/CIDFont/HiraMinPro-W6.otf adobejapan -otf-cjmb-v /usr/local/share/texmf/dvipdfm/CIDFont/HiraMinPro-W6.otf adobejapan -hminb-h /usr/local/share/texmf/dvipdfm/CIDFont/HiraMinPro-W6.otf -hminb-v /usr/local/share/texmf/dvipdfm/CIDFont/HiraMinPro-W6.otf -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 -otf-cjgb-h /usr/local/share/texmf/dvipdfm/CIDFont/HiraKakuPro-W6.otf adobejapan -otf-cjgb-v /usr/local/share/texmf/dvipdfm/CIDFont/HiraKakuPro-W6.otf adobejapan -hgothb-h /usr/local/share/texmf/dvipdfm/CIDFont/HiraKakuPro-W6.otf -hgothb-v /usr/local/share/texmf/dvipdfm/CIDFont/HiraKakuPro-W6.otf -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 -otf-cjmgr-h /usr/local/share/texmf/dvipdfm/CIDFont/HiraMaruPro-W4.otf adobejapan -otf-cjmgr-v /usr/local/share/texmf/dvipdfm/CIDFont/HiraMaruPro-W4.otf adobejapan -hmgothr-h /usr/local/share/texmf/dvipdfm/CIDFont/HiraMaruPro-W4.otf -hmgothr-v /usr/local/share/texmf/dvipdfm/CIDFont/HiraMaruPro-W4.otf -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 -otf-ucmr-h /usr/local/share/texmf/dvipdfm/CIDFont/STSongStd-Light-Acro.otf unicode -otf-ucmr-v /usr/local/share/texmf/dvipdfm/CIDFont/STSongStd-Light-Acro.otf unicode -otf-utmr-h /usr/local/share/texmf/dvipdfm/CIDFont/MSungStd-Light-Acro.otf unicode -otf-utmr-v /usr/local/share/texmf/dvipdfm/CIDFont/MSungStd-Light-Acro.otf unicode diff --git a/Master/texmf-dist/source/fonts/japanese-otf-uptex/patch/otfbeta_uptex-0.07.patch b/Master/texmf-dist/source/fonts/japanese-otf-uptex/patch/otfbeta_uptex-0.09.patch index 6eb9a5fa47f..83d5f3c827f 100644 --- a/Master/texmf-dist/source/fonts/japanese-otf-uptex/patch/otfbeta_uptex-0.07.patch +++ b/Master/texmf-dist/source/fonts/japanese-otf-uptex/patch/otfbeta_uptex-0.09.patch @@ -356,3 +356,98 @@ diff -urN otfbeta.orig/fontmap/vfontmap.txt otfbeta/fontmap/vfontmap.txt 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/script/MakeSPList.pm b/Master/texmf-dist/source/fonts/japanese-otf-uptex/script/MakeSPList.pm new file mode 100644 index 00000000000..0fc803ad6e7 --- /dev/null +++ b/Master/texmf-dist/source/fonts/japanese-otf-uptex/script/MakeSPList.pm @@ -0,0 +1,68 @@ +package MakeSPList; + +use strict; +use Exporter; +our @ISA = qw(Exporter); +our @EXPORT = qw(make_sp_char_list); + +=head1 NAME + +MakeSPList.pm + +=head1 NOTE + +This software is a part of otfbeta-uptex (a.k.a. japanese-otf-uptex). + +=cut + +our ($r_exist_head, $r_exist_char); + +my $num = '[12][0-9A-F]{4}'; + +sub make_sp_char_list(@) { + my (@lang)=@_; + my (@exist_head_mul, %exist_char_mul)=(); + my ($lang, $first_hex); + + foreach $lang (@lang) { + open(LIST, "script/sp_list_$lang.txt") || die "$!"; + my (@exist_head_each, %exist_char_each)=(); + while (<LIST>) { + chomp; + s/\s+//g; + next if (/^[#%]/); + s/[#%].*$//; + s/,$//; + my @tmp; + foreach $_ (split ',', $_) { + if (/^($num)$/io) { + @tmp = (hex($1)); + } elsif (/^($num)-($num)$/io) { + @tmp = (hex($1)..hex($2)); + } else { + die "input [$_] is not expected\n"; + } + foreach $_ (@tmp) { + my $HEX=sprintf("%X",$_); + $first_hex=int($_/0x1000); + $exist_head_each[$first_hex]++; + $exist_char_each{$HEX}=1; + if ($exist_char_mul{$HEX} eq '' && $exist_head_mul[$first_hex]!~/$lang/) { + $exist_head_mul[$first_hex].=$lang; + } + $exist_char_mul{$HEX}.=$lang; +# warn "$HEX $first_hex ",sprintf("%X",$first_hex),"\n"; + } + } + } + @{$r_exist_head->{$lang}}=@exist_head_each; + %{$r_exist_char->{$lang}}=%exist_char_each; + } + if (@lang>1) { + $lang = join ',', @lang; + @{$r_exist_head->{$lang}}=@exist_head_mul; + %{$r_exist_char->{$lang}}=%exist_char_mul; + } +} + +1; diff --git a/Master/texmf-dist/source/fonts/japanese-otf-uptex/script/mktfm_sp.pl b/Master/texmf-dist/source/fonts/japanese-otf-uptex/script/mktfm_sp.pl new file mode 100755 index 00000000000..7e1334f25c9 --- /dev/null +++ b/Master/texmf-dist/source/fonts/japanese-otf-uptex/script/mktfm_sp.pl @@ -0,0 +1,97 @@ +#!/usr/bin/perl + +=head1 NAME + +mktfm_sp.pl + +=head1 USAGE + +script/mktfm_sp.pl + +=head1 NOTE + +This software is a part of otfbeta-uptex (a.k.a. japanese-otf-uptex). + +=cut + +use script::MakeSPList; + +$multi=3; +@tex_tfm_h=(0x00, 0x0B, 0x00, 0x01, 0x00, 0x2B, 0x00, 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x02, 0x00, 0x02, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA0, 0x00, 0x00, 0x0E, 0x54, 0x45, 0x58, 0x20, 0x4B, 0x41, 0x4E, 0x4A, 0x49, 0x20, 0x54, 0x45, 0x58, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x4F, 0x54, 0x46, 0x20, 0x4B, 0x41, 0x4E, 0x4A, 0x49, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0E, 0x14, 0x7B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0xEB, 0x85, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x99, 0x9A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x03, 0x33, 0x33, 0x00, 0x02, 0x00, 0x00); +@tex_tfm_v=(0x00, 0x09, 0x00, 0x01, 0x00, 0x2B, 0x00, 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x02, 0x00, 0x02, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA0, 0x00, 0x00, 0x0E, 0x54, 0x45, 0x58, 0x20, 0x4B, 0x41, 0x4E, 0x4A, 0x49, 0x20, 0x54, 0x45, 0x58, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x4F, 0x54, 0x46, 0x20, 0x4B, 0x41, 0x4E, 0x4A, 0x49, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x99, 0x9A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x03, 0x33, 0x33, 0x00, 0x02, 0x00, 0x00); +@dvips_tfm_h=(0x00, 0x0B, 0x00, 0x01, 0x00, 0x1B, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x02, 0x00, 0x02, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0E, 0x14, 0x7B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0xEB, 0x85, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00); +@dvips_tfm_v=(0x00, 0x09, 0x00, 0x01, 0x00, 0x1B, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x02, 0x00, 0x02, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00); + +opendir(TFM, "tfm") || mkdir("tfm",0755) || die "cannot mkdir tfm"; + +my @face = qw/mr gr mb gb mgr ml/; +my @lang = qw/j t c k/; +my @dir = qw/h v/; +my %font_id = qw/1b g 1d h 1e i 1f j + 20 k 21 l 22 m 23 n 24 o 25 p 26 q 27 r + 28 s 29 t 2a u 2b v 2c w 2d x 2e y 2f z/; + +&MakeSPList::make_sp_char_list(@lang); + +&make_utf_tfm; +&make_multi_utf_tfm; +&make_unified_utf_tfm; + +sub make_utf_tfm { + foreach $lang ($lang[0]){ #language + foreach $face (@face){ #face + foreach $dir (@dir){ #direction + &maketfm_body($face, $dir, $lang); + } + } + } +} +sub make_multi_utf_tfm { + foreach $lang (@lang[1..$multi]){ #language + foreach $face (@face[0..1]){ #face + foreach $dir (@dir){ #direction + &maketfm_body($face, $dir, $lang); + } + } + } +} +sub make_unified_utf_tfm { + foreach $face (@face[0..1]){ #face + foreach $dir (@dir){ #direction + &maketfm_body($face, $dir, @lang); + } + } +} + +sub maketfm_body { + my ($face, $dir, @ln)=@_; +=comment + ## mktfm.pl does same procedure. + $filename="utf$lang$face".sprintf("%x",$first_hex)."-$dir"; + open(TEXTFM,">tfm/$filename.tfm") || die "Can't make \'tfm/$filename.tfm\'!\n"; + binmode(TEXTFM); + if ($i==0) { + foreach $binary(@tex_tfm_h) {$_ = pack("C", $binary);print TEXTFM "$_";} + }elsif ($i==1){ + foreach $binary(@tex_tfm_v) {$_ = pack("C", $binary);print TEXTFM "$_";} + } + close(TEXTFM); +=cut + my $lang = join ',', @ln; + my @exist_head=@{$MakeSPList::r_exist_head->{$lang}}; + + foreach $first_hex (0x1b, 0x1d .. 0x2b, 0x2f) { # U+1Cxxx, U+2[CDE]xxx : not defined yet + next if (!$exist_head[$first_hex]); + + $id = $font_id{sprintf("%x", $first_hex)}; + $filename= (@ln>1) ? "utf$face$id-$dir" : "utf$lang$face$id-$dir"; + open(TEXTFM,">tfm/$filename.tfm") || die "Can't make \'tfm/$filename.tfm\'!\n"; + binmode(TEXTFM); + if ($dir eq 'h') { + foreach $binary(@tex_tfm_h) {$_ = pack("C", $binary);print TEXTFM "$_";} + }elsif ($dir eq 'v'){ + foreach $binary(@tex_tfm_v) {$_ = pack("C", $binary);print TEXTFM "$_";} + } + close(TEXTFM); + } +} diff --git a/Master/texmf-dist/source/fonts/japanese-otf-uptex/script/mkutf32list.pl b/Master/texmf-dist/source/fonts/japanese-otf-uptex/script/mkutf32list.pl new file mode 100755 index 00000000000..eff5fa69346 --- /dev/null +++ b/Master/texmf-dist/source/fonts/japanese-otf-uptex/script/mkutf32list.pl @@ -0,0 +1,155 @@ +#!/usr/bin/perl -n -s + +=head1 NAME + +mkutf32list.pl + +=head1 USAGE + +mkutf32list.pl cid2code.txt > sp_jp_text.tex +mkutf32list.pl -style=utf cid2code.txt > sp_jp_utf.tex +mkutf32list.pl -style=kchar cid2code.txt > sp_jp_kchar.tex +mkutf32list.pl -style=list cid2code.txt > sp_list_j.txt + +=head1 AUTHOR + +Takuji Tanaka + +=head1 NOTE + +This software is a part of otfbeta-uptex (a.k.a. japanese-otf-uptex). + +=cut + +use strict; +use encoding 'utf8'; +use feature 'switch'; + +our ($style); +our (@count, %reset_ch, $icollec, $cid2code, $line); +our ($col_utf32, @out); +our (@cid_max, $collection_n, $collection, $utfmac, $cmap, $source); + +BEGIN{ + $line = 0; + @count = (); + %reset_ch = (); + $icollec = 0; + @out = (); +} + +if (/cid2code/) { + chomp; + s/^# /# in /; + $cid2code=$_; + $cid2code=~s/^#/%/; +} +if (/((Adobe.*)-\d) Character Collection/) { + $collection_n=$1; + $collection=$2; + given($collection) { + when (/cns/i) { @cid_max = qw/-1 14098 17407 17600 18845 18964 19087 19155/; + $utfmac="UTFT"; $cmap="UniCNS-UTF32"; + $source="cmapresources_cns1-6.tar.z"; } + when (/gb/i) { @cid_max = qw/-1 7716 9896 22126 22352 29063 30283/; + $utfmac="UTFC"; $cmap="UniGB-UTF32"; + $source="cmapresources_gb1-5.tar.z"; } + when (/kor/i) { @cid_max = qw/-1 9332 18154 18351/; + $utfmac="UTFK"; $cmap="UniKS-UTF32"; + $source="cmapresources_korean1-2.tar.z"; } + default { @cid_max = qw/-1 8283 8358 8719 9353 15443 20316 23057/; + $utfmac="UTF"; $cmap="UniJIS-UTF32"; + $source="cmapresources_japan1-6.tar.z"; } + } +} + +next if (/^#/); +$line++; +if ($line == 1) { + print <<END; +% +% This file is generated from the data of $cmap +$cid2code +% for $collection_n +% +% Reference: +% http://sourceforge.net/adobe/cmap/home/Home/ +% $source +% +% A newer CMap may be required for some code points. +% +END +} +if (/^CID/) { + my @header = split; + my $i=0; + foreach (@header) { + if (/^Uni(JIS|KS|CNS|GB)-UTF32$/) { + $col_utf32 = $i; + last; + } + $i++ + } + next; +} + +my @list = split; +my $cid = $list[0]; +my @utf32 = split ',', $list[$col_utf32]; + +foreach (@utf32) { + s/^0+//; + + next if ($_ eq '*'); + next if ($_ =~ '^[1-7][0-9a-f]$|^.$'); + next if ($_ =~ 'v'); + tr/a-z/A-Z/; + my $ch=hex($_); + next if ($ch < 0x10000); + + while(!($cid_max[$icollec+1]>=$cid && $cid>$cid_max[$icollec])) { + $icollec++; + if ($icollec>@cid_max) { + die "CID:$cid (Character $_) is out of range!!\n"; + } + } + if ($count[$icollec]==0) { + $reset_ch{$ch}=$icollec; + } + $count[$icollec]++; + push @out, $ch; +} + + +END { + my ($i, $out, $ch); + + foreach $ch (@out) { + if (defined($reset_ch{$ch})) { + $i=0; + print "\n\n"; + print "%" if ($style =~ /list/); + print "$collection-$reset_ch{$ch}"; + print "\\\\" if ($style !~ 'list'); + print "\n"; + } + + $i++; + given($style) { + when (/utf/) { $out=sprintf "\\${utfmac}{%X}", $ch; } + when (/kchar/) { $out=sprintf "\\kchar\"%X", $ch; } + when (/list/) { $out=sprintf "%X", $ch; } + default { $out=chr($ch); } + } + if ($i % 10 != 1) { + print "," if ($style =~ /list/); + } + print $out; + if ($i % 10 == 0) { + print "%" if ($style =~ /utf/); + print "\n" ; + } + } + + print "\n\n% end\n"; +} 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 new file mode 100755 index 00000000000..da2292d9917 --- /dev/null +++ b/Master/texmf-dist/source/fonts/japanese-otf-uptex/script/mkutfvf_sp.pl @@ -0,0 +1,162 @@ +#!/usr/bin/perl -s + +=head1 NAME + +mkutfvf_sp.pl + +=head1 USAGE + +script/mkutfvf_sp.pl +script/mkutfvf_sp.pl -debug +script/mkutfvf_sp.pl -ovp2ovf='wovp2ovf' + +=head1 NOTE + +This software is a part of otfbeta-uptex (a.k.a. japanese-otf-uptex). + +=cut + +use script::MakeSPList; + +$ovp2ovf = 'ovp2ovf' if (!defined($ovp2ovf)); # option -ovp2ovf + +$multi=3; +opendir(OVP, "ovp") || mkdir("ovp",0755) || die "cannot mkdir ovp"; +opendir(VF, "vf") || mkdir("vf",0755) || die "cannot mkdir vf"; + +my @face = qw/mr gr mb gb mgr ml/; +my @lang = qw/j t c k/; ## priority: j > t > c > k +my %lang_id; foreach $_ (0..$#lang) { $lang_id{$lang[$_]}=$_; } +my @dir = qw/h v/; +my %font_id = qw/1b g 1d h 1e i 1f j + 20 k 21 l 22 m 23 n 24 o 25 p 26 q 27 r + 28 s 29 t 2a u 2b v 2c w 2d x 2e y 2f z/; + +&MakeSPList::make_sp_char_list(@lang); + +&makejvf; +&makemlvf; +&makeunivf; + +sub makejvf { + foreach $lang ($lang[0]){ #language + foreach $face (@face){ #face + foreach $dir (@dir){ #direction + &makevf_body($face, $dir, $lang); + } + } + } +} +sub makemlvf { + foreach $lang (@lang[1..$multi]){ #language + foreach $face (@face[0..1]){ #face + foreach $dir (@dir){ #direction + &makevf_body($face, $dir, $lang); + } + } + } +} +sub makeunivf { + foreach $face (@face[0..1]){ #face + foreach $dir (@dir){ #direction + &make_uni_vf_body($face, $dir, @lang); + } + } +} + +sub makevf_body { + my ($face, $dir, $lang)=@_; + + my @exist_head=@{$MakeSPList::r_exist_head->{$lang}}; + foreach $first_hex (0x1b, 0x1d .. 0x2b, 0x2f) { # U+1Cxxx, U+2[CDE]xxx : not defined yet + next if (!$exist_head[$first_hex]); + + $HEX = sprintf("%X", $first_hex); + $id = $font_id{sprintf("%x", $first_hex)}; + warn "now processing (face:$face, dir:$dir, lang:$lang, first_hex:$HEX, ID:$id) ...\n"; + $filename="utf$lang$face$id-$dir"; + open(OUT, ">ovp/$filename.ovp")||die "$!"; + &fonthead; + print OUT "(MAPFONT D 0\n (FONTNAME otf-u$lang$face-$dir)\n"; + &fontfoot; + &writechar($first_hex, $lang); + close(OUT); + unless ($debug){ + system("$ovp2ovf ovp/$filename.ovp vf/$filename.vf vf/$filename.ofm"); + unlink "vf/$filename.ofm"; + } + } +} + +sub make_uni_vf_body { + my ($face, $dir, @ln)=@_; + my $lang = join ',', @ln; + + my @exist_head=@{$MakeSPList::r_exist_head->{$lang}}; + foreach $first_hex (0x1b, 0x1d .. 0x2b, 0x2f) { # U+1Cxxx, U+2[CDE]xxx : not defined yet + next if (!$exist_head[$first_hex]); + + $HEX = sprintf("%X", $first_hex); + $id = $font_id{sprintf("%x", $first_hex)}; + warn "now processing (face:$face, dir:$dir, lang:MULTI, first_hex:$HEX, ID:$id) ...\n"; + $filename="utf$face$id-$dir"; + open(OUT, ">ovp/$filename.ovp")||die "$!"; + &fonthead; + foreach $l (0 .. $#ln){ + next if ($exist_head[$first_hex]!~/$ln[$l]/); + print OUT "(MAPFONT D $l\n (FONTNAME otf-u$lang[$l]$face-$dir)\n"; + &fontfoot; + } + &writechar($first_hex, @ln); + close(OUT); + unless ($debug){ + system("$ovp2ovf ovp/$filename.ovp vf/$filename.vf vf/$filename.ofm"); + unlink "vf/$filename.ofm"; + } + } +} + +sub fonthead { +print OUT <<END_OF_DATA; +(VTITLE JVF for UTF16) +(OFMLEVEL D 0) +(DESIGNSIZE R 10.000000) +(CHECKSUM O 0) +END_OF_DATA +} + +sub fontfoot { +print OUT <<END_OF_DATA; + (FONTCHECKSUM O 0) + (FONTAT R 1.0) + (FONTDSIZE R 10.000000) + ) +END_OF_DATA +} + +sub writechar { + my ($hex, @ln) = @_; + my $lang = join ',', @ln; + my %exist_char=%{$MakeSPList::r_exist_char->{$lang}}; + + foreach $ku (16 .. 79){ + foreach $ten (16 .. 79){ + $jis=sprintf("%X", $ku*256 + $ten + 0x2020); + $uni=sprintf("%X", $hex*0x1000 + ($ku-16)*64 + ($ten-16)); + my $echr=$exist_char{$uni}; + if ($echr) { + #warn("lang: $lang, jis: $jis, uni: $uni\n"); + print OUT "(CHARACTER H $jis (CHARWD R 1.0) (MAP \n"; + if (@ln>1 && $echr !~ $ln[0]) { + foreach $l (1 .. $#ln) { + if ($echr =~ /$ln[$l]/){ + print OUT " (SELECTFONT D $lang_id{$ln[$l]})\n"; + last; + } + } + } + print OUT " (SETCHAR H $uni)))\n"; + } + } + } +} diff --git a/Master/texmf-dist/source/fonts/japanese-otf-uptex/script/sp_list_c.txt b/Master/texmf-dist/source/fonts/japanese-otf-uptex/script/sp_list_c.txt new file mode 100644 index 00000000000..4e0bf01c94e --- /dev/null +++ b/Master/texmf-dist/source/fonts/japanese-otf-uptex/script/sp_list_c.txt @@ -0,0 +1,17 @@ +% +% This file is generated from the data of UniGB-UTF32 +% in cid2code.txt (Version 10/29/2010) +% for Adobe-GB1-5 +% +% Reference: +% http://sourceforge.net/adobe/cmap/home/Home/ +% cmapresources_gb1-5.tar.z +% +% A newer CMap may be required for some code points. +% + + +%Adobe-GB1-2 +20087,20089,200CC,215D7,2298F,20509,2099D,241FE + +% end diff --git a/Master/texmf-dist/source/fonts/japanese-otf-uptex/script/sp_list_j.txt b/Master/texmf-dist/source/fonts/japanese-otf-uptex/script/sp_list_j.txt new file mode 100644 index 00000000000..6e20b5c2558 --- /dev/null +++ b/Master/texmf-dist/source/fonts/japanese-otf-uptex/script/sp_list_j.txt @@ -0,0 +1,74 @@ +% +% This file is generated from the data of UniJIS-UTF32 +% in cid2code.txt (Version 02/04/2012) +% for Adobe-Japan1-6 +% +% Reference: +% http://sourceforge.net/adobe/cmap/home/Home/ +% cmapresources_japan1-6.tar.z +% +% A newer CMap may be required for some code points. +% + + +%Adobe-Japan1-0 +28CDD,2F8ED,25874,28EF6,2F8DC,2F884,2F877,2F80F,2F8D3,2F818 +21A1A,243D0,2F920,1F100 + +%Adobe-Japan1-4 +1F110,1F111,1F112,1F113,1F114,1F115,1F116,1F117,1F118,1F119 +1F11A,1F11B,1F11C,1F11D,1F11E,1F11F,1F120,1F121,1F122,1F123 +1F124,1F125,1F126,1F127,1F128,1F129,1F150,1F151,1F152,1F153 +1F154,1F155,1F156,1F157,1F158,1F159,1F15A,1F15B,1F15C,1F15D +1F15E,1F15F,1F160,1F161,1F162,1F163,1F164,1F165,1F166,1F167 +1F168,1F169,1F130,1F131,1F132,1F133,1F134,1F135,1F136,1F137 +1F138,1F139,1F13A,1F13B,1F13C,1F13D,1F13E,1F13F,1F140,1F141 +1F142,1F143,1F144,1F145,1F146,1F147,1F148,1F149,1F202,1F237 +1F170,1F171,1F172,1F173,1F174,1F175,1F176,1F177,1F178,1F179 +1F17A,1F17B,1F17C,1F17D,1F17E,1F17F,1F180,1F181,1F182,1F183 +1F184,1F185,1F186,1F187,1F188,1F189,2F945,2090E,26951,2B7D8 +2F8FC,2F995,2F8EA,2F822,26222,20BB7,29D4B,2F833,2B78E,2F8AC +20A64,2F903,2B746,2B777,2F90B,20B9F,2F828,2F921,2F83F,2F873 +2000B,2F852,2967F,2F947,201A2,2B751,2F8B2,27FB7,23CFE,2F91A +25AD7,2F89A,2F90F,2123D,2F81A,24D14,2F862,2B789,2F9D0,2F9DF +2567F,266B0,20628,2008A,20984,2F82C,2F86D,2F8B6,26999,233CC +2F8DB,2A9E6,2B7BD,2F96C,2053F,2626A,200B0,28987,28E17,2B81A +242EE,2F8E1,23CBE,20611,2F9F4,2F804,2363A,233FE,22609 + +%Adobe-Japan1-5 +2131B,2146E,218BD,216B4,21E34,231C4,235C4,2373F,23763,247F1 +2548E,2550E,25771,259C4,25DA1,26AFF,26E40,270F4,27684,28277 +283CD,2A190,20089,200A2,200A4,20213,2032B,20381,20371,203F9 +2044A,20509,205D6,2074F,20807,2083A,208B9,2097C,2099D,20AD3 +20B1D,20D45,20DE1,20E95,20E6D,20E64,20F5F,21201,21255,2127B +21274,212E4,212D7,212FD,21336,21344,213C4,2146D,215D7,26C29 +21647,21706,21742,219C3,21C56,21D2D,21D45,21D78,21D62,21DA1 +21D9C,21D92,21DB7,21DE0,21E33,21F1E,21F76,21FFA,2217B,2231E +223AD,226F3,2285B,228AB,2298F,22AB8,22B4F,22B50,22B46,22C1D +22BA6,22C24,22DE1,231C3,231F5,231B6,23372,233D3,233D2,233D0 +233E4,233D5,233DA,233DF,2344A,23451,2344B,23465,234E4,2355A +23594,23639,23647,23638,2371C,2370C,23764,237FF,237E7,23824 +2383D,23A98,23C7F,23D00,23D40,23DFA,23DF9,23DD3,23F7E,24096 +24103,241C6,241FE,243BC,24629,246A5,24896,24A4D,24B56,24B6F +24C16,24E0E,24E37,24E6A,24E8B,2504A,25055,25122,251A9,251E5 +251CD,2521E,2524C,2542E,254D9,255A7,257A9,257B4,259D4,25AE4 +25AE3,25AF1,25BB2,25C4B,25C64,25E2E,25E56,25E65,25E62,25ED8 +25EC2,25EE8,25F23,25F5C,25FE0,25FD4,2600C,25FFB,26017,26060 +260ED,26270,26286,23D0E,26402,2667E,2671D,268DD,268EA,2696F +269DD,26A1E,26A58,26A8C,26AB7,26C73,26CDD,26E65,26F94,26FF8 +26FF6,26FF7,2710D,27139,273DB,273DA,273FE,27410,27449,27615 +27614,27631,27693,2770E,27723,27752,27985,27A84,27BB3,27BBE +27BC7,27CB8,27DA0,27E10,2808A,280BB,28282,282F3,2840C,28455 +2856B,285C8,285C9,286D7,286FA,28949,28946,2896B,28988,289BA +289BB,28A1E,28A29,28A71,28A43,28A99,28ACD,28AE4,28ADD,28BC1 +28BEF,28D10,28D71,28DFB,28E1F,28E36,28E89,28EEB,28F32,28FF8 +292A0,292B1,29490,295CF,296F0,29719,29750,298C6,29A72,29DDB +29E15,29E8A,29E49,29EC4,29EE9,29EDB,29FCE,29FD7,2A02F,2A01A +2A0F9,2A082,22218,2A38C,2A437,2A5F1,2A602,2A6B2,200F5,24E04 +24FF2,27D73,2F815,2F846,2F899,2F8A6,2F8E5,2F9DE,2A2B2,20158 +205B1,206EC,2B753,20D58,2B75A,2B75C,259CC,2B776,22E42,2B77C +207C8,22FEB,279B4,2B782,2B78B,237F1,2B794,2404B,2B7AC,2B7AF +2B7C9,2B7CF,2B7D2,26C9E,27C3C,2B7F0,2B765,2B80D,2B817,2634C +29E3D,2A61A + +% end diff --git a/Master/texmf-dist/source/fonts/japanese-otf-uptex/script/sp_list_k.txt b/Master/texmf-dist/source/fonts/japanese-otf-uptex/script/sp_list_k.txt new file mode 100644 index 00000000000..ec3e7f2141b --- /dev/null +++ b/Master/texmf-dist/source/fonts/japanese-otf-uptex/script/sp_list_k.txt @@ -0,0 +1,14 @@ +% +% This file is generated from the data of UniKS-UTF32 +% in cid2code.txt (Version 01/31/2012) +% for Adobe-Korea1-2 +% +% Reference: +% http://sourceforge.net/adobe/cmap/home/Home/ +% cmapresources_korean1-2.tar.z +% +% A newer CMap may be required for some code points. +% + + +% end diff --git a/Master/texmf-dist/source/fonts/japanese-otf-uptex/script/sp_list_t.txt b/Master/texmf-dist/source/fonts/japanese-otf-uptex/script/sp_list_t.txt new file mode 100644 index 00000000000..b89626fd993 --- /dev/null +++ b/Master/texmf-dist/source/fonts/japanese-otf-uptex/script/sp_list_t.txt @@ -0,0 +1,203 @@ +% +% This file is generated from the data of UniCNS-UTF32 +% in cid2code.txt (Version 10/25/2010) +% for Adobe-CNS1-6 +% +% Reference: +% http://sourceforge.net/adobe/cmap/home/Home/ +% cmapresources_cns1-6.tar.z +% +% A newer CMap may be required for some code points. +% + + +%Adobe-CNS1-0 +200CC,2008A,27607 + +%Adobe-CNS1-1 +23ED7,26ED3,257E0,28BE9,258E1,294D9,259AC,2648D,25C01,2530E +25CFE,25BB4,26C7F,25D20,25CC1,24882,24578,26E44,26ED6,24057 +26029,217F9,2836D,26121,2615A,262D0,26351,21661,20068,23766 +2833A,26489,2A087,26CC3,22714,26626,23DE3,266E8,28A48,226F6 +26498,2148A,2185E,24A65,24A95,26A52,23D7E,214FD,2F98F,249A7 +23530,21773,23DF8,2F994,20E16,217B4,2317D,2355A,23E8B,26DA3 +26B05,26B97,235CE,26DA5,26ED4,26E42,25BE4,26B96,26E77,26E43 +25C91,25CC0,28625,2863B,27088,21582,270CD,2F9B2,218A2,2739A +2A0F8,22C27,275E0,23DB9,275E4,2770F,28A25,27924,27ABD,27A59 +27B3A,27B38,25430,25565,24A7A,216DF,27D54,27D8F,2F9D4,27D53 +27D98,27DBD,21910,2F9D7,28002,21014,2498A,281BC,2710C,28365 +28412,2A29F,20A50,289DE,2853D,23DBB,23262,22325,26ED7,2853C +27ABE,2856C,2860B,28713,286E6,28933,21E89,255B9,28AC6,23C9B +28B0C,255DB,20D31,28AE1,28BEB,28AE2,28AE5,28BEC,28C39,28BFF +286D8,2127C,23E2E,26ED5,28AE0,26CB8,20274,26410,290AF,290E5 +24AD1,21915,2330A,24AE9,291D5,291EB,230B7,230BC,2546C,29433 +2941D,2797A,27175,20630,2415C,25706,26D27,216D3,24A29,29857 +29905,25725,290B1,29BD5,29B05,28600,2307D,29D3E,21863,29E68 +29FB7,2A192,2A1AB,2A0E1,2A123,2A1DF,2A134,2A193,2A220,2193B +2A233,2A0B9,2A2B4,24364,28C2B,26DA2,2FA1B,2908B,24975,249BB +249F8,24348,24A51,28BDA,218FA,2897E,28E36,28A44,2896C,244B9 +24473,243F8,217EF,218BE,23599,21885,2542F,217F8,216FB,21839 +21774,218D1,25F4B,216C0,24A25,213FE,212A8,213C6,214B6,236A6 +24994,27165,23E31,2555C,23EFB,27052,236EE,2999D,26F26,21922 +2373F,240E1,2408B,2410F,26C21,266B1,20FDF,20BA8,20E0D,28B13 +24436,20465,25651,201AB,203CB,2030A,20414,202C0,28EB3,20275 +2020C,24A0E,23E8A,23595,23E39,23EBF,21884,23E89,205E0,204A3 +20492,20491,28A9C,2070E,20873,2438C,20C20,249AC,210E4,20E1D +24ABC,2408D,240C9,20345,20BC6,28A46,216FA,2176F,21710,25946 +219F3,21861,24295,25E83,28BD7,20413,21303,289FB,21996,2197C +23AEE,21903,21904,218A0,216FE,28A47,21DBA,23472,289A8,21927 +217AB,2173B,275FD,22860,2262B,225AF,225BE,29088,26F73,2003E +20046,2261B,22C9B,22D07,246D4,2914D,24665,22B6A,22B22,23450 +298EA,22E78,249E3,22D67,22CA1,2308E,232AD,24989,232AB,232E0 +218D9,2943F,23289,231B3,25584,28B22,2558F,216FC,2555B,25425 +23103,2182A,23234,2320F,23182,242C9,26D24,27870,21DEB,232D2 +232E1,25872,2383A,237BC,237A2,233FE,2462A,237D5,24487,21912 +23FC0,23C9A,28BEA,28ACB,2801E,289DC,23F7F,2403C,2431A,24276 +2478F,24725,24AA4,205EB,23EF8,2365F,24A4A,24917,25FE1,24ADF +28C23,23F35,26DEA,24CD9,24D06,2A5C6,28ACC,249AB,2498E,24A4E +249C5,248F3,28AE3,21864,25221,251E7,23232,24697,23781,248F0 +24ABA,24AC7,24A96,261AE,25581,27741,256E3,23EFA,216E6,20D4C +2498C,20299,23DBA,2176E,201D4,20C0D,226F5,25AAF,25A9C,2025B +25BC6,25BB3,25EBC,25EA6,249F9,217B0,26261,2615C,27B48,25E82 +26B75,20916,2004E,235CF,26412,263F8,2082C,25AE9,25D43,25E0E +2343F,249F7,265AD,265A0,27127,26CD1,267B4,26A42,26A51,26DA7 +2721B,21840,218A1,218D8,2F9BC,23D8F,27422,25683,27785,27784 +28BF5,28BD9,28B9C,289F9,29448,24284,21845,27DDC,24C09,22321 +217DA,2492F,28A4B,28AFC,28C1D,28C3B,28D34,248FF,24A42,243EA +23225,28EE7,28E66,28E65,249ED,24A78,23FEE,290B0,29093,257DF +28989,28C26,28B2F,263BE,2421B,20F26,28BC5,24AB2,294DA,295D7 +28B50,24A67,28B64,28A45,27B06,28B65,258C8,298F1,29948,21302 +249B8,214E8,2271F,23DB8,22781,2296B,29E2D,2A1F5,2A0FE,24104 +2A1B4,2A0ED,2A0F3,2992F,26E12,26FDF,26B82,26DA4,26E84,26DF0 +26E00,237D7,26064,2359C,23640,249DE,202BF,2555D,21757,231C9 +24941,241B5,241AC,26C40,24F97,217B5,28A49,24488,289FC,218D6 +20F1D,26CC0,21413,242FA,22C26,243C1,23DB7,26741,2615B,260A4 +249B9,2498B,289FA,28B63,2189F,24AB3,24A3E,24A94,217D9,24A66 +203A7,21424,249E5,24916,24976,204FE,28ACE,28A16,28BE7,255D5 +28A82,24943,20CFF,2061A,20BEB,20CB8,217FA,216C2,24A50,21852 +28AC0,249AD,218BF,21883,27484,23D5B,28A81,21862,20AB4,2139C +28218,290E4,27E4F,23FED,23E2D,203F5,28C1C,26BC0,21452,24362 +24A71,22FE3,212B0,223BD,21398,234E5,27BF4,236DF,28A83,237D6 +233FA,24C9F,236AD,26CB7,26D26,26D51,26C82,26FDE,2173A,26C80 +27053,217DB,217B3,21905,241FC,2173C,242A5,24293,23EF9,27736 +2445B,242CA,24259,289E1,26D28,244CE,27E4D,243BD,24256,21304 +243E9,2F825,23300,27AF4,256F6,27B18,27A79,249BA,20346,27657 +25FE2,275FE,2209A,28A9A,2403B,24A45,205CA,20611,21EA8,23CFF +285E8,299C9,221C3,28B4E,20C78,20779,23F4A,24AA7,26B52,27632 +2493F,233CC,28948,21D90,27C12,24F9A,26BF7,2191C,249F6,23FEF +2271B,257E1,2F8CD,2F806,24521,24934,26CBD,26411,290C0,20A11 +26469,20021,23519,2258D,2217A,249D0,20EF8,22926,28473,217B1 +24A2A,21820,29CAD,298A4,2160A,2372F,280E8,213C5,291A8,270AF +289AB,2417A,2A2DF,28318,26E07,2816F,269B5,213ED,2322F,28C30 +28949,24988,24AA5,23F81,21FA1,295E9,2789D,28024,27A3E,23CB7 +26258,29D98,23D40,20E9D,282E2,20C41,20C96,20E76,22C62,20EA2 +21075,22B43,22EB3,20DA7,2688A,20EF9,27FF9,247E0,29D7C,275A3 +26048,24618,29EAC,29FDE,272B2,2048E,20EB6,27F2E,2A434,243F2 +29E06,294D0,26335,20D28,20D71,21F0F,21DD1,2176D,28E97,25C21 +20CD4,201F2,2A64A,2837D,2A2B2,24ABB,26E05,2251B,28E39,20F3B +25F1A,27486,267CC,24011,2F922,20547,205DF,23FC5,24942,289E4 +219DB,23CC8,24933,289AA,202A0,26BB3,21305,224ED,26D29,27A84 +23600,24AB1,22513,2037E,20380,20347,2041F,249A4,20487,233B4 +20BFF,220FC,202E5,22530,2058E,23233,21983,205B3,23C99,24AA6 +2372D,26B13,2F829,28ADE,23F80,20954,23FEC,20BE2,21726,216E8 +286AB,2F832,21596,21613,28A9B,25772,20B8F,23FEB,22DA3,20C77 +26B53,20D74,2170D,20EDD,20D4D,289BC,22698,218D7,2403A,24435 +210B4,2328A,28B66,2124F,241A5,26C7E,21416,21454,24363,24BF5 +2123C,2A150,24278,2163E,21692,20D4E,26C81,26D2A,217DC,217FB +217B2,26DA6,21828,216D5,26E45,249A9,26FA1,22554,21911,216B8 +27A0E,20204,21A34,259CC,205A5,21B44,21CA5,26B28,21DF9,21E37 +21EA4,24901,22049,22173,244BC,20CD3,21771,28482,201C1,2F894 +2133A,26888,223D0,22471,26E6E,28A36,25250,21F6A,270F8,22668 +2029E,28A29,227B4,24982,2498F,27A53,2F8A6,26ED2,20656,23FB7 +2285F,28B9D,2995D,22980,228C1,20118,21770,22E0D,249DF,2138E +217FC,22E36,2571D,24A28,24A23,24940,21829,23400,231F7,231F8 +231A4,231A5,20E75,251E6,23231,285F4,231C8,25313,228F7,2439C +24A21,237C2,2F8DB,241CD,290ED,233E6,26DA0,2346F,28ADF,235CD +2363C,28A4A,203C9,23659,2212A,23703,2919C,20923,227CD,23ADB +21958,23B5A,23EFC,2248B,248F1,26B51,23DBC,23DBD,241A4,2490C +24900,23CC9,20D32,231F9,22491,26D25,26DA1,26DEB,2497F,24085 +26E72,26F74,28B21,2F908,23E2F,23F82,2304B,23E30,21497,2403D +29170,24144,24091,24155,24039,23FF0,23FB4,2413F,24156,24157 +24140,261DD,24277,24365,242C1,2445A,24A27,24A22,28BE8,25605 +24974,23044,24823,2882B,28804,20C3A,26A2E,241E2,216E7,24A24 +249B7,2498D,249FB,24A26,2F92F,228AD,28EB2,24A8C,2415F,24A79 +28B8F,28C03,2189E,21988,28ED9,21A4B,28EAC,24F82,24D13,263F5 +26911,2690E,26F9F,2509D,2517D,21E1C,25220,232AC,28964,28968 +216C1,255E0,2760C,2261C,25857,27B39,27126,2910D,20C42,20D15 +2512B,22CC6,20341,24DB8,294E5,280BE,22C38,2815D,269F2,24DEA +20D7C,20FB4,20CD5,20E96,20F64,22CA9,28256,244D3,20D46,29A4D +280E9,24EA7,22CC2,295F4,252C7,297D4,22D44,22BCA,266DA,26716 +279A0,25052,20C43,28B4C,20731,201A9,22D8D,245C8,204FC,26097 +20F4C,22A66,2109D,20D9C,22775,2A601,20E09,22ACF,210C8,239C2 +2829B,25E49,220C7,22CB2,29720,24E3B,27574,22E8B,22208,2A65B +28CCD,20E7A,20C34,27639,22BCE,22C51,210C7,2A632,28CD2,28D99 +28CCA,2775E,2F828,2107B,210D3,212FE,247EF,24EA5,24F5C,28189 + + +%Adobe-CNS1-3 +2010C,200D1,200CD,200CB,21FE8,200CA,2010E,21BC1,2F878,20086 +248E9,2626A,2634B,26612,26951,278B2,28E0F,29810,20087,2A3A9 +21145,27735,209E7,29DF6,2700E,2A133,2846C,21DCA,205D0,22AE6 +27D84,210F4,20C0B,278C8,260A5,22D4C,21077,2106F,221A1,20D96 +22CC9,20F31,2681C,210CF,22803,22939,251E3,20E8C,20F8D,20EAA +20F30,20D47,2114F,20E4C,20EAB,20BA9,20D48,210C0,2113D,22696 +20FAD,233F4,20D7E,20D7F,22C55,20E98,20F2E,26B50,29EC3,22DEE +26572,280BD,20EFA,20E0F,20E77,20EFB,24DEB,20CD6,227B5,210C9 +20E10,20E78,21078,21148,28207,21455,20E79,24E50,22DA4,2101D +2101E,210F5,210F6,20E11,27694,282CD,20FB5,20E7B,2517E,20FB6 +21180,252D8,2A2BD,249DA,2183A,24177,2827C,2573D,25B74,2313D +289C0,23F41,20325,20ED8,25C65,24FB8,20B0D,26B0A,22EEF,23CB5 +26E99,23F8F,24CC9,2A014,286BC,28501,2267A,269A8,2424B,2215B +2037F,2A45B,249EC,24962,27109,24A4F,24A5D,217DF,23AFA,20214 +208D5,20619,21F9E,2A2B6,2915B,28A59,29420,248F2,25535,20CCF +27967,21BC2,20094,202B7,203A0,204D7,205D5,20615,20676,216BA +20AC2,20ACD,20BBF,2F83B,20BCB,20BFB,20C3B,20C53,20C65,20C7C +20C8D,20CB5,20CDD,20CED,20D6F,20DB2,20DC8,20E04,20E0E,20ED7 +20F90,20F2D,20E73,20FBC,2105C,2104F,21076,21088,21096,210BF +2112F,2113B,212E3,21375,21336,21577,21619,217C3,217C7,2182D +2196A,21A2D,21A45,21C2A,21C70,21CAC,21EC8,21ED5,21F15,22045 +2227C,223D7,223FA,2272A,22871,2294F,22967,22993,22AD5,22AE8 +22B0E,22B3F,22C4C,22C88,22CB7,25BE8,22D08,22D12,22DB7,22D95 +22E42,22F74,22FCC,23033,23066,2331F,233DE,23567,235F3,2361A +23716,23AA7,23E11,23EB9,24119,242EE,2430D,24334,24396,24404 +244D6,24674,2472F,24812,248FB,24A15,24AC0,24F86,2502C,25299 +25419,25446,2546E,2553F,2555E,25562,25566,257C7,2585D,25903 +25AAE,25B89,25C06,26102,261B2,26402,2644A,26484,26488,26512 +265BF,266B5,266FC,26799,2686E,2685E,268C7,26926,26939,269FA +26A2D,26A34,26B5B,26B9D,26CA4,26DAE,2704B,271CD,27280,27285 +2728B,272E6,27450,277CC,27858,279DD,279FD,27A0A,27B0B,27D66 +28009,28023,28048,28083,28090,280F4,2812E,2814F,281AF,2821A +28306,2832F,2838A,28468,286AA,28956,289B8,289E7,289E8,28B46 +28BD4,28C09,28FC5,290EC,29110,2913C,2915E,24ACA,294E7,295B0 +295B8,29732,298D1,29949,2996A,299C3,29A28,29B0E,29D5A,29D9B +29EF8,29F23,2A293,2A2FF,2A5CB,20C9C,224B0,24A93,28B2C,217F5 +28B6C,28B99,266AF,27655,25635,25956,25E81,20E6D,23E88,24C9E +217F6,2187B,25C4A,25311,25ED8,20FEA,20D49,236BA,25148,210C1 +24706,26893,226F4,27D2F,241A3,27D73,26ED0,272B6,211D9,23CFC +2A6A9,20EAC,21CA2,24FC2,20FEB,22DA0,20FEC,20E0A,20FED,21187 +24B6E,25A95,20979,22465,23CFE,29F30,24FA9,2959E,23DB6,267B3 +23720,23EF7,23E2C,230DA,212A9,24963,270AE,2176C,27164,26D22 +24AE2,2493E,26D23,203FC,23CFD,24919,24A77,28A5A,2F840,2183B +26159,233F5,28BC2,21D46,26ED1,28B2D,23CC7,25ED7,27656,25531 +21944,29903,26DDC,270AD,261AD,28A0F,23677,200EE,26846,24F0E +2634C,2626B,21877,2408C,2307E,21E3D,203B5,205C3,21376,24A12 +28B2B,26083 + +%Adobe-CNS1-4 +29C73,2414E,251CD,25D30,28A32,23281,2A107,21980,2870F,2A2BA +29947,28AEA,2207E,289E3,21DB6,22712,233F9,23C63,24505,24A13 +25CA4,25695,28DB9,2143F,2497B,2710D,26D74,26B15,26FBE + +%Adobe-CNS1-5 +27267,27CB1,27CC5,242BF,23617,27352,26E8B,270D2,2A351,27C6C +26B23,25A54,21A63,23E06,23F61,28BB9,27BEF,21D5E,29EB0,29945 +20A6F,23256,22796,23B1A,23551,240EC,21E23,201A4,26C41,20239 +298FA,20B9F,221C1,2896D,29079,2A1B5,26C46,286B2,273FF,2549A +24B0F + +%Adobe-CNS1-6 +21D53,2369E,26021,258DE,24161,2890D,231EA,20A8A,2325E,25DB9 +2368E,27B65,26E88,25D99,224BC,224C1,224C9,224CC,235BB,2ADFF + + +% end diff --git a/Master/texmf-dist/source/fonts/japanese-otf-uptex/test/uplatex/Makefile b/Master/texmf-dist/source/fonts/japanese-otf-uptex/test/uplatex/Makefile deleted file mode 100644 index 00a8574b155..00000000000 --- a/Master/texmf-dist/source/fonts/japanese-otf-uptex/test/uplatex/Makefile +++ /dev/null @@ -1,32 +0,0 @@ -UPTEX = uptex -PTEX = ptex -UPLATEX = uplatex -PLATEX = platex -DVIPS = dvips -DVIPDFMX = dvipdfmx -PDVITYPE = pdvitype - -all: uplatex platex - -uplatex: - for opt in default deluxe expert bold noreplace; do \ - $(UPLATEX) "\def\option{$$opt}\def\class{ujarticle}\input" uotftest-utf8.tex ; \ - mv uotftest-utf8.dvi uotftest-$$opt-h-uplatex.dvi ; \ - $(DVIPDFMX) uotftest-$$opt-h-uplatex.dvi ; \ - $(UPLATEX) "\def\option{$$opt}\def\class{utarticle}\input" uotftest-utf8.tex ; \ - mv uotftest-utf8.dvi uotftest-$$opt-v-uplatex.dvi ; \ - $(DVIPDFMX) uotftest-$$opt-v-uplatex.dvi ; \ - done - -platex: - for opt in default deluxe expert bold noreplace; do \ - $(PLATEX) "\def\option{$$opt}\def\class{jarticle}\input" uotftest.tex ; \ - mv uotftest.dvi uotftest-$$opt-h-platex.dvi ; \ - $(DVIPDFMX) uotftest-$$opt-h-platex.dvi ; \ - $(PLATEX) "\def\option{$$opt}\def\class{tarticle}\input" uotftest.tex ; \ - mv uotftest.dvi uotftest-$$opt-v-platex.dvi ; \ - $(DVIPDFMX) uotftest-$$opt-v-platex.dvi ; \ - done - -clean: - rm *.aux *.log *.dvi *.pdf diff --git a/Master/texmf-dist/source/fonts/japanese-otf-uptex/test/uplatex/uotftest-utf8.tex b/Master/texmf-dist/source/fonts/japanese-otf-uptex/test/uplatex/uotftest-utf8.tex deleted file mode 100644 index 6a10f44c9e4..00000000000 --- a/Master/texmf-dist/source/fonts/japanese-otf-uptex/test/uplatex/uotftest-utf8.tex +++ /dev/null @@ -1,258 +0,0 @@ -\makeatletter - -\def\@opt@{multi} -\def\@default{default} -\def\@jarticle{jarticle} -\def\@tarticle{tarticle} - -\ifx\option\@undefined - \def\option{default} -\fi -\ifx\option\@default -\else - \edef\@opt@{\option,\@opt@} -\fi - -\ifx\class\@undefined - \def\class{jarticle} -\fi -\ifx\class\@jarticle -\else - \ifx\class\@tarticle - \else - \edef\@opt@{uplatex,\@opt@} - \fi -\fi -\newif\ifuptexmode\uptexmodefalse -\ifnum\jis"2121="3000\uptexmodetrue\fi - -\documentclass[a4paper,titlepage, draft]{\class} -%\documentclass[a4paper,titlepage, draft,landscape]{\class} - -\usepackage[\@opt@]{otf} - -% -% furikana.sty があれば読み込む -\newread\@istheresuchafile -\openin\@istheresuchafile furikana.sty -\ifeof\@istheresuchafile\relax -\else\closein\@istheresuchafile\relax -\usepackage{furikana}% found -\fi - -\makeatother - -\usepackage{redeffont} - - -\AtBeginDvi{\special{papersize=\the\paperwidth,\the\paperheight}} -\ajCIDVarDef{り}{12746} -\ajCIDVarDef{高}{8705} -\ajUTFVarDef{鴎}{9DD7} -\pagestyle{empty} -\makeatletter -\ifx\rubyfamily\@undefined\let\rubyfamily=\relax\fi -\ifx\mgfamily\@undefined\let\mgfamily=\relax\fi -\makeatother -\begin{document} -\section{見出し} - -クラス：\texttt{\class}\\ -オプション：\texttt{\option} - -\vspace{\baselineskip} -\begin{tabular}{l||ccccc} -フォント & 仮名 & 漢字 & UTF & CID & ルビ\\ -\hline -mc/m & ひらかな & 漢字 & \UTF{9DD7} & \CID{8705} & {\rubyfamily 振りかな}\\ -mc/bx & {\bfseries ひらかな} & {\bfseries 漢字} & {\bfseries\UTF{9DD7}} & {\bfseries\CID{8705}} & {\bfseries\rubyfamily 振りかな}\\ -gt/m & {\gtfamily ひらかな} & {\gtfamily 漢字} & {\gtfamily\UTF{9DD7}} & {\gtfamily\CID{8705}} & {\gtfamily\rubyfamily 振りかな}\\ -gt/bx & {\gtfamily\bfseries ひらかな} & {\gtfamily\bfseries 漢字} & {\gtfamily\bfseries\UTF{9DD7}} & {\gtfamily\bfseries\CID{8705}} & {\gtfamily\bfseries\rubyfamily 振りかな}\\ -mg/m & {\mgfamily ひらかな} & {\mgfamily 漢字} & {\mgfamily\UTF{9DD7}} & {\mgfamily\CID{8705}} & {\mgfamily\rubyfamily 振りかな}\\ -\end{tabular} -\vspace{\baselineskip} - -日本：\UTF{9aa8} 簡体字：\UTFC{9aa8} 繁體字：\UTFT{9aa8} 朝鮮：\UTFK{9aa8} - -日本：\UTF{6d77} 簡体字：\UTFC{6d77} 繁體字：\UTFT{6d77} 朝鮮：\UTFK{6d77} - -% with furikana.sty -\makeatletter -\ifx\kana\@undefined -\else -\kana{漢字}{振りかな}{\bfseries \kana{漢字}{振りかな}}% -{\gtfamily\kana{漢字}{振りかな}\bfseries \kana{漢字}{振りかな}} -{\mgfamily\kana{漢字}{振りかな}} - -\kana{\UTF{9DD7}}{かな}\kana{鴎}{かな} - -\Kana[3]{\UTFK{c548},\UTFK{b155},\UTFK{d558},\UTFK{c138},\UTFK{c694}}{アン,ニョン,ハ,セ,ヨ} -\fi -\makeatother - - -\clearpage -[mc/m] - -ぁあぃいぅうぇえぉおかがきぎくぐけげこごさざしじすずせぜそぞただちぢっつづてでとどなにぬねのは -ばぱひびぴふぶぷへべぺほぼぽまみむめもゃやゅゆょよらりるれろゎわゐゑをんヽヾゝゞー -\ifuptexmode -ゔゕゖ -\fi - -ァアィイゥウェエォオカガキギクグケゲコゴサザシジスズセゼソゾタダチヂッツヅテデトドナニヌネノハ -バパヒビピフブプヘベペホボポマミムメモャヤュユョヨラリルレロヮワヰヱヲンヴヵヶ -\ifuptexmode -ヷヸヹヺㇰㇱㇲㇳㇴㇵㇶㇷㇸㇹㇺㇻㇼㇽㇾㇿ -\fi - -{\bfseries% -[mc/bx] - -ぁあぃいぅうぇえぉおかがきぎくぐけげこごさざしじすずせぜそぞただちぢっつづてでとどなにぬねのは -ばぱひびぴふぶぷへべぺほぼぽまみむめもゃやゅゆょよらりるれろゎわゐゑをんヽヾゝゞー -\ifuptexmode -ゔゕゖ -\fi - -ァアィイゥウェエォオカガキギクグケゲコゴサザシジスズセゼソゾタダチヂッツヅテデトドナニヌネノハ -バパヒビピフブプヘベペホボポマミムメモャヤュユョヨラリルレロヮワヰヱヲンヴヵヶ -\ifuptexmode -ヷヸヹヺㇰㇱㇲㇳㇴㇵㇶㇷㇸㇹㇺㇻㇼㇽㇾㇿ -\fi -} - -{\gtfamily -[gt/m] - -ぁあぃいぅうぇえぉおかがきぎくぐけげこごさざしじすずせぜそぞただちぢっつづてでとどなにぬねのは -ばぱひびぴふぶぷへべぺほぼぽまみむめもゃやゅゆょよらりるれろゎわゐゑをんヽヾゝゞー -\ifuptexmode -ゔゕゖ -\fi - -ァアィイゥウェエォオカガキギクグケゲコゴサザシジスズセゼソゾタダチヂッツヅテデトドナニヌネノハ -バパヒビピフブプヘベペホボポマミムメモャヤュユョヨラリルレロヮワヰヱヲンヴヵヶ -\ifuptexmode -ヷヸヹヺㇰㇱㇲㇳㇴㇵㇶㇷㇸㇹㇺㇻㇼㇽㇾㇿ -\fi - -{\bfseries% -[gt/bx] - -ぁあぃいぅうぇえぉおかがきぎくぐけげこごさざしじすずせぜそぞただちぢっつづてでとどなにぬねのは -ばぱひびぴふぶぷへべぺほぼぽまみむめもゃやゅゆょよらりるれろゎわゐゑをんヽヾゝゞー -\ifuptexmode -ゔゕゖ -\fi - -ァアィイゥウェエォオカガキギクグケゲコゴサザシジスズセゼソゾタダチヂッツヅテデトドナニヌネノハ -バパヒビピフブプヘベペホボポマミムメモャヤュユョヨラリルレロヮワヰヱヲンヴヵヶ -\ifuptexmode -ヷヸヹヺㇰㇱㇲㇳㇴㇵㇶㇷㇸㇹㇺㇻㇼㇽㇾㇿ -\fi -}} - -{\mgfamily -[mg/m] - -ぁあぃいぅうぇえぉおかがきぎくぐけげこごさざしじすずせぜそぞただちぢっつづてでとどなにぬねのは -ばぱひびぴふぶぷへべぺほぼぽまみむめもゃやゅゆょよらりるれろゎわゐゑをんヽヾゝゞー -\ifuptexmode -ゔゕゖ -\fi - -ァアィイゥウェエォオカガキギクグケゲコゴサザシジスズセゼソゾタダチヂッツヅテデトドナニヌネノハ -バパヒビピフブプヘベペホボポマミムメモャヤュユョヨラリルレロヮワヰヱヲンヴヵヶ -\ifuptexmode -ヷヸヹヺㇰㇱㇲㇳㇴㇵㇶㇷㇸㇹㇺㇻㇼㇽㇾㇿ -\fi -} - -{\rubyfamily% -[ruby/m] - -ぁあぃいぅうぇえぉおかがきぎくぐけげこごさざしじすずせぜそぞただちぢっつづてでとどなにぬねのは -ばぱひびぴふぶぷへべぺほぼぽまみむめもゃやゅゆょよらりるれろゎわゐゑをんヽヾゝゞー -\ifuptexmode -ゔゕゖ - -\fbox{\hbox{\tate\Huge ㇰ}} - -\fbox{\hbox{\yoko\Huge ㇰ}} - -\fi - -ァアィイゥウェエォオカガキギクグケゲコゴサザシジスズセゼソゾタダチヂッツヅテデトドナニヌネノハ -バパヒビピフブプヘベペホボポマミムメモャヤュユョヨラリルレロヮワヰヱヲンヴヵヶ -\ifuptexmode -ヷヸヹヺㇰㇱㇲㇳㇴㇵㇶㇷㇸㇹㇺㇻㇼㇽㇾㇿ -\fi - -{\bfseries% -[ruby/bx] - -ぁあぃいぅうぇえぉおかがきぎくぐけげこごさざしじすずせぜそぞただちぢっつづてでとどなにぬねのは -ばぱひびぴふぶぷへべぺほぼぽまみむめもゃやゅゆょよらりるれろゎわゐゑをんヽヾゝゞー -\ifuptexmode -ゔゕゖ -\fi - -ァアィイゥウェエォオカガキギクグケゲコゴサザシジスズセゼソゾタダチヂッツヅテデトドナニヌネノハ -バパヒビピフブプヘベペホボポマミムメモャヤュユョヨラリルレロヮワヰヱヲンヴヵヶ -\ifuptexmode -ヷヸヹヺㇰㇱㇲㇳㇴㇵㇶㇷㇸㇹㇺㇻㇼㇽㇾㇿ -\fi -}} - -{\gtfamily\rubyfamily% -[rubyg/m] - -ぁあぃいぅうぇえぉおかがきぎくぐけげこごさざしじすずせぜそぞただちぢっつづてでとどなにぬねのは -ばぱひびぴふぶぷへべぺほぼぽまみむめもゃやゅゆょよらりるれろゎわゐゑをんヽヾゝゞー -\ifuptexmode -ゔゕゖ -\fi - -ァアィイゥウェエォオカガキギクグケゲコゴサザシジスズセゼソゾタダチヂッツヅテデトドナニヌネノハ -バパヒビピフブプヘベペホボポマミムメモャヤュユョヨラリルレロヮワヰヱヲンヴヵヶ -\ifuptexmode -ヷヸヹヺㇰㇱㇲㇳㇴㇵㇶㇷㇸㇹㇺㇻㇼㇽㇾㇿ -\fi - -{\gtfamily\rubyfamily\bfseries% -[rubyg/bx] - -\fbox{\hbox{\tate\Huge ぁ}} - -\fbox{\hbox{\yoko\Huge ぁ}} - -ぁあぃいぅうぇえぉおかがきぎくぐけげこごさざしじすずせぜそぞただちぢっつづてでとどなにぬねのは -ばぱひびぴふぶぷへべぺほぼぽまみむめもゃやゅゆょよらりるれろゎわゐゑをんヽヾゝゞー -\ifuptexmode -ゔゕゖ -\fi - -ァアィイゥウェエォオカガキギクグケゲコゴサザシジスズセゼソゾタダチヂッツヅテデトドナニヌネノハ -バパヒビピフブプヘベペホボポマミムメモャヤュユョヨラリルレロヮワヰヱヲンヴヵヶ -\ifuptexmode -ヷヸヹヺㇰㇱㇲㇳㇴㇵㇶㇷㇸㇹㇺㇻㇼㇽㇾㇿ -\fi -}} - -{\mgfamily\rubyfamily% -[rubymg/m] - -ぁあぃいぅうぇえぉおかがきぎくぐけげこごさざしじすずせぜそぞただちぢっつづてでとどなにぬねのは -ばぱひびぴふぶぷへべぺほぼぽまみむめもゃやゅゆょよらりるれろゎわゐゑをんヽヾゝゞー -\ifuptexmode -ゔゕゖ -\fi - -ァアィイゥウェエォオカガキギクグケゲコゴサザシジスズセゼソゾタダチヂッツヅテデトドナニヌネノハ -バパヒビピフブプヘベペホボポマミムメモャヤュユョヨラリルレロヮワヰヱヲンヴヵヶ -\ifuptexmode -ヷヸヹヺㇰㇱㇲㇳㇴㇵㇶㇷㇸㇹㇺㇻㇼㇽㇾㇿ -\fi -} -\end{document} diff --git a/Master/texmf-dist/source/fonts/japanese-otf-uptex/test/uplatex/uotftest.tex b/Master/texmf-dist/source/fonts/japanese-otf-uptex/test/uplatex/uotftest.tex deleted file mode 100644 index afe549dd0e1..00000000000 --- a/Master/texmf-dist/source/fonts/japanese-otf-uptex/test/uplatex/uotftest.tex +++ /dev/null @@ -1,191 +0,0 @@ -\makeatletter - -\def\@opt@{multi} -\def\@default{default} -\def\@jarticle{jarticle} -\def\@tarticle{tarticle} - -\ifx\option\@undefined - \def\option{default} -\fi -\ifx\option\@default -\else - \edef\@opt@{\option,\@opt@} -\fi - -\ifx\class\@undefined - \def\class{jarticle} -\fi -\ifx\class\@jarticle -\else - \ifx\class\@tarticle - \else - \edef\@opt@{uplatex,\@opt@} - \fi -\fi - -\documentclass[a4paper,titlepage, draft]{\class} -%\documentclass[a4paper,titlepage, draft,landscape]{\class} - -\usepackage[\@opt@]{otf} - -% -% furikana.sty $B$,$"$l$PFI$_9~$`(B -\newread\@istheresuchafile -\openin\@istheresuchafile furikana.sty -\ifeof\@istheresuchafile\relax -\else\closein\@istheresuchafile\relax -\usepackage{furikana}% found -\fi - -\makeatother - -\usepackage{redeffont} - - -\AtBeginDvi{\special{papersize=\the\paperwidth,\the\paperheight}} -\ajCIDVarDef{$B$j(B}{12746} -\ajCIDVarDef{$B9b(B}{8705} -\ajUTFVarDef{$B2*(B}{9DD7} -\pagestyle{empty} -\makeatletter -\ifx\rubyfamily\@undefined\let\rubyfamily=\relax\fi -\ifx\mgfamily\@undefined\let\mgfamily=\relax\fi -\makeatother -\begin{document} -\section{$B8+=P$7(B} - -$B%/%i%9!'(B\texttt{\class}\\ -$B%*%W%7%g%s!'(B\texttt{\option} - -\vspace{\baselineskip} -\begin{tabular}{l||ccccc} -$B%U%)%s%H(B & $B2>L>(B & $B4A;z(B & UTF & CID & $B%k%S(B\\ -\hline -mc/m & $B$R$i$+$J(B & $B4A;z(B & \UTF{9DD7} & \CID{8705} & {\rubyfamily $B?6$j$+$J(B}\\ -mc/bx & {\bfseries $B$R$i$+$J(B} & {\bfseries $B4A;z(B} & {\bfseries\UTF{9DD7}} & {\bfseries\CID{8705}} & {\bfseries\rubyfamily $B?6$j$+$J(B}\\ -gt/m & {\gtfamily $B$R$i$+$J(B} & {\gtfamily $B4A;z(B} & {\gtfamily\UTF{9DD7}} & {\gtfamily\CID{8705}} & {\gtfamily\rubyfamily $B?6$j$+$J(B}\\ -gt/bx & {\gtfamily\bfseries $B$R$i$+$J(B} & {\gtfamily\bfseries $B4A;z(B} & {\gtfamily\bfseries\UTF{9DD7}} & {\gtfamily\bfseries\CID{8705}} & {\gtfamily\bfseries\rubyfamily $B?6$j$+$J(B}\\ -mg/m & {\mgfamily $B$R$i$+$J(B} & {\mgfamily $B4A;z(B} & {\mgfamily\UTF{9DD7}} & {\mgfamily\CID{8705}} & {\mgfamily\rubyfamily $B?6$j$+$J(B}\\ -\end{tabular} -\vspace{\baselineskip} - -$BF|K\!'(B\UTF{9aa8}$B!!4JBN;z!'(B\UTFC{9aa8}$B!!HKqs;z!'(B\UTFT{9aa8}$B!!D+A/!'(B\UTFK{9aa8} - -$BF|K\!'(B\UTF{6d77}$B!!4JBN;z!'(B\UTFC{6d77}$B!!HKqs;z!'(B\UTFT{6d77}$B!!D+A/!'(B\UTFK{6d77} - -% with furikana.sty -\makeatletter -\ifx\kana\@undefined -\else -\kana{$B4A;z(B}{$B?6$j$+$J(B}{\bfseries \kana{$B4A;z(B}{$B?6$j$+$J(B}}% -{\gtfamily\kana{$B4A;z(B}{$B?6$j$+$J(B}\bfseries \kana{$B4A;z(B}{$B?6$j$+$J(B}} -{\mgfamily\kana{$B4A;z(B}{$B?6$j$+$J(B}} - -\kana{\UTF{9DD7}}{$B$+$J(B}\kana{$B2*(B}{$B$+$J(B} - -\Kana[3]{\UTFK{c548},\UTFK{b155},\UTFK{d558},\UTFK{c138},\UTFK{c694}}{$B%"%s(B,$B%K%g%s(B,$B%O(B,$B%;(B,$B%h(B} -\fi -\makeatother - - -\clearpage -[mc/m] - -$B$!$"$#$$$%$&$'$($)$*$+$,$-$.$/$0$1$2$3$4$5$6$7$8$9$:$;$<$=$>$?$@$A$B$C$D$E$F$G$H$I$J$K$L$M$N$O(B -$B$P$Q$R$S$T$U$V$W$X$Y$Z$[$\$]$^$_$`$a$b$c$d$e$f$g$h$i$j$k$l$m$n$o$p$q$r$s!3!4!5!6!<(B - -$B%!%"%#%$%%%&%'%(%)%*%+%,%-%.%/%0%1%2%3%4%5%6%7%8%9%:%;%<%=%>%?%@%A%B%C%D%E%F%G%H%I%J%K%L%M%N%O(B -$B%P%Q%R%S%T%U%V%W%X%Y%Z%[%\%]%^%_%`%a%b%c%d%e%f%g%h%i%j%k%l%m%n%o%p%q%r%s%t%u%v(B - -{\bfseries% -[mc/bx] - -$B$!$"$#$$$%$&$'$($)$*$+$,$-$.$/$0$1$2$3$4$5$6$7$8$9$:$;$<$=$>$?$@$A$B$C$D$E$F$G$H$I$J$K$L$M$N$O(B -$B$P$Q$R$S$T$U$V$W$X$Y$Z$[$\$]$^$_$`$a$b$c$d$e$f$g$h$i$j$k$l$m$n$o$p$q$r$s!3!4!5!6!<(B - -$B%!%"%#%$%%%&%'%(%)%*%+%,%-%.%/%0%1%2%3%4%5%6%7%8%9%:%;%<%=%>%?%@%A%B%C%D%E%F%G%H%I%J%K%L%M%N%O(B -$B%P%Q%R%S%T%U%V%W%X%Y%Z%[%\%]%^%_%`%a%b%c%d%e%f%g%h%i%j%k%l%m%n%o%p%q%r%s%t%u%v(B -} - -{\gtfamily -[gt/m] - -$B$!$"$#$$$%$&$'$($)$*$+$,$-$.$/$0$1$2$3$4$5$6$7$8$9$:$;$<$=$>$?$@$A$B$C$D$E$F$G$H$I$J$K$L$M$N$O(B -$B$P$Q$R$S$T$U$V$W$X$Y$Z$[$\$]$^$_$`$a$b$c$d$e$f$g$h$i$j$k$l$m$n$o$p$q$r$s!3!4!5!6!<(B - -$B%!%"%#%$%%%&%'%(%)%*%+%,%-%.%/%0%1%2%3%4%5%6%7%8%9%:%;%<%=%>%?%@%A%B%C%D%E%F%G%H%I%J%K%L%M%N%O(B -$B%P%Q%R%S%T%U%V%W%X%Y%Z%[%\%]%^%_%`%a%b%c%d%e%f%g%h%i%j%k%l%m%n%o%p%q%r%s%t%u%v(B - -{\bfseries% -[gt/bx] - -$B$!$"$#$$$%$&$'$($)$*$+$,$-$.$/$0$1$2$3$4$5$6$7$8$9$:$;$<$=$>$?$@$A$B$C$D$E$F$G$H$I$J$K$L$M$N$O(B -$B$P$Q$R$S$T$U$V$W$X$Y$Z$[$\$]$^$_$`$a$b$c$d$e$f$g$h$i$j$k$l$m$n$o$p$q$r$s!3!4!5!6!<(B - -$B%!%"%#%$%%%&%'%(%)%*%+%,%-%.%/%0%1%2%3%4%5%6%7%8%9%:%;%<%=%>%?%@%A%B%C%D%E%F%G%H%I%J%K%L%M%N%O(B -$B%P%Q%R%S%T%U%V%W%X%Y%Z%[%\%]%^%_%`%a%b%c%d%e%f%g%h%i%j%k%l%m%n%o%p%q%r%s%t%u%v(B -}} - -{\mgfamily -[mg/m] - -$B$!$"$#$$$%$&$'$($)$*$+$,$-$.$/$0$1$2$3$4$5$6$7$8$9$:$;$<$=$>$?$@$A$B$C$D$E$F$G$H$I$J$K$L$M$N$O(B -$B$P$Q$R$S$T$U$V$W$X$Y$Z$[$\$]$^$_$`$a$b$c$d$e$f$g$h$i$j$k$l$m$n$o$p$q$r$s!3!4!5!6!<(B - -$B%!%"%#%$%%%&%'%(%)%*%+%,%-%.%/%0%1%2%3%4%5%6%7%8%9%:%;%<%=%>%?%@%A%B%C%D%E%F%G%H%I%J%K%L%M%N%O(B -$B%P%Q%R%S%T%U%V%W%X%Y%Z%[%\%]%^%_%`%a%b%c%d%e%f%g%h%i%j%k%l%m%n%o%p%q%r%s%t%u%v(B -} - -{\rubyfamily% -[ruby/m] - -$B$!$"$#$$$%$&$'$($)$*$+$,$-$.$/$0$1$2$3$4$5$6$7$8$9$:$;$<$=$>$?$@$A$B$C$D$E$F$G$H$I$J$K$L$M$N$O(B -$B$P$Q$R$S$T$U$V$W$X$Y$Z$[$\$]$^$_$`$a$b$c$d$e$f$g$h$i$j$k$l$m$n$o$p$q$r$s!3!4!5!6!<(B - -$B%!%"%#%$%%%&%'%(%)%*%+%,%-%.%/%0%1%2%3%4%5%6%7%8%9%:%;%<%=%>%?%@%A%B%C%D%E%F%G%H%I%J%K%L%M%N%O(B -$B%P%Q%R%S%T%U%V%W%X%Y%Z%[%\%]%^%_%`%a%b%c%d%e%f%g%h%i%j%k%l%m%n%o%p%q%r%s%t%u%v(B - -{\bfseries% -[ruby/bx] - -$B$!$"$#$$$%$&$'$($)$*$+$,$-$.$/$0$1$2$3$4$5$6$7$8$9$:$;$<$=$>$?$@$A$B$C$D$E$F$G$H$I$J$K$L$M$N$O(B -$B$P$Q$R$S$T$U$V$W$X$Y$Z$[$\$]$^$_$`$a$b$c$d$e$f$g$h$i$j$k$l$m$n$o$p$q$r$s!3!4!5!6!<(B - -$B%!%"%#%$%%%&%'%(%)%*%+%,%-%.%/%0%1%2%3%4%5%6%7%8%9%:%;%<%=%>%?%@%A%B%C%D%E%F%G%H%I%J%K%L%M%N%O(B -$B%P%Q%R%S%T%U%V%W%X%Y%Z%[%\%]%^%_%`%a%b%c%d%e%f%g%h%i%j%k%l%m%n%o%p%q%r%s%t%u%v(B -}} - -{\gtfamily\rubyfamily% -[rubyg/m] - -$B$!$"$#$$$%$&$'$($)$*$+$,$-$.$/$0$1$2$3$4$5$6$7$8$9$:$;$<$=$>$?$@$A$B$C$D$E$F$G$H$I$J$K$L$M$N$O(B -$B$P$Q$R$S$T$U$V$W$X$Y$Z$[$\$]$^$_$`$a$b$c$d$e$f$g$h$i$j$k$l$m$n$o$p$q$r$s!3!4!5!6!<(B - -$B%!%"%#%$%%%&%'%(%)%*%+%,%-%.%/%0%1%2%3%4%5%6%7%8%9%:%;%<%=%>%?%@%A%B%C%D%E%F%G%H%I%J%K%L%M%N%O(B -$B%P%Q%R%S%T%U%V%W%X%Y%Z%[%\%]%^%_%`%a%b%c%d%e%f%g%h%i%j%k%l%m%n%o%p%q%r%s%t%u%v(B - -{\gtfamily\rubyfamily\bfseries% -[rubyg/bx] - -\fbox{\hbox{\tate\Huge $B$!(B}} - -\fbox{\hbox{\yoko\Huge $B$!(B}} - -$B$!$"$#$$$%$&$'$($)$*$+$,$-$.$/$0$1$2$3$4$5$6$7$8$9$:$;$<$=$>$?$@$A$B$C$D$E$F$G$H$I$J$K$L$M$N$O(B -$B$P$Q$R$S$T$U$V$W$X$Y$Z$[$\$]$^$_$`$a$b$c$d$e$f$g$h$i$j$k$l$m$n$o$p$q$r$s!3!4!5!6!<(B - -$B%!%"%#%$%%%&%'%(%)%*%+%,%-%.%/%0%1%2%3%4%5%6%7%8%9%:%;%<%=%>%?%@%A%B%C%D%E%F%G%H%I%J%K%L%M%N%O(B -$B%P%Q%R%S%T%U%V%W%X%Y%Z%[%\%]%^%_%`%a%b%c%d%e%f%g%h%i%j%k%l%m%n%o%p%q%r%s%t%u%v(B -}} - -{\mgfamily\rubyfamily% -[rubymg/m] - -$B$!$"$#$$$%$&$'$($)$*$+$,$-$.$/$0$1$2$3$4$5$6$7$8$9$:$;$<$=$>$?$@$A$B$C$D$E$F$G$H$I$J$K$L$M$N$O(B -$B$P$Q$R$S$T$U$V$W$X$Y$Z$[$\$]$^$_$`$a$b$c$d$e$f$g$h$i$j$k$l$m$n$o$p$q$r$s!3!4!5!6!<(B - -$B%!%"%#%$%%%&%'%(%)%*%+%,%-%.%/%0%1%2%3%4%5%6%7%8%9%:%;%<%=%>%?%@%A%B%C%D%E%F%G%H%I%J%K%L%M%N%O(B -$B%P%Q%R%S%T%U%V%W%X%Y%Z%[%\%]%^%_%`%a%b%c%d%e%f%g%h%i%j%k%l%m%n%o%p%q%r%s%t%u%v(B -} -\end{document} diff --git a/Master/texmf-dist/source/fonts/japanese-otf-uptex/umakeotf b/Master/texmf-dist/source/fonts/japanese-otf-uptex/umakeotf index f27adaf5323..e9f9b24d6d6 100755 --- a/Master/texmf-dist/source/fonts/japanese-otf-uptex/umakeotf +++ b/Master/texmf-dist/source/fonts/japanese-otf-uptex/umakeotf @@ -43,46 +43,52 @@ 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 -./umkjvf -ucs -cq -chk upnmlminr-h uphminr-h -./umkjvf -ucs -cm -cp upnmlminr-v uphminr-v -./umkjvf -ucs -cq -chk upnmlgothr-h uphgothr-h -./umkjvf -ucs -cm -cp upnmlgothr-v uphgothr-v -./umkjvf -ucs -cq -chk upnmlminb-h uphminb-h -./umkjvf -ucs -cm -cp upnmlminb-v uphminb-v -./umkjvf -ucs -cq -chk upnmlgothb-h uphgothb-h -./umkjvf -ucs -cm -cp upnmlgothb-v uphgothb-v -./umkjvf -ucs -cq -chk upnmlmgothr-h uphmgothr-h -./umkjvf -ucs -cm -cp upnmlmgothr-v uphmgothr-v +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 #extra fonts -./umkjvf -ucs -cq -chk upnmlgotheb-h uphgotheb-h -./umkjvf -ucs -cp upnmlgotheb-v uphgotheb-v -./umkjvf -ucs -cq -chk upnmlminl-h uphminl-h -./umkjvf -ucs -cm -cp upnmlminl-v uphminl-v +./umkjvf -ucs -sp 1 -cq upnmlgotheb-h uphgotheb-h +./umkjvf -ucs -sp 1 -cp upnmlgotheb-v uphgotheb-v +./umkjvf -ucs -sp 1 -cq upnmlminl-h uphminl-h +./umkjvf -ucs -sp 1 -cm -cp upnmlminl-v uphminl-v echo "making alt. kana ..." -./umkjvf -ucs -cq -chk -expert upexpminr-h uphminr-h cidjminr -./umkjvf -ucs -cm -cp -expert upexpminr-v uphminr-v cidjminr -./umkjvf -ucs -cq -chk -expert upexpgothr-h uphgothr-h cidjgothr -./umkjvf -ucs -cm -cp -expert upexpgothr-v uphgothr-v cidjgothr -./umkjvf -ucs -cq -chk -expert upexpminb-h uphminb-h cidjminb -./umkjvf -ucs -cm -cp -expert upexpminb-v uphminb-v cidjminb -./umkjvf -ucs -cq -chk -expert upexpgothb-h uphgothb-h cidjgothb -./umkjvf -ucs -cm -cp -expert upexpgothb-v uphgothb-v cidjgothb -./umkjvf -ucs -cq -chk -expert upexpmgothr-h hmgothr-h cidjmgothr -./umkjvf -ucs -cm -cp -expert upexpmgothr-v hmgothr-v cidjmgothr -./umkjvf -ucs -cq -chk -ruby uprubyminr-h uphminr-h cidjminr -./umkjvf -ucs -cm -cp -ruby uprubyminr-v uphminr-v cidjminr -./umkjvf -ucs -cq -chk -ruby uprubygothr-h uphgothr-h cidjgothr -./umkjvf -ucs -cm -cp -ruby uprubygothr-v uphgothr-v cidjgothr -./umkjvf -ucs -cq -chk -ruby uprubyminb-h uphminb-h cidjminb -./umkjvf -ucs -cm -cp -ruby uprubyminb-v uphminb-v cidjminb -./umkjvf -ucs -cq -chk -ruby uprubygothb-h uphgothb-h cidjgothb -./umkjvf -ucs -cm -cp -ruby uprubygothb-v uphgothb-v cidjgothb -./umkjvf -ucs -cq -chk -ruby uprubymgothr-h hmgothr-h cidjmgothr -./umkjvf -ucs -cm -cp -ruby uprubymgothr-v hmgothr-v cidjmgothr -./umkjvf -ucs -cq -chk -expert upexpminl-h uphminl-h cidjminl -./umkjvf -ucs -cm -cp -expert upexpminl-v uphminl-v cidjminl -./umkjvf -ucs -cq -chk -ruby uprubyminl-h uphminl-h cidjminl -./umkjvf -ucs -cm -cp -ruby uprubyminl-v uphminl-v cidjminl +./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 +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/umkjvf b/Master/texmf-dist/source/fonts/japanese-otf-uptex/umkjvf index 23354df5ecd..f832af37de8 100755 --- a/Master/texmf-dist/source/fonts/japanese-otf-uptex/umkjvf +++ b/Master/texmf-dist/source/fonts/japanese-otf-uptex/umkjvf @@ -6,6 +6,11 @@ &initialize_constant; #processing arguments &proc_arg; +if ($sp==1) { # supplemental plane + use script::MakeSPList; + &MakeSPList::make_sp_char_list('j'); + %exist_char=%{$MakeSPList::r_exist_char->{'j'}}; +} #make ovp &font_header; &write_char; @@ -32,6 +37,35 @@ sub initialize_constant{ $exp_font_map=2; @yoko_tfm_binary=(0x00, 0x0B, 0x00, 0x01, 0x00, 0x1B, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x02, 0x00, 0x02, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0E, 0x14, 0x7B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0xEB, 0x85, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00); @tate_tfm_binary=(0x00, 0x09, 0x00, 0x01, 0x00, 0x1B, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x02, 0x00, 0x02, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00); + @yoko_ucs_tfm_binary=map{ hex($_) } qw/ + 00 0b 00 40 00 6c 00 12 00 00 00 01 00 03 00 02 + 00 02 00 01 00 00 00 00 00 00 00 09 00 00 00 00 + 00 a0 00 00 0b 55 4e 53 50 45 43 49 46 49 45 44 + 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 + 00 00 00 00 00 00 00 00 00 00 00 00 0b 55 4e 53 + 50 45 43 49 46 49 45 44 00 00 00 00 00 00 00 00 + 80 00 00 00 00 00 00 00 ff 61 00 01 ff 62 00 01 + ff 63 00 01 ff 64 00 01 ff 65 00 01 ff 66 00 01 + ff 67 00 01 ff 68 00 01 ff 69 00 01 ff 6a 00 01 + ff 6b 00 01 ff 6c 00 01 ff 6d 00 01 ff 6e 00 01 + ff 6f 00 01 ff 70 00 01 ff 71 00 01 ff 72 00 01 + ff 73 00 01 ff 74 00 01 ff 75 00 01 ff 76 00 01 + ff 77 00 01 ff 78 00 01 ff 79 00 01 ff 7a 00 01 + ff 7b 00 01 ff 7c 00 01 ff 7d 00 01 ff 7e 00 01 + ff 7f 00 01 ff 80 00 01 ff 81 00 01 ff 82 00 01 + ff 83 00 01 ff 84 00 01 ff 85 00 01 ff 86 00 01 + ff 87 00 01 ff 88 00 01 ff 89 00 01 ff 8a 00 01 + ff 8b 00 01 ff 8c 00 01 ff 8d 00 01 ff 8e 00 01 + ff 8f 00 01 ff 90 00 01 ff 91 00 01 ff 92 00 01 + ff 93 00 01 ff 94 00 01 ff 95 00 01 ff 96 00 01 + ff 97 00 01 ff 98 00 01 ff 99 00 01 ff 9a 00 01 + ff 9b 00 01 ff 9c 00 01 ff 9d 00 01 ff 9e 00 01 + ff 9f 00 01 02 11 00 00 01 11 00 00 00 00 00 00 + 00 08 00 00 00 10 00 00 00 00 00 00 00 0e 14 7b + 00 00 00 00 00 01 eb 85 00 00 00 00 00 00 00 00 + 00 00 00 00 00 00 00 00 00 00 00 00 00 10 00 00 + 00 10 00 00 00 00 00 00 00 00 00 00 00 00 00 00 + /; @minute_code=(0x216C, 0x216C, 0x216D, 0x216D); @shift_minute_code=(0x818C, 0x818C, 0x818D, 0x818D); @cid_minute_code=(0x6E3D, 0x6E3E, 0x6C44, 0x6C45); @@ -61,7 +95,7 @@ JIS UCS } sub proc_arg { if ($#ARGV == -1) {&print_help;} - GetOptions(\@ARGV, ['^-b', \$baseline_shift, 1], ['^-m', \$minute_option, 0], ['^-cm', \$cid_minute, 0], ['^-cq', \$cid_quote, 0], ['^-cp', \$comma_period, 0], ['^-chk', \$cid_hankana, 0], ['^-SJIS', \$sjis, 0], ['^-scale', \$scale, 1], ['^-notfm', \$without_tfm, 1], ['^-expert', \$expert, 0], ['^-ruby', \$ruby, 0], ['^-sage', \$burasage, 0], ['^-jp04', \$jis2004, 0], ['^-ucs', \$ucs, 0], ['^-sip', \$sip, 0], ['^-h(e|el|elp)?', \$help, 0], ['^-(.+)', \$unknown, 0]); + GetOptions(\@ARGV, ['^-b', \$baseline_shift, 1], ['^-m', \$minute_option, 0], ['^-cm', \$cid_minute, 0], ['^-cq', \$cid_quote, 0], ['^-cp', \$comma_period, 0], ['^-chk', \$cid_hankana, 0], ['^-SJIS', \$sjis, 0], ['^-scale', \$scale, 1], ['^-notfm', \$without_tfm, 1], ['^-expert', \$expert, 0], ['^-ruby', \$ruby, 0], ['^-sage', \$burasage, 0], ['^-jp04', \$jis2004, 0], ['^-ucs', \$ucs, 0], ['^-sp', \$sp, 1], ['^-ovp2ovf', \$ovp2ovf_command, 1], ['^-h(e|el|elp)?', \$help, 0], ['^-dbg', \$debug_mode, 0], ['^-(.+)', \$unknown, 0]); if ($unknown == 1){ print "mkjvf: Unknown options!\n"; &print_help; @@ -119,7 +153,7 @@ sub proc_arg { } sub font_header { print OVP "(VTITLE )\n"; - print OVP "(OFMLEVEL D 0)"; + print OVP "(OFMLEVEL D 0)\n"; print OVP "(DESIGNSIZE R 10.000000)\n"; print OVP "(CHECKSUM O 0)\n"; print OVP "(MAPFONT D 1\n"; @@ -141,8 +175,8 @@ sub font_header { print OVP "(MAPFONT D 3\n"; print OVP " (FONTNAME $face"."4-h)\n"; print OVP " (FONTCHECKSUM O 0)\n"; - print OVP " (FONTAT R 1)\n"; - printf OVP " (FONTDSIZE R 10)\n"; + print OVP " (FONTAT R 1.0)\n"; + print OVP " (FONTDSIZE R 10.0)\n"; print OVP " )\n"; } }elsif ($direction eq "t"){ @@ -156,8 +190,8 @@ sub font_header { print OVP "(MAPFONT D 3\n"; print OVP " (FONTNAME $face"."4-v)\n"; print OVP " (FONTCHECKSUM O 0)\n"; - print OVP " (FONTAT R 1)\n"; - printf OVP " (FONTDSIZE R 10)\n"; + print OVP " (FONTAT R 1.0)\n"; + print OVP " (FONTDSIZE R 10.0)\n"; print OVP " )\n"; } } @@ -188,7 +222,7 @@ sub font_header { print OVP " (FONTNAME $face"."4-v)\n"; print OVP " (FONTCHECKSUM O 0)\n"; printf OVP " (FONTAT R %f)\n",$scale; - printf OVP " (FONTDSIZE R 10)\n"; + print OVP " (FONTDSIZE R 10.0)\n"; print OVP " )\n"; } } @@ -225,16 +259,16 @@ sub font_header { print OVP "(MAPFONT D 4\n"; print OVP " (FONTNAME $face"."0-h)\n"; print OVP " (FONTCHECKSUM O 0)\n"; - printf OVP " (FONTAT R 1)\n"; - printf OVP " (FONTDSIZE R 10)\n"; + print OVP " (FONTAT R 1.0)\n"; + print OVP " (FONTDSIZE R 10.0)\n"; print OVP " )\n"; } elsif ($direction eq "t"){ print OVP "(MAPFONT D 4\n"; print OVP " (FONTNAME $face"."2-v)\n"; print OVP " (FONTCHECKSUM O 0)\n"; - printf OVP " (FONTAT R 1)\n"; - printf OVP " (FONTDSIZE R 10)\n"; + print OVP " (FONTAT R 1.0)\n"; + print OVP " (FONTDSIZE R 10.0)\n"; print OVP " )\n"; } } @@ -278,8 +312,8 @@ sub font_header { print OVP "(MAPFONT D 6\n"; print OVP " (FONTNAME $face"."0-h)\n"; print OVP " (FONTCHECKSUM O 0)\n"; - printf OVP " (FONTAT R 1)\n"; - printf OVP " (FONTDSIZE R 10)\n"; + print OVP " (FONTAT R 1.0)\n"; + print OVP " (FONTDSIZE R 10.0)\n"; print OVP " )\n"; } } @@ -314,9 +348,12 @@ sub write_char { } } } else { # ucs - $max_ucs= ($sip) ? 0x2FA1F : 0xFFFF; + $max_ucs= $sp ? 0x2FA1F : 0xFFFF; # U+2FA1F: max of CJK Compatibility Ideographs Supplement for ($ucscode=0; $ucscode<=$max_ucs; $ucscode++){ next unless (&is_ucs_jpn_range); + if ($sp==1 && $ucscode>0xFFFF) { + next unless ($exist_char{sprintf("%X",$ucscode)}); + } $dvicode=$ucscode; $char_code=$ucscode; if(&is_ucs_hankana && $direction eq "y"){ @@ -353,8 +390,12 @@ sub make_vf { my ($ovp2ovf); close(OVP); -# $ovp2ovf = ($ucs && $sip) ? 'upovp2ovf' : 'ovp2ovf'; # obsolete - $ovp2ovf = 'ovp2ovf'; # use ovp2ovf in TeXLive svn r24922 or later for SIP + 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_command; + } system("$ovp2ovf $tfm_name.ovp $tfm_name.vf $tfm_name.ofm"); unlink "$tfm_name.ovp"; unlink "$tfm_name.ofm"; @@ -363,7 +404,8 @@ sub make_tfm { open(KANJITFM,">$kanji_font.tfm") || die "Can't make \'$kanji_font.tfm\'!\n"; binmode(KANJITFM); if ($direction eq "y") { - foreach $binary(@yoko_tfm_binary) { + my (@tfm) = $ucs ? @yoko_ucs_tfm_binary : @yoko_tfm_binary; + foreach $binary(@tfm) { $_ = pack("C", $binary); print KANJITFM "$_"; } @@ -395,7 +437,7 @@ sub make_tfm { #### dfn of sub sub rtns ### ############################## sub print_help { - print "This is umkjvf version 0.07 (2012/1/2) by ttk\n"; + print "This is umkjvf version 0.09 (2012/2/18) 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"; @@ -410,9 +452,11 @@ sub print_help { print " -burasage make the width of kutoh-ten zero for burasage\n"; print " -jp04 make a font mapped JIS X 0213:2004 glyphs\n"; print " -ucs make ucs mapped vf (umkjvf extention)\n"; - print " -sip include supplemental ideographic plane (umkjvf extention)\n"; + print " -sp <0--2> include supplemental plane (umkjvf extention)\n"; print " -SJIS make shift jis mapped vf (experimental)\n"; print " -scale <0--1> make kokana vf\n"; + print " -ovp2ovf <command> use ovp2ovf command\n"; + print " -dbg debug mode\n"; print " -help print this message\n"; exit; } @@ -647,8 +691,10 @@ sub print_kigo_char{ $odorijicode= $dvicode; } printf OVP " (SETCHAR H %X)\n",$odorijicode; - } elsif ((&is_dvicode('comma') || &is_dvicode('period')) && $comma_period == 1){ - printf OVP " (SETCHAR H %X)\n",$char_code-2; + } elsif (&is_dvicode('comma') && $comma_period == 1){ + printf OVP " (SETCHAR H %X)\n", ($ucs ? 0x3001 : $char_code-2); + } elsif (&is_dvicode('period') && $comma_period == 1){ + printf OVP " (SETCHAR H %X)\n", ($ucs ? 0x3002 : $char_code-2); }else { printf OVP " (SETCHAR H %X)\n",$char_code; } @@ -690,7 +736,7 @@ sub print_kana_char{ } sub print_hankana_char{ printf OVP "(CHARACTER H %X\n", $dvicode; - print OVP " (CHARWD R $font_at)\n"; + printf OVP " (CHARWD R %f)\n", $font_at/2.0; print OVP " (MAP\n"; if ($cid_hankana == 1){ print OVP " (SELECTFONT D 6)\n"; @@ -1064,52 +1110,58 @@ sub is_ucs_hankana{ } sub is_ucs_jpn_range{ - return 1 if ($ucscode<=0x04FF); + return 1 if ($ucscode<=0x04FF); # Cyrillic return 0 if ($ucscode< 0x1E00); - return 1 if ($ucscode<=0x243F); + return 1 if ($ucscode<=0x243F); # Control Pictures return 0 if ($ucscode< 0x2460); - return 1 if ($ucscode<=0x27BF); + return 1 if ($ucscode<=0x27BF); # Dingbats return 0 if ($ucscode< 0x2900); - return 1 if ($ucscode<=0x29FF); + return 1 if ($ucscode<=0x29FF); # Miscellaneous Mathematical Symbols-B return 0 if ($ucscode< 0x2B00); - return 1 if ($ucscode<=0x2BFF); + return 1 if ($ucscode<=0x2BFF); # Miscellaneous Symbols and Arrows return 0 if ($ucscode< 0x2E80); - return 1 if ($ucscode<=0x2FDF); + return 1 if ($ucscode<=0x2FDF); # Kangxi Radicals return 0 if ($ucscode< 0x3000); - return 1 if ($ucscode<=0x30FF); + return 1 if ($ucscode<=0x30FF); # Katakana return 0 if ($ucscode< 0x3190); - return 1 if ($ucscode<=0x319F); + return 1 if ($ucscode<=0x319F); # Kanbun return 0 if ($ucscode< 0x31F0); - return 1 if ($ucscode<=0x4DBF); + return 1 if ($ucscode<=0x4DBF); # CJK Unified Ideographs Extension A return 0 if ($ucscode< 0x4E00); - return 1 if ($ucscode<=0x9FFF); + return 1 if ($ucscode<=0x9FFF); # CJK Unified Ideographs return 0 if ($ucscode< 0xE000); - return 1 if ($ucscode<=0xFB4F); + return 1 if ($ucscode<=0xFB4F); # Alphabetic Presentation Forms return 0 if ($ucscode< 0xFE10); - return 1 if ($ucscode<=0xFE1F); + return 1 if ($ucscode<=0xFE1F); # Vertical Forms return 0 if ($ucscode< 0xFE30); - return 1 if ($ucscode<=0xFE4F); + return 1 if ($ucscode<=0xFE4F); # CJK Compatibility Forms return 0 if ($ucscode< 0xFF00); - return 1 if ($ucscode<=0xFFEF); + return 1 if ($ucscode<=0xFFEF); # Halfwidth and Fullwidth Forms + + return 0 if ($ucscode< 0x1F100); + return 1 if ($ucscode<=0x1F1FF); # Enclosed Alphanumeric Supplement + return 1 if ($ucscode<=0x1F2FF); # Enclosed Ideographic Supplement return 0 if ($ucscode< 0x20000); - return 1 if ($ucscode<=0x2A6DF); + return 1 if ($ucscode<=0x2A6DF); # CJK Unified Ideographs Extension B + return 1 if ($ucscode<=0x2B73F); # CJK Unified Ideographs Extension C + return 1 if ($ucscode<=0x2B81F); # CJK Unified Ideographs Extension D return 0 if ($ucscode< 0x2F800); - return 1 if ($ucscode<=0x2FA1F); + return 1 if ($ucscode<=0x2FA1F); # CJK Compatibility Ideographs Supplement return 0; } |