summaryrefslogtreecommitdiff
path: root/macros/jptex/latex/japanese-otf/doc/test/uplatex
diff options
context:
space:
mode:
Diffstat (limited to 'macros/jptex/latex/japanese-otf/doc/test/uplatex')
-rw-r--r--macros/jptex/latex/japanese-otf/doc/test/uplatex/Makefile95
-rw-r--r--macros/jptex/latex/japanese-otf/doc/test/uplatex/sp_jp_text.tex32
-rw-r--r--macros/jptex/latex/japanese-otf/doc/test/uplatex/sp_jp_utf.tex32
-rw-r--r--macros/jptex/latex/japanese-otf/doc/test/uplatex/uotftest-utf8.tex40
-rw-r--r--macros/jptex/latex/japanese-otf/doc/test/uplatex/upkanatest1.tex2
-rw-r--r--macros/jptex/latex/japanese-otf/doc/test/uplatex/utfmacro-kozuka.map144
6 files changed, 292 insertions, 53 deletions
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