diff options
Diffstat (limited to 'macros/jptex')
168 files changed, 421 insertions, 119 deletions
diff --git a/macros/jptex/latex/japanese-otf/COPYRIGHT b/macros/jptex/latex/japanese-otf/COPYRIGHT index c4c8fb7048..aa57e578d4 100644 --- a/macros/jptex/latex/japanese-otf/COPYRIGHT +++ b/macros/jptex/latex/japanese-otf/COPYRIGHT @@ -1,6 +1,6 @@ Copyright (C) 2003--2019 SAITO Shuzaburo and INOUE Koichi -Copyright (C) 2007--2022 TANAKA Takuji -Copyright (C) 2017--2022 Japanese TeX Development Community +Copyright (C) 2007--2023 TANAKA Takuji +Copyright (C) 2017--2023 Japanese TeX Development Community All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/macros/jptex/latex/japanese-otf/README b/macros/jptex/latex/japanese-otf/README index be383b2747..1d6034b23d 100644 --- a/macros/jptex/latex/japanese-otf/README +++ b/macros/jptex/latex/japanese-otf/README @@ -14,7 +14,7 @@ consists of following packages: - author: Tanaka Takuji - upstream: http://www.t-lab.opal.ne.jp/tex/uptex_en.html https://github.com/t-tk/japanese-otf-uptex - - currently japanese-otf-uptex Ver.0.27 (2022/02/16) + - currently japanese-otf-uptex Ver.0.28 (2023/02/23) - readme by the author: 00otf-uptex.txt In addition, several patches were applied to support extended @@ -29,4 +29,4 @@ The contents of this package is under the license given in the COPYRIGHT file, which is the 3-clause BSD license. Japanese TeX Development Community -20220305.0 +20230223.0 diff --git a/macros/jptex/latex/japanese-otf/doc/00otf-uptex.txt b/macros/jptex/latex/japanese-otf/doc/00otf-uptex.txt index 036cfbe3cd..d81e7f80ec 100644 --- a/macros/jptex/latex/japanese-otf/doc/00otf-uptex.txt +++ b/macros/jptex/latex/japanese-otf/doc/00otf-uptex.txt @@ -1,5 +1,5 @@ [ Title ] -japanese-otf-uptex Ver.0.27 2022/02/16 +japanese-otf-uptex Ver.0.28 2022/02/23 [ Abstract ] @@ -480,4 +480,26 @@ https://github.com/t-tk/japanese-otf-uptex Add new tests for CK multi-weight plain texts. COPYRIGHT :: Update year. +2023.02.23 Ver0.28 + sty/otf.sty, sty/mlutf.sty :: + Bump version number. + Set option autodetect-engine default. + Add a new option platex to check if engine is platex. + umkjvf, umakeotf{,_brsg,_jis04,_pre,_prop}, + script/{CheckDVICode,MakeSPList}.pm, + script/{mktfm_sp,mkutf32list,mkutfvf_sp,umk{,v}pkana}.pl :: + Update header comments. + script/CheckDVICode.pm, script/sp_list_j.txt, + test/uplatex/sp_jp_{utf,text}.tex :: + Update references: + Unicode Blocks-15.0.0.txt (Date: 2022-01-28, 20:58:00 GMT [KW]) + Adobe-Japan1-7 cid2code.txt (Version 05/18/2022). + script/{CheckDVICode,MakeSPList}.pm, script/umk{,v}pkana}.pl, + umkjvf, umakeotf_prop :: + Support Kana Letter Small Ko defined by Unicode 15.0. + test/uplatex/Makefile, test/uplatex/utfmacro-kozuka.map, + test/uplatex/{uotftest-utf8,upkanatest1}.tex :: + Add new tests for Small Kana Extension & Adobe fonts. + COPYRIGHT :: + Update year. diff --git a/macros/jptex/latex/japanese-otf/doc/test/uplatex/Makefile b/macros/jptex/latex/japanese-otf/doc/test/uplatex/Makefile index bb5ba6d3f6..d3337fb3fe 100644 --- a/macros/jptex/latex/japanese-otf/doc/test/uplatex/Makefile +++ b/macros/jptex/latex/japanese-otf/doc/test/uplatex/Makefile @@ -6,6 +6,53 @@ DVIPS = dvips DVIPDFMX = dvipdfmx -v PDVITYPE = pdvitype +JPOTF = ../../.. +MYFONTDIR = /please/set/personal/fontdir + +export TEXINPUTS := .;${JPOTF}/japanese-otf-uptex/sty/;${JPOTF}/japanese-otf/sty/;$$TEXMF/tex/{platex,latex,generic,}// +export VFFONTS := .;${JPOTF}//vf/;$$TEXMF/fonts/vf// +export TFMFONTS := .;${JPOTF}//tfm/;{$$TEXMF/fonts,$$VARTEXFONTS}/tfm// +export OFMFONTS := .;${JPOTF}//ofm/;{$$TEXMF/fonts,$$VARTEXFONTS}/{ofm,tfm}// +export OPENTYPEFONTS := .;${MYFONTDIR}//;$$TEXMF/fonts/{opentype,truetype}//;$$OSFONTDIR// + +which-otf: + kpsewhich otf.sty + +which-exp-vf: + kpsewhich -format vf upexpminr-h.vf + +which-exp-tfm: + kpsewhich -format tfm upexpminr-h.tfm + +which-cmr-tfm: + kpsewhich -format tfm cmr10.tfm + +which-cjmr-tfm: + kpsewhich -format tfm otf-cjmr-h.tfm + +which-cjmr-ofm: + kpsewhich -format ofm otf-cjmr-h.ofm + +which-hara-otf: + kpsewhich -format "opentype fonts" HaranoAjiMincho-Regular.otf + kpsewhich -format "opentype fonts" HaranoAjiGothic-Medium.otf + +which-hara-ck-otf: + kpsewhich -format "opentype fonts" HaranoAjiMinchoCN-Regular.otf + kpsewhich -format "opentype fonts" HaranoAjiGothicCN-Medium.otf + kpsewhich -format "opentype fonts" HaranoAjiMinchoTW-Regular.otf + kpsewhich -format "opentype fonts" HaranoAjiGothicTW-Medium.otf + kpsewhich -format "opentype fonts" HaranoAjiMinchoK1-Regular.otf + kpsewhich -format "opentype fonts" HaranoAjiGothicK1-Medium.otf + +which-koz-otf: + kpsewhich -format "opentype fonts" KozMinPr6N-Regular.otf + kpsewhich -format "opentype fonts" KozGoPr6N-Medium.otf + kpsewhich -format "opentype fonts" AdobeSongStd-Light.otf + kpsewhich -format "opentype fonts" AdobeMingStd-Light.otf + kpsewhich -format "opentype fonts" AdobeMyungjoStd-Medium.otf + + all: otf sp art brsg jis04 scale prop punct exclam dir otf: uplatex-otf platex-otf @@ -39,6 +86,30 @@ platex-otf: $(DVIPDFMX) uotftest-$$opt-v-platex.dvi ; \ done +uplatex-otf-haranoaji: uplatex-otf + for opt in deluxe expert; do \ + $(DVIPDFMX) -f utfmacro-haranoaji.map -o uotftest-$$opt-h-hara-uplatex.pdf uotftest-$$opt-h-uplatex.dvi ; \ + $(DVIPDFMX) -f utfmacro-haranoaji.map -o uotftest-$$opt-v-hara-uplatex.pdf uotftest-$$opt-v-uplatex.dvi ; \ + done + +uplatex-otf-kozuka: uplatex-otf + for opt in deluxe expert; do \ + $(DVIPDFMX) -f utfmacro-kozuka.map -o uotftest-$$opt-h-koz-uplatex.pdf uotftest-$$opt-h-uplatex.dvi ; \ + $(DVIPDFMX) -f utfmacro-kozuka.map -o uotftest-$$opt-v-koz-uplatex.pdf uotftest-$$opt-v-uplatex.dvi ; \ + done + +platex-otf-haranoaji: platex-otf + for opt in deluxe expert; do \ + $(DVIPDFMX) -f utfmacro-haranoaji.map -o uotftest-$$opt-h-hara-platex.pdf uotftest-$$opt-h-platex.dvi ; \ + $(DVIPDFMX) -f utfmacro-haranoaji.map -o uotftest-$$opt-v-hara-platex.pdf uotftest-$$opt-v-platex.dvi ; \ + done + +platex-otf-kozuka: platex-otf + for opt in deluxe expert; do \ + $(DVIPDFMX) -f utfmacro-kozuka.map -o uotftest-$$opt-h-koz-platex.pdf uotftest-$$opt-h-platex.dvi ; \ + $(DVIPDFMX) -f utfmacro-kozuka.map -o uotftest-$$opt-v-koz-platex.pdf uotftest-$$opt-v-platex.dvi ; \ + done + uplatex-sp: for opt in default deluxe expert bold noreplace; do \ $(UPLATEX) "\def\option{$$opt}\def\class{ujarticle}\input" uotf-sp-utf8.tex ; \ @@ -59,6 +130,30 @@ platex-sp: $(DVIPDFMX) uotf-sp-$$opt-v-platex.dvi ; \ done +uplatex-sp-haranoaji: uplatex-sp + for opt in deluxe expert; do \ + $(DVIPDFMX) -f utfmacro-haranoaji.map -o uotf-sp-$$opt-h-hara-uplatex.pdf uotf-sp-$$opt-h-uplatex.dvi ; \ + $(DVIPDFMX) -f utfmacro-haranoaji.map -o uotf-sp-$$opt-v-hara-uplatex.pdf uotf-sp-$$opt-v-uplatex.dvi ; \ + done + +uplatex-sp-kozuka: uplatex-sp + for opt in deluxe expert; do \ + $(DVIPDFMX) -f utfmacro-kozuka.map -o uotf-sp-$$opt-h-koz-uplatex.pdf uotf-sp-$$opt-h-uplatex.dvi ; \ + $(DVIPDFMX) -f utfmacro-kozuka.map -o uotf-sp-$$opt-v-koz-uplatex.pdf uotf-sp-$$opt-v-uplatex.dvi ; \ + done + +platex-sp-haranoaji: platex-sp + for opt in deluxe expert; do \ + $(DVIPDFMX) -f utfmacro-haranoaji.map -o uotf-sp-$$opt-h-hara-platex.pdf uotf-sp-$$opt-h-platex.dvi ; \ + $(DVIPDFMX) -f utfmacro-haranoaji.map -o uotf-sp-$$opt-v-hara-platex.pdf uotf-sp-$$opt-v-platex.dvi ; \ + done + +platex-sp-kozuka: platex-sp + for opt in deluxe expert; do \ + $(DVIPDFMX) -f utfmacro-kozuka.map -o uotf-sp-$$opt-h-koz-platex.pdf uotf-sp-$$opt-h-platex.dvi ; \ + $(DVIPDFMX) -f utfmacro-kozuka.map -o uotf-sp-$$opt-v-koz-platex.pdf uotf-sp-$$opt-v-platex.dvi ; \ + done + uplatex-article: for opt in noreplace; do \ $(UPLATEX) "\def\option{$$opt}\def\class{article}\input" uotftest-utf8.tex ; \ diff --git a/macros/jptex/latex/japanese-otf/doc/test/uplatex/sp_jp_text.tex b/macros/jptex/latex/japanese-otf/doc/test/uplatex/sp_jp_text.tex index 24203b59b9..5fc7ae1d8c 100644 --- a/macros/jptex/latex/japanese-otf/doc/test/uplatex/sp_jp_text.tex +++ b/macros/jptex/latex/japanese-otf/doc/test/uplatex/sp_jp_text.tex @@ -1,6 +1,6 @@ % % This file is generated from the data of UniJIS-UTF32 -% in cid2code.txt (Version 07/30/2019) +% in cid2code.txt (Version 05/18/2022) % for Adobe-Japan1-7 % % Reference: @@ -26,15 +26,15 @@ Adobe-Japan1-4\\ 🅂🅃🅄🅅🅆🅇🅈🅉🈂🈷 🅰🅱🅲🅳🅴🅵🅶🅷🅸🅹 🅺🅻🅼🅽🅾🅿🆀🆁🆂🆃 -🆄🆅🆆🆇🆈🆉🞜眞𠤎𦥑 -𫟘沿芽槪割𦈢𠮷𩵋卿𫞎 -憲𠩤浩𫝆𫝷滋𠮟勺爵周 -将𭕄𠀋城𩙿真𠆢𮕩𫝑成 -𧾷𣳾炭𥫗彫潮𡈽冬𤴔姬 -𫞉諭輸𥙿𦚰𠘨𠂊𠦄卉寃 -拔𦦙𣏌杞𪧦𫞽絣𮉸𠔿𦉪 -𠂰𮛪𨦇𨸗𫠚𤋮桒𣲾𠘑嶲 -你𣘺𣏾𢘉 +🆄🆅🆆🆇🆈🆉🞜𛄲𛅕眞 +𠤎𦥑𫟘沿芽槪割𦈢𠮷𩵋 +卿𫞎憲𠩤浩𫝆𫝷滋𠮟勺 +爵周将𭕄𠀋城𩙿真𠆢𮕩 +𫝑成𧾷𣳾炭𥫗彫潮𡈽冬 +𤴔姬𫞉諭輸𥙿𦚰𠘨𠂊𠦄 +卉寃拔𦦙𣏌杞𪧦𫞽絣𮉸 +𠔿𦉪𠂰𮛪𨦇𨸗𫠚𤋮桒𣲾 +𠘑嶲你𣘺𣏾𢘉 Adobe-Japan1-5\\ 𡌛𡑮𡢽𡚴𡸴𣇄𣗄𣜿𣝣𤟱 @@ -65,11 +65,11 @@ Adobe-Japan1-5\\ 𨯯𨴐𨵱𨷻𨸟𨸶𨺉𨻫𨼲𨿸 𩊠𩊱𩒐𩗏𩛰𩜙𩝐𩣆𩩲𩷛 𩸕𩺊𩹉𩻄𩻩𩻛𩿎𩿗𪀯𪀚 -𪃹𪂂𢈘𪎌𪐷𪗱𪘂𪚲𠃵𤸄 -𤿲𧵳再善形慈栟軔𪊲𠅘 -𠖱𠛬𫝓𠵘𫝚𫝜𥧌𫝶𢹂𫝼 -𠟈𢿫𧦴𫞂𫞋𣟱𫞔𤁋𫞬𫞯 -𫟉𫟏𫟒𦲞𧰼𫟰𫝥𫠍𫠗𦍌 -𩸽𪘚 +𪃹𪂂𢈘𪎌𪐷𪗱𪘂𪚲𱍐𠃵 +𤸄𤿲𧵳再善形慈栟軔𪊲 +𠅘𠖱𠛬𫝓𠵘𫝚𫝜𥧌𫝶𢹂 +𫝼𠟈𢿫𧦴𫞂𫞋𣟱𫞔𤁋𫞬 +𫞯𫟉𫟏𫟒𦲞𧰼𫟰𫝥𫠍𫠗 +𦍌𩸽𪘚 % end diff --git a/macros/jptex/latex/japanese-otf/doc/test/uplatex/sp_jp_utf.tex b/macros/jptex/latex/japanese-otf/doc/test/uplatex/sp_jp_utf.tex index 3f9a1e6fcb..7570f6686a 100644 --- a/macros/jptex/latex/japanese-otf/doc/test/uplatex/sp_jp_utf.tex +++ b/macros/jptex/latex/japanese-otf/doc/test/uplatex/sp_jp_utf.tex @@ -1,6 +1,6 @@ % % This file is generated from the data of UniJIS-UTF32 -% in cid2code.txt (Version 07/30/2019) +% in cid2code.txt (Version 05/18/2022) % for Adobe-Japan1-7 % % Reference: @@ -26,15 +26,15 @@ Adobe-Japan1-4\\ \UTF{1F142}\UTF{1F143}\UTF{1F144}\UTF{1F145}\UTF{1F146}\UTF{1F147}\UTF{1F148}\UTF{1F149}\UTF{1F202}\UTF{1F237}% \UTF{1F170}\UTF{1F171}\UTF{1F172}\UTF{1F173}\UTF{1F174}\UTF{1F175}\UTF{1F176}\UTF{1F177}\UTF{1F178}\UTF{1F179}% \UTF{1F17A}\UTF{1F17B}\UTF{1F17C}\UTF{1F17D}\UTF{1F17E}\UTF{1F17F}\UTF{1F180}\UTF{1F181}\UTF{1F182}\UTF{1F183}% -\UTF{1F184}\UTF{1F185}\UTF{1F186}\UTF{1F187}\UTF{1F188}\UTF{1F189}\UTF{1F79C}\UTF{2F945}\UTF{2090E}\UTF{26951}% -\UTF{2B7D8}\UTF{2F8FC}\UTF{2F995}\UTF{2F8EA}\UTF{2F822}\UTF{26222}\UTF{20BB7}\UTF{29D4B}\UTF{2F833}\UTF{2B78E}% -\UTF{2F8AC}\UTF{20A64}\UTF{2F903}\UTF{2B746}\UTF{2B777}\UTF{2F90B}\UTF{20B9F}\UTF{2F828}\UTF{2F921}\UTF{2F83F}% -\UTF{2F873}\UTF{2D544}\UTF{2000B}\UTF{2F852}\UTF{2967F}\UTF{2F947}\UTF{201A2}\UTF{2E569}\UTF{2B751}\UTF{2F8B2}% -\UTF{27FB7}\UTF{23CFE}\UTF{2F91A}\UTF{25AD7}\UTF{2F89A}\UTF{2F90F}\UTF{2123D}\UTF{2F81A}\UTF{24D14}\UTF{2F862}% -\UTF{2B789}\UTF{2F9D0}\UTF{2F9DF}\UTF{2567F}\UTF{266B0}\UTF{20628}\UTF{2008A}\UTF{20984}\UTF{2F82C}\UTF{2F86D}% -\UTF{2F8B6}\UTF{26999}\UTF{233CC}\UTF{2F8DB}\UTF{2A9E6}\UTF{2B7BD}\UTF{2F96C}\UTF{2E278}\UTF{2053F}\UTF{2626A}% -\UTF{200B0}\UTF{2E6EA}\UTF{28987}\UTF{28E17}\UTF{2B81A}\UTF{242EE}\UTF{2F8E1}\UTF{23CBE}\UTF{20611}\UTF{2F9F4}% -\UTF{2F804}\UTF{2363A}\UTF{233FE}\UTF{22609} +\UTF{1F184}\UTF{1F185}\UTF{1F186}\UTF{1F187}\UTF{1F188}\UTF{1F189}\UTF{1F79C}\UTF{1B132}\UTF{1B155}\UTF{2F945}% +\UTF{2090E}\UTF{26951}\UTF{2B7D8}\UTF{2F8FC}\UTF{2F995}\UTF{2F8EA}\UTF{2F822}\UTF{26222}\UTF{20BB7}\UTF{29D4B}% +\UTF{2F833}\UTF{2B78E}\UTF{2F8AC}\UTF{20A64}\UTF{2F903}\UTF{2B746}\UTF{2B777}\UTF{2F90B}\UTF{20B9F}\UTF{2F828}% +\UTF{2F921}\UTF{2F83F}\UTF{2F873}\UTF{2D544}\UTF{2000B}\UTF{2F852}\UTF{2967F}\UTF{2F947}\UTF{201A2}\UTF{2E569}% +\UTF{2B751}\UTF{2F8B2}\UTF{27FB7}\UTF{23CFE}\UTF{2F91A}\UTF{25AD7}\UTF{2F89A}\UTF{2F90F}\UTF{2123D}\UTF{2F81A}% +\UTF{24D14}\UTF{2F862}\UTF{2B789}\UTF{2F9D0}\UTF{2F9DF}\UTF{2567F}\UTF{266B0}\UTF{20628}\UTF{2008A}\UTF{20984}% +\UTF{2F82C}\UTF{2F86D}\UTF{2F8B6}\UTF{26999}\UTF{233CC}\UTF{2F8DB}\UTF{2A9E6}\UTF{2B7BD}\UTF{2F96C}\UTF{2E278}% +\UTF{2053F}\UTF{2626A}\UTF{200B0}\UTF{2E6EA}\UTF{28987}\UTF{28E17}\UTF{2B81A}\UTF{242EE}\UTF{2F8E1}\UTF{23CBE}% +\UTF{20611}\UTF{2F9F4}\UTF{2F804}\UTF{2363A}\UTF{233FE}\UTF{22609} Adobe-Japan1-5\\ \UTF{2131B}\UTF{2146E}\UTF{218BD}\UTF{216B4}\UTF{21E34}\UTF{231C4}\UTF{235C4}\UTF{2373F}\UTF{23763}\UTF{247F1}% @@ -65,11 +65,11 @@ Adobe-Japan1-5\\ \UTF{28BEF}\UTF{28D10}\UTF{28D71}\UTF{28DFB}\UTF{28E1F}\UTF{28E36}\UTF{28E89}\UTF{28EEB}\UTF{28F32}\UTF{28FF8}% \UTF{292A0}\UTF{292B1}\UTF{29490}\UTF{295CF}\UTF{296F0}\UTF{29719}\UTF{29750}\UTF{298C6}\UTF{29A72}\UTF{29DDB}% \UTF{29E15}\UTF{29E8A}\UTF{29E49}\UTF{29EC4}\UTF{29EE9}\UTF{29EDB}\UTF{29FCE}\UTF{29FD7}\UTF{2A02F}\UTF{2A01A}% -\UTF{2A0F9}\UTF{2A082}\UTF{22218}\UTF{2A38C}\UTF{2A437}\UTF{2A5F1}\UTF{2A602}\UTF{2A6B2}\UTF{200F5}\UTF{24E04}% -\UTF{24FF2}\UTF{27D73}\UTF{2F815}\UTF{2F846}\UTF{2F899}\UTF{2F8A6}\UTF{2F8E5}\UTF{2F9DE}\UTF{2A2B2}\UTF{20158}% -\UTF{205B1}\UTF{206EC}\UTF{2B753}\UTF{20D58}\UTF{2B75A}\UTF{2B75C}\UTF{259CC}\UTF{2B776}\UTF{22E42}\UTF{2B77C}% -\UTF{207C8}\UTF{22FEB}\UTF{279B4}\UTF{2B782}\UTF{2B78B}\UTF{237F1}\UTF{2B794}\UTF{2404B}\UTF{2B7AC}\UTF{2B7AF}% -\UTF{2B7C9}\UTF{2B7CF}\UTF{2B7D2}\UTF{26C9E}\UTF{27C3C}\UTF{2B7F0}\UTF{2B765}\UTF{2B80D}\UTF{2B817}\UTF{2634C}% -\UTF{29E3D}\UTF{2A61A} +\UTF{2A0F9}\UTF{2A082}\UTF{22218}\UTF{2A38C}\UTF{2A437}\UTF{2A5F1}\UTF{2A602}\UTF{2A6B2}\UTF{31350}\UTF{200F5}% +\UTF{24E04}\UTF{24FF2}\UTF{27D73}\UTF{2F815}\UTF{2F846}\UTF{2F899}\UTF{2F8A6}\UTF{2F8E5}\UTF{2F9DE}\UTF{2A2B2}% +\UTF{20158}\UTF{205B1}\UTF{206EC}\UTF{2B753}\UTF{20D58}\UTF{2B75A}\UTF{2B75C}\UTF{259CC}\UTF{2B776}\UTF{22E42}% +\UTF{2B77C}\UTF{207C8}\UTF{22FEB}\UTF{279B4}\UTF{2B782}\UTF{2B78B}\UTF{237F1}\UTF{2B794}\UTF{2404B}\UTF{2B7AC}% +\UTF{2B7AF}\UTF{2B7C9}\UTF{2B7CF}\UTF{2B7D2}\UTF{26C9E}\UTF{27C3C}\UTF{2B7F0}\UTF{2B765}\UTF{2B80D}\UTF{2B817}% +\UTF{2634C}\UTF{29E3D}\UTF{2A61A} % end diff --git a/macros/jptex/latex/japanese-otf/doc/test/uplatex/uotftest-utf8.tex b/macros/jptex/latex/japanese-otf/doc/test/uplatex/uotftest-utf8.tex index 2b112b0834..e8fdc9965e 100644 --- a/macros/jptex/latex/japanese-otf/doc/test/uplatex/uotftest-utf8.tex +++ b/macros/jptex/latex/japanese-otf/doc/test/uplatex/uotftest-utf8.tex @@ -133,13 +133,13 @@ UTFM:% ぁあぃいぅうぇえぉおかがきぎくぐけげこごさざしじすずせぜそぞただちぢっつづてでとどなにぬねのは ばぱひびぴふぶぷへべぺほぼぽまみむめもゃやゅゆょよらりるれろゎわゐゑをんヽヾゝゞー \ifuptexmode -ゔゕゖ +ゔゕゖ𛄲 \fi ァアィイゥウェエォオカガキギクグケゲコゴサザシジスズセゼソゾタダチヂッツヅテデトドナニヌネノハ バパヒビピフブプヘベペホボポマミムメモャヤュユョヨラリルレロヮワヰヱヲンヴヵヶ \ifuptexmode -ヷヸヹヺㇰㇱㇲㇳㇴㇵㇶㇷㇸㇹㇺㇻㇼㇽㇾㇿ +ヷヸヹヺㇰㇱㇲㇳㇴㇵㇶㇷㇸㇹㇺㇻㇼㇽㇾㇿ𛅕 \fi “回”、‘回’。“回”，‘回’． @@ -150,13 +150,13 @@ UTFM:% ぁあぃいぅうぇえぉおかがきぎくぐけげこごさざしじすずせぜそぞただちぢっつづてでとどなにぬねのは ばぱひびぴふぶぷへべぺほぼぽまみむめもゃやゅゆょよらりるれろゎわゐゑをんヽヾゝゞー \ifuptexmode -ゔゕゖ +ゔゕゖ𛄲 \fi ァアィイゥウェエォオカガキギクグケゲコゴサザシジスズセゼソゾタダチヂッツヅテデトドナニヌネノハ バパヒビピフブプヘベペホボポマミムメモャヤュユョヨラリルレロヮワヰヱヲンヴヵヶ \ifuptexmode -ヷヸヹヺㇰㇱㇲㇳㇴㇵㇶㇷㇸㇹㇺㇻㇼㇽㇾㇿ +ヷヸヹヺㇰㇱㇲㇳㇴㇵㇶㇷㇸㇹㇺㇻㇼㇽㇾㇿ𛅕 \fi “回”、‘回’。“回”，‘回’． @@ -168,13 +168,13 @@ UTFM:% ぁあぃいぅうぇえぉおかがきぎくぐけげこごさざしじすずせぜそぞただちぢっつづてでとどなにぬねのは ばぱひびぴふぶぷへべぺほぼぽまみむめもゃやゅゆょよらりるれろゎわゐゑをんヽヾゝゞー \ifuptexmode -ゔゕゖ +ゔゕゖ𛄲 \fi ァアィイゥウェエォオカガキギクグケゲコゴサザシジスズセゼソゾタダチヂッツヅテデトドナニヌネノハ バパヒビピフブプヘベペホボポマミムメモャヤュユョヨラリルレロヮワヰヱヲンヴヵヶ \ifuptexmode -ヷヸヹヺㇰㇱㇲㇳㇴㇵㇶㇷㇸㇹㇺㇻㇼㇽㇾㇿ +ヷヸヹヺㇰㇱㇲㇳㇴㇵㇶㇷㇸㇹㇺㇻㇼㇽㇾㇿ𛅕 \fi “回”、‘回’。“回”，‘回’． @@ -185,13 +185,13 @@ UTFM:% ぁあぃいぅうぇえぉおかがきぎくぐけげこごさざしじすずせぜそぞただちぢっつづてでとどなにぬねのは ばぱひびぴふぶぷへべぺほぼぽまみむめもゃやゅゆょよらりるれろゎわゐゑをんヽヾゝゞー \ifuptexmode -ゔゕゖ +ゔゕゖ𛄲 \fi ァアィイゥウェエォオカガキギクグケゲコゴサザシジスズセゼソゾタダチヂッツヅテデトドナニヌネノハ バパヒビピフブプヘベペホボポマミムメモャヤュユョヨラリルレロヮワヰヱヲンヴヵヶ \ifuptexmode -ヷヸヹヺㇰㇱㇲㇳㇴㇵㇶㇷㇸㇹㇺㇻㇼㇽㇾㇿ +ヷヸヹヺㇰㇱㇲㇳㇴㇵㇶㇷㇸㇹㇺㇻㇼㇽㇾㇿ𛅕 \fi “回”、‘回’。“回”，‘回’． @@ -203,13 +203,13 @@ UTFM:% ぁあぃいぅうぇえぉおかがきぎくぐけげこごさざしじすずせぜそぞただちぢっつづてでとどなにぬねのは ばぱひびぴふぶぷへべぺほぼぽまみむめもゃやゅゆょよらりるれろゎわゐゑをんヽヾゝゞー \ifuptexmode -ゔゕゖ +ゔゕゖ𛄲 \fi ァアィイゥウェエォオカガキギクグケゲコゴサザシジスズセゼソゾタダチヂッツヅテデトドナニヌネノハ バパヒビピフブプヘベペホボポマミムメモャヤュユョヨラリルレロヮワヰヱヲンヴヵヶ \ifuptexmode -ヷヸヹヺㇰㇱㇲㇳㇴㇵㇶㇷㇸㇹㇺㇻㇼㇽㇾㇿ +ヷヸヹヺㇰㇱㇲㇳㇴㇵㇶㇷㇸㇹㇺㇻㇼㇽㇾㇿ𛅕 \fi “回”、‘回’。“回”，‘回’． @@ -221,7 +221,7 @@ UTFM:% ぁあぃいぅうぇえぉおかがきぎくぐけげこごさざしじすずせぜそぞただちぢっつづてでとどなにぬねのは ばぱひびぴふぶぷへべぺほぼぽまみむめもゃやゅゆょよらりるれろゎわゐゑをんヽヾゝゞー \ifuptexmode -ゔゕゖ +ゔゕゖ𛄲 \fbox{\hbox{\tate\Huge ㇰ}} @@ -232,7 +232,7 @@ UTFM:% ァアィイゥウェエォオカガキギクグケゲコゴサザシジスズセゼソゾタダチヂッツヅテデトドナニヌネノハ バパヒビピフブプヘベペホボポマミムメモャヤュユョヨラリルレロヮワヰヱヲンヴヵヶ \ifuptexmode -ヷヸヹヺㇰㇱㇲㇳㇴㇵㇶㇷㇸㇹㇺㇻㇼㇽㇾㇿ +ヷヸヹヺㇰㇱㇲㇳㇴㇵㇶㇷㇸㇹㇺㇻㇼㇽㇾㇿ𛅕 \fi “回”、‘回’。“回”，‘回’． @@ -243,13 +243,13 @@ UTFM:% ぁあぃいぅうぇえぉおかがきぎくぐけげこごさざしじすずせぜそぞただちぢっつづてでとどなにぬねのは ばぱひびぴふぶぷへべぺほぼぽまみむめもゃやゅゆょよらりるれろゎわゐゑをんヽヾゝゞー \ifuptexmode -ゔゕゖ +ゔゕゖ𛄲 \fi ァアィイゥウェエォオカガキギクグケゲコゴサザシジスズセゼソゾタダチヂッツヅテデトドナニヌネノハ バパヒビピフブプヘベペホボポマミムメモャヤュユョヨラリルレロヮワヰヱヲンヴヵヶ \ifuptexmode -ヷヸヹヺㇰㇱㇲㇳㇴㇵㇶㇷㇸㇹㇺㇻㇼㇽㇾㇿ +ヷヸヹヺㇰㇱㇲㇳㇴㇵㇶㇷㇸㇹㇺㇻㇼㇽㇾㇿ𛅕 \fi “回”、‘回’。“回”，‘回’． @@ -261,13 +261,13 @@ UTFM:% ぁあぃいぅうぇえぉおかがきぎくぐけげこごさざしじすずせぜそぞただちぢっつづてでとどなにぬねのは ばぱひびぴふぶぷへべぺほぼぽまみむめもゃやゅゆょよらりるれろゎわゐゑをんヽヾゝゞー \ifuptexmode -ゔゕゖ +ゔゕゖ𛄲 \fi ァアィイゥウェエォオカガキギクグケゲコゴサザシジスズセゼソゾタダチヂッツヅテデトドナニヌネノハ バパヒビピフブプヘベペホボポマミムメモャヤュユョヨラリルレロヮワヰヱヲンヴヵヶ \ifuptexmode -ヷヸヹヺㇰㇱㇲㇳㇴㇵㇶㇷㇸㇹㇺㇻㇼㇽㇾㇿ +ヷヸヹヺㇰㇱㇲㇳㇴㇵㇶㇷㇸㇹㇺㇻㇼㇽㇾㇿ𛅕 \fi “回”、‘回’。“回”，‘回’． @@ -282,13 +282,13 @@ UTFM:% ぁあぃいぅうぇえぉおかがきぎくぐけげこごさざしじすずせぜそぞただちぢっつづてでとどなにぬねのは ばぱひびぴふぶぷへべぺほぼぽまみむめもゃやゅゆょよらりるれろゎわゐゑをんヽヾゝゞー \ifuptexmode -ゔゕゖ +ゔゕゖ𛄲 \fi ァアィイゥウェエォオカガキギクグケゲコゴサザシジスズセゼソゾタダチヂッツヅテデトドナニヌネノハ バパヒビピフブプヘベペホボポマミムメモャヤュユョヨラリルレロヮワヰヱヲンヴヵヶ \ifuptexmode -ヷヸヹヺㇰㇱㇲㇳㇴㇵㇶㇷㇸㇹㇺㇻㇼㇽㇾㇿ +ヷヸヹヺㇰㇱㇲㇳㇴㇵㇶㇷㇸㇹㇺㇻㇼㇽㇾㇿ𛅕 \fi “回”、‘回’。“回”，‘回’． @@ -300,13 +300,13 @@ UTFM:% ぁあぃいぅうぇえぉおかがきぎくぐけげこごさざしじすずせぜそぞただちぢっつづてでとどなにぬねのは ばぱひびぴふぶぷへべぺほぼぽまみむめもゃやゅゆょよらりるれろゎわゐゑをんヽヾゝゞー \ifuptexmode -ゔゕゖ +ゔゕゖ𛄲 \fi ァアィイゥウェエォオカガキギクグケゲコゴサザシジスズセゼソゾタダチヂッツヅテデトドナニヌネノハ バパヒビピフブプヘベペホボポマミムメモャヤュユョヨラリルレロヮワヰヱヲンヴヵヶ \ifuptexmode -ヷヸヹヺㇰㇱㇲㇳㇴㇵㇶㇷㇸㇹㇺㇻㇼㇽㇾㇿ +ヷヸヹヺㇰㇱㇲㇳㇴㇵㇶㇷㇸㇹㇺㇻㇼㇽㇾㇿ𛅕 \fi “回”、‘回’。“回”，‘回’． diff --git a/macros/jptex/latex/japanese-otf/doc/test/uplatex/upkanatest1.tex b/macros/jptex/latex/japanese-otf/doc/test/uplatex/upkanatest1.tex index 087bcbcece..0f0d8d18d8 100644 --- a/macros/jptex/latex/japanese-otf/doc/test/uplatex/upkanatest1.tex +++ b/macros/jptex/latex/japanese-otf/doc/test/uplatex/upkanatest1.tex @@ -58,7 +58,7 @@ otfbeta-uptex (japanese-otf-uptex) Ver.0.18でProportional仮名を、 Ver.0.21で半角片仮名を拡張しました。 -\long\def\testA{〃〆ヿゟゔゕゖㇰㇱㇲㇳㇴㇵㇶㇷㇸㇹㇺㇻㇼㇽㇾㇿヷヸヹヺ +\long\def\testA{〃〆ヿゟゔゕゖㇰㇱㇲㇳㇴㇵㇶㇷㇸㇹㇺㇻㇼㇽㇾㇿヷヸヹヺ𛄲𛅕 𨳝櫛𥡴𨻶杓巽屠兔冕冤𡨚𤏐爨🄀 🄐🄑🄒🄓🄔🄕🄖🄗🄘🄙🄚🄛🄜🄝🄞🄟🄠🄡🄢🄣 🄤🄥🄦🄧🄨🄩🅐🅑🅒🅓🅔🅕🅖🅗🅘🅙🅚🅛🅜🅝 diff --git a/macros/jptex/latex/japanese-otf/doc/test/uplatex/utfmacro-kozuka.map b/macros/jptex/latex/japanese-otf/doc/test/uplatex/utfmacro-kozuka.map new file mode 100644 index 0000000000..06050a030c --- /dev/null +++ b/macros/jptex/latex/japanese-otf/doc/test/uplatex/utfmacro-kozuka.map @@ -0,0 +1,144 @@ +rml H KozMinPr6N-Regular.otf +rmlv V KozMinPr6N-Regular.otf + +uprml-h UniJISup-UTF16-H KozMinPr6N-Regular.otf +uprml-v UniJISup-UTF16-V KozMinPr6N-Regular.otf + +hminr-h H KozMinPr6N-Regular.otf +hminb-h H KozMinPr6N-Regular.otf +hminl-h H KozMinPr6N-Regular.otf +hgothr-h H KozGoPr6N-Medium.otf +hgothb-h H KozGoPr6N-Medium.otf +hgotheb-h H KozGoPr6N-Medium.otf +hmgothr-h H KozGoPr6N-Medium.otf +hminr-v V KozMinPr6N-Regular.otf +hminb-v V KozMinPr6N-Regular.otf +hminl-v V KozMinPr6N-Regular.otf +hgothr-v V KozGoPr6N-Medium.otf +hgothb-v V KozGoPr6N-Medium.otf +hgotheb-v V KozGoPr6N-Medium.otf +hmgothr-v V KozGoPr6N-Medium.otf + +hminrn-h H KozMinPr6N-Regular.otf +hminbn-h H KozMinPr6N-Regular.otf +hminln-h H KozMinPr6N-Regular.otf +hgothrn-h H KozGoPr6N-Medium.otf +hgothbn-h H KozGoPr6N-Medium.otf +hgothebn-h H KozGoPr6N-Medium.otf +hmgothrn-h H KozGoPr6N-Medium.otf +hminrn-v V KozMinPr6N-Regular.otf +hminbn-v V KozMinPr6N-Regular.otf +hminln-v V KozMinPr6N-Regular.otf +hgothrn-v V KozGoPr6N-Medium.otf +hgothbn-v V KozGoPr6N-Medium.otf +hgothebn-v V KozGoPr6N-Medium.otf +hmgothrn-v V KozGoPr6N-Medium.otf + +uphminr-h UniJISup-UTF16-H KozMinPr6N-Regular.otf +uphminb-h UniJISup-UTF16-H KozMinPr6N-Regular.otf +uphminl-h UniJISup-UTF16-H KozMinPr6N-Regular.otf +uphgothr-h UniJISup-UTF16-H KozGoPr6N-Medium.otf +uphgothb-h UniJISup-UTF16-H KozGoPr6N-Medium.otf +uphgotheb-h UniJISup-UTF16-H KozGoPr6N-Medium.otf +uphmgothr-h UniJISup-UTF16-H KozGoPr6N-Medium.otf +uphminr-v UniJISup-UTF16-V KozMinPr6N-Regular.otf +uphminb-v UniJISup-UTF16-V KozMinPr6N-Regular.otf +uphminl-v UniJISup-UTF16-V KozMinPr6N-Regular.otf +uphgothr-v UniJISup-UTF16-V KozGoPr6N-Medium.otf +uphgothb-v UniJISup-UTF16-V KozGoPr6N-Medium.otf +uphgotheb-v UniJISup-UTF16-V KozGoPr6N-Medium.otf +uphmgothr-v UniJISup-UTF16-V KozGoPr6N-Medium.otf + +uphminrn-h UniJIS2004up-UTF16-H KozMinPr6N-Regular.otf +uphminbn-h UniJIS2004up-UTF16-H KozMinPr6N-Regular.otf +uphminln-h UniJIS2004up-UTF16-H KozMinPr6N-Regular.otf +uphgothrn-h UniJIS2004up-UTF16-H KozGoPr6N-Medium.otf +uphgothbn-h UniJIS2004up-UTF16-H KozGoPr6N-Medium.otf +uphgothebn-h UniJIS2004up-UTF16-H KozGoPr6N-Medium.otf +uphmgothrn-h UniJIS2004up-UTF16-H KozGoPr6N-Medium.otf +uphminrn-v UniJIS2004up-UTF16-V KozMinPr6N-Regular.otf +uphminbn-v UniJIS2004up-UTF16-V KozMinPr6N-Regular.otf +uphminln-v UniJIS2004up-UTF16-V KozMinPr6N-Regular.otf +uphgothrn-v UniJIS2004up-UTF16-V KozGoPr6N-Medium.otf +uphgothbn-v UniJIS2004up-UTF16-V KozGoPr6N-Medium.otf +uphgothebn-v UniJIS2004up-UTF16-V KozGoPr6N-Medium.otf +uphmgothrn-v UniJIS2004up-UTF16-V KozGoPr6N-Medium.otf + +otf-ujmr-h UniJISup-UTF16-H KozMinPr6N-Regular.otf +otf-ujmb-h UniJISup-UTF16-H KozMinPr6N-Regular.otf +otf-ujml-h UniJISup-UTF16-H KozMinPr6N-Regular.otf +otf-ujgr-h UniJISup-UTF16-H KozGoPr6N-Medium.otf +otf-ujgb-h UniJISup-UTF16-H KozGoPr6N-Medium.otf +otf-ujge-h UniJISup-UTF16-H KozGoPr6N-Medium.otf +otf-ujmgr-h UniJISup-UTF16-H KozGoPr6N-Medium.otf + +otf-ujmrn-h UniJIS2004up-UTF16-H KozMinPr6N-Regular.otf +otf-ujmbn-h UniJIS2004up-UTF16-H KozMinPr6N-Regular.otf +otf-ujmln-h UniJIS2004up-UTF16-H KozMinPr6N-Regular.otf +otf-ujgrn-h UniJIS2004up-UTF16-H KozGoPr6N-Medium.otf +otf-ujgbn-h UniJIS2004up-UTF16-H KozGoPr6N-Medium.otf +otf-ujgen-h UniJIS2004up-UTF16-H KozGoPr6N-Medium.otf +otf-ujmgrn-h UniJIS2004up-UTF16-H KozGoPr6N-Medium.otf + +otf-ujmr-v UniJISup-UTF16-V KozMinPr6N-Regular.otf +otf-ujmb-v UniJISup-UTF16-V KozMinPr6N-Regular.otf +otf-ujml-v UniJISup-UTF16-V KozMinPr6N-Regular.otf +otf-ujgr-v UniJISup-UTF16-V KozGoPr6N-Medium.otf +otf-ujgb-v UniJISup-UTF16-V KozGoPr6N-Medium.otf +otf-ujge-v UniJISup-UTF16-V KozGoPr6N-Medium.otf +otf-ujmgr-v UniJISup-UTF16-V KozGoPr6N-Medium.otf + +otf-ujmrn-v UniJIS2004up-UTF16-V KozMinPr6N-Regular.otf +otf-ujmbn-v UniJIS2004up-UTF16-V KozMinPr6N-Regular.otf +otf-ujmln-v UniJIS2004up-UTF16-V KozMinPr6N-Regular.otf +otf-ujgrn-v UniJIS2004up-UTF16-V KozGoPr6N-Medium.otf +otf-ujgbn-v UniJIS2004up-UTF16-V KozGoPr6N-Medium.otf +otf-ujgen-v UniJIS2004up-UTF16-V KozGoPr6N-Medium.otf +otf-ujmgrn-v UniJIS2004up-UTF16-V KozGoPr6N-Medium.otf + +otf-cjmr-h Identity-H KozMinPr6N-Regular.otf +otf-cjmb-h Identity-H KozMinPr6N-Regular.otf +otf-cjml-h Identity-H KozMinPr6N-Regular.otf +otf-cjgr-h Identity-H KozGoPr6N-Medium.otf +otf-cjgb-h Identity-H KozGoPr6N-Medium.otf +otf-cjge-h Identity-H KozGoPr6N-Medium.otf +otf-cjmgr-h Identity-H KozGoPr6N-Medium.otf + +otf-cjmr-v Identity-V KozMinPr6N-Regular.otf +otf-cjmb-v Identity-V KozMinPr6N-Regular.otf +otf-cjml-v Identity-V KozMinPr6N-Regular.otf +otf-cjgr-v Identity-V KozGoPr6N-Medium.otf +otf-cjgb-v Identity-V KozGoPr6N-Medium.otf +otf-cjge-v Identity-V KozGoPr6N-Medium.otf +otf-cjmgr-v Identity-V KozGoPr6N-Medium.otf + + +otf-ucmr-h UniGB-UTF16-H AdobeSongStd-Light.otf +otf-ucmr-v UniGB-UTF16-V AdobeSongStd-Light.otf +otf-ucgr-h UniGB-UTF16-H AdobeHeitiStd-Regular.otf +otf-ucgr-v UniGB-UTF16-V AdobeHeitiStd-Regular.otf + +otf-utmr-h UniCNS-UTF16-H AdobeMingStd-Light.otf +otf-utmr-v UniCNS-UTF16-V AdobeMingStd-Light.otf +otf-utgr-h UniCNS-UTF16-H AdobeFanHeitiStd-Bold.otf +otf-utgr-v UniCNS-UTF16-V AdobeFanHeitiStd-Bold.otf + +otf-ukmr-h UniKS-UTF16-H AdobeMyungjoStd-Medium.otf +otf-ukmr-v UniKS-UTF16-V AdobeMyungjoStd-Medium.otf +otf-ukgr-h UniKS-UTF16-H AdobeMyungjoStd-Medium.otf +otf-ukgr-v UniKS-UTF16-V AdobeMyungjoStd-Medium.otf + +otf-ccmr-h Identity-H AdobeSongStd-Light.otf +otf-ccmr-v Identity-V AdobeSongStd-Light.otf +otf-ccgr-h Identity-H AdobeHeitiStd-Regular.otf +otf-ccgr-v Identity-V AdobeHeitiStd-Regular.otf + +otf-ctmr-h Identity-H AdobeMingStd-Light.otf +otf-ctmr-v Identity-V AdobeMingStd-Light.otf +otf-ctgr-h Identity-H AdobeFanHeitiStd-Bold.otf +otf-ctgr-v Identity-V AdobeFanHeitiStd-Bold.otf + +otf-ckmr-h Identity-H AdobeMyungjoStd-Medium.otf +otf-ckmr-v Identity-V AdobeMyungjoStd-Medium.otf +otf-ckgr-h Identity-H AdobeMyungjoStd-Medium.otf +otf-ckgr-v Identity-V AdobeMyungjoStd-Medium.otf diff --git a/macros/jptex/latex/japanese-otf/src/script/CheckDVICode.pm b/macros/jptex/latex/japanese-otf/src/script/CheckDVICode.pm index 3af7198b94..2ff357b65d 100644 --- a/macros/jptex/latex/japanese-otf/src/script/CheckDVICode.pm +++ b/macros/jptex/latex/japanese-otf/src/script/CheckDVICode.pm @@ -12,7 +12,7 @@ CheckDVICode.pm =head1 NOTE -This software is a part of otfbeta-uptex (a.k.a. japanese-otf-uptex). +This software is a part of japanese-otf-uptex. =cut @@ -94,6 +94,7 @@ sub is_dvicode($){ if ($key eq 'hira-Vu') { return ($code == 0x3094);} # large JIS X 0213 if ($key eq 'hira-ka') { return ($code == 0x3095);} # small JIS X 0213 if ($key eq 'hira-ke') { return ($code == 0x3096);} # small JIS X 0213 + if ($key eq 'hira-ko') { return ($code == 0x1B132);}# small Unicode 15.0 if ($key eq 'kata-a') { return ($code == 0x30A1);} # small if ($key eq 'kata-i') { return ($code == 0x30A3);} # : if ($key eq 'kata-u') { return ($code == 0x30A5);} # : @@ -106,6 +107,7 @@ sub is_dvicode($){ if ($key eq 'kata-wa') { return ($code == 0x30EE);} # : if ($key eq 'kata-ka') { return ($code == 0x30F5);} # : if ($key eq 'kata-ke') { return ($code == 0x30F6);} # small + if ($key eq 'kata-ko') { return ($code == 0x1B155);}# small Unicode 15.0 if ($key eq 'kata-Va') { return ($code == 0x30F7);} # large JIS X 0213 if ($key eq 'kata-Vi') { return ($code == 0x30F8);} # : JIS X 0213 if ($key eq 'kata-Ve') { return ($code == 0x30F9);} # : JIS X 0213 @@ -197,6 +199,7 @@ sub is_ucs_hira{ return 1 if ($dvicode>=0x3041 && $dvicode<=0x3093); return 1 if ($dvicode>=0x3094 && $dvicode<=0x3096); # Vu, small Ka, small Ke # return 1 if ($dvicode==0x309F); # Yori :: It is omitted because it is not included in "Tuned" in AJ1-6 + return 1 if ($dvicode==0x1B132); # small Ko Unicode 15.0 return 0; } @@ -205,6 +208,7 @@ sub is_ucs_kata{ return 1 if ($dvicode>=0x30F7 && $dvicode<=0x30FA); # Va, Vi, Ve, Vo return 1 if ($dvicode>=0x31F0 && $dvicode<=0x31FF); # small Ku, small Shi, ... , Small Re, Small Ro # return 1 if ($dvicode==0x30FF); # Koto :: It is omitted because it is not included in "Tuned" in AJ1-6 + return 1 if ($dvicode==0x1B155); # small Ko Unicode 15.0 return 0; } @@ -215,8 +219,8 @@ sub is_ucs_hankana{ # Reference: # http://www.unicode.org/Public/UNIDATA/Blocks.txt -# Blocks-12.0.0.txt -# Date: 2018-07-30, 19:40:00 GMT [KW] +# Blocks-15.0.0.txt +# Date: 2022-01-28, 20:58:00 GMT [KW] sub is_ucs_jpn_range{ return 1 if ($dvicode<=0x04FF); # Cyrillic @@ -259,7 +263,8 @@ sub is_ucs_jpn_range{ return 0 if ($dvicode< 0xFF00); return 1 if ($dvicode<=0xFFEF); # Halfwidth and Fullwidth Forms - return 0 if ($dvicode< 0x1B000); + return 0 if ($dvicode< 0x1AFF0); + return 1 if ($dvicode<=0x1AFFF); # Kana Extended-B return 1 if ($dvicode<=0x1B0FF); # Kana Supplement return 1 if ($dvicode<=0x1B12F); # Kana Extended-A return 1 if ($dvicode<=0x1B16F); # Small Kana Extension @@ -281,6 +286,10 @@ sub is_ucs_jpn_range{ return 0 if ($dvicode< 0x2F800); return 1 if ($dvicode<=0x2FA1F); # CJK Compatibility Ideographs Supplement + return 0 if ($dvicode< 0x30000); + return 1 if ($dvicode<=0x3134F); # CJK Unified Ideographs Extension G + return 1 if ($dvicode<=0x323AF); # CJK Unified Ideographs Extension H + return 0; } diff --git a/macros/jptex/latex/japanese-otf/src/script/MakeSPList.pm b/macros/jptex/latex/japanese-otf/src/script/MakeSPList.pm index 8dc9ce0e3a..29e79a3792 100644 --- a/macros/jptex/latex/japanese-otf/src/script/MakeSPList.pm +++ b/macros/jptex/latex/japanese-otf/src/script/MakeSPList.pm @@ -12,13 +12,13 @@ MakeSPList.pm =head1 NOTE -This software is a part of otfbeta-uptex (a.k.a. japanese-otf-uptex). +This software is a part of japanese-otf-uptex. =cut our ($r_exist_head, $r_exist_char); -my $num = '[12][0-9A-F]{4}'; +my $num = '[123][0-9A-F]{4}'; sub make_sp_char_list(@) { my (@lang)=@_; diff --git a/macros/jptex/latex/japanese-otf/src/script/mktfm_sp.pl b/macros/jptex/latex/japanese-otf/src/script/mktfm_sp.pl index 90f464d13a..d14bd5866d 100755 --- a/macros/jptex/latex/japanese-otf/src/script/mktfm_sp.pl +++ b/macros/jptex/latex/japanese-otf/src/script/mktfm_sp.pl @@ -10,7 +10,7 @@ script/mktfm_sp.pl =head1 NOTE -This software is a part of otfbeta-uptex (a.k.a. japanese-otf-uptex). +This software is a part of japanese-otf-uptex. =cut diff --git a/macros/jptex/latex/japanese-otf/src/script/mkutf32list.pl b/macros/jptex/latex/japanese-otf/src/script/mkutf32list.pl index 377659d398..2a05252074 100755 --- a/macros/jptex/latex/japanese-otf/src/script/mkutf32list.pl +++ b/macros/jptex/latex/japanese-otf/src/script/mkutf32list.pl @@ -19,7 +19,7 @@ Takuji Tanaka =head1 NOTE -This software is a part of otfbeta-uptex (a.k.a. japanese-otf-uptex). +This software is a part of japanese-otf-uptex. =cut diff --git a/macros/jptex/latex/japanese-otf/src/script/mkutfvf_sp.pl b/macros/jptex/latex/japanese-otf/src/script/mkutfvf_sp.pl index 97ea89f2af..cf6379f957 100755 --- a/macros/jptex/latex/japanese-otf/src/script/mkutfvf_sp.pl +++ b/macros/jptex/latex/japanese-otf/src/script/mkutfvf_sp.pl @@ -12,7 +12,7 @@ script/mkutfvf_sp.pl -ovp2ovf='wovp2ovf' =head1 NOTE -This software is a part of otfbeta-uptex (a.k.a. japanese-otf-uptex). +This software is a part of japanese-otf-uptex. =cut diff --git a/macros/jptex/latex/japanese-otf/src/script/sp_list_j.txt b/macros/jptex/latex/japanese-otf/src/script/sp_list_j.txt index 2092c5767a..ad1db44239 100644 --- a/macros/jptex/latex/japanese-otf/src/script/sp_list_j.txt +++ b/macros/jptex/latex/japanese-otf/src/script/sp_list_j.txt @@ -1,6 +1,6 @@ % % This file is generated from the data of UniJIS-UTF32 -% in cid2code.txt (Version 07/30/2019) +% in cid2code.txt (Version 05/18/2022) % for Adobe-Japan1-7 % % Reference: @@ -26,15 +26,15 @@ 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,1F79C,2F945,2090E,26951 -2B7D8,2F8FC,2F995,2F8EA,2F822,26222,20BB7,29D4B,2F833,2B78E -2F8AC,20A64,2F903,2B746,2B777,2F90B,20B9F,2F828,2F921,2F83F -2F873,2D544,2000B,2F852,2967F,2F947,201A2,2E569,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,2E278,2053F,2626A -200B0,2E6EA,28987,28E17,2B81A,242EE,2F8E1,23CBE,20611,2F9F4 -2F804,2363A,233FE,22609 +1F184,1F185,1F186,1F187,1F188,1F189,1F79C,1B132,1B155,2F945 +2090E,26951,2B7D8,2F8FC,2F995,2F8EA,2F822,26222,20BB7,29D4B +2F833,2B78E,2F8AC,20A64,2F903,2B746,2B777,2F90B,20B9F,2F828 +2F921,2F83F,2F873,2D544,2000B,2F852,2967F,2F947,201A2,2E569 +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,2E278 +2053F,2626A,200B0,2E6EA,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 @@ -65,11 +65,11 @@ 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 +2A0F9,2A082,22218,2A38C,2A437,2A5F1,2A602,2A6B2,31350,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/macros/jptex/latex/japanese-otf/src/script/umkpkana.pl b/macros/jptex/latex/japanese-otf/src/script/umkpkana.pl index 2620888454..c72e56fc64 100755 --- a/macros/jptex/latex/japanese-otf/src/script/umkpkana.pl +++ b/macros/jptex/latex/japanese-otf/src/script/umkpkana.pl @@ -2,7 +2,7 @@ =head1 NOTE -This software is a part of otfbeta-uptex (a.k.a. japanese-otf-uptex). +This software is a part of japanese-otf-uptex. =cut @@ -373,7 +373,7 @@ sub print_type_prop{ sub get_charwidth{ my ($i,$dvicode)=@_; - my ($char,$u,$l); + my ($char,$t,$u,$l); if (!$ucs) { if ($dvicode>=0x2474 && $dvicode<=0x2476) { @@ -384,10 +384,11 @@ sub get_charwidth{ $char = pack("C*",$u,$l); Encode::from_to($char,'euc-jp','utf-8'); } else { + $t = ($dvicode >>16) & 0xFF; $u = ($dvicode >> 8) & 0xFF; $l = $dvicode & 0xFF; - $char = pack("C*",$u,$l); - Encode::from_to($char,'utf-16be','utf-8'); + $char = pack("C*",0x00,$t,$u,$l); + Encode::from_to($char,'utf-32','utf-8'); } if (!exists($charwidth[$i]{$char})) { return 0; @@ -397,7 +398,7 @@ sub get_charwidth{ __DATA__ -character cid min_w3 min_w6 goth_w3 goth_w6 maru_w4 +character cid min_w3 min_w6 goth_w3 goth_w6 maru_w4 comment ヽ 15449 7.11 7.54 7.19 7.49 7.45 ヾ 15450 7.68 7.95 7.69 8 8.15 ゝ 15451 7.17 7.43 7.23 7.53 7.63 @@ -599,4 +600,6 @@ character cid min_w3 min_w6 goth_w3 goth_w6 maru_w4 ヸ 15720 9.41 9.75 9.6 9.7 9.75 ヹ 15721 9.47 9.7 9.65 9.7 9.8 ヺ 15722 8.91 9.32 9.34 9.39 9.73 +𛄲 15723 7.53 7.76 7.9 8.18 8.33 U+1B132 小書き「こ」 +𛅕 15724 8.04 8.35 8.4 8.65 8.65 U+1B155 小書き「コ」 end diff --git a/macros/jptex/latex/japanese-otf/src/script/umkvpkana.pl b/macros/jptex/latex/japanese-otf/src/script/umkvpkana.pl index da4d0d7d8a..60e1712662 100755 --- a/macros/jptex/latex/japanese-otf/src/script/umkvpkana.pl +++ b/macros/jptex/latex/japanese-otf/src/script/umkvpkana.pl @@ -2,7 +2,7 @@ =head1 NOTE -This software is a part of otfbeta-uptex (a.k.a. japanese-otf-uptex). +This software is a part of japanese-otf-uptex. =cut @@ -340,7 +340,7 @@ sub print_type_prop{ sub get_charwidth{ my ($i,$dvicode)=@_; - my ($char,$u,$l); + my ($char,$t,$u,$l); if (!$ucs) { if ($dvicode>=0x2474 && $dvicode<=0x2476) { @@ -351,10 +351,11 @@ sub get_charwidth{ $char = pack("C*",$u,$l); Encode::from_to($char,'euc-jp','utf-8'); } else { + $t = ($dvicode >>16) & 0xFF; $u = ($dvicode >> 8) & 0xFF; $l = $dvicode & 0xFF; - $char = pack("C*",$u,$l); - Encode::from_to($char,'utf-16be','utf-8'); + $char = pack("C*",0x00,$t,$u,$l); + Encode::from_to($char,'utf-32','utf-8'); } if (!exists($charwidth[$i]{$char})) { return 0; @@ -364,7 +365,7 @@ sub get_charwidth{ __DATA__ -character cid min_w3 min_w6 goth_w3 goth_w6 maru_w4 +character cid min_w3 min_w6 goth_w3 goth_w6 maru_w4 comment ヽ 15976 7.17 7.46 7.92 8.27 8.13 ヾ 15977 8.34 8.44 8.46 8.62 8.5 ゝ 15978 7.77 7.98 8.44 8.69 8.62 @@ -566,4 +567,6 @@ character cid min_w3 min_w6 goth_w3 goth_w6 maru_w4 ヸ 16188 9.61 9.8 9.73 9.84 9.77 ヹ 16189 8.94 9.28 9.56 9.80 9.88 ヺ 16190 9.54 9.71 9.67 9.82 9.74 +𛄲 16191 8.72 8.88 8.83 9.13 9.04 U+1B132 小書き「こ」 +𛅕 16192 8 8.23 8.65 8.95 8.91 U+1B155 小書き「コ」 end diff --git a/macros/jptex/latex/japanese-otf/src/umakeotf b/macros/jptex/latex/japanese-otf/src/umakeotf index 5749e6fcb7..d675f106d2 100755 --- a/macros/jptex/latex/japanese-otf/src/umakeotf +++ b/macros/jptex/latex/japanese-otf/src/umakeotf @@ -1,7 +1,7 @@ #!/bin/sh # -# This script is a part of otfbeta-uptex (a.k.a. japanese-otf-uptex). +# This script is a part of japanese-otf-uptex. # # setting for ovp2ovf & uppltotf diff --git a/macros/jptex/latex/japanese-otf/src/umakeotf_brsg b/macros/jptex/latex/japanese-otf/src/umakeotf_brsg index 2296dc7929..d4d6fabffb 100755 --- a/macros/jptex/latex/japanese-otf/src/umakeotf_brsg +++ b/macros/jptex/latex/japanese-otf/src/umakeotf_brsg @@ -1,7 +1,7 @@ #!/bin/sh # -# This script is a part of otfbeta-uptex (a.k.a. japanese-otf-uptex). +# This script is a part of japanese-otf-uptex. # # setting for ovp2ovf & uppltotf diff --git a/macros/jptex/latex/japanese-otf/src/umakeotf_jis04 b/macros/jptex/latex/japanese-otf/src/umakeotf_jis04 index f02e69fd63..13b7fdc102 100755 --- a/macros/jptex/latex/japanese-otf/src/umakeotf_jis04 +++ b/macros/jptex/latex/japanese-otf/src/umakeotf_jis04 @@ -1,7 +1,7 @@ #!/bin/sh # -# This script is a part of otfbeta-uptex (a.k.a. japanese-otf-uptex). +# This script is a part of japanese-otf-uptex. # # setting for ovp2ovf & uppltotf diff --git a/macros/jptex/latex/japanese-otf/src/umakeotf_pre b/macros/jptex/latex/japanese-otf/src/umakeotf_pre index 1336cc2182..c9bcb8b5d4 100644 --- a/macros/jptex/latex/japanese-otf/src/umakeotf_pre +++ b/macros/jptex/latex/japanese-otf/src/umakeotf_pre @@ -1,7 +1,7 @@ #!/bin/sh # -# This script is a part of otfbeta-uptex (a.k.a. japanese-otf-uptex). +# This script is a part of japanese-otf-uptex. # # setting for ovp2ovf & uppltotf diff --git a/macros/jptex/latex/japanese-otf/src/umakeotf_prop b/macros/jptex/latex/japanese-otf/src/umakeotf_prop index 13b27d5152..b83a6e0742 100755 --- a/macros/jptex/latex/japanese-otf/src/umakeotf_prop +++ b/macros/jptex/latex/japanese-otf/src/umakeotf_prop @@ -1,7 +1,7 @@ #!/bin/sh # -# This script is a part of otfbeta-uptex (a.k.a. japanese-otf-uptex). +# This script is a part of japanese-otf-uptex. # # setting for ovp2ovf & uppltotf @@ -18,8 +18,8 @@ mkdir ovp fi echo "making proportional kana tfm/vf ..." -perl -s script/umkpkana.pl -omitfw -hk -perl -s script/umkvpkana.pl -omitfw +perl -s script/umkpkana.pl -omitfw -sp -hk +perl -s script/umkvpkana.pl -omitfw -sp for face in minw3 minw6 kakuw3 kakuw6 maruw4 do diff --git a/macros/jptex/latex/japanese-otf/src/umkjvf b/macros/jptex/latex/japanese-otf/src/umkjvf index f90f4a5a0a..229d70e304 100755 --- a/macros/jptex/latex/japanese-otf/src/umkjvf +++ b/macros/jptex/latex/japanese-otf/src/umkjvf @@ -775,6 +775,8 @@ sub print_ruby_hira_char{ if (&is_dvicode('hira-Vu')){$ruby_hira_code=0x3744;} if (&is_dvicode('hira-ka')){$ruby_hira_code=0x363A;} if (&is_dvicode('hira-ke')){$ruby_hira_code=0x3641;} + if (&is_dvicode('hira-ko')){$ruby_hira_code=0x3130; + $ruby_font_map=3;} # Unicode 15.0 $ruby_hira_code_orig=$ruby_hira_code; if ($direction eq "t"){&fix_ruby_hira_code;} printf OVP "(CHARACTER H %X\n", $dvicode; @@ -800,6 +802,7 @@ sub print_ruby_kata_char{ $ruby_font_map=3;} # JIS X 0213 if (&is_dvicode('kata-ku')){$ruby_kata_code_orig=$ruby_kata_code=0x305B;} # JIS X 0213 if (&is_dvicode('kata-mu')){$ruby_kata_code_orig=$ruby_kata_code=0x3066;} # JIS X 0213 + if (&is_dvicode('kata-ko')){$ruby_kata_code_orig=$ruby_kata_code=0x3131;} # Unicode 15.0 if ($direction eq "t"){&fix_ruby_kata_code;} printf OVP "(CHARACTER H %X\n", $dvicode; printf OVP " (CHARWD R %f)\n",$font_at; @@ -819,6 +822,7 @@ sub exp_hira_h_char{ if (&is_dvicode('hira-Vu')){$exp_hira_code_h=0x3139;$exp_font_map=3;} # JIS X 0213 if (&is_dvicode('hira-ka')){$exp_hira_code_h=0x6f6d;$exp_font_map=2;} # JIS X 0213 if (&is_dvicode('hira-ke')){$exp_hira_code_h=0x3034;$exp_font_map=3;} # JIS X 0213 + if (&is_dvicode('hira-ko')){$exp_hira_code_h=0x3037;$exp_font_map=3;} # Unicode 15.0 printf OVP "(CHARACTER H %X\n", $dvicode; printf OVP " (CHARWD R %f)\n",$font_at; print OVP " (MAP\n"; @@ -838,6 +842,7 @@ sub exp_hira_h_char{ sub exp_kata_h_char{ if (&is_dvicode('kata-ka')){$exp_kata_code_h=0x3147;} if (&is_dvicode('kata-ke')){$exp_kata_code_h=0x314e;} + if (&is_dvicode('kata-ko')){$exp_kata_code_h=0x3151;} # Unicode 15.0 if (&is_dvicode('kata-Va')){$exp_kata_code_h=0x3254;} # JIS X 0213 if (&is_dvicode('kata-ku')){$exp_kata_code_h=0x6f5d;} # JIS X 0213 if (&is_dvicode('kata-mu')){$exp_kata_code_h=0x6f68;} # JIS X 0213 @@ -860,6 +865,7 @@ sub exp_hira_v_char{ if (&is_dvicode('hira-Vu')){$exp_hira_code_v=0x3430;$exp_font_map=2;} # JIS X 0213 if (&is_dvicode('hira-ka')){$exp_hira_code_v=0x3264;$exp_font_map=2;} # JIS X 0213 if (&is_dvicode('hira-ke')){$exp_hira_code_v=0x326b;$exp_font_map=2;} # JIS X 0213 + if (&is_dvicode('hira-ko')){$exp_hira_code_v=0x326e;$exp_font_map=2;} # Unicode 15.0 printf OVP "(CHARACTER H %X\n", $dvicode; printf OVP " (CHARWD R %f)\n",$font_at; print OVP " (MAP\n"; @@ -881,6 +887,7 @@ sub exp_kata_v_char{ if (&is_dvicode('kata-Va')){$exp_kata_code_v=0x354b;} # JIS X 0213 if (&is_dvicode('kata-ku')){$exp_kata_code_v=0x303b;$exp_font_map=3;} # JIS X 0213 if (&is_dvicode('kata-mu')){$exp_kata_code_v=0x3046;} # JIS X 0213 + if (&is_dvicode('kata-ko')){$exp_kata_code_v=0x3448;$exp_font_map=2;} # Unicode 15.0 printf OVP "(CHARACTER H %X\n", $dvicode; printf OVP " (CHARWD R %f)\n",$font_at; print OVP " (MAP\n"; @@ -909,6 +916,7 @@ sub fix_ruby_hira_code{ if (&is_dvicode('hira-wa' )){$ruby_hira_code=0x3750;}#wa if (&is_dvicode('hira-ka' )){$ruby_hira_code=0x374a;} # JIS X 0213 if (&is_dvicode('hira-ke' )){$ruby_hira_code=0x374b;} # JIS X 0213 + if (&is_dvicode('hira-ko' )){$ruby_hira_code=0x3143;} # Unicode 15.0 } sub fix_ruby_kata_code{ if (&is_dvicode('kata-a' )){$ruby_kata_code=0x3867;}#a @@ -922,8 +930,9 @@ sub fix_ruby_kata_code{ if (&is_dvicode('kata-yo' )){$ruby_kata_code=0x3931;}#yo if (&is_dvicode('kata-wa' )){$ruby_kata_code=0x3932;}#wa if (&is_dvicode('kata-ka' )){$ruby_kata_code=0x386c;}#ka - if (&is_dvicode('kata-ke' )){$ruby_kata_code=0x386d;}#ke + if (&is_dvicode('kata-ke' )){$ruby_kata_code=0x386d;}#ke if (&is_dvicode('kata-ku..ro')){$ruby_kata_code+=215;} # JIS X 0213 + if (&is_dvicode('kata-ko' )){$ruby_kata_code=0x3144;} # Unicode 15.0 } sub get_shift_jiscode{ $c1=$ku+32; diff --git a/macros/jptex/latex/japanese-otf/sty/mlutf.sty b/macros/jptex/latex/japanese-otf/sty/mlutf.sty index 78a6b2353d..28538d0d28 100644 --- a/macros/jptex/latex/japanese-otf/sty/mlutf.sty +++ b/macros/jptex/latex/japanese-otf/sty/mlutf.sty @@ -1,5 +1,5 @@ \NeedsTeXFormat{pLaTeX2e} -\ProvidesPackage{mlutf}[2004/04/17 v1.1.2 psitau, u0.27 ttk] +\ProvidesPackage{mlutf}[2004/04/17 v1.1.2 psitau, u0.28 ttk] %force catcode of \" be 12 \count@\catcode`\" \catcode`\"=12 diff --git a/macros/jptex/latex/japanese-otf/sty/otf.sty b/macros/jptex/latex/japanese-otf/sty/otf.sty index e302cea886..27ceb01d0d 100644 --- a/macros/jptex/latex/japanese-otf/sty/otf.sty +++ b/macros/jptex/latex/japanese-otf/sty/otf.sty @@ -1,7 +1,7 @@ \NeedsTeXFormat{pLaTeX2e} -\ProvidesPackage{otf}[2022/03/05 TeX JP org, v1.7b8 psitau, u0.27 ttk] +\ProvidesPackage{otf}[2023/02/23 TeX JP org, v1.7b8 psitau, u0.28 ttk] \RequirePackage{keyval} -%for processing options +%for processing options \newif\if@kana \@kanafalse \newif\if@macro \@macrotrue \newif\if@deluxe \@deluxefalse @@ -10,7 +10,6 @@ \newif\if@burasage \@burasagefalse \newif\if@newglyph \@newglyphfalse \newif\if@otf@uplatex \@otf@uplatexfalse -\newif\if@otf@autodetect \@otf@autodetectfalse \newif\if@otf@scale \@otf@scalefalse \newif\if@jsclasses \@jsclassesfalse @@ -22,8 +21,10 @@ \DeclareOption{deluxe}{\@boldfalse\@replacetrue\@deluxetrue} \DeclareOption{multi}{\AtEndOfPackage{\RequirePackage{mlutf}\RequirePackage{mlcid}}} \DeclareOption{burasage}{\@burasagetrue} -\DeclareOption{uplatex}{\@otf@uplatextrue} -\DeclareOption{autodetect-engine}{\@otf@autodetecttrue} +\let\@otf@engine@given=* +\DeclareOption{platex}{\let\@otf@engine@given=p\@otf@uplatexfalse} +\DeclareOption{uplatex}{\let\@otf@engine@given=u\@otf@uplatextrue} +\DeclareOption{autodetect-engine}{\let\@otf@engine@given=*} \DeclareOption{jis2004}{\@newglyphtrue} \DeclareOption*{\otfpkg@setkey} \def\otfpkg@setkey{\expandafter\otfpkg@setkey@a\expandafter{\CurrentOption}} @@ -40,23 +41,33 @@ % Autodetect engine \ifnum \ifx\ucs\@undefined\z@\else\ucs"3000 \fi ="3000 %upTeX - \if@otf@autodetect + \ifx *\@otf@engine@given \PackageInfo{otf}{Autodetected engine: upLaTeX} \@otf@uplatextrue \fi + \ifx p\@otf@engine@given + \PackageError{otf} + {Option 'platex' is specified but you are running upLaTeX.} + {\@ehc} + \fi \if@otf@uplatex\else \PackageError{otf} {You are running upLaTeX.\MessageBreak - Please use pLaTeX instead, or add 'uplatex' to\MessageBreak + Please use pLaTeX instead, or remove 'platex' from\MessageBreak the package option list} {\@ehc} \@otf@uplatextrue \fi \else %pTeX - \if@otf@autodetect + \ifx *\@otf@engine@given \PackageInfo{otf}{Autodetected engine: pLaTeX} \@otf@uplatexfalse \fi + \ifx u\@otf@engine@given + \PackageError{otf} + {Option 'uplatex' is specified but you are running pLaTeX.} + {\@ehc} + \fi \if@otf@uplatex \PackageError{otf} {You are running pLaTeX.\MessageBreak diff --git a/macros/jptex/latex/japanese-otf/tfm/utfgrg-h.tfm b/macros/jptex/latex/japanese-otf/tfm/utfgrg-h.tfm Binary files differnew file mode 100644 index 0000000000..29cb2cd42d --- /dev/null +++ b/macros/jptex/latex/japanese-otf/tfm/utfgrg-h.tfm diff --git a/macros/jptex/latex/japanese-otf/tfm/utfgrg-v.tfm b/macros/jptex/latex/japanese-otf/tfm/utfgrg-v.tfm Binary files differnew file mode 100644 index 0000000000..00f00ca892 --- /dev/null +++ b/macros/jptex/latex/japanese-otf/tfm/utfgrg-v.tfm diff --git a/macros/jptex/latex/japanese-otf/tfm/utfjgbg-h.tfm b/macros/jptex/latex/japanese-otf/tfm/utfjgbg-h.tfm Binary files differnew file mode 100644 index 0000000000..29cb2cd42d --- /dev/null +++ b/macros/jptex/latex/japanese-otf/tfm/utfjgbg-h.tfm diff --git a/macros/jptex/latex/japanese-otf/tfm/utfjgbg-v.tfm b/macros/jptex/latex/japanese-otf/tfm/utfjgbg-v.tfm Binary files differnew file mode 100644 index 0000000000..00f00ca892 --- /dev/null +++ b/macros/jptex/latex/japanese-otf/tfm/utfjgbg-v.tfm diff --git a/macros/jptex/latex/japanese-otf/tfm/utfjgeg-h.tfm b/macros/jptex/latex/japanese-otf/tfm/utfjgeg-h.tfm Binary files differnew file mode 100644 index 0000000000..29cb2cd42d --- /dev/null +++ b/macros/jptex/latex/japanese-otf/tfm/utfjgeg-h.tfm diff --git a/macros/jptex/latex/japanese-otf/tfm/utfjgeg-v.tfm b/macros/jptex/latex/japanese-otf/tfm/utfjgeg-v.tfm Binary files differnew file mode 100644 index 0000000000..00f00ca892 --- /dev/null +++ b/macros/jptex/latex/japanese-otf/tfm/utfjgeg-v.tfm diff --git a/macros/jptex/latex/japanese-otf/tfm/utfjgrg-h.tfm b/macros/jptex/latex/japanese-otf/tfm/utfjgrg-h.tfm Binary files differnew file mode 100644 index 0000000000..29cb2cd42d --- /dev/null +++ b/macros/jptex/latex/japanese-otf/tfm/utfjgrg-h.tfm diff --git a/macros/jptex/latex/japanese-otf/tfm/utfjgrg-v.tfm b/macros/jptex/latex/japanese-otf/tfm/utfjgrg-v.tfm Binary files differnew file mode 100644 index 0000000000..00f00ca892 --- /dev/null +++ b/macros/jptex/latex/japanese-otf/tfm/utfjgrg-v.tfm diff --git a/macros/jptex/latex/japanese-otf/tfm/utfjmbg-h.tfm b/macros/jptex/latex/japanese-otf/tfm/utfjmbg-h.tfm Binary files differnew file mode 100644 index 0000000000..29cb2cd42d --- /dev/null +++ b/macros/jptex/latex/japanese-otf/tfm/utfjmbg-h.tfm diff --git a/macros/jptex/latex/japanese-otf/tfm/utfjmbg-v.tfm b/macros/jptex/latex/japanese-otf/tfm/utfjmbg-v.tfm Binary files differnew file mode 100644 index 0000000000..00f00ca892 --- /dev/null +++ b/macros/jptex/latex/japanese-otf/tfm/utfjmbg-v.tfm diff --git a/macros/jptex/latex/japanese-otf/tfm/utfjmgrg-h.tfm b/macros/jptex/latex/japanese-otf/tfm/utfjmgrg-h.tfm Binary files differnew file mode 100644 index 0000000000..29cb2cd42d --- /dev/null +++ b/macros/jptex/latex/japanese-otf/tfm/utfjmgrg-h.tfm diff --git a/macros/jptex/latex/japanese-otf/tfm/utfjmgrg-v.tfm b/macros/jptex/latex/japanese-otf/tfm/utfjmgrg-v.tfm Binary files differnew file mode 100644 index 0000000000..00f00ca892 --- /dev/null +++ b/macros/jptex/latex/japanese-otf/tfm/utfjmgrg-v.tfm diff --git a/macros/jptex/latex/japanese-otf/tfm/utfjmlg-h.tfm b/macros/jptex/latex/japanese-otf/tfm/utfjmlg-h.tfm Binary files differnew file mode 100644 index 0000000000..29cb2cd42d --- /dev/null +++ b/macros/jptex/latex/japanese-otf/tfm/utfjmlg-h.tfm diff --git a/macros/jptex/latex/japanese-otf/tfm/utfjmlg-v.tfm b/macros/jptex/latex/japanese-otf/tfm/utfjmlg-v.tfm Binary files differnew file mode 100644 index 0000000000..00f00ca892 --- /dev/null +++ b/macros/jptex/latex/japanese-otf/tfm/utfjmlg-v.tfm diff --git a/macros/jptex/latex/japanese-otf/tfm/utfjmrg-h.tfm b/macros/jptex/latex/japanese-otf/tfm/utfjmrg-h.tfm Binary files differnew file mode 100644 index 0000000000..29cb2cd42d --- /dev/null +++ b/macros/jptex/latex/japanese-otf/tfm/utfjmrg-h.tfm diff --git a/macros/jptex/latex/japanese-otf/tfm/utfjmrg-v.tfm b/macros/jptex/latex/japanese-otf/tfm/utfjmrg-v.tfm Binary files differnew file mode 100644 index 0000000000..00f00ca892 --- /dev/null +++ b/macros/jptex/latex/japanese-otf/tfm/utfjmrg-v.tfm diff --git a/macros/jptex/latex/japanese-otf/tfm/utfmrg-h.tfm b/macros/jptex/latex/japanese-otf/tfm/utfmrg-h.tfm Binary files differnew file mode 100644 index 0000000000..29cb2cd42d --- /dev/null +++ b/macros/jptex/latex/japanese-otf/tfm/utfmrg-h.tfm diff --git a/macros/jptex/latex/japanese-otf/tfm/utfmrg-v.tfm b/macros/jptex/latex/japanese-otf/tfm/utfmrg-v.tfm Binary files differnew file mode 100644 index 0000000000..00f00ca892 --- /dev/null +++ b/macros/jptex/latex/japanese-otf/tfm/utfmrg-v.tfm diff --git a/macros/jptex/latex/japanese-otf/vf/upbrsgexpgothb-h.vf b/macros/jptex/latex/japanese-otf/vf/upbrsgexpgothb-h.vf Binary files differindex 8995843b3d..b8607babbd 100644 --- a/macros/jptex/latex/japanese-otf/vf/upbrsgexpgothb-h.vf +++ b/macros/jptex/latex/japanese-otf/vf/upbrsgexpgothb-h.vf diff --git a/macros/jptex/latex/japanese-otf/vf/upbrsgexpgothb-v.vf b/macros/jptex/latex/japanese-otf/vf/upbrsgexpgothb-v.vf Binary files differindex 3a62ae9a4d..49cabeef6b 100644 --- a/macros/jptex/latex/japanese-otf/vf/upbrsgexpgothb-v.vf +++ b/macros/jptex/latex/japanese-otf/vf/upbrsgexpgothb-v.vf diff --git a/macros/jptex/latex/japanese-otf/vf/upbrsgexpgothbn-h.vf b/macros/jptex/latex/japanese-otf/vf/upbrsgexpgothbn-h.vf Binary files differindex 894fac8889..6333c506e5 100644 --- a/macros/jptex/latex/japanese-otf/vf/upbrsgexpgothbn-h.vf +++ b/macros/jptex/latex/japanese-otf/vf/upbrsgexpgothbn-h.vf diff --git a/macros/jptex/latex/japanese-otf/vf/upbrsgexpgothbn-v.vf b/macros/jptex/latex/japanese-otf/vf/upbrsgexpgothbn-v.vf Binary files differindex 7ee87ff11a..54951b67da 100644 --- a/macros/jptex/latex/japanese-otf/vf/upbrsgexpgothbn-v.vf +++ b/macros/jptex/latex/japanese-otf/vf/upbrsgexpgothbn-v.vf diff --git a/macros/jptex/latex/japanese-otf/vf/upbrsgexpgotheb-h.vf b/macros/jptex/latex/japanese-otf/vf/upbrsgexpgotheb-h.vf Binary files differindex bf9be0a01f..6831b29c23 100644 --- a/macros/jptex/latex/japanese-otf/vf/upbrsgexpgotheb-h.vf +++ b/macros/jptex/latex/japanese-otf/vf/upbrsgexpgotheb-h.vf diff --git a/macros/jptex/latex/japanese-otf/vf/upbrsgexpgotheb-v.vf b/macros/jptex/latex/japanese-otf/vf/upbrsgexpgotheb-v.vf Binary files differindex dc7dc36032..089c196842 100644 --- a/macros/jptex/latex/japanese-otf/vf/upbrsgexpgotheb-v.vf +++ b/macros/jptex/latex/japanese-otf/vf/upbrsgexpgotheb-v.vf diff --git a/macros/jptex/latex/japanese-otf/vf/upbrsgexpgothebn-h.vf b/macros/jptex/latex/japanese-otf/vf/upbrsgexpgothebn-h.vf Binary files differindex beea53f470..f1a09d9e38 100644 --- a/macros/jptex/latex/japanese-otf/vf/upbrsgexpgothebn-h.vf +++ b/macros/jptex/latex/japanese-otf/vf/upbrsgexpgothebn-h.vf diff --git a/macros/jptex/latex/japanese-otf/vf/upbrsgexpgothebn-v.vf b/macros/jptex/latex/japanese-otf/vf/upbrsgexpgothebn-v.vf Binary files differindex f390c3db7d..ed0278ebf8 100644 --- a/macros/jptex/latex/japanese-otf/vf/upbrsgexpgothebn-v.vf +++ b/macros/jptex/latex/japanese-otf/vf/upbrsgexpgothebn-v.vf diff --git a/macros/jptex/latex/japanese-otf/vf/upbrsgexpgothr-h.vf b/macros/jptex/latex/japanese-otf/vf/upbrsgexpgothr-h.vf Binary files differindex 111b3eb99f..1943956026 100644 --- a/macros/jptex/latex/japanese-otf/vf/upbrsgexpgothr-h.vf +++ b/macros/jptex/latex/japanese-otf/vf/upbrsgexpgothr-h.vf diff --git a/macros/jptex/latex/japanese-otf/vf/upbrsgexpgothr-v.vf b/macros/jptex/latex/japanese-otf/vf/upbrsgexpgothr-v.vf Binary files differindex b9e590ac53..3be74db00e 100644 --- a/macros/jptex/latex/japanese-otf/vf/upbrsgexpgothr-v.vf +++ b/macros/jptex/latex/japanese-otf/vf/upbrsgexpgothr-v.vf diff --git a/macros/jptex/latex/japanese-otf/vf/upbrsgexpgothrn-h.vf b/macros/jptex/latex/japanese-otf/vf/upbrsgexpgothrn-h.vf Binary files differindex 056e9daf8e..3b6697f872 100644 --- a/macros/jptex/latex/japanese-otf/vf/upbrsgexpgothrn-h.vf +++ b/macros/jptex/latex/japanese-otf/vf/upbrsgexpgothrn-h.vf diff --git a/macros/jptex/latex/japanese-otf/vf/upbrsgexpgothrn-v.vf b/macros/jptex/latex/japanese-otf/vf/upbrsgexpgothrn-v.vf Binary files differindex 7bcdd86ca5..415cb9d349 100644 --- a/macros/jptex/latex/japanese-otf/vf/upbrsgexpgothrn-v.vf +++ b/macros/jptex/latex/japanese-otf/vf/upbrsgexpgothrn-v.vf diff --git a/macros/jptex/latex/japanese-otf/vf/upbrsgexpmgothr-h.vf b/macros/jptex/latex/japanese-otf/vf/upbrsgexpmgothr-h.vf Binary files differindex 16a7a60dee..2520ca77ae 100644 --- a/macros/jptex/latex/japanese-otf/vf/upbrsgexpmgothr-h.vf +++ b/macros/jptex/latex/japanese-otf/vf/upbrsgexpmgothr-h.vf diff --git a/macros/jptex/latex/japanese-otf/vf/upbrsgexpmgothr-v.vf b/macros/jptex/latex/japanese-otf/vf/upbrsgexpmgothr-v.vf Binary files differindex 9efb8f69dc..53c00470ff 100644 --- a/macros/jptex/latex/japanese-otf/vf/upbrsgexpmgothr-v.vf +++ b/macros/jptex/latex/japanese-otf/vf/upbrsgexpmgothr-v.vf diff --git a/macros/jptex/latex/japanese-otf/vf/upbrsgexpmgothrn-h.vf b/macros/jptex/latex/japanese-otf/vf/upbrsgexpmgothrn-h.vf Binary files differindex 02cdb7bf9c..8344ed97ea 100644 --- a/macros/jptex/latex/japanese-otf/vf/upbrsgexpmgothrn-h.vf +++ b/macros/jptex/latex/japanese-otf/vf/upbrsgexpmgothrn-h.vf diff --git a/macros/jptex/latex/japanese-otf/vf/upbrsgexpmgothrn-v.vf b/macros/jptex/latex/japanese-otf/vf/upbrsgexpmgothrn-v.vf Binary files differindex 90e938fa79..e49e90a70e 100644 --- a/macros/jptex/latex/japanese-otf/vf/upbrsgexpmgothrn-v.vf +++ b/macros/jptex/latex/japanese-otf/vf/upbrsgexpmgothrn-v.vf diff --git a/macros/jptex/latex/japanese-otf/vf/upbrsgexpminb-h.vf b/macros/jptex/latex/japanese-otf/vf/upbrsgexpminb-h.vf Binary files differindex b0edcb1473..d863022e38 100644 --- a/macros/jptex/latex/japanese-otf/vf/upbrsgexpminb-h.vf +++ b/macros/jptex/latex/japanese-otf/vf/upbrsgexpminb-h.vf diff --git a/macros/jptex/latex/japanese-otf/vf/upbrsgexpminb-v.vf b/macros/jptex/latex/japanese-otf/vf/upbrsgexpminb-v.vf Binary files differindex 98e5c838c5..3f607ce1d0 100644 --- a/macros/jptex/latex/japanese-otf/vf/upbrsgexpminb-v.vf +++ b/macros/jptex/latex/japanese-otf/vf/upbrsgexpminb-v.vf diff --git a/macros/jptex/latex/japanese-otf/vf/upbrsgexpminbn-h.vf b/macros/jptex/latex/japanese-otf/vf/upbrsgexpminbn-h.vf Binary files differindex aed6596e72..1c3e9caaab 100644 --- a/macros/jptex/latex/japanese-otf/vf/upbrsgexpminbn-h.vf +++ b/macros/jptex/latex/japanese-otf/vf/upbrsgexpminbn-h.vf diff --git a/macros/jptex/latex/japanese-otf/vf/upbrsgexpminbn-v.vf b/macros/jptex/latex/japanese-otf/vf/upbrsgexpminbn-v.vf Binary files differindex 4a6cf39f2b..0b10c2ae52 100644 --- a/macros/jptex/latex/japanese-otf/vf/upbrsgexpminbn-v.vf +++ b/macros/jptex/latex/japanese-otf/vf/upbrsgexpminbn-v.vf diff --git a/macros/jptex/latex/japanese-otf/vf/upbrsgexpminl-h.vf b/macros/jptex/latex/japanese-otf/vf/upbrsgexpminl-h.vf Binary files differindex 2801803629..c60a79151f 100644 --- a/macros/jptex/latex/japanese-otf/vf/upbrsgexpminl-h.vf +++ b/macros/jptex/latex/japanese-otf/vf/upbrsgexpminl-h.vf diff --git a/macros/jptex/latex/japanese-otf/vf/upbrsgexpminl-v.vf b/macros/jptex/latex/japanese-otf/vf/upbrsgexpminl-v.vf Binary files differindex a6b2d511d4..7eecba150b 100644 --- a/macros/jptex/latex/japanese-otf/vf/upbrsgexpminl-v.vf +++ b/macros/jptex/latex/japanese-otf/vf/upbrsgexpminl-v.vf diff --git a/macros/jptex/latex/japanese-otf/vf/upbrsgexpminln-h.vf b/macros/jptex/latex/japanese-otf/vf/upbrsgexpminln-h.vf Binary files differindex a13eecd29a..04ffd96fc8 100644 --- a/macros/jptex/latex/japanese-otf/vf/upbrsgexpminln-h.vf +++ b/macros/jptex/latex/japanese-otf/vf/upbrsgexpminln-h.vf diff --git a/macros/jptex/latex/japanese-otf/vf/upbrsgexpminln-v.vf b/macros/jptex/latex/japanese-otf/vf/upbrsgexpminln-v.vf Binary files differindex 3a1850cd6e..f2bde5f99c 100644 --- a/macros/jptex/latex/japanese-otf/vf/upbrsgexpminln-v.vf +++ b/macros/jptex/latex/japanese-otf/vf/upbrsgexpminln-v.vf diff --git a/macros/jptex/latex/japanese-otf/vf/upbrsgexpminr-h.vf b/macros/jptex/latex/japanese-otf/vf/upbrsgexpminr-h.vf Binary files differindex 6c0f3af64f..1c878a72a5 100644 --- a/macros/jptex/latex/japanese-otf/vf/upbrsgexpminr-h.vf +++ b/macros/jptex/latex/japanese-otf/vf/upbrsgexpminr-h.vf diff --git a/macros/jptex/latex/japanese-otf/vf/upbrsgexpminr-v.vf b/macros/jptex/latex/japanese-otf/vf/upbrsgexpminr-v.vf Binary files differindex 7ee0f520c5..ddf9e7ccc8 100644 --- a/macros/jptex/latex/japanese-otf/vf/upbrsgexpminr-v.vf +++ b/macros/jptex/latex/japanese-otf/vf/upbrsgexpminr-v.vf diff --git a/macros/jptex/latex/japanese-otf/vf/upbrsgexpminrn-h.vf b/macros/jptex/latex/japanese-otf/vf/upbrsgexpminrn-h.vf Binary files differindex cfb159fcce..245154b65a 100644 --- a/macros/jptex/latex/japanese-otf/vf/upbrsgexpminrn-h.vf +++ b/macros/jptex/latex/japanese-otf/vf/upbrsgexpminrn-h.vf diff --git a/macros/jptex/latex/japanese-otf/vf/upbrsgexpminrn-v.vf b/macros/jptex/latex/japanese-otf/vf/upbrsgexpminrn-v.vf Binary files differindex 5a41ee7162..8c2cecd4c4 100644 --- a/macros/jptex/latex/japanese-otf/vf/upbrsgexpminrn-v.vf +++ b/macros/jptex/latex/japanese-otf/vf/upbrsgexpminrn-v.vf diff --git a/macros/jptex/latex/japanese-otf/vf/upexpgothb-h.vf b/macros/jptex/latex/japanese-otf/vf/upexpgothb-h.vf Binary files differindex 0ac0212df2..bcadcb3c08 100644 --- a/macros/jptex/latex/japanese-otf/vf/upexpgothb-h.vf +++ b/macros/jptex/latex/japanese-otf/vf/upexpgothb-h.vf diff --git a/macros/jptex/latex/japanese-otf/vf/upexpgothb-v.vf b/macros/jptex/latex/japanese-otf/vf/upexpgothb-v.vf Binary files differindex fc0f0f0bc4..62b791e07d 100644 --- a/macros/jptex/latex/japanese-otf/vf/upexpgothb-v.vf +++ b/macros/jptex/latex/japanese-otf/vf/upexpgothb-v.vf diff --git a/macros/jptex/latex/japanese-otf/vf/upexpgothbn-h.vf b/macros/jptex/latex/japanese-otf/vf/upexpgothbn-h.vf Binary files differindex cc6598608d..73cca22e88 100644 --- a/macros/jptex/latex/japanese-otf/vf/upexpgothbn-h.vf +++ b/macros/jptex/latex/japanese-otf/vf/upexpgothbn-h.vf diff --git a/macros/jptex/latex/japanese-otf/vf/upexpgothbn-v.vf b/macros/jptex/latex/japanese-otf/vf/upexpgothbn-v.vf Binary files differindex fb1c975772..b750fc94e2 100644 --- a/macros/jptex/latex/japanese-otf/vf/upexpgothbn-v.vf +++ b/macros/jptex/latex/japanese-otf/vf/upexpgothbn-v.vf diff --git a/macros/jptex/latex/japanese-otf/vf/upexpgotheb-h.vf b/macros/jptex/latex/japanese-otf/vf/upexpgotheb-h.vf Binary files differindex fca53d7197..f0425ac226 100644 --- a/macros/jptex/latex/japanese-otf/vf/upexpgotheb-h.vf +++ b/macros/jptex/latex/japanese-otf/vf/upexpgotheb-h.vf diff --git a/macros/jptex/latex/japanese-otf/vf/upexpgotheb-v.vf b/macros/jptex/latex/japanese-otf/vf/upexpgotheb-v.vf Binary files differindex b9d20f6ed5..f890e98bc4 100644 --- a/macros/jptex/latex/japanese-otf/vf/upexpgotheb-v.vf +++ b/macros/jptex/latex/japanese-otf/vf/upexpgotheb-v.vf diff --git a/macros/jptex/latex/japanese-otf/vf/upexpgothebn-h.vf b/macros/jptex/latex/japanese-otf/vf/upexpgothebn-h.vf Binary files differindex 18304945b4..be753c2359 100644 --- a/macros/jptex/latex/japanese-otf/vf/upexpgothebn-h.vf +++ b/macros/jptex/latex/japanese-otf/vf/upexpgothebn-h.vf diff --git a/macros/jptex/latex/japanese-otf/vf/upexpgothebn-v.vf b/macros/jptex/latex/japanese-otf/vf/upexpgothebn-v.vf Binary files differindex 5e63410631..f54677d601 100644 --- a/macros/jptex/latex/japanese-otf/vf/upexpgothebn-v.vf +++ b/macros/jptex/latex/japanese-otf/vf/upexpgothebn-v.vf diff --git a/macros/jptex/latex/japanese-otf/vf/upexpgothr-h.vf b/macros/jptex/latex/japanese-otf/vf/upexpgothr-h.vf Binary files differindex 87800e0a86..8d9645966c 100644 --- a/macros/jptex/latex/japanese-otf/vf/upexpgothr-h.vf +++ b/macros/jptex/latex/japanese-otf/vf/upexpgothr-h.vf diff --git a/macros/jptex/latex/japanese-otf/vf/upexpgothr-v.vf b/macros/jptex/latex/japanese-otf/vf/upexpgothr-v.vf Binary files differindex d903d20b81..f443b97884 100644 --- a/macros/jptex/latex/japanese-otf/vf/upexpgothr-v.vf +++ b/macros/jptex/latex/japanese-otf/vf/upexpgothr-v.vf diff --git a/macros/jptex/latex/japanese-otf/vf/upexpgothrn-h.vf b/macros/jptex/latex/japanese-otf/vf/upexpgothrn-h.vf Binary files differindex afb4dc1356..c965fcaed4 100644 --- a/macros/jptex/latex/japanese-otf/vf/upexpgothrn-h.vf +++ b/macros/jptex/latex/japanese-otf/vf/upexpgothrn-h.vf diff --git a/macros/jptex/latex/japanese-otf/vf/upexpgothrn-v.vf b/macros/jptex/latex/japanese-otf/vf/upexpgothrn-v.vf Binary files differindex 58b0297566..e0abcd0a96 100644 --- a/macros/jptex/latex/japanese-otf/vf/upexpgothrn-v.vf +++ b/macros/jptex/latex/japanese-otf/vf/upexpgothrn-v.vf diff --git a/macros/jptex/latex/japanese-otf/vf/upexpmgothr-h.vf b/macros/jptex/latex/japanese-otf/vf/upexpmgothr-h.vf Binary files differindex 9766958a9e..ae90f6f7cc 100644 --- a/macros/jptex/latex/japanese-otf/vf/upexpmgothr-h.vf +++ b/macros/jptex/latex/japanese-otf/vf/upexpmgothr-h.vf diff --git a/macros/jptex/latex/japanese-otf/vf/upexpmgothr-v.vf b/macros/jptex/latex/japanese-otf/vf/upexpmgothr-v.vf Binary files differindex 3ab44b2fd9..daa44c4509 100644 --- a/macros/jptex/latex/japanese-otf/vf/upexpmgothr-v.vf +++ b/macros/jptex/latex/japanese-otf/vf/upexpmgothr-v.vf diff --git a/macros/jptex/latex/japanese-otf/vf/upexpmgothrn-h.vf b/macros/jptex/latex/japanese-otf/vf/upexpmgothrn-h.vf Binary files differindex 4c27e900b5..d309f59b2e 100644 --- a/macros/jptex/latex/japanese-otf/vf/upexpmgothrn-h.vf +++ b/macros/jptex/latex/japanese-otf/vf/upexpmgothrn-h.vf diff --git a/macros/jptex/latex/japanese-otf/vf/upexpmgothrn-v.vf b/macros/jptex/latex/japanese-otf/vf/upexpmgothrn-v.vf Binary files differindex 2d68a70368..a392c38217 100644 --- a/macros/jptex/latex/japanese-otf/vf/upexpmgothrn-v.vf +++ b/macros/jptex/latex/japanese-otf/vf/upexpmgothrn-v.vf diff --git a/macros/jptex/latex/japanese-otf/vf/upexpminb-h.vf b/macros/jptex/latex/japanese-otf/vf/upexpminb-h.vf Binary files differindex dee6fe7304..e065232c5c 100644 --- a/macros/jptex/latex/japanese-otf/vf/upexpminb-h.vf +++ b/macros/jptex/latex/japanese-otf/vf/upexpminb-h.vf diff --git a/macros/jptex/latex/japanese-otf/vf/upexpminb-v.vf b/macros/jptex/latex/japanese-otf/vf/upexpminb-v.vf Binary files differindex f75b4cdb2e..7c70f1c197 100644 --- a/macros/jptex/latex/japanese-otf/vf/upexpminb-v.vf +++ b/macros/jptex/latex/japanese-otf/vf/upexpminb-v.vf diff --git a/macros/jptex/latex/japanese-otf/vf/upexpminbn-h.vf b/macros/jptex/latex/japanese-otf/vf/upexpminbn-h.vf Binary files differindex 2d5cde2154..3818915245 100644 --- a/macros/jptex/latex/japanese-otf/vf/upexpminbn-h.vf +++ b/macros/jptex/latex/japanese-otf/vf/upexpminbn-h.vf diff --git a/macros/jptex/latex/japanese-otf/vf/upexpminbn-v.vf b/macros/jptex/latex/japanese-otf/vf/upexpminbn-v.vf Binary files differindex 6afb336afb..e23c0a8dc4 100644 --- a/macros/jptex/latex/japanese-otf/vf/upexpminbn-v.vf +++ b/macros/jptex/latex/japanese-otf/vf/upexpminbn-v.vf diff --git a/macros/jptex/latex/japanese-otf/vf/upexpminl-h.vf b/macros/jptex/latex/japanese-otf/vf/upexpminl-h.vf Binary files differindex cec1093175..a1c61cc9bd 100644 --- a/macros/jptex/latex/japanese-otf/vf/upexpminl-h.vf +++ b/macros/jptex/latex/japanese-otf/vf/upexpminl-h.vf diff --git a/macros/jptex/latex/japanese-otf/vf/upexpminl-v.vf b/macros/jptex/latex/japanese-otf/vf/upexpminl-v.vf Binary files differindex 71e8081aa3..2eb98966ec 100644 --- a/macros/jptex/latex/japanese-otf/vf/upexpminl-v.vf +++ b/macros/jptex/latex/japanese-otf/vf/upexpminl-v.vf diff --git a/macros/jptex/latex/japanese-otf/vf/upexpminln-h.vf b/macros/jptex/latex/japanese-otf/vf/upexpminln-h.vf Binary files differindex 03db7b2307..38b7fa9529 100644 --- a/macros/jptex/latex/japanese-otf/vf/upexpminln-h.vf +++ b/macros/jptex/latex/japanese-otf/vf/upexpminln-h.vf diff --git a/macros/jptex/latex/japanese-otf/vf/upexpminln-v.vf b/macros/jptex/latex/japanese-otf/vf/upexpminln-v.vf Binary files differindex b413419bbf..8c973afb09 100644 --- a/macros/jptex/latex/japanese-otf/vf/upexpminln-v.vf +++ b/macros/jptex/latex/japanese-otf/vf/upexpminln-v.vf diff --git a/macros/jptex/latex/japanese-otf/vf/upexpminr-h.vf b/macros/jptex/latex/japanese-otf/vf/upexpminr-h.vf Binary files differindex 87bcd4f10c..cab1c7f7b5 100644 --- a/macros/jptex/latex/japanese-otf/vf/upexpminr-h.vf +++ b/macros/jptex/latex/japanese-otf/vf/upexpminr-h.vf diff --git a/macros/jptex/latex/japanese-otf/vf/upexpminr-v.vf b/macros/jptex/latex/japanese-otf/vf/upexpminr-v.vf Binary files differindex 413ae22939..8c6181546d 100644 --- a/macros/jptex/latex/japanese-otf/vf/upexpminr-v.vf +++ b/macros/jptex/latex/japanese-otf/vf/upexpminr-v.vf diff --git a/macros/jptex/latex/japanese-otf/vf/upexpminrn-h.vf b/macros/jptex/latex/japanese-otf/vf/upexpminrn-h.vf Binary files differindex 149fef2bf9..95b1faf3bb 100644 --- a/macros/jptex/latex/japanese-otf/vf/upexpminrn-h.vf +++ b/macros/jptex/latex/japanese-otf/vf/upexpminrn-h.vf diff --git a/macros/jptex/latex/japanese-otf/vf/upexpminrn-v.vf b/macros/jptex/latex/japanese-otf/vf/upexpminrn-v.vf Binary files differindex 68e4c2dbc6..6b6351a811 100644 --- a/macros/jptex/latex/japanese-otf/vf/upexpminrn-v.vf +++ b/macros/jptex/latex/japanese-otf/vf/upexpminrn-v.vf diff --git a/macros/jptex/latex/japanese-otf/vf/upnmlgothb-h.vf b/macros/jptex/latex/japanese-otf/vf/upnmlgothb-h.vf Binary files differindex a5781acd0f..140e5f9447 100644 --- a/macros/jptex/latex/japanese-otf/vf/upnmlgothb-h.vf +++ b/macros/jptex/latex/japanese-otf/vf/upnmlgothb-h.vf diff --git a/macros/jptex/latex/japanese-otf/vf/upnmlgothb-v.vf b/macros/jptex/latex/japanese-otf/vf/upnmlgothb-v.vf Binary files differindex ba2b280bec..e508fa680f 100644 --- a/macros/jptex/latex/japanese-otf/vf/upnmlgothb-v.vf +++ b/macros/jptex/latex/japanese-otf/vf/upnmlgothb-v.vf diff --git a/macros/jptex/latex/japanese-otf/vf/upnmlgothbn-h.vf b/macros/jptex/latex/japanese-otf/vf/upnmlgothbn-h.vf Binary files differindex 0084a01481..9a28081bf3 100644 --- a/macros/jptex/latex/japanese-otf/vf/upnmlgothbn-h.vf +++ b/macros/jptex/latex/japanese-otf/vf/upnmlgothbn-h.vf diff --git a/macros/jptex/latex/japanese-otf/vf/upnmlgothbn-v.vf b/macros/jptex/latex/japanese-otf/vf/upnmlgothbn-v.vf Binary files differindex 98ce4bd20a..890106e9d8 100644 --- a/macros/jptex/latex/japanese-otf/vf/upnmlgothbn-v.vf +++ b/macros/jptex/latex/japanese-otf/vf/upnmlgothbn-v.vf diff --git a/macros/jptex/latex/japanese-otf/vf/upnmlgotheb-h.vf b/macros/jptex/latex/japanese-otf/vf/upnmlgotheb-h.vf Binary files differindex 59d14920fd..7f2fa29644 100644 --- a/macros/jptex/latex/japanese-otf/vf/upnmlgotheb-h.vf +++ b/macros/jptex/latex/japanese-otf/vf/upnmlgotheb-h.vf diff --git a/macros/jptex/latex/japanese-otf/vf/upnmlgotheb-v.vf b/macros/jptex/latex/japanese-otf/vf/upnmlgotheb-v.vf Binary files differindex 45159fc605..6bce3f7318 100644 --- a/macros/jptex/latex/japanese-otf/vf/upnmlgotheb-v.vf +++ b/macros/jptex/latex/japanese-otf/vf/upnmlgotheb-v.vf diff --git a/macros/jptex/latex/japanese-otf/vf/upnmlgothebn-h.vf b/macros/jptex/latex/japanese-otf/vf/upnmlgothebn-h.vf Binary files differindex 89ad1d0d8d..2a6d09a4af 100644 --- a/macros/jptex/latex/japanese-otf/vf/upnmlgothebn-h.vf +++ b/macros/jptex/latex/japanese-otf/vf/upnmlgothebn-h.vf diff --git a/macros/jptex/latex/japanese-otf/vf/upnmlgothebn-v.vf b/macros/jptex/latex/japanese-otf/vf/upnmlgothebn-v.vf Binary files differindex faebc355aa..f66830bef7 100644 --- a/macros/jptex/latex/japanese-otf/vf/upnmlgothebn-v.vf +++ b/macros/jptex/latex/japanese-otf/vf/upnmlgothebn-v.vf diff --git a/macros/jptex/latex/japanese-otf/vf/upnmlgothr-h.vf b/macros/jptex/latex/japanese-otf/vf/upnmlgothr-h.vf Binary files differindex 3ff7fb00db..4be6f677cc 100644 --- a/macros/jptex/latex/japanese-otf/vf/upnmlgothr-h.vf +++ b/macros/jptex/latex/japanese-otf/vf/upnmlgothr-h.vf diff --git a/macros/jptex/latex/japanese-otf/vf/upnmlgothr-v.vf b/macros/jptex/latex/japanese-otf/vf/upnmlgothr-v.vf Binary files differindex 70570b4816..0044e2a02e 100644 --- a/macros/jptex/latex/japanese-otf/vf/upnmlgothr-v.vf +++ b/macros/jptex/latex/japanese-otf/vf/upnmlgothr-v.vf diff --git a/macros/jptex/latex/japanese-otf/vf/upnmlgothrn-h.vf b/macros/jptex/latex/japanese-otf/vf/upnmlgothrn-h.vf Binary files differindex 4f1868d5b5..a0a2ac271c 100644 --- a/macros/jptex/latex/japanese-otf/vf/upnmlgothrn-h.vf +++ b/macros/jptex/latex/japanese-otf/vf/upnmlgothrn-h.vf diff --git a/macros/jptex/latex/japanese-otf/vf/upnmlgothrn-v.vf b/macros/jptex/latex/japanese-otf/vf/upnmlgothrn-v.vf Binary files differindex 90874681ca..d79ed7dead 100644 --- a/macros/jptex/latex/japanese-otf/vf/upnmlgothrn-v.vf +++ b/macros/jptex/latex/japanese-otf/vf/upnmlgothrn-v.vf diff --git a/macros/jptex/latex/japanese-otf/vf/upnmlmgothr-h.vf b/macros/jptex/latex/japanese-otf/vf/upnmlmgothr-h.vf Binary files differindex 4ac9b03745..d31637e0db 100644 --- a/macros/jptex/latex/japanese-otf/vf/upnmlmgothr-h.vf +++ b/macros/jptex/latex/japanese-otf/vf/upnmlmgothr-h.vf diff --git a/macros/jptex/latex/japanese-otf/vf/upnmlmgothr-v.vf b/macros/jptex/latex/japanese-otf/vf/upnmlmgothr-v.vf Binary files differindex ce6e080a89..001cd31680 100644 --- a/macros/jptex/latex/japanese-otf/vf/upnmlmgothr-v.vf +++ b/macros/jptex/latex/japanese-otf/vf/upnmlmgothr-v.vf diff --git a/macros/jptex/latex/japanese-otf/vf/upnmlmgothrn-h.vf b/macros/jptex/latex/japanese-otf/vf/upnmlmgothrn-h.vf Binary files differindex c4b111b6f9..ab7675ebf9 100644 --- a/macros/jptex/latex/japanese-otf/vf/upnmlmgothrn-h.vf +++ b/macros/jptex/latex/japanese-otf/vf/upnmlmgothrn-h.vf diff --git a/macros/jptex/latex/japanese-otf/vf/upnmlmgothrn-v.vf b/macros/jptex/latex/japanese-otf/vf/upnmlmgothrn-v.vf Binary files differindex 1921de3f87..68939d0e39 100644 --- a/macros/jptex/latex/japanese-otf/vf/upnmlmgothrn-v.vf +++ b/macros/jptex/latex/japanese-otf/vf/upnmlmgothrn-v.vf diff --git a/macros/jptex/latex/japanese-otf/vf/upnmlminb-h.vf b/macros/jptex/latex/japanese-otf/vf/upnmlminb-h.vf Binary files differindex b393789b18..bd85684f74 100644 --- a/macros/jptex/latex/japanese-otf/vf/upnmlminb-h.vf +++ b/macros/jptex/latex/japanese-otf/vf/upnmlminb-h.vf diff --git a/macros/jptex/latex/japanese-otf/vf/upnmlminb-v.vf b/macros/jptex/latex/japanese-otf/vf/upnmlminb-v.vf Binary files differindex bab92c9778..9003a8aa22 100644 --- a/macros/jptex/latex/japanese-otf/vf/upnmlminb-v.vf +++ b/macros/jptex/latex/japanese-otf/vf/upnmlminb-v.vf diff --git a/macros/jptex/latex/japanese-otf/vf/upnmlminbn-h.vf b/macros/jptex/latex/japanese-otf/vf/upnmlminbn-h.vf Binary files differindex e97d138fa9..d00af2baf8 100644 --- a/macros/jptex/latex/japanese-otf/vf/upnmlminbn-h.vf +++ b/macros/jptex/latex/japanese-otf/vf/upnmlminbn-h.vf diff --git a/macros/jptex/latex/japanese-otf/vf/upnmlminbn-v.vf b/macros/jptex/latex/japanese-otf/vf/upnmlminbn-v.vf Binary files differindex 2f9bf3f4aa..5e6ddcfe05 100644 --- a/macros/jptex/latex/japanese-otf/vf/upnmlminbn-v.vf +++ b/macros/jptex/latex/japanese-otf/vf/upnmlminbn-v.vf diff --git a/macros/jptex/latex/japanese-otf/vf/upnmlminl-h.vf b/macros/jptex/latex/japanese-otf/vf/upnmlminl-h.vf Binary files differindex 9c9e014075..bfb9401431 100644 --- a/macros/jptex/latex/japanese-otf/vf/upnmlminl-h.vf +++ b/macros/jptex/latex/japanese-otf/vf/upnmlminl-h.vf diff --git a/macros/jptex/latex/japanese-otf/vf/upnmlminl-v.vf b/macros/jptex/latex/japanese-otf/vf/upnmlminl-v.vf Binary files differindex b6523316e6..571a7e26ea 100644 --- a/macros/jptex/latex/japanese-otf/vf/upnmlminl-v.vf +++ b/macros/jptex/latex/japanese-otf/vf/upnmlminl-v.vf diff --git a/macros/jptex/latex/japanese-otf/vf/upnmlminln-h.vf b/macros/jptex/latex/japanese-otf/vf/upnmlminln-h.vf Binary files differindex 55374728d7..87f9d72a92 100644 --- a/macros/jptex/latex/japanese-otf/vf/upnmlminln-h.vf +++ b/macros/jptex/latex/japanese-otf/vf/upnmlminln-h.vf diff --git a/macros/jptex/latex/japanese-otf/vf/upnmlminln-v.vf b/macros/jptex/latex/japanese-otf/vf/upnmlminln-v.vf Binary files differindex cdf4b64eb8..2eaee8e4e3 100644 --- a/macros/jptex/latex/japanese-otf/vf/upnmlminln-v.vf +++ b/macros/jptex/latex/japanese-otf/vf/upnmlminln-v.vf diff --git a/macros/jptex/latex/japanese-otf/vf/upnmlminr-h.vf b/macros/jptex/latex/japanese-otf/vf/upnmlminr-h.vf Binary files differindex 9c36f040b7..4f7837c20e 100644 --- a/macros/jptex/latex/japanese-otf/vf/upnmlminr-h.vf +++ b/macros/jptex/latex/japanese-otf/vf/upnmlminr-h.vf diff --git a/macros/jptex/latex/japanese-otf/vf/upnmlminr-v.vf b/macros/jptex/latex/japanese-otf/vf/upnmlminr-v.vf Binary files differindex f5322eb1b1..1a1f8f18bf 100644 --- a/macros/jptex/latex/japanese-otf/vf/upnmlminr-v.vf +++ b/macros/jptex/latex/japanese-otf/vf/upnmlminr-v.vf diff --git a/macros/jptex/latex/japanese-otf/vf/upnmlminrn-h.vf b/macros/jptex/latex/japanese-otf/vf/upnmlminrn-h.vf Binary files differindex c7989f92f7..4a84bd574d 100644 --- a/macros/jptex/latex/japanese-otf/vf/upnmlminrn-h.vf +++ b/macros/jptex/latex/japanese-otf/vf/upnmlminrn-h.vf diff --git a/macros/jptex/latex/japanese-otf/vf/upnmlminrn-v.vf b/macros/jptex/latex/japanese-otf/vf/upnmlminrn-v.vf Binary files differindex 08778a48d4..ef0eed7151 100644 --- a/macros/jptex/latex/japanese-otf/vf/upnmlminrn-v.vf +++ b/macros/jptex/latex/japanese-otf/vf/upnmlminrn-v.vf diff --git a/macros/jptex/latex/japanese-otf/vf/uprubygothb-h.vf b/macros/jptex/latex/japanese-otf/vf/uprubygothb-h.vf Binary files differindex 65423f155f..d0dcf2e623 100644 --- a/macros/jptex/latex/japanese-otf/vf/uprubygothb-h.vf +++ b/macros/jptex/latex/japanese-otf/vf/uprubygothb-h.vf diff --git a/macros/jptex/latex/japanese-otf/vf/uprubygothb-v.vf b/macros/jptex/latex/japanese-otf/vf/uprubygothb-v.vf Binary files differindex 5d92fbda1d..6b1a3f1ba0 100644 --- a/macros/jptex/latex/japanese-otf/vf/uprubygothb-v.vf +++ b/macros/jptex/latex/japanese-otf/vf/uprubygothb-v.vf diff --git a/macros/jptex/latex/japanese-otf/vf/uprubygotheb-h.vf b/macros/jptex/latex/japanese-otf/vf/uprubygotheb-h.vf Binary files differindex ed7c860694..43bf92f912 100644 --- a/macros/jptex/latex/japanese-otf/vf/uprubygotheb-h.vf +++ b/macros/jptex/latex/japanese-otf/vf/uprubygotheb-h.vf diff --git a/macros/jptex/latex/japanese-otf/vf/uprubygotheb-v.vf b/macros/jptex/latex/japanese-otf/vf/uprubygotheb-v.vf Binary files differindex 574b09daae..f48736b485 100644 --- a/macros/jptex/latex/japanese-otf/vf/uprubygotheb-v.vf +++ b/macros/jptex/latex/japanese-otf/vf/uprubygotheb-v.vf diff --git a/macros/jptex/latex/japanese-otf/vf/uprubygothr-h.vf b/macros/jptex/latex/japanese-otf/vf/uprubygothr-h.vf Binary files differindex 844de9ad22..e63d144017 100644 --- a/macros/jptex/latex/japanese-otf/vf/uprubygothr-h.vf +++ b/macros/jptex/latex/japanese-otf/vf/uprubygothr-h.vf diff --git a/macros/jptex/latex/japanese-otf/vf/uprubygothr-v.vf b/macros/jptex/latex/japanese-otf/vf/uprubygothr-v.vf Binary files differindex aa2bf7a74a..789cd4acec 100644 --- a/macros/jptex/latex/japanese-otf/vf/uprubygothr-v.vf +++ b/macros/jptex/latex/japanese-otf/vf/uprubygothr-v.vf diff --git a/macros/jptex/latex/japanese-otf/vf/uprubymgothr-h.vf b/macros/jptex/latex/japanese-otf/vf/uprubymgothr-h.vf Binary files differindex 71fe042ae9..892c88a972 100644 --- a/macros/jptex/latex/japanese-otf/vf/uprubymgothr-h.vf +++ b/macros/jptex/latex/japanese-otf/vf/uprubymgothr-h.vf diff --git a/macros/jptex/latex/japanese-otf/vf/uprubymgothr-v.vf b/macros/jptex/latex/japanese-otf/vf/uprubymgothr-v.vf Binary files differindex f8d1aa4b5e..5b0da0cf19 100644 --- a/macros/jptex/latex/japanese-otf/vf/uprubymgothr-v.vf +++ b/macros/jptex/latex/japanese-otf/vf/uprubymgothr-v.vf diff --git a/macros/jptex/latex/japanese-otf/vf/uprubyminb-h.vf b/macros/jptex/latex/japanese-otf/vf/uprubyminb-h.vf Binary files differindex e5f403e442..c697a7e801 100644 --- a/macros/jptex/latex/japanese-otf/vf/uprubyminb-h.vf +++ b/macros/jptex/latex/japanese-otf/vf/uprubyminb-h.vf diff --git a/macros/jptex/latex/japanese-otf/vf/uprubyminb-v.vf b/macros/jptex/latex/japanese-otf/vf/uprubyminb-v.vf Binary files differindex 3d927c801c..4c4810e945 100644 --- a/macros/jptex/latex/japanese-otf/vf/uprubyminb-v.vf +++ b/macros/jptex/latex/japanese-otf/vf/uprubyminb-v.vf diff --git a/macros/jptex/latex/japanese-otf/vf/uprubyminl-h.vf b/macros/jptex/latex/japanese-otf/vf/uprubyminl-h.vf Binary files differindex 837e5bd6a7..ad053697fe 100644 --- a/macros/jptex/latex/japanese-otf/vf/uprubyminl-h.vf +++ b/macros/jptex/latex/japanese-otf/vf/uprubyminl-h.vf diff --git a/macros/jptex/latex/japanese-otf/vf/uprubyminl-v.vf b/macros/jptex/latex/japanese-otf/vf/uprubyminl-v.vf Binary files differindex 5b689e5340..73b0cf162f 100644 --- a/macros/jptex/latex/japanese-otf/vf/uprubyminl-v.vf +++ b/macros/jptex/latex/japanese-otf/vf/uprubyminl-v.vf diff --git a/macros/jptex/latex/japanese-otf/vf/uprubyminr-h.vf b/macros/jptex/latex/japanese-otf/vf/uprubyminr-h.vf Binary files differindex 4fcb83b59a..5c310d4959 100644 --- a/macros/jptex/latex/japanese-otf/vf/uprubyminr-h.vf +++ b/macros/jptex/latex/japanese-otf/vf/uprubyminr-h.vf diff --git a/macros/jptex/latex/japanese-otf/vf/uprubyminr-v.vf b/macros/jptex/latex/japanese-otf/vf/uprubyminr-v.vf Binary files differindex 21e6eaaa3b..b4992b6144 100644 --- a/macros/jptex/latex/japanese-otf/vf/uprubyminr-v.vf +++ b/macros/jptex/latex/japanese-otf/vf/uprubyminr-v.vf diff --git a/macros/jptex/latex/japanese-otf/vf/utfgrg-h.vf b/macros/jptex/latex/japanese-otf/vf/utfgrg-h.vf Binary files differnew file mode 100644 index 0000000000..762285ed63 --- /dev/null +++ b/macros/jptex/latex/japanese-otf/vf/utfgrg-h.vf diff --git a/macros/jptex/latex/japanese-otf/vf/utfgrg-v.vf b/macros/jptex/latex/japanese-otf/vf/utfgrg-v.vf Binary files differnew file mode 100644 index 0000000000..eb6ca6a547 --- /dev/null +++ b/macros/jptex/latex/japanese-otf/vf/utfgrg-v.vf diff --git a/macros/jptex/latex/japanese-otf/vf/utfjgbg-h.vf b/macros/jptex/latex/japanese-otf/vf/utfjgbg-h.vf Binary files differnew file mode 100644 index 0000000000..e289aa7d16 --- /dev/null +++ b/macros/jptex/latex/japanese-otf/vf/utfjgbg-h.vf diff --git a/macros/jptex/latex/japanese-otf/vf/utfjgbg-v.vf b/macros/jptex/latex/japanese-otf/vf/utfjgbg-v.vf Binary files differnew file mode 100644 index 0000000000..c564ba401f --- /dev/null +++ b/macros/jptex/latex/japanese-otf/vf/utfjgbg-v.vf diff --git a/macros/jptex/latex/japanese-otf/vf/utfjgeg-h.vf b/macros/jptex/latex/japanese-otf/vf/utfjgeg-h.vf Binary files differnew file mode 100644 index 0000000000..96507a6d49 --- /dev/null +++ b/macros/jptex/latex/japanese-otf/vf/utfjgeg-h.vf diff --git a/macros/jptex/latex/japanese-otf/vf/utfjgeg-v.vf b/macros/jptex/latex/japanese-otf/vf/utfjgeg-v.vf Binary files differnew file mode 100644 index 0000000000..ff729a0254 --- /dev/null +++ b/macros/jptex/latex/japanese-otf/vf/utfjgeg-v.vf diff --git a/macros/jptex/latex/japanese-otf/vf/utfjgrg-h.vf b/macros/jptex/latex/japanese-otf/vf/utfjgrg-h.vf Binary files differnew file mode 100644 index 0000000000..762285ed63 --- /dev/null +++ b/macros/jptex/latex/japanese-otf/vf/utfjgrg-h.vf diff --git a/macros/jptex/latex/japanese-otf/vf/utfjgrg-v.vf b/macros/jptex/latex/japanese-otf/vf/utfjgrg-v.vf Binary files differnew file mode 100644 index 0000000000..eb6ca6a547 --- /dev/null +++ b/macros/jptex/latex/japanese-otf/vf/utfjgrg-v.vf diff --git a/macros/jptex/latex/japanese-otf/vf/utfjmbg-h.vf b/macros/jptex/latex/japanese-otf/vf/utfjmbg-h.vf Binary files differnew file mode 100644 index 0000000000..9ea4b04476 --- /dev/null +++ b/macros/jptex/latex/japanese-otf/vf/utfjmbg-h.vf diff --git a/macros/jptex/latex/japanese-otf/vf/utfjmbg-v.vf b/macros/jptex/latex/japanese-otf/vf/utfjmbg-v.vf Binary files differnew file mode 100644 index 0000000000..09c161ff58 --- /dev/null +++ b/macros/jptex/latex/japanese-otf/vf/utfjmbg-v.vf diff --git a/macros/jptex/latex/japanese-otf/vf/utfjmgrg-h.vf b/macros/jptex/latex/japanese-otf/vf/utfjmgrg-h.vf Binary files differnew file mode 100644 index 0000000000..6165c1352c --- /dev/null +++ b/macros/jptex/latex/japanese-otf/vf/utfjmgrg-h.vf diff --git a/macros/jptex/latex/japanese-otf/vf/utfjmgrg-v.vf b/macros/jptex/latex/japanese-otf/vf/utfjmgrg-v.vf Binary files differnew file mode 100644 index 0000000000..dcd596486c --- /dev/null +++ b/macros/jptex/latex/japanese-otf/vf/utfjmgrg-v.vf diff --git a/macros/jptex/latex/japanese-otf/vf/utfjmlg-h.vf b/macros/jptex/latex/japanese-otf/vf/utfjmlg-h.vf Binary files differnew file mode 100644 index 0000000000..c6806239d9 --- /dev/null +++ b/macros/jptex/latex/japanese-otf/vf/utfjmlg-h.vf diff --git a/macros/jptex/latex/japanese-otf/vf/utfjmlg-v.vf b/macros/jptex/latex/japanese-otf/vf/utfjmlg-v.vf Binary files differnew file mode 100644 index 0000000000..57cbbab4d6 --- /dev/null +++ b/macros/jptex/latex/japanese-otf/vf/utfjmlg-v.vf diff --git a/macros/jptex/latex/japanese-otf/vf/utfjmrg-h.vf b/macros/jptex/latex/japanese-otf/vf/utfjmrg-h.vf Binary files differnew file mode 100644 index 0000000000..e5d4a5f9ed --- /dev/null +++ b/macros/jptex/latex/japanese-otf/vf/utfjmrg-h.vf diff --git a/macros/jptex/latex/japanese-otf/vf/utfjmrg-v.vf b/macros/jptex/latex/japanese-otf/vf/utfjmrg-v.vf Binary files differnew file mode 100644 index 0000000000..23046c13d0 --- /dev/null +++ b/macros/jptex/latex/japanese-otf/vf/utfjmrg-v.vf diff --git a/macros/jptex/latex/japanese-otf/vf/utfmrg-h.vf b/macros/jptex/latex/japanese-otf/vf/utfmrg-h.vf Binary files differnew file mode 100644 index 0000000000..e5d4a5f9ed --- /dev/null +++ b/macros/jptex/latex/japanese-otf/vf/utfmrg-h.vf diff --git a/macros/jptex/latex/japanese-otf/vf/utfmrg-v.vf b/macros/jptex/latex/japanese-otf/vf/utfmrg-v.vf Binary files differnew file mode 100644 index 0000000000..23046c13d0 --- /dev/null +++ b/macros/jptex/latex/japanese-otf/vf/utfmrg-v.vf diff --git a/macros/jptex/latex/jlreq-deluxe/LICENSE b/macros/jptex/latex/jlreq-deluxe/LICENSE index 72664ec02a..fb51f9cba4 100644 --- a/macros/jptex/latex/jlreq-deluxe/LICENSE +++ b/macros/jptex/latex/jlreq-deluxe/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2019-2021 Yukimasa Morimi (h20y6m) +Copyright (c) 2019-2023 Yukimasa Morimi (h20y6m) Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/macros/jptex/latex/jlreq-deluxe/README-ja.md b/macros/jptex/latex/jlreq-deluxe/README-ja.md index e8ed5ad0a8..699a661133 100644 --- a/macros/jptex/latex/jlreq-deluxe/README-ja.md +++ b/macros/jptex/latex/jlreq-deluxe/README-ja.md @@ -71,6 +71,8 @@ jlreq クラスでは [JLReq](https://www.w3.org/TR/jlreq/?lang=ja) に従った 更新履歴 ------- +* Version 0.4.1 <2023/02/23> + - e-upTeX ベースの pLaTeX をサポート * Version 0.4.0 <2021/03/13> - 仮想フォントの軽量化 - ルビ用かなのサポート diff --git a/macros/jptex/latex/jlreq-deluxe/README.md b/macros/jptex/latex/jlreq-deluxe/README.md index f9eaf29dc4..5d33f536eb 100644 --- a/macros/jptex/latex/jlreq-deluxe/README.md +++ b/macros/jptex/latex/jlreq-deluxe/README.md @@ -32,6 +32,8 @@ This package is distributed under [the MIT License](LICENSE). History ------- +* Version 0.4.1 <2023/02/23> + - Support e-upTeX based pLaTeX. * Version 0.4.0 <2021/03/13> - Compact virtual fonts. - Add support for the ruby family. diff --git a/macros/jptex/latex/jlreq-deluxe/jlreq-deluxe.pdf b/macros/jptex/latex/jlreq-deluxe/jlreq-deluxe.pdf Binary files differindex e06d0246e8..2ed89d8c0a 100644 --- a/macros/jptex/latex/jlreq-deluxe/jlreq-deluxe.pdf +++ b/macros/jptex/latex/jlreq-deluxe/jlreq-deluxe.pdf diff --git a/macros/jptex/latex/jlreq-deluxe/jlreq-deluxe.sty b/macros/jptex/latex/jlreq-deluxe/jlreq-deluxe.sty index bad7995b90..d7b5fe53d2 100644 --- a/macros/jptex/latex/jlreq-deluxe/jlreq-deluxe.sty +++ b/macros/jptex/latex/jlreq-deluxe/jlreq-deluxe.sty @@ -1,7 +1,7 @@ %% %% jlreq-deluxe.sty %% -%% Copyright 2019-2021 Yukimasa Morimi (h20y6m) +%% Copyright (c) 2019-2023 Yukimasa Morimi (h20y6m) %% GitHub: https://github.com/h20y6m %% %% This package is distributed under the MIT License. @@ -11,7 +11,7 @@ \NeedsTeXFormat{pLaTeX2e} \RequirePackage{expl3}[2019-05-03] -\ProvidesExplPackage {jlreq-deluxe} {2021-03-13} {0.4.0} +\ProvidesExplPackage {jlreq-deluxe} {2023-02-23} {0.4.1} {Multi-weight Japanese font for jlreq class} % -------------------------------------------------- @@ -95,7 +95,9 @@ \__jldx_if_class_loaded:nT { jlreq } { % uplatex - \sys_if_engine_uptex:T + \bool_lazy_and:nnT + { \token_if_primitive_p:N \ucs } + { \int_compare_p:n { \ucs"FA4A = "FA4A } } { \bool_set_true:N \l__jldx_uplatex_bool } diff --git a/macros/jptex/latex/jlreq-deluxe/jlreq-deluxe.tex b/macros/jptex/latex/jlreq-deluxe/jlreq-deluxe.tex index 4ab05347f8..f9dddc6e3f 100644 --- a/macros/jptex/latex/jlreq-deluxe/jlreq-deluxe.tex +++ b/macros/jptex/latex/jlreq-deluxe/jlreq-deluxe.tex @@ -18,7 +18,7 @@ \title{\pkg{jlreq-deluxe}パッケージ} \author{Yukimasa Morimi (h20y6m)\thanks{\url{https://github.com/h20y6m}}} -\date{2021-03-13} +\date{2023-02-23} \begin{document} @@ -106,4 +106,4 @@ \end{itemize} -\end{document}
\ No newline at end of file +\end{document} diff --git a/macros/jptex/latex/jsclasses/README.md b/macros/jptex/latex/jsclasses/README.md index 5c022354f5..ab0a7981ab 100644 --- a/macros/jptex/latex/jsclasses/README.md +++ b/macros/jptex/latex/jsclasses/README.md @@ -37,7 +37,7 @@ distributed separately. ## Release Date -2023-02-12 +2023-02-23 Haruhiko Okumura, Japanese TeX Development Community diff --git a/macros/jptex/latex/jsclasses/jsclasses.dtx b/macros/jptex/latex/jsclasses/jsclasses.dtx index b84449ac8c..d0bfcdbcb8 100644 --- a/macros/jptex/latex/jsclasses/jsclasses.dtx +++ b/macros/jptex/latex/jsclasses/jsclasses.dtx @@ -32,7 +32,7 @@ %<*driver> \ProvidesFile{jsclasses.dtx} %</driver> - [2023/02/12 jsclasses (okumura, texjporg)] + [2023/02/23 jsclasses (okumura, texjporg)] %<*driver> \RequirePackage{plautopatch} \documentclass[dvipdfmx]{jsarticle} @@ -730,7 +730,7 @@ \if@jsc@uplatex\else \ClassError\jsc@clsname {You are running upLaTeX.\MessageBreak - Please use pLaTeX instead, or add 'uplatex' to\MessageBreak + Please use pLaTeX instead, or remove 'platex' from\MessageBreak the class option list} {\@ehc} \@jsc@uplatextrue diff --git a/macros/jptex/latex/jsclasses/jsclasses.pdf b/macros/jptex/latex/jsclasses/jsclasses.pdf Binary files differindex 18b0d895d6..c567977a9c 100644 --- a/macros/jptex/latex/jsclasses/jsclasses.pdf +++ b/macros/jptex/latex/jsclasses/jsclasses.pdf |