summaryrefslogtreecommitdiff
path: root/macros/jptex/latex/japanese-otf/doc/test
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2023-06-26 03:01:58 +0000
committerNorbert Preining <norbert@preining.info>2023-06-26 03:01:58 +0000
commita2ebe77da32f4499676953174f774795b0d054fb (patch)
treef4fdcc85ff2094087365d264261b4581ae2dab40 /macros/jptex/latex/japanese-otf/doc/test
parentaf81f7c9824b89002c882d1425479009b3186b4b (diff)
CTAN sync 202306260301
Diffstat (limited to 'macros/jptex/latex/japanese-otf/doc/test')
-rw-r--r--macros/jptex/latex/japanese-otf/doc/test/uplatex/Makefile221
-rw-r--r--macros/jptex/latex/japanese-otf/doc/test/uplatex/cid_cns_h.tex25
-rw-r--r--macros/jptex/latex/japanese-otf/doc/test/uplatex/cid_cns_v.tex25
-rw-r--r--macros/jptex/latex/japanese-otf/doc/test/uplatex/cid_gb_h.tex28
-rw-r--r--macros/jptex/latex/japanese-otf/doc/test/uplatex/cid_gb_v.tex25
-rw-r--r--macros/jptex/latex/japanese-otf/doc/test/uplatex/cid_jp_h.tex34
-rw-r--r--macros/jptex/latex/japanese-otf/doc/test/uplatex/cid_jp_v.tex34
-rw-r--r--macros/jptex/latex/japanese-otf/doc/test/uplatex/cid_ks_h.tex22
-rw-r--r--macros/jptex/latex/japanese-otf/doc/test/uplatex/cid_ks_v.tex22
-rw-r--r--macros/jptex/latex/japanese-otf/doc/test/uplatex/otfscale.tex2
-rw-r--r--macros/jptex/latex/japanese-otf/doc/test/uplatex/uotf-cid-h.tex447
-rw-r--r--macros/jptex/latex/japanese-otf/doc/test/uplatex/uotf-cid-v.tex452
-rw-r--r--macros/jptex/latex/japanese-otf/doc/test/uplatex/uotf-sp-utf8.tex6
-rw-r--r--macros/jptex/latex/japanese-otf/doc/test/uplatex/uotftest-utf8.tex58
-rw-r--r--macros/jptex/latex/japanese-otf/doc/test/uplatex/utfmacro-haranoaji.map95
-rw-r--r--macros/jptex/latex/japanese-otf/doc/test/uplatex/utfmacro-ibmplex.map255
-rw-r--r--macros/jptex/latex/japanese-otf/doc/test/uplatex/utfmacro-kozuka.map118
17 files changed, 1781 insertions, 88 deletions
diff --git a/macros/jptex/latex/japanese-otf/doc/test/uplatex/Makefile b/macros/jptex/latex/japanese-otf/doc/test/uplatex/Makefile
index d3337fb3fe..38c7c6fee2 100644
--- a/macros/jptex/latex/japanese-otf/doc/test/uplatex/Makefile
+++ b/macros/jptex/latex/japanese-otf/doc/test/uplatex/Makefile
@@ -15,42 +15,107 @@ 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
+
+uplatex-version:
+ uplatex --version
+
+euptex-version:
+ euptex --version
+
+xdvipdfmx-version:
+ xdvipdfmx --version
+
+dvipdfmx-version:
+ xdvipdfmx --dvipdfmx --version
+ which xdvipdfmx
+
+which-otf-sty:
+ -@kpsewhich otf.sty
+ -@kpsewhich mlutf.sty
+ -@kpsewhich mlcid.sty
+ -@kpsewhich ajmacros.sty
which-exp-vf:
- kpsewhich -format vf upexpminr-h.vf
+ -@kpsewhich -format vf upexpminr-h.vf
+ -@kpsewhich -format vf upexpminr-v.vf
which-exp-tfm:
- kpsewhich -format tfm upexpminr-h.tfm
+ -@kpsewhich -format tfm upexpminr-h.tfm
+ -@kpsewhich -format tfm upexpminr-v.tfm
which-cmr-tfm:
- kpsewhich -format tfm cmr10.tfm
+ -@kpsewhich -format tfm cmr10.tfm
+ -@kpsewhich -format tfm cmbx12.tfm
+ -@kpsewhich -progname=dvipdfmx -format tfm cmr10.tfm
+ -@kpsewhich -progname=dvipdfmx -format tfm cmbx12.tfm
which-cjmr-tfm:
- kpsewhich -format tfm otf-cjmr-h.tfm
+ -@kpsewhich -format tfm otf-cjmr-h.tfm
+ -@kpsewhich -format tfm otf-cjmr-v.tfm
which-cjmr-ofm:
- kpsewhich -format ofm otf-cjmr-h.ofm
+ -@kpsewhich -format ofm otf-cjmr-h.ofm
+ -@kpsewhich -format ofm otf-cjmr-v.ofm
+
+which-ucgb-tfm:
+ -@kpsewhich -format tfm otf-ucgb-h.tfm
+ -@kpsewhich -format tfm otf-ucgb-v.tfm
which-hara-otf:
- kpsewhich -format "opentype fonts" HaranoAjiMincho-Regular.otf
- kpsewhich -format "opentype fonts" HaranoAjiGothic-Medium.otf
+ -@kpsewhich -format "opentype fonts" HaranoAjiMincho-Regular.otf
+ -@kpsewhich -format "opentype fonts" HaranoAjiMincho-Bold.otf
+ -@kpsewhich -format "opentype fonts" HaranoAjiMincho-Light.otf
+ -@kpsewhich -format "opentype fonts" HaranoAjiGothic-Normal.otf
+ -@kpsewhich -format "opentype fonts" HaranoAjiGothic-Medium.otf
+ -@kpsewhich -format "opentype fonts" HaranoAjiGothic-Bold.otf
+ -@kpsewhich -format "opentype fonts" HaranoAjiGothic-Heavy.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
+ -@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
+ -@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
+
+which-iplx-otf:
+ -@kpsewhich -format "opentype fonts" IBMPlexSansJP-Regular.otf
+ -@kpsewhich -format "opentype fonts" IBMPlexSansJP-Light.otf
+ -@kpsewhich -format "opentype fonts" IBMPlexSansJP-ExtraLight.otf
+ -@kpsewhich -format "opentype fonts" IBMPlexSansJP-Medium.otf
+ -@kpsewhich -format "opentype fonts" IBMPlexSansJP-SemiBold.otf
+ -@kpsewhich -format "opentype fonts" IBMPlexSansJP-Bold.otf
+ -@kpsewhich -format "opentype fonts" IBMPlexSansJP-Text.otf
+ -@kpsewhich -format "opentype fonts" IBMPlexSansJP-Thin.otf
+
+which-dvipdfmx-cfg:
+ kpsewhich -progname=dvipdfmx -format=othertext dvipdfmx.cfg
+
+which-map:
+ -@kpsewhich -format "map" utfmacro-haranoaji.map
+ -@kpsewhich -format "map" utfmacro-kozuka.map
+ -@kpsewhich -format "map" jotf-psfonts.map
+
+which-cmap:
+ -@kpsewhich -format "cmap files" UniJIS-UTF16-H
+ -@kpsewhich -format "cmap files" UniJIS-UTF16-V
+ -@kpsewhich -format "cmap files" UniGB-UTF16-H
+ -@kpsewhich -format "cmap files" UniGB-UTF16-V
+ -@kpsewhich -format "cmap files" UniCNS-UTF16-H
+ -@kpsewhich -format "cmap files" UniCNS-UTF16-V
+ -@kpsewhich -format "cmap files" UniKS-UTF16-H
+ -@kpsewhich -format "cmap files" UniKS-UTF16-V
+
+which-cid-tex:
+ -@kpsewhich uotf-cid-h.tex
+ -@kpsewhich uotf-cid-v.tex
all: otf sp art brsg jis04 scale prop punct exclam dir
@@ -67,47 +132,67 @@ utfmacro: uplatex-utfmacro platex-utfmacro
dir: uplatex-dir platex-dir
uplatex-otf:
- for opt in default deluxe expert bold noreplace; do \
+ for opt in default deluxe expert deluxe,expert bold noreplace; do \
+ optx=`echo $$opt | sed -e 's/,/_/g'` ; \
$(UPLATEX) "\def\option{$$opt}\def\class{ujarticle}\input" uotftest-utf8.tex ; \
- mv uotftest-utf8.dvi uotftest-$$opt-h-uplatex.dvi ; \
- $(DVIPDFMX) uotftest-$$opt-h-uplatex.dvi ; \
+ mv uotftest-utf8.dvi uotftest-$$optx-h-uplatex.dvi ; \
+ $(DVIPDFMX) uotftest-$$optx-h-uplatex.dvi ; \
$(UPLATEX) "\def\option{$$opt}\def\class{utarticle}\input" uotftest-utf8.tex ; \
- mv uotftest-utf8.dvi uotftest-$$opt-v-uplatex.dvi ; \
- $(DVIPDFMX) uotftest-$$opt-v-uplatex.dvi ; \
+ mv uotftest-utf8.dvi uotftest-$$optx-v-uplatex.dvi ; \
+ $(DVIPDFMX) uotftest-$$optx-v-uplatex.dvi ; \
done
platex-otf:
- for opt in default deluxe expert bold noreplace; do \
+ for opt in default deluxe expert deluxe,expert bold noreplace; do \
+ optx=`echo $$opt | sed -e 's/,/_/g'` ; \
$(PLATEX) "\def\option{$$opt}\def\class{jarticle}\input" uotftest-utf8.tex ; \
- mv uotftest-utf8.dvi uotftest-$$opt-h-platex.dvi ; \
- $(DVIPDFMX) uotftest-$$opt-h-platex.dvi ; \
+ mv uotftest-utf8.dvi uotftest-$$optx-h-platex.dvi ; \
+ $(DVIPDFMX) uotftest-$$optx-h-platex.dvi ; \
$(PLATEX) "\def\option{$$opt}\def\class{tarticle}\input" uotftest-utf8.tex ; \
- mv uotftest-utf8.dvi uotftest-$$opt-v-platex.dvi ; \
- $(DVIPDFMX) uotftest-$$opt-v-platex.dvi ; \
+ mv uotftest-utf8.dvi uotftest-$$optx-v-platex.dvi ; \
+ $(DVIPDFMX) uotftest-$$optx-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 ; \
+ for opt in expert,noruby deluxe,expert,noruby; do \
+ optx=`echo $$opt | sed -e 's/,/_/g'` ; \
+ $(UPLATEX) "\def\option{$$opt}\def\class{ujarticle}\input" uotftest-utf8.tex ; \
+ mv uotftest-utf8.dvi uotftest-$$optx-h-uplatex.dvi ; \
+ $(UPLATEX) "\def\option{$$opt}\def\class{utarticle}\input" uotftest-utf8.tex ; \
+ mv uotftest-utf8.dvi uotftest-$$optx-v-uplatex.dvi ; \
+ done
+ for opt in deluxe expert deluxe,expert expert,noruby deluxe,expert,noruby; do \
+ optx=`echo $$opt | sed -e 's/,/_/g'` ; \
+ $(DVIPDFMX) -f utfmacro-haranoaji.map -o uotftest-$$optx-h-hara-uplatex.pdf uotftest-$$optx-h-uplatex.dvi ; \
+ $(DVIPDFMX) -f utfmacro-haranoaji.map -o uotftest-$$optx-v-hara-uplatex.pdf uotftest-$$optx-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 ; \
+ for opt in deluxe expert deluxe,expert; do \
+ optx=`echo $$opt | sed -e 's/,/_/g'` ; \
+ $(DVIPDFMX) -f utfmacro-kozuka.map -o uotftest-$$optx-h-koz-uplatex.pdf uotftest-$$optx-h-uplatex.dvi ; \
+ $(DVIPDFMX) -f utfmacro-kozuka.map -o uotftest-$$optx-v-koz-uplatex.pdf uotftest-$$optx-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 ; \
+ for opt in expert,noruby deluxe,expert,noruby; do \
+ optx=`echo $$opt | sed -e 's/,/_/g'` ; \
+ $(PLATEX) "\def\option{$$opt}\def\class{jarticle}\input" uotftest-utf8.tex ; \
+ mv uotftest-utf8.dvi uotftest-$$optx-h-platex.dvi ; \
+ $(PLATEX) "\def\option{$$opt}\def\class{tarticle}\input" uotftest-utf8.tex ; \
+ mv uotftest-utf8.dvi uotftest-$$optx-v-platex.dvi ; \
+ done
+ for opt in deluxe expert deluxe,expert expert,noruby deluxe,expert,noruby; do \
+ optx=`echo $$opt | sed -e 's/,/_/g'` ; \
+ $(DVIPDFMX) -f utfmacro-haranoaji.map -o uotftest-$$optx-h-hara-platex.pdf uotftest-$$optx-h-platex.dvi ; \
+ $(DVIPDFMX) -f utfmacro-haranoaji.map -o uotftest-$$optx-v-hara-platex.pdf uotftest-$$optx-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 ; \
+ for opt in deluxe expert deluxe,expert; do \
+ optx=`echo $$opt | sed -e 's/,/_/g'` ; \
+ $(DVIPDFMX) -f utfmacro-kozuka.map -o uotftest-$$optx-h-koz-platex.pdf uotftest-$$optx-h-platex.dvi ; \
+ $(DVIPDFMX) -f utfmacro-kozuka.map -o uotftest-$$optx-v-koz-platex.pdf uotftest-$$optx-v-platex.dvi ; \
done
uplatex-sp:
@@ -154,6 +239,58 @@ platex-sp-kozuka: platex-sp
$(DVIPDFMX) -f utfmacro-kozuka.map -o uotf-sp-$$opt-v-koz-platex.pdf uotf-sp-$$opt-v-platex.dvi ; \
done
+uplatex-cid-compile:
+ for opt in default deluxe bold expert dlxexp; do \
+ $(UPLATEX) "\def\option{$$opt}\def\class{ujarticle}\input" uotf-cid-h.tex ; \
+ mv uotf-cid-h.dvi uotf-cid-$$opt-h-uplatex.dvi ; \
+ $(UPLATEX) "\def\option{$$opt}\def\class{utarticle}\input" uotf-cid-v.tex ; \
+ mv uotf-cid-v.dvi uotf-cid-$$opt-v-uplatex.dvi ; \
+ done
+
+uplatex-cid-haranoaji:
+ for opt in default deluxe bold expert dlxexp; do \
+ $(DVIPDFMX) -f utfmacro-haranoaji.map -o uotf-cid-$$opt-h-hara-uplatex.pdf uotf-cid-$$opt-h-uplatex.dvi ; \
+ $(DVIPDFMX) -f utfmacro-haranoaji.map -o uotf-cid-$$opt-v-hara-uplatex.pdf uotf-cid-$$opt-v-uplatex.dvi ; \
+ done
+
+uplatex-cid-kozuka:
+ for opt in default deluxe expert dlxexp; do \
+ $(DVIPDFMX) -f utfmacro-kozuka.map -o uotf-cid-$$opt-h-koz-uplatex.pdf uotf-cid-$$opt-h-uplatex.dvi ; \
+ $(DVIPDFMX) -f utfmacro-kozuka.map -o uotf-cid-$$opt-v-koz-uplatex.pdf uotf-cid-$$opt-v-uplatex.dvi ; \
+ done
+
+uplatex-cid-ibmplex:
+ for opt in default deluxe dlxexp; do \
+ $(DVIPDFMX) -f utfmacro-ibmplex.map -o uotf-cid-$$opt-h-iplx-uplatex.pdf uotf-cid-$$opt-h-uplatex.dvi ; \
+ $(DVIPDFMX) -f utfmacro-ibmplex.map -o uotf-cid-$$opt-v-iplx-uplatex.pdf uotf-cid-$$opt-v-uplatex.dvi ; \
+ done
+
+platex-cid-compile:
+ for opt in default deluxe bold expert dlxexp; do \
+ $(PLATEX) "\def\option{$$opt}\def\class{jarticle}\input" uotf-cid-h.tex ; \
+ mv uotf-cid-h.dvi uotf-cid-$$opt-h-platex.dvi ; \
+ $(PLATEX) "\def\option{$$opt}\def\class{tarticle}\input" uotf-cid-v.tex ; \
+ mv uotf-cid-v.dvi uotf-cid-$$opt-v-platex.dvi ; \
+ done
+
+platex-cid-haranoaji:
+ for opt in default deluxe bold expert dlxexp; do \
+ $(DVIPDFMX) -f utfmacro-haranoaji.map -o uotf-cid-$$opt-h-hara-platex.pdf uotf-cid-$$opt-h-platex.dvi ; \
+ $(DVIPDFMX) -f utfmacro-haranoaji.map -o uotf-cid-$$opt-v-hara-platex.pdf uotf-cid-$$opt-v-platex.dvi ; \
+ done
+
+platex-cid-kozuka:
+ for opt in default deluxe expert dlxexp; do \
+ $(DVIPDFMX) -f utfmacro-kozuka.map -o uotf-cid-$$opt-h-koz-platex.pdf uotf-cid-$$opt-h-platex.dvi ; \
+ $(DVIPDFMX) -f utfmacro-kozuka.map -o uotf-cid-$$opt-v-koz-platex.pdf uotf-cid-$$opt-v-platex.dvi ; \
+ done
+
+platex-cid-ibmplex:
+ for opt in default deluxe dlxexp; do \
+ $(DVIPDFMX) -f utfmacro-ibmplex.map -o uotf-cid-$$opt-h-iplx-platex.pdf uotf-cid-$$opt-h-platex.dvi ; \
+ $(DVIPDFMX) -f utfmacro-ibmplex.map -o uotf-cid-$$opt-v-iplx-platex.pdf uotf-cid-$$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/cid_cns_h.tex b/macros/jptex/latex/japanese-otf/doc/test/uplatex/cid_cns_h.tex
new file mode 100644
index 0000000000..b01453d378
--- /dev/null
+++ b/macros/jptex/latex/japanese-otf/doc/test/uplatex/cid_cns_h.tex
@@ -0,0 +1,25 @@
+%
+% Reference:
+% https://github.com/adobe-type-tools/cmap-resources/
+% Adobe-CNS1-7
+%
+\makeatletter
+\newcount\K@@CT%
+\def\CIDTrange#1#2{%
+ \K@@CT=#1%
+ \loop\ifnum\K@@CT<#2%
+ \CIDT{\number\K@@CT}%
+ \advance\K@@CT by1%
+ \repeat%
+ }
+\makeatother
+
+\CIDT{2550}\CIDT{2318}\CIDT{1628}\CIDT{4764}\CIDT{2065}\CIDT{5042}~~\CIDTrange{19078}{19088}~~\CIDTrange{180}{193}
+
+Adobe-CNS1 1/2 13648--\\
+\CIDTrange{13648}{13743}
+
+Adobe-CNS1 1/2 17603\\
+\CIDTrange{17603}{17604}
+
+% end
diff --git a/macros/jptex/latex/japanese-otf/doc/test/uplatex/cid_cns_v.tex b/macros/jptex/latex/japanese-otf/doc/test/uplatex/cid_cns_v.tex
new file mode 100644
index 0000000000..22d6a066f8
--- /dev/null
+++ b/macros/jptex/latex/japanese-otf/doc/test/uplatex/cid_cns_v.tex
@@ -0,0 +1,25 @@
+%
+% Reference:
+% https://github.com/adobe-type-tools/cmap-resources/
+% Adobe-CNS1-7
+%
+\makeatletter
+\newcount\K@@CT%
+\def\CIDTrange#1#2{%
+ \K@@CT=#1%
+ \loop\ifnum\K@@CT<#2%
+ \CIDT{\number\K@@CT}%
+ \advance\K@@CT by1%
+ \repeat%
+ }
+\makeatother
+
+\CIDT{2550}\CIDT{2318}\CIDT{1628}\CIDT{4764}\CIDT{2065}\CIDT{5042}~~\CIDTrange{19078}{19088}~~\CIDTrange{180}{193}
+
+Adobe-CNS1 1/2 17506--\\
+\CIDTrange{17506}{17601}
+
+Adobe-CNS1 1/2 17605\\
+\CIDTrange{17605}{17606}
+
+% end
diff --git a/macros/jptex/latex/japanese-otf/doc/test/uplatex/cid_gb_h.tex b/macros/jptex/latex/japanese-otf/doc/test/uplatex/cid_gb_h.tex
new file mode 100644
index 0000000000..b0b46df75b
--- /dev/null
+++ b/macros/jptex/latex/japanese-otf/doc/test/uplatex/cid_gb_h.tex
@@ -0,0 +1,28 @@
+%
+% Reference:
+% https://github.com/adobe-type-tools/cmap-resources/
+% Adobe-GB1-5
+%
+\makeatletter
+\newcount\K@@CC%
+\def\CIDCrange#1#2{%
+ \K@@CC=#1%
+ \loop\ifnum\K@@CC<#2%
+ \CIDC{\number\K@@CC}%
+ \advance\K@@CC by1%
+ \repeat%
+ }
+\makeatother
+
+\CIDC{1824}\CIDC{1882}\CIDC{4528}\CIDC{3094}\CIDC{3469}\CIDC{2627}~~\CIDCrange{29049}{29059}~~\CIDCrange{173}{184}
+
+Adobe-GB1 1/2 814--\\
+\CIDCrange{814}{940}
+
+Adobe-GB1 1/2 7716\\
+\CIDCrange{7716}{7717}
+
+Adobe-GB1 1/2 22355--\\
+\CIDCrange{22355}{22358}
+
+% end
diff --git a/macros/jptex/latex/japanese-otf/doc/test/uplatex/cid_gb_v.tex b/macros/jptex/latex/japanese-otf/doc/test/uplatex/cid_gb_v.tex
new file mode 100644
index 0000000000..410c796f45
--- /dev/null
+++ b/macros/jptex/latex/japanese-otf/doc/test/uplatex/cid_gb_v.tex
@@ -0,0 +1,25 @@
+%
+% Reference:
+% https://github.com/adobe-type-tools/cmap-resources/
+% Adobe-GB1-5
+%
+\makeatletter
+\newcount\K@@CC%
+\def\CIDCrange#1#2{%
+ \K@@CC=#1%
+ \loop\ifnum\K@@CC<#2%
+ \CIDC{\number\K@@CC}%
+ \advance\K@@CC by1%
+ \repeat%
+ }
+\makeatother
+
+\CIDC{1824}\CIDC{1882}\CIDC{4528}\CIDC{3094}\CIDC{3469}\CIDC{2627}~~\CIDCrange{29049}{29059}~~\CIDCrange{173}{184}
+
+Adobe-GB1 1/2 22226--\\
+\CIDCrange{22226}{22353}
+
+Adobe-GB1 1/2 29060--\\
+\CIDCrange{29060}{29064}
+
+% end
diff --git a/macros/jptex/latex/japanese-otf/doc/test/uplatex/cid_jp_h.tex b/macros/jptex/latex/japanese-otf/doc/test/uplatex/cid_jp_h.tex
new file mode 100644
index 0000000000..10e7d04d89
--- /dev/null
+++ b/macros/jptex/latex/japanese-otf/doc/test/uplatex/cid_jp_h.tex
@@ -0,0 +1,34 @@
+%
+% Reference:
+% https://github.com/adobe-type-tools/cmap-resources/
+% Adobe-Japan1-7
+%
+\makeatletter
+\newcount\K@@CJ%
+\def\CIDJrange#1#2{%
+ \K@@CJ=#1%
+ \loop\ifnum\K@@CJ<#2%
+ \CID{\number\K@@CJ}%
+ \advance\K@@CJ by1%
+ \repeat%
+ }
+\makeatother
+
+\CID{2062}\CID{1410}\CID{3034}\CID{1579}\CID{2396}\CID{3965}~~\CIDJrange{23050}{23060}~~\CIDJrange{721}{734}
+
+Adobe-Japan1 1/2 231--\\
+\CIDJrange{231}{633}
+
+Adobe-Japan1 1/2 8718--\\
+\CIDJrange{8718}{8720}
+
+Adobe-Japan1 1/2 12063--\\
+\CIDJrange{12063}{12088}
+
+Adobe-Japan1 1/3 9758--\\
+\CIDJrange{9758}{9779}
+
+Adobe-Japan1 1/4 9738--\\
+\CIDJrange{9738}{9758}
+
+% end
diff --git a/macros/jptex/latex/japanese-otf/doc/test/uplatex/cid_jp_v.tex b/macros/jptex/latex/japanese-otf/doc/test/uplatex/cid_jp_v.tex
new file mode 100644
index 0000000000..a4dde4d86b
--- /dev/null
+++ b/macros/jptex/latex/japanese-otf/doc/test/uplatex/cid_jp_v.tex
@@ -0,0 +1,34 @@
+%
+% Reference:
+% https://github.com/adobe-type-tools/cmap-resources/
+% Adobe-Japan1-7
+%
+\makeatletter
+\newcount\K@@CJ%
+\def\CIDJrange#1#2{%
+ \K@@CJ=#1%
+ \loop\ifnum\K@@CJ<#2%
+ \CID{\number\K@@CJ}%
+ \advance\K@@CJ by1%
+ \repeat%
+ }
+\makeatother
+
+\CID{2062}\CID{1410}\CID{3034}\CID{1579}\CID{2396}\CID{3965}~~\CIDJrange{23050}{23060}~~\CIDJrange{721}{734}
+
+Adobe-Japan1 1/2 8950--\\
+\CIDJrange{8950}{9354}
+
+Adobe-Japan1 1/2 10185--\\
+\CIDJrange{10185}{10196}
+
+Adobe-Japan1 1/2 13295--\\
+\CIDJrange{13295}{13320}
+
+Adobe-Japan1 1/3 13274--\\
+\CIDJrange{13274}{13295}
+
+Adobe-Japan1 1/4 13254--\\
+\CIDJrange{13254}{13274}
+
+% end
diff --git a/macros/jptex/latex/japanese-otf/doc/test/uplatex/cid_ks_h.tex b/macros/jptex/latex/japanese-otf/doc/test/uplatex/cid_ks_h.tex
new file mode 100644
index 0000000000..76ee979de2
--- /dev/null
+++ b/macros/jptex/latex/japanese-otf/doc/test/uplatex/cid_ks_h.tex
@@ -0,0 +1,22 @@
+%
+% Reference:
+% https://github.com/adobe-type-tools/cmap-resources/
+% Adobe-Korea1-2
+%
+\makeatletter
+\newcount\K@@CK%
+\def\CIDKrange#1#2{%
+ \K@@CK=#1%
+ \loop\ifnum\K@@CK<#2%
+ \CIDK{\number\K@@CK}%
+ \advance\K@@CK by1%
+ \repeat%
+ }
+\makeatother
+
+\CIDK{3785}\CIDK{7694}\CIDK{6975}\CIDK{4067}\CIDK{5669}\CIDK{2570}~~\CIDKrange{18145}{18155}~~\CIDKrange{157}{170}
+
+Adobe-Korea1 1/2 8094--\\
+\CIDKrange{8094}{8191}
+
+% end
diff --git a/macros/jptex/latex/japanese-otf/doc/test/uplatex/cid_ks_v.tex b/macros/jptex/latex/japanese-otf/doc/test/uplatex/cid_ks_v.tex
new file mode 100644
index 0000000000..082f87b3d4
--- /dev/null
+++ b/macros/jptex/latex/japanese-otf/doc/test/uplatex/cid_ks_v.tex
@@ -0,0 +1,22 @@
+%
+% Reference:
+% https://github.com/adobe-type-tools/cmap-resources/
+% Adobe-Korea1-2
+%
+\makeatletter
+\newcount\K@@CK%
+\def\CIDKrange#1#2{%
+ \K@@CK=#1%
+ \loop\ifnum\K@@CK<#2%
+ \CIDK{\number\K@@CK}%
+ \advance\K@@CK by1%
+ \repeat%
+ }
+\makeatother
+
+\CIDK{3785}\CIDK{7694}\CIDK{6975}\CIDK{4067}\CIDK{5669}\CIDK{2570}~~\CIDKrange{18145}{18155}~~\CIDKrange{157}{170}
+
+Adobe-Korea1 1/2 18255--\\
+\CIDKrange{18255}{18352}
+
+% end
diff --git a/macros/jptex/latex/japanese-otf/doc/test/uplatex/otfscale.tex b/macros/jptex/latex/japanese-otf/doc/test/uplatex/otfscale.tex
index 49d42eb177..ba451fdfec 100644
--- a/macros/jptex/latex/japanese-otf/doc/test/uplatex/otfscale.tex
+++ b/macros/jptex/latex/japanese-otf/doc/test/uplatex/otfscale.tex
@@ -39,7 +39,7 @@
\fi
\fi
-\documentclass[a4paper,titlepage,draft\@op@cls]{\class}
+\documentclass[a4paper,titlepage,draft,dvipdfmx\@op@cls]{\class}
\usepackage[\@opt@]{otf}
\usepackage{color}
diff --git a/macros/jptex/latex/japanese-otf/doc/test/uplatex/uotf-cid-h.tex b/macros/jptex/latex/japanese-otf/doc/test/uplatex/uotf-cid-h.tex
new file mode 100644
index 0000000000..1c23e77ae9
--- /dev/null
+++ b/macros/jptex/latex/japanese-otf/doc/test/uplatex/uotf-cid-h.tex
@@ -0,0 +1,447 @@
+% -*- coding: utf-8 -*-
+%%%%%%%%
+% To control hyperref on command line,
+% you can select one of (1),(2a),(2b),(3).
+% (1) do not treat hyperref
+% $ uplatex uotf-cid-h.tex
+% (2a) hyperref + dvipdfmx (with CMap conversion)
+% $ uplatex "\def\withhyperref{dvipdfmx}\input" uotf-cid-h.tex
+% (2b) hyperref + dvipdfmx + out2uni (without CMap conversion)
+% $ uplatex "\def\withhyperref{dvipdfmx}\nocmap{true}\input" uotf-cid-h.tex
+% (3) hyperref + dvips + convbkmk.rb + distiller/ps2pdf
+% $ uplatex "\def\withhyperref{dvips}\input" uotf-cid-h.tex
+%%%%%%
+
+\newif\ifuptexmode\uptexmodefalse
+\ifnum\jis"2121="3000
+ \uptexmodetrue
+ \def\tounicode{pdf:tounicode UTF8-UTF16}
+\else
+ \ifnum\jis"2121="A1A1
+ \def\tounicode{pdf:tounicode EUC-UCS2}
+ \fi
+ \ifnum\jis"2121="8140
+ \def\tounicode{pdf:tounicode 90ms-RKSJ-UCS2}
+ \fi
+\fi
+
+\makeatletter
+
+\def\@opt@{multi}
+\def\@default{default}
+\def\@jarticle{jarticle}
+\def\@tarticle{tarticle}
+\def\@ujarticle{ujarticle}
+\def\@noreplace{noreplace}
+\def\@deluxe{deluxe}
+\def\@dlx@exp{dlxexp}
+
+\ifx\option\@dlx@exp
+ \edef\option{deluxe,expert}
+\fi
+\newif\ifdeluxe \deluxefalse
+\@for\@@opt:=\option\do{%
+ \ifx\@@opt\@deluxe\deluxetrue\fi
+}
+\ifx\option\@undefined
+ \def\option{default}
+\fi
+\ifx\option\@noreplace
+ \ifuptexmode
+ \ifx\class\@ujarticle
+ \def\@enc@{JY2}\def\@dir@{h}
+ \else
+ \def\@enc@{JT2}\def\@dir@{v}
+ \fi
+ \DeclareFontFamily{\@enc@}{mcw}{}
+ \DeclareFontFamily{\@enc@}{gtw}{}
+ \DeclareFontShape{\@enc@}{mcw}{m}{n}{<->s*[0.962216]upjpnrm-\@dir@}{}
+ \DeclareFontShape{\@enc@}{gtw}{m}{n}{<->s*[0.962216]upjpngt-\@dir@}{}
+ \DeclareFontShape{\@enc@}{gt}{m}{n}{<->s*[0.962216]upjpngt-\@dir@}{}
+ \DeclareFontShape{\@enc@}{mcw}{bx}{n}{<->ssub*gt/m/n}{}
+ \DeclareFontShape{\@enc@}{gtw}{bx}{n}{<->ssub*gt/m/n}{}
+ \DeclareFontShape{\@enc@}{gt}{bx}{n}{<->ssub*gt/m/n}{}
+ \DeclareRobustCommand\mcw{\kanjifamily{mcw}\selectfont}
+ \DeclareRobustCommand\gtw{\kanjifamily{gtw}\selectfont}
+ \renewcommand\mcdefault{mcw}
+ \renewcommand\gtdefault{gtw}
+ \fi
+\fi
+\ifx\option\@default
+\else
+ \edef\@opt@{\option,\@opt@}
+\fi
+
+\ifx\class\@undefined
+ \ifuptexmode
+ \def\class{ujarticle}
+ \else
+ \def\class{jarticle}
+ \fi
+\fi
+
+\def\baseshift{-.12zh}
+
+\ifuptexmode
+ \edef\@opt@{uplatex,\@opt@}
+\fi
+\ifx\class\@jarticle
+ \documentclass[a4paper,titlepage,dvipdfmx]{\class}
+\else
+ \ifx\class\@ujarticle
+ \documentclass[a4paper,titlepage,dvipdfmx]{\class}
+ \else
+ \documentclass[a4paper,titlepage,landscape,dvipdfmx]{\class}
+ \fi
+\fi
+
+\usepackage[\@opt@]{otf}
+
+\def\@dvipdfmx{dvipdfmx}
+\def\@dvips{dvips}
+
+\ifx\withhyperref\@undefined
+ \def\withhyperref{undefined}
+ \edef\texorpdfstring#1#2{#1}
+\else
+ \ifx\withhyperref\@dvipdfmx
+ \def\@hyperrefkeyval{dvipdfm}
+ \usepackage{atbegshi}
+ \ifx\nocmap\@undefined
+ \AtBeginShipoutFirst{\special{\tounicode}}
+ \fi
+ \fi
+ \ifx\withhyperref\@dvips
+ \def\@hyperrefkeyval{dvips}
+ \fi
+
+\usepackage[\@hyperrefkeyval,%
+bookmarks=true,%
+bookmarksnumbered=true,%
+bookmarkstype=toc,%
+%pdfstartview={FitBH -32768},%
+pdftitle={japanese-otfのテスト},%
+pdfsubject={CID macro編},%
+pdfauthor={upTeXプロジェクト},%
+pdfkeywords={TeX; dvips; dvipdfmx; bookmark; hyperref; しおり; pdf}%
+]{hyperref}
+
+\fi
+
+\makeatother
+
+\usepackage{redeffont}
+
+\AtBeginDvi{\special{papersize=\the\paperwidth,\the\paperheight}}
+\pagestyle{empty}
+\makeatletter
+\ifx\rubyfamily\@undefined\let\rubyfamily=\relax\fi
+\ifx\mgfamily\@undefined\let\mgfamily=\relax\fi
+\makeatother
+
+\font\upjpnrml = upnmlminl-h at 10.0pt
+\font\upjpnrmm = upnmlminr-h at 10.0pt
+\font\upjpnrmb = upnmlminb-h at 10.0pt
+\font\upjpngtm = upnmlgothr-h at 10.0pt
+\font\upjpngtb = upnmlgothb-h at 10.0pt
+\font\upjpngte = upnmlgotheb-h at 10.0pt
+\font\upjpnmgm = upnmlmgothr-h at 10.0pt
+
+\font\upschrml = upnmschminl-h at 10.0pt
+\font\upschrmm = upnmschminr-h at 10.0pt
+\font\upschrmb = upnmschminb-h at 10.0pt
+\font\upschgtm = upnmschgothr-h at 10.0pt
+\font\upschgtb = upnmschgothb-h at 10.0pt
+\font\upschgte = upnmschgotheb-h at 10.0pt
+\font\upschmgm = upnmschmgothr-h at 10.0pt
+
+\font\uptchrml = upnmtchminl-h at 10.0pt
+\font\uptchrmm = upnmtchminr-h at 10.0pt
+\font\uptchrmb = upnmtchminb-h at 10.0pt
+\font\uptchgtm = upnmtchgothr-h at 10.0pt
+\font\uptchgtb = upnmtchgothb-h at 10.0pt
+\font\uptchgte = upnmtchgotheb-h at 10.0pt
+\font\uptchmgm = upnmtchmgothr-h at 10.0pt
+
+\font\upkorrml = upnmkorminl-h at 10.0pt
+\font\upkorrmm = upnmkorminr-h at 10.0pt
+\font\upkorrmb = upnmkorminb-h at 10.0pt
+\font\upkorgtm = upnmkorgothr-h at 10.0pt
+\font\upkorgtb = upnmkorgothb-h at 10.0pt
+\font\upkorgte = upnmkorgotheb-h at 10.0pt
+\font\upkormgm = upnmkormgothr-h at 10.0pt
+
+\edef\bs{$\backslash$\kern0em}
+\setlength\parindent{0em}
+\textwidth150mm
+\oddsidemargin0mm
+\evensidemargin0mm
+\textheight250mm
+\topmargin-15mm
+
+\begin{document}
+\section{見出し}
+
+コンパイラー:\ifuptexmode upLaTeX\else pLaTeX\fi\\
+クラス:\texttt{\class}\\
+オプション:\texttt{\option}
+
+\vspace{\baselineskip}
+\ifuptexmode
+\begin{tabular}{l||ccccc}
+フォント & default & JPN & SCH & TCH & KOR\\
+\hline
+mc/m & 骨海直器述り &
+ {\upjpnrmm 骨海直器述竜} & {\upschrmm 骨海直器述龙} & {\uptchrmm 骨海直器述龍} & {\upkorrmm 骨海直器述용} \\
+mc/bx & {\bfseries 骨海直器述り} &
+ {\upjpnrmb 骨海直器述竜} & {\upschrmb 骨海直器述龙} & {\uptchrmb 骨海直器述龍} & {\upkorrmb 骨海直器述용} \\
+\ifdeluxe
+mc/l & {\ltseries 骨海直器述り} &
+ {\upjpnrml 骨海直器述竜} & {\upschrml 骨海直器述龙} & {\uptchrml 骨海直器述龍} & {\upkorrml 骨海直器述용} \\
+\fi
+gt/m & {\gtfamily 骨海直器述り} &
+ {\upjpngtm 骨海直器述竜} & {\upschgtm 骨海直器述龙} & {\uptchgtm 骨海直器述龍} & {\upkorgtm 骨海直器述용} \\
+gt/bx & {\gtfamily\bfseries 骨海直器述り} &
+ {\upjpngtb 骨海直器述竜} & {\upschgtb 骨海直器述龙} & {\uptchgtb 骨海直器述龍} & {\upkorgtb 骨海直器述용} \\
+\ifdeluxe
+gt/eb & {\gtfamily\ebseries 骨海直器述り} &
+ {\upjpngte 骨海直器述竜} & {\upschgte 骨海直器述龙} & {\uptchgte 骨海直器述龍} & {\upkorgte 骨海直器述용} \\
+\fi
+mg/m & {\mgfamily 骨海直器述り} &
+ {\upjpnmgm 骨海直器述竜} & {\upschmgm 骨海直器述龙} & {\uptchmgm 骨海直器述龍} & {\upkormgm 骨海直器述용} \\
+\end{tabular}
+\else
+\begin{tabular}{l||c}
+フォント & default\\
+\hline
+mc/m & 骨海直器述り\\
+mc/bx & {\bfseries 骨海直器述り} \\
+\ifdeluxe
+mc/l & {\ltseries 骨海直器述り}\\
+\fi
+gt/m & {\gtfamily 骨海直器述り}\\
+gt/bx & {\gtfamily\bfseries 骨海直器述り}\\
+\ifdeluxe
+gt/eb & {\gtfamily\ebseries 骨海直器述り}\\
+\fi
+mg/m & {\mgfamily 骨海直器述り}\\
+\end{tabular}
+\fi
+\vspace{\baselineskip}
+
+\begin{tabular}{l||ccccc}
+フォント & \bs UTF & \bs UTFC & \bs UTFT & \bs UTFK & \bs UTFM\\
+\hline
+mc/m &
+ \UTF{9AA8}\UTF{6D77}\UTF{76F4}\UTF{5668}\UTF{8FF0}\UTF{7ADC} & \UTFC{9AA8}\UTFC{6D77}\UTFC{76F4}\UTFC{5668}\UTFC{8FF0}\UTFC{9F99} &
+ \UTFT{9AA8}\UTFT{6D77}\UTFT{76F4}\UTFT{5668}\UTFT{8FF0}\UTFT{9F8D} & \UTFK{9AA8}\UTFK{6D77}\UTFK{76F4}\UTFK{5668}\UTFK{8FF0}\UTFK{C6A9} &
+ \UTFM{9AA8}\UTFM{6D77}\UTFM{76F4}\UTFM{5668}\UTFM{8FF0}\UTFM{7ADC}\UTFM{9F99}\UTFM{9F8D}\UTFM{C6A9} \\
+mc/bx &
+ {\bfseries\UTF{9AA8}\UTF{6D77}\UTF{76F4}\UTF{5668}\UTF{8FF0}\UTF{7ADC}} & {\bfseries\UTFC{9AA8}\UTFC{6D77}\UTFC{76F4}\UTFC{5668}\UTFC{8FF0}\UTFC{9F99}} &
+ {\bfseries\UTFT{9AA8}\UTFT{6D77}\UTFT{76F4}\UTFT{5668}\UTFT{8FF0}\UTFT{9F8D}} & {\bfseries\UTFK{9AA8}\UTFK{6D77}\UTFK{76F4}\UTFK{5668}\UTFK{8FF0}\UTFK{C6A9}} &
+ {\bfseries\UTFM{9AA8}\UTFM{6D77}\UTFM{76F4}\UTFM{5668}\UTFM{8FF0}\UTFM{7ADC}\UTFM{9F99}\UTFM{9F8D}\UTFM{C6A9}} \\
+\ifdeluxe
+mc/l &
+ {\ltseries\UTF{9AA8}\UTF{6D77}\UTF{76F4}\UTF{5668}\UTF{8FF0}\UTF{7ADC}} & {\ltseries\UTFC{9AA8}\UTFC{6D77}\UTFC{76F4}\UTFC{5668}\UTFC{8FF0}\UTFC{9F99}} &
+ {\ltseries\UTFT{9AA8}\UTFT{6D77}\UTFT{76F4}\UTFT{5668}\UTFT{8FF0}\UTFT{9F8D}} & {\ltseries\UTFK{9AA8}\UTFK{6D77}\UTFK{76F4}\UTFK{5668}\UTFK{8FF0}\UTFK{C6A9}} &
+ {\ltseries\UTFM{9AA8}\UTFM{6D77}\UTFM{76F4}\UTFM{5668}\UTFM{8FF0}\UTFM{7ADC}\UTFM{9F99}\UTFM{9F8D}\UTFM{C6A9}} \\
+\fi
+gt/m &
+ {\gtfamily\UTF{9AA8}\UTF{6D77}\UTF{76F4}\UTF{5668}\UTF{8FF0}\UTF{7ADC}} & {\gtfamily\UTFC{9AA8}\UTFC{6D77}\UTFC{76F4}\UTFC{5668}\UTFC{8FF0}\UTFC{9F99}} &
+ {\gtfamily\UTFT{9AA8}\UTFT{6D77}\UTFT{76F4}\UTFT{5668}\UTFT{8FF0}\UTFT{9F8D}} & {\gtfamily\UTFK{9AA8}\UTFK{6D77}\UTFK{76F4}\UTFK{5668}\UTFK{8FF0}\UTFK{C6A9}} &
+ {\gtfamily\UTFM{9AA8}\UTFM{6D77}\UTFM{76F4}\UTFM{5668}\UTFM{8FF0}\UTFM{7ADC}\UTFM{9F99}\UTFM{9F8D}\UTFM{C6A9}} \\
+gt/bx &
+ {\gtfamily\bfseries\UTF{9AA8}\UTF{6D77}\UTF{76F4}\UTF{5668}\UTF{8FF0}\UTF{7ADC}} & {\gtfamily\bfseries\UTFC{9AA8}\UTFC{6D77}\UTFC{76F4}\UTFC{5668}\UTFC{8FF0}\UTFC{9F99}} &
+ {\gtfamily\bfseries\UTFT{9AA8}\UTFT{6D77}\UTFT{76F4}\UTFT{5668}\UTFT{8FF0}\UTFT{9F8D}} & {\gtfamily\bfseries\UTFK{9AA8}\UTFK{6D77}\UTFK{76F4}\UTFK{5668}\UTFK{8FF0}\UTFK{C6A9}} &
+ {\gtfamily\bfseries\UTFM{9AA8}\UTFM{6D77}\UTFM{76F4}\UTFM{5668}\UTFM{8FF0}\UTFM{7ADC}\UTFM{9F99}\UTFM{9F8D}\UTFM{C6A9}} \\
+\ifdeluxe
+gt/eb &
+ {\gtfamily\ebseries\UTF{9AA8}\UTF{6D77}\UTF{76F4}\UTF{5668}\UTF{8FF0}\UTF{7ADC}} & {\gtfamily\ebseries\UTFC{9AA8}\UTFC{6D77}\UTFC{76F4}\UTFC{5668}\UTFC{8FF0}\UTFC{9F99}} &
+ {\gtfamily\ebseries\UTFT{9AA8}\UTFT{6D77}\UTFT{76F4}\UTFT{5668}\UTFT{8FF0}\UTFT{9F8D}} & {\gtfamily\ebseries\UTFK{9AA8}\UTFK{6D77}\UTFK{76F4}\UTFK{5668}\UTFK{8FF0}\UTFK{C6A9}} &
+ {\gtfamily\ebseries\UTFM{9AA8}\UTFM{6D77}\UTFM{76F4}\UTFM{5668}\UTFM{8FF0}\UTFM{7ADC}\UTFM{9F99}\UTFM{9F8D}\UTFM{C6A9}}\\
+\fi
+mg/m &
+ {\mgfamily\UTF{9AA8}\UTF{6D77}\UTF{76F4}\UTF{5668}\UTF{8FF0}\UTF{7ADC}} & {\mgfamily\UTFC{9AA8}\UTFC{6D77}\UTFC{76F4}\UTFC{5668}\UTFC{8FF0}\UTFC{9F99}} &
+ {\mgfamily\UTFT{9AA8}\UTFT{6D77}\UTFT{76F4}\UTFT{5668}\UTFT{8FF0}\UTFT{9F8D}} & {\mgfamily\UTFK{9AA8}\UTFK{6D77}\UTFK{76F4}\UTFK{5668}\UTFK{8FF0}\UTFK{C6A9}} &
+ {\mgfamily\UTFM{9AA8}\UTFM{6D77}\UTFM{76F4}\UTFM{5668}\UTFM{8FF0}\UTFM{7ADC}\UTFM{9F99}\UTFM{9F8D}\UTFM{C6A9}} \\
+\end{tabular}
+\vspace{\baselineskip}
+
+\begin{tabular}{l||cccc}
+フォント & \bs CID & \bs CIDC & \bs CIDT & \bs CIDK\\
+\hline
+mc/m &
+ \CID{2062}\CID{1410}\CID{3034}\CID{1579}\CID{2396}\CID{3965} & \CIDC{1824}\CIDC{1882}\CIDC{4528}\CIDC{3094}\CIDC{3469}\CIDC{2627} &
+ \CIDT{2550}\CIDT{2318}\CIDT{1628}\CIDT{4764}\CIDT{2065}\CIDT{5042} & \CIDK{3785}\CIDK{7694}\CIDK{6975}\CIDK{4067}\CIDK{5669}\CIDK{2570} \\
+mc/bx &
+ {\bfseries\CID{2062}\CID{1410}\CID{3034}\CID{1579}\CID{2396}\CID{3965}} & {\bfseries\CIDC{1824}\CIDC{1882}\CIDC{4528}\CIDC{3094}\CIDC{3469}\CIDC{2627}} &
+ {\bfseries\CIDT{2550}\CIDT{2318}\CIDT{1628}\CIDT{4764}\CIDT{2065}\CIDT{5042}} & {\bfseries\CIDK{3785}\CIDK{7694}\CIDK{6975}\CIDK{4067}\CIDK{5669}\CIDK{2570}} \\
+\ifdeluxe
+mc/l &
+ {\ltseries\CID{2062}\CID{1410}\CID{3034}\CID{1579}\CID{2396}\CID{3965}} & {\ltseries\CIDC{1824}\CIDC{1882}\CIDC{4528}\CIDC{3094}\CIDC{3469}\CIDC{2627}} &
+ {\ltseries\CIDT{2550}\CIDT{2318}\CIDT{1628}\CIDT{4764}\CIDT{2065}\CIDT{5042}} & {\ltseries\CIDK{3785}\CIDK{7694}\CIDK{6975}\CIDK{4067}\CIDK{5669}\CIDK{2570}} \\
+\fi
+gt/m &
+ {\gtfamily\CID{2062}\CID{1410}\CID{3034}\CID{1579}\CID{2396}\CID{3965}} & {\gtfamily\CIDC{1824}\CIDC{1882}\CIDC{4528}\CIDC{3094}\CIDC{3469}\CIDC{2627}} &
+ {\gtfamily\CIDT{2550}\CIDT{2318}\CIDT{1628}\CIDT{4764}\CIDT{2065}\CIDT{5042}} & {\gtfamily\CIDK{3785}\CIDK{7694}\CIDK{6975}\CIDK{4067}\CIDK{5669}\CIDK{2570}} \\
+gt/bx &
+ {\gtfamily\bfseries\CID{2062}\CID{1410}\CID{3034}\CID{1579}\CID{2396}\CID{3965}} & {\gtfamily\bfseries\CIDC{1824}\CIDC{1882}\CIDC{4528}\CIDC{3094}\CIDC{3469}\CIDC{2627}} &
+ {\gtfamily\bfseries\CIDT{2550}\CIDT{2318}\CIDT{1628}\CIDT{4764}\CIDT{2065}\CIDT{5042}} & {\gtfamily\bfseries\CIDK{3785}\CIDK{7694}\CIDK{6975}\CIDK{4067}\CIDK{5669}\CIDK{2570}} \\
+\ifdeluxe
+gt/eb &
+ {\gtfamily\ebseries\CID{2062}\CID{1410}\CID{3034}\CID{1579}\CID{2396}\CID{3965}} & {\gtfamily\ebseries\CIDC{1824}\CIDC{1882}\CIDC{4528}\CIDC{3094}\CIDC{3469}\CIDC{2627}} &
+ {\gtfamily\ebseries\CIDT{2550}\CIDT{2318}\CIDT{1628}\CIDT{4764}\CIDT{2065}\CIDT{5042}} & {\gtfamily\ebseries\CIDK{3785}\CIDK{7694}\CIDK{6975}\CIDK{4067}\CIDK{5669}\CIDK{2570}} \\
+\fi
+mg/m &
+ {\mgfamily\CID{2062}\CID{1410}\CID{3034}\CID{1579}\CID{2396}\CID{3965}} & {\mgfamily\CIDC{1824}\CIDC{1882}\CIDC{4528}\CIDC{3094}\CIDC{3469}\CIDC{2627}} &
+ {\mgfamily\CIDT{2550}\CIDT{2318}\CIDT{1628}\CIDT{4764}\CIDT{2065}\CIDT{5042}} & {\mgfamily\CIDK{3785}\CIDK{7694}\CIDK{6975}\CIDK{4067}\CIDK{5669}\CIDK{2570}} \\
+\end{tabular}
+
+\section{Half Width}
+
+\bs CID: \raisebox\baseshift{\frame{\CID{234}}\frame{\CID{235}}\frame{\CID{236}}\frame{\CID{237}}}~~
+\raisebox\baseshift{\frame{\CID{247}}\frame{\CID{248}}\frame{\CID{249}}\frame{\CID{250}}\frame{\CID{251}}}~~
+\raisebox\baseshift{\frame{\CID{264}}\frame{\CID{265}}\frame{\CID{266}}\frame{\CID{267}}\frame{\CID{268}}}~~
+\raisebox\baseshift{\frame{\CID{296}}\frame{\CID{297}}\frame{\CID{298}}\frame{\CID{299}}\frame{\CID{300}}}~~
+\raisebox\baseshift{\frame{\CID{231}}}~~
+\raisebox\baseshift{\frame{\CID{343}}\frame{\CID{344}}\frame{\CID{345}}\frame{\CID{346}}\frame{\CID{347}}}~~
+\raisebox\baseshift{\frame{\CID{9758}}\frame{\CID{9759}}\frame{\CID{9760}}\frame{\CID{9761}}\frame{\CID{9762}}}~~
+\raisebox\baseshift{\frame{\CID{9738}}\frame{\CID{9739}}\frame{\CID{9740}}\frame{\CID{9741}}\frame{\CID{9742}}}~~
+\raisebox\baseshift{\frame{\CID{12070}}\frame{\CID{12071}}\frame{\CID{12072}}\frame{\CID{12073}}\frame{\CID{12074}}\frame{\CID{12075}}}
+
+\raisebox\baseshift{\frame{\CID{234}\CID{235}\CID{236}\CID{237}}}~~
+\raisebox\baseshift{\frame{\CID{247}\CID{248}\CID{249}\CID{250}\CID{251}}}~~
+\raisebox\baseshift{\frame{\CID{264}\CID{265}\CID{266}\CID{267}\CID{268}}}~~
+\raisebox\baseshift{\frame{\CID{296}\CID{297}\CID{298}\CID{299}\CID{300}}}~~
+\raisebox\baseshift{\frame{\CID{231}}}~~
+\raisebox\baseshift{\frame{\CID{343}\CID{344}\CID{345}\CID{346}\CID{347}}}~~
+\raisebox\baseshift{\frame{\CID{9758}\CID{9759}\CID{9760}\CID{9761}\CID{9762}}}~~
+\raisebox\baseshift{\frame{\CID{9738}\CID{9739}\CID{9740}\CID{9741}\CID{9742}}}~~
+\raisebox\baseshift{\frame{\CID{12070}\CID{12071}\CID{12072}\CID{12073}\CID{12074}\CID{12075}}}
+
+\ifuptexmode
+アイウエオ\raisebox\baseshift{\frame{ア}\frame{イ}\frame{ウ}\frame{エ}\frame{オ}}%
+\fi
+
+
+\bs CIDC: \raisebox\baseshift{\frame{\CIDC{816}}\frame{\CIDC{817}}\frame{\CIDC{818}}\frame{\CIDC{819}}}~~
+\raisebox\baseshift{\frame{\CIDC{829}}\frame{\CIDC{830}}\frame{\CIDC{831}}\frame{\CIDC{832}}\frame{\CIDC{833}}}~~
+\raisebox\baseshift{\frame{\CIDC{846}}\frame{\CIDC{847}}\frame{\CIDC{848}}\frame{\CIDC{849}}\frame{\CIDC{850}}}~~
+\raisebox\baseshift{\frame{\CIDC{878}}\frame{\CIDC{879}}\frame{\CIDC{880}}\frame{\CIDC{881}}\frame{\CIDC{882}}}~~
+\raisebox\baseshift{\frame{\CIDC{7716}}\frame{\CIDC{22355}}}~~~~~~
+\raisebox\baseshift{\frame{\CIDC{816}\CIDC{817}\CIDC{818}\CIDC{819}}}~~
+\raisebox\baseshift{\frame{\CIDC{829}\CIDC{830}\CIDC{831}\CIDC{832}\CIDC{833}}}~~
+\raisebox\baseshift{\frame{\CIDC{846}\CIDC{847}\CIDC{848}\CIDC{849}\CIDC{850}}}~~
+\raisebox\baseshift{\frame{\CIDC{878}\CIDC{879}\CIDC{880}\CIDC{881}\CIDC{882}}}~~
+\raisebox\baseshift{\frame{\CIDC{7716}\CIDC{22355}}}
+
+
+\bs CIDT: \raisebox\baseshift{\frame{\CIDT{13651}}\frame{\CIDT{13652}}\frame{\CIDT{13653}}\frame{\CIDT{13654}}}~~
+\raisebox\baseshift{\frame{\CIDT{13664}}\frame{\CIDT{13665}}\frame{\CIDT{13666}}\frame{\CIDT{13667}}\frame{\CIDT{13668}}}~~
+\raisebox\baseshift{\frame{\CIDT{13681}}\frame{\CIDT{13682}}\frame{\CIDT{13683}}\frame{\CIDT{13684}}\frame{\CIDT{13685}}}~~
+\raisebox\baseshift{\frame{\CIDT{13713}}\frame{\CIDT{13714}}\frame{\CIDT{13715}}\frame{\CIDT{13716}}\frame{\CIDT{13717}}}~~
+\raisebox\baseshift{\frame{\CIDT{13648}}\frame{\CIDT{17603}}}~~~~~~
+\raisebox\baseshift{\frame{\CIDT{13651}\CIDT{13652}\CIDT{13653}\CIDT{13654}}}~~
+\raisebox\baseshift{\frame{\CIDT{13664}\CIDT{13665}\CIDT{13666}\CIDT{13667}\CIDT{13668}}}~~
+\raisebox\baseshift{\frame{\CIDT{13681}\CIDT{13682}\CIDT{13683}\CIDT{13684}\CIDT{13685}}}~~
+\raisebox\baseshift{\frame{\CIDT{13713}\CIDT{13714}\CIDT{13715}\CIDT{13716}\CIDT{13717}}}~~
+\raisebox\baseshift{\frame{\CIDT{13648}\CIDT{17603}}}
+
+
+\bs CIDK: \raisebox\baseshift{\frame{\CIDK{8097}}\frame{\CIDK{8098}}\frame{\CIDK{8099}}\frame{\CIDK{8100}}}~~
+\raisebox\baseshift{\frame{\CIDK{8110}}\frame{\CIDK{8111}}\frame{\CIDK{8112}}\frame{\CIDK{8113}}\frame{\CIDK{8114}}}~~
+\raisebox\baseshift{\frame{\CIDK{8127}}\frame{\CIDK{8128}}\frame{\CIDK{8129}}\frame{\CIDK{8130}}\frame{\CIDK{8131}}}~~
+\raisebox\baseshift{\frame{\CIDK{8159}}\frame{\CIDK{8160}}\frame{\CIDK{8161}}\frame{\CIDK{8162}}\frame{\CIDK{8163}}}~~
+\raisebox\baseshift{\frame{\CIDK{8094}}}~~~~~~
+\raisebox\baseshift{\frame{\CIDK{8097}\CIDK{8098}\CIDK{8099}\CIDK{8100}}}~~
+\raisebox\baseshift{\frame{\CIDK{8110}\CIDK{8111}\CIDK{8112}\CIDK{8113}\CIDK{8114}}}~~
+\raisebox\baseshift{\frame{\CIDK{8127}\CIDK{8128}\CIDK{8129}\CIDK{8130}\CIDK{8131}}}~~
+\raisebox\baseshift{\frame{\CIDK{8159}\CIDK{8160}\CIDK{8161}\CIDK{8162}\CIDK{8163}}}~~
+\raisebox\baseshift{\frame{\CIDK{8094}}}
+
+
+\clearpage
+[mc/m]
+
+\input{cid_jp_h}
+\input{cid_gb_h}
+\input{cid_cns_h}
+\input{cid_ks_h}
+
+\fbox{\hbox{\Huge り}}
+~std:\fbox{\hbox{\Huge\CID{915}}}% standard
+~tuned:\fbox{\hbox{\Huge\CID{12351}}}% tuned horizontal
+\fbox{\hbox{\Huge\CID{12534}}}% tuned vertical
+~ruby:\fbox{\hbox{\Huge\CID{12746}}}% ruby
+~UTF:\fbox{\hbox{\Huge\UTF{308A}}}
+\vspace{\baselineskip}
+
+{\bfseries%
+[mc/bx]
+
+\input{cid_jp_h}
+\input{cid_gb_h}
+\input{cid_cns_h}
+\input{cid_ks_h}
+
+}
+
+\ifdeluxe
+{\ltseries%
+[mc/l]
+
+\input{cid_jp_h}
+\input{cid_gb_h}
+\input{cid_cns_h}
+\input{cid_ks_h}
+}
+\fi
+
+{\gtfamily
+[gt/m]
+
+\input{cid_jp_h}
+\input{cid_gb_h}
+\input{cid_cns_h}
+\input{cid_ks_h}
+
+\fbox{\hbox{\Huge り}}
+~std:\fbox{\hbox{\Huge\CID{915}}}% standard
+~tuned:\fbox{\hbox{\Huge\CID{12351}}}% tuned horizontal
+\fbox{\hbox{\Huge\CID{12534}}}% tuned vertical
+~ruby:\fbox{\hbox{\Huge\CID{12746}}}% ruby
+~UTF:\fbox{\hbox{\Huge\UTF{308A}}}
+\vspace{\baselineskip}
+
+{\bfseries%
+[gt/bx]
+
+\input{cid_jp_h}
+\input{cid_gb_h}
+\input{cid_cns_h}
+\input{cid_ks_h}
+}
+
+\ifdeluxe
+{\ebseries%
+[gt/eb]
+
+\input{cid_jp_h}
+\input{cid_gb_h}
+\input{cid_cns_h}
+\input{cid_ks_h}
+}
+\fi
+
+}
+
+{\mgfamily
+[mg/m]
+
+\input{cid_jp_h}
+\input{cid_gb_h}
+\input{cid_cns_h}
+\input{cid_ks_h}
+}
+
+\end{document}
diff --git a/macros/jptex/latex/japanese-otf/doc/test/uplatex/uotf-cid-v.tex b/macros/jptex/latex/japanese-otf/doc/test/uplatex/uotf-cid-v.tex
new file mode 100644
index 0000000000..6fa1cbce4b
--- /dev/null
+++ b/macros/jptex/latex/japanese-otf/doc/test/uplatex/uotf-cid-v.tex
@@ -0,0 +1,452 @@
+% -*- coding: utf-8 -*-
+%%%%%%%%
+% To control hyperref on command line,
+% you can select one of (1),(2a),(2b),(3).
+% (1) do not treat hyperref
+% $ uplatex uotf-cid-h.tex
+% (2a) hyperref + dvipdfmx (with CMap conversion)
+% $ uplatex "\def\withhyperref{dvipdfmx}\input" uotf-cid-h.tex
+% (2b) hyperref + dvipdfmx + out2uni (without CMap conversion)
+% $ uplatex "\def\withhyperref{dvipdfmx}\nocmap{true}\input" uotf-cid-h.tex
+% (3) hyperref + dvips + convbkmk.rb + distiller/ps2pdf
+% $ uplatex "\def\withhyperref{dvips}\input" uotf-cid-h.tex
+%%%%%%
+
+\newif\ifuptexmode\uptexmodefalse
+\ifnum\jis"2121="3000
+ \uptexmodetrue
+ \def\tounicode{pdf:tounicode UTF8-UTF16}
+\else
+ \ifnum\jis"2121="A1A1
+ \def\tounicode{pdf:tounicode EUC-UCS2}
+ \fi
+ \ifnum\jis"2121="8140
+ \def\tounicode{pdf:tounicode 90ms-RKSJ-UCS2}
+ \fi
+\fi
+
+\makeatletter
+
+\def\@opt@{multi}
+\def\@default{default}
+\def\@jarticle{jarticle}
+\def\@tarticle{tarticle}
+\def\@ujarticle{ujarticle}
+\def\@noreplace{noreplace}
+\def\@deluxe{deluxe}
+\def\@dlx@exp{dlxexp}
+
+\ifx\option\@dlx@exp
+ \edef\option{deluxe,expert}
+\fi
+\newif\ifdeluxe \deluxefalse
+\@for\@@opt:=\option\do{%
+ \ifx\@@opt\@deluxe\deluxetrue\fi
+}
+\ifx\option\@undefined
+ \def\option{default}
+\fi
+\ifx\option\@noreplace
+ \ifuptexmode
+ \ifx\class\@ujarticle
+ \def\@enc@{JY2}\def\@dir@{h}
+ \else
+ \def\@enc@{JT2}\def\@dir@{v}
+ \fi
+ \DeclareFontFamily{\@enc@}{mcw}{}
+ \DeclareFontFamily{\@enc@}{gtw}{}
+ \DeclareFontShape{\@enc@}{mcw}{m}{n}{<->s*[0.962216]upjpnrm-\@dir@}{}
+ \DeclareFontShape{\@enc@}{gtw}{m}{n}{<->s*[0.962216]upjpngt-\@dir@}{}
+ \DeclareFontShape{\@enc@}{gt}{m}{n}{<->s*[0.962216]upjpngt-\@dir@}{}
+ \DeclareFontShape{\@enc@}{mcw}{bx}{n}{<->ssub*gt/m/n}{}
+ \DeclareFontShape{\@enc@}{gtw}{bx}{n}{<->ssub*gt/m/n}{}
+ \DeclareFontShape{\@enc@}{gt}{bx}{n}{<->ssub*gt/m/n}{}
+ \DeclareRobustCommand\mcw{\kanjifamily{mcw}\selectfont}
+ \DeclareRobustCommand\gtw{\kanjifamily{gtw}\selectfont}
+ \renewcommand\mcdefault{mcw}
+ \renewcommand\gtdefault{gtw}
+ \fi
+\fi
+\ifx\option\@default
+\else
+ \edef\@opt@{\option,\@opt@}
+\fi
+
+\ifx\class\@undefined
+ \ifuptexmode
+ \def\class{ujarticle}
+ \else
+ \def\class{jarticle}
+ \fi
+\fi
+
+\def\baseshift{-.5zh}
+
+\ifuptexmode
+ \edef\@opt@{uplatex,\@opt@}
+\fi
+\ifx\class\@jarticle
+ \documentclass[a4paper,titlepage,dvipdfmx]{\class}
+\else
+ \ifx\class\@ujarticle
+ \documentclass[a4paper,titlepage,dvipdfmx]{\class}
+ \else
+ \documentclass[a4paper,titlepage,landscape,dvipdfmx]{\class}
+ \fi
+\fi
+
+\usepackage[\@opt@]{otf}
+
+\def\@dvipdfmx{dvipdfmx}
+\def\@dvips{dvips}
+
+\ifx\withhyperref\@undefined
+ \def\withhyperref{undefined}
+ \edef\texorpdfstring#1#2{#1}
+\else
+ \ifx\withhyperref\@dvipdfmx
+ \def\@hyperrefkeyval{dvipdfm}
+ \usepackage{atbegshi}
+ \ifx\nocmap\@undefined
+ \AtBeginShipoutFirst{\special{\tounicode}}
+ \fi
+ \fi
+ \ifx\withhyperref\@dvips
+ \def\@hyperrefkeyval{dvips}
+ \fi
+
+\usepackage[\@hyperrefkeyval,%
+bookmarks=true,%
+bookmarksnumbered=true,%
+bookmarkstype=toc,%
+%pdfstartview={FitBH -32768},%
+pdftitle={japanese-otfのテスト},%
+pdfsubject={CID macro編},%
+pdfauthor={upTeXプロジェクト},%
+pdfkeywords={TeX; dvips; dvipdfmx; bookmark; hyperref; しおり; pdf}%
+]{hyperref}
+
+\fi
+
+\makeatother
+
+\usepackage{redeffont}
+
+\AtBeginDvi{\special{papersize=\the\paperwidth,\the\paperheight}}
+\pagestyle{empty}
+\makeatletter
+\ifx\rubyfamily\@undefined\let\rubyfamily=\relax\fi
+\ifx\mgfamily\@undefined\let\mgfamily=\relax\fi
+\makeatother
+
+\font\upjpnrml = upnmlminl-v at 10.0pt
+\font\upjpnrmm = upnmlminr-v at 10.0pt
+\font\upjpnrmb = upnmlminb-v at 10.0pt
+\font\upjpngtm = upnmlgothr-v at 10.0pt
+\font\upjpngtb = upnmlgothb-v at 10.0pt
+\font\upjpngte = upnmlgotheb-v at 10.0pt
+\font\upjpnmgm = upnmlmgothr-v at 10.0pt
+
+\font\upschrml = upnmschminl-v at 10.0pt
+\font\upschrmm = upnmschminr-v at 10.0pt
+\font\upschrmb = upnmschminb-v at 10.0pt
+\font\upschgtm = upnmschgothr-v at 10.0pt
+\font\upschgtb = upnmschgothb-v at 10.0pt
+\font\upschgte = upnmschgotheb-v at 10.0pt
+\font\upschmgm = upnmschmgothr-v at 10.0pt
+
+\font\uptchrml = upnmtchminl-v at 10.0pt
+\font\uptchrmm = upnmtchminr-v at 10.0pt
+\font\uptchrmb = upnmtchminb-v at 10.0pt
+\font\uptchgtm = upnmtchgothr-v at 10.0pt
+\font\uptchgtb = upnmtchgothb-v at 10.0pt
+\font\uptchgte = upnmtchgotheb-v at 10.0pt
+\font\uptchmgm = upnmtchmgothr-v at 10.0pt
+
+\font\upkorrml = upnmkorminl-v at 10.0pt
+\font\upkorrmm = upnmkorminr-v at 10.0pt
+\font\upkorrmb = upnmkorminb-v at 10.0pt
+\font\upkorgtm = upnmkorgothr-v at 10.0pt
+\font\upkorgtb = upnmkorgothb-v at 10.0pt
+\font\upkorgte = upnmkorgotheb-v at 10.0pt
+\font\upkormgm = upnmkormgothr-v at 10.0pt
+
+\edef\bs{$\backslash$\kern0em}
+\setlength\parindent{0em}
+\textwidth150mm
+\oddsidemargin0mm
+\evensidemargin0mm
+\textheight250mm
+\topmargin-15mm
+
+\begin{document}
+\section{見出し}
+
+コンパイラー:\ifuptexmode upLaTeX\else pLaTeX\fi\\
+クラス:\texttt{\class}\\
+オプション:\texttt{\option}
+
+\vspace{\baselineskip}
+\ifuptexmode
+\begin{tabular}{l||ccccc}
+フォント & default & JPN & SCH & TCH & KOR\\
+\hline
+mc/m & 骨海直器述り &
+ {\upjpnrmm 骨海直器述竜} & {\upschrmm 骨海直器述龙} & {\uptchrmm 骨海直器述龍} & {\upkorrmm 骨海直器述용} \\
+mc/bx & {\bfseries 骨海直器述り} &
+ {\upjpnrmb 骨海直器述竜} & {\upschrmb 骨海直器述龙} & {\uptchrmb 骨海直器述龍} & {\upkorrmb 骨海直器述용} \\
+\ifdeluxe
+mc/l & {\ltseries 骨海直器述り} &
+ {\upjpnrml 骨海直器述竜} & {\upschrml 骨海直器述龙} & {\uptchrml 骨海直器述龍} & {\upkorrml 骨海直器述용} \\
+\fi
+gt/m & {\gtfamily 骨海直器述り} &
+ {\upjpngtm 骨海直器述竜} & {\upschgtm 骨海直器述龙} & {\uptchgtm 骨海直器述龍} & {\upkorgtm 骨海直器述용} \\
+gt/bx & {\gtfamily\bfseries 骨海直器述り} &
+ {\upjpngtb 骨海直器述竜} & {\upschgtb 骨海直器述龙} & {\uptchgtb 骨海直器述龍} & {\upkorgtb 骨海直器述용} \\
+\ifdeluxe
+gt/eb & {\gtfamily\ebseries 骨海直器述り} &
+ {\upjpngte 骨海直器述竜} & {\upschgte 骨海直器述龙} & {\uptchgte 骨海直器述龍} & {\upkorgte 骨海直器述용} \\
+\fi
+mg/m & {\mgfamily 骨海直器述り} &
+ {\upjpnmgm 骨海直器述竜} & {\upschmgm 骨海直器述龙} & {\uptchmgm 骨海直器述龍} & {\upkormgm 骨海直器述용} \\
+\end{tabular}
+\else
+\begin{tabular}{l||c}
+フォント & default\\
+\hline
+mc/m & 骨海直器述り\\
+mc/bx & {\bfseries 骨海直器述り} \\
+\ifdeluxe
+mc/l & {\ltseries 骨海直器述り}\\
+\fi
+gt/m & {\gtfamily 骨海直器述り}\\
+gt/bx & {\gtfamily\bfseries 骨海直器述り}\\
+\ifdeluxe
+gt/eb & {\gtfamily\ebseries 骨海直器述り}\\
+\fi
+mg/m & {\mgfamily 骨海直器述り}\\
+\end{tabular}
+\fi
+\vspace{\baselineskip}
+
+\begin{tabular}{l||ccccc}
+フォント & \bs UTF & \bs UTFC & \bs UTFT & \bs UTFK & \bs UTFM\\
+\hline
+mc/m &
+ \UTF{9AA8}\UTF{6D77}\UTF{76F4}\UTF{5668}\UTF{8FF0}\UTF{7ADC} & \UTFC{9AA8}\UTFC{6D77}\UTFC{76F4}\UTFC{5668}\UTFC{8FF0}\UTFC{9F99} &
+ \UTFT{9AA8}\UTFT{6D77}\UTFT{76F4}\UTFT{5668}\UTFT{8FF0}\UTFT{9F8D} & \UTFK{9AA8}\UTFK{6D77}\UTFK{76F4}\UTFK{5668}\UTFK{8FF0}\UTFK{C6A9} &
+ \UTFM{9AA8}\UTFM{6D77}\UTFM{76F4}\UTFM{5668}\UTFM{8FF0}\UTFM{7ADC}\UTFM{9F99}\UTFM{9F8D}\UTFM{C6A9} \\
+mc/bx &
+ {\bfseries\UTF{9AA8}\UTF{6D77}\UTF{76F4}\UTF{5668}\UTF{8FF0}\UTF{7ADC}} & {\bfseries\UTFC{9AA8}\UTFC{6D77}\UTFC{76F4}\UTFC{5668}\UTFC{8FF0}\UTFC{9F99}} &
+ {\bfseries\UTFT{9AA8}\UTFT{6D77}\UTFT{76F4}\UTFT{5668}\UTFT{8FF0}\UTFT{9F8D}} & {\bfseries\UTFK{9AA8}\UTFK{6D77}\UTFK{76F4}\UTFK{5668}\UTFK{8FF0}\UTFK{C6A9}} &
+ {\bfseries\UTFM{9AA8}\UTFM{6D77}\UTFM{76F4}\UTFM{5668}\UTFM{8FF0}\UTFM{7ADC}\UTFM{9F99}\UTFM{9F8D}\UTFM{C6A9}} \\
+\ifdeluxe
+mc/l &
+ {\ltseries\UTF{9AA8}\UTF{6D77}\UTF{76F4}\UTF{5668}\UTF{8FF0}\UTF{7ADC}} & {\ltseries\UTFC{9AA8}\UTFC{6D77}\UTFC{76F4}\UTFC{5668}\UTFC{8FF0}\UTFC{9F99}} &
+ {\ltseries\UTFT{9AA8}\UTFT{6D77}\UTFT{76F4}\UTFT{5668}\UTFT{8FF0}\UTFT{9F8D}} & {\ltseries\UTFK{9AA8}\UTFK{6D77}\UTFK{76F4}\UTFK{5668}\UTFK{8FF0}\UTFK{C6A9}} &
+ {\ltseries\UTFM{9AA8}\UTFM{6D77}\UTFM{76F4}\UTFM{5668}\UTFM{8FF0}\UTFM{7ADC}\UTFM{9F99}\UTFM{9F8D}\UTFM{C6A9}} \\
+\fi
+gt/m &
+ {\gtfamily\UTF{9AA8}\UTF{6D77}\UTF{76F4}\UTF{5668}\UTF{8FF0}\UTF{7ADC}} & {\gtfamily\UTFC{9AA8}\UTFC{6D77}\UTFC{76F4}\UTFC{5668}\UTFC{8FF0}\UTFC{9F99}} &
+ {\gtfamily\UTFT{9AA8}\UTFT{6D77}\UTFT{76F4}\UTFT{5668}\UTFT{8FF0}\UTFT{9F8D}} & {\gtfamily\UTFK{9AA8}\UTFK{6D77}\UTFK{76F4}\UTFK{5668}\UTFK{8FF0}\UTFK{C6A9}} &
+ {\gtfamily\UTFM{9AA8}\UTFM{6D77}\UTFM{76F4}\UTFM{5668}\UTFM{8FF0}\UTFM{7ADC}\UTFM{9F99}\UTFM{9F8D}\UTFM{C6A9}} \\
+gt/bx &
+ {\gtfamily\bfseries\UTF{9AA8}\UTF{6D77}\UTF{76F4}\UTF{5668}\UTF{8FF0}\UTF{7ADC}} & {\gtfamily\bfseries\UTFC{9AA8}\UTFC{6D77}\UTFC{76F4}\UTFC{5668}\UTFC{8FF0}\UTFC{9F99}} &
+ {\gtfamily\bfseries\UTFT{9AA8}\UTFT{6D77}\UTFT{76F4}\UTFT{5668}\UTFT{8FF0}\UTFT{9F8D}} & {\gtfamily\bfseries\UTFK{9AA8}\UTFK{6D77}\UTFK{76F4}\UTFK{5668}\UTFK{8FF0}\UTFK{C6A9}} &
+ {\gtfamily\bfseries\UTFM{9AA8}\UTFM{6D77}\UTFM{76F4}\UTFM{5668}\UTFM{8FF0}\UTFM{7ADC}\UTFM{9F99}\UTFM{9F8D}\UTFM{C6A9}} \\
+\ifdeluxe
+gt/eb &
+ {\gtfamily\ebseries\UTF{9AA8}\UTF{6D77}\UTF{76F4}\UTF{5668}\UTF{8FF0}\UTF{7ADC}} & {\gtfamily\ebseries\UTFC{9AA8}\UTFC{6D77}\UTFC{76F4}\UTFC{5668}\UTFC{8FF0}\UTFC{9F99}} &
+ {\gtfamily\ebseries\UTFT{9AA8}\UTFT{6D77}\UTFT{76F4}\UTFT{5668}\UTFT{8FF0}\UTFT{9F8D}} & {\gtfamily\ebseries\UTFK{9AA8}\UTFK{6D77}\UTFK{76F4}\UTFK{5668}\UTFK{8FF0}\UTFK{C6A9}} &
+ {\gtfamily\ebseries\UTFM{9AA8}\UTFM{6D77}\UTFM{76F4}\UTFM{5668}\UTFM{8FF0}\UTFM{7ADC}\UTFM{9F99}\UTFM{9F8D}\UTFM{C6A9}}\\
+\fi
+mg/m &
+ {\mgfamily\UTF{9AA8}\UTF{6D77}\UTF{76F4}\UTF{5668}\UTF{8FF0}\UTF{7ADC}} & {\mgfamily\UTFC{9AA8}\UTFC{6D77}\UTFC{76F4}\UTFC{5668}\UTFC{8FF0}\UTFC{9F99}} &
+ {\mgfamily\UTFT{9AA8}\UTFT{6D77}\UTFT{76F4}\UTFT{5668}\UTFT{8FF0}\UTFT{9F8D}} & {\mgfamily\UTFK{9AA8}\UTFK{6D77}\UTFK{76F4}\UTFK{5668}\UTFK{8FF0}\UTFK{C6A9}} &
+ {\mgfamily\UTFM{9AA8}\UTFM{6D77}\UTFM{76F4}\UTFM{5668}\UTFM{8FF0}\UTFM{7ADC}\UTFM{9F99}\UTFM{9F8D}\UTFM{C6A9}} \\
+\end{tabular}
+\vspace{\baselineskip}
+
+\begin{tabular}{l||cccc}
+フォント & \bs CID & \bs CIDC & \bs CIDT & \bs CIDK\\
+\hline
+mc/m &
+ \CID{2062}\CID{1410}\CID{3034}\CID{1579}\CID{2396}\CID{3965} & \CIDC{1824}\CIDC{1882}\CIDC{4528}\CIDC{3094}\CIDC{3469}\CIDC{2627} &
+ \CIDT{2550}\CIDT{2318}\CIDT{1628}\CIDT{4764}\CIDT{2065}\CIDT{5042} & \CIDK{3785}\CIDK{7694}\CIDK{6975}\CIDK{4067}\CIDK{5669}\CIDK{2570} \\
+mc/bx &
+ {\bfseries\CID{2062}\CID{1410}\CID{3034}\CID{1579}\CID{2396}\CID{3965}} & {\bfseries\CIDC{1824}\CIDC{1882}\CIDC{4528}\CIDC{3094}\CIDC{3469}\CIDC{2627}} &
+ {\bfseries\CIDT{2550}\CIDT{2318}\CIDT{1628}\CIDT{4764}\CIDT{2065}\CIDT{5042}} & {\bfseries\CIDK{3785}\CIDK{7694}\CIDK{6975}\CIDK{4067}\CIDK{5669}\CIDK{2570}} \\
+\ifdeluxe
+mc/l &
+ {\ltseries\CID{2062}\CID{1410}\CID{3034}\CID{1579}\CID{2396}\CID{3965}} & {\ltseries\CIDC{1824}\CIDC{1882}\CIDC{4528}\CIDC{3094}\CIDC{3469}\CIDC{2627}} &
+ {\ltseries\CIDT{2550}\CIDT{2318}\CIDT{1628}\CIDT{4764}\CIDT{2065}\CIDT{5042}} & {\ltseries\CIDK{3785}\CIDK{7694}\CIDK{6975}\CIDK{4067}\CIDK{5669}\CIDK{2570}} \\
+\fi
+gt/m &
+ {\gtfamily\CID{2062}\CID{1410}\CID{3034}\CID{1579}\CID{2396}\CID{3965}} & {\gtfamily\CIDC{1824}\CIDC{1882}\CIDC{4528}\CIDC{3094}\CIDC{3469}\CIDC{2627}} &
+ {\gtfamily\CIDT{2550}\CIDT{2318}\CIDT{1628}\CIDT{4764}\CIDT{2065}\CIDT{5042}} & {\gtfamily\CIDK{3785}\CIDK{7694}\CIDK{6975}\CIDK{4067}\CIDK{5669}\CIDK{2570}} \\
+gt/bx &
+ {\gtfamily\bfseries\CID{2062}\CID{1410}\CID{3034}\CID{1579}\CID{2396}\CID{3965}} & {\gtfamily\bfseries\CIDC{1824}\CIDC{1882}\CIDC{4528}\CIDC{3094}\CIDC{3469}\CIDC{2627}} &
+ {\gtfamily\bfseries\CIDT{2550}\CIDT{2318}\CIDT{1628}\CIDT{4764}\CIDT{2065}\CIDT{5042}} & {\gtfamily\bfseries\CIDK{3785}\CIDK{7694}\CIDK{6975}\CIDK{4067}\CIDK{5669}\CIDK{2570}} \\
+\ifdeluxe
+gt/eb &
+ {\gtfamily\ebseries\CID{2062}\CID{1410}\CID{3034}\CID{1579}\CID{2396}\CID{3965}} & {\gtfamily\ebseries\CIDC{1824}\CIDC{1882}\CIDC{4528}\CIDC{3094}\CIDC{3469}\CIDC{2627}} &
+ {\gtfamily\ebseries\CIDT{2550}\CIDT{2318}\CIDT{1628}\CIDT{4764}\CIDT{2065}\CIDT{5042}} & {\gtfamily\ebseries\CIDK{3785}\CIDK{7694}\CIDK{6975}\CIDK{4067}\CIDK{5669}\CIDK{2570}} \\
+\fi
+mg/m &
+ {\mgfamily\CID{2062}\CID{1410}\CID{3034}\CID{1579}\CID{2396}\CID{3965}} & {\mgfamily\CIDC{1824}\CIDC{1882}\CIDC{4528}\CIDC{3094}\CIDC{3469}\CIDC{2627}} &
+ {\mgfamily\CIDT{2550}\CIDT{2318}\CIDT{1628}\CIDT{4764}\CIDT{2065}\CIDT{5042}} & {\mgfamily\CIDK{3785}\CIDK{7694}\CIDK{6975}\CIDK{4067}\CIDK{5669}\CIDK{2570}} \\
+\end{tabular}
+
+\section{Half Width}
+
+\bs CID: \raisebox\baseshift{\frame{\CID{8953}}\frame{\CID{8954}}\frame{\CID{8955}}\frame{\CID{8956}}}~~
+\raisebox\baseshift{\frame{\CID{8966}}\frame{\CID{8967}}\frame{\CID{8968}}\frame{\CID{8969}}\frame{\CID{8970}}}~~
+\raisebox\baseshift{\frame{\CID{8983}}\frame{\CID{8984}}\frame{\CID{8985}}\frame{\CID{8986}}\frame{\CID{8987}}}~~
+\raisebox\baseshift{\frame{\CID{9015}}\frame{\CID{9016}}\frame{\CID{9017}}\frame{\CID{9018}}\frame{\CID{9019}}}~~
+\raisebox\baseshift{\frame{\CID{8950}}}~~
+\raisebox\baseshift{\frame{\CID{9101}}\frame{\CID{9102}}\frame{\CID{9103}}\frame{\CID{9104}}\frame{\CID{9105}}}~~
+\raisebox\baseshift{\frame{\CID{13274}}\frame{\CID{13275}}\frame{\CID{13276}}\frame{\CID{13277}}\frame{\CID{13278}}}~~
+\raisebox\baseshift{\frame{\CID{13254}}\frame{\CID{13255}}\frame{\CID{13256}}\frame{\CID{13257}}\frame{\CID{13258}}}~~
+\raisebox\baseshift{\frame{\CID{13302}}\frame{\CID{13303}}\frame{\CID{13304}}\frame{\CID{13305}}\frame{\CID{13306}}\frame{\CID{13307}}}~~
+\raisebox\baseshift{\frame{\CID{10185}}\frame{\CID{10186}}\frame{\CID{10187}}\frame{\CID{10188}}\frame{\CID{10189}}}
+
+\raisebox\baseshift{\frame{\CID{8953}\CID{8954}\CID{8955}\CID{8956}}}~~
+\raisebox\baseshift{\frame{\CID{8966}\CID{8967}\CID{8968}\CID{8969}\CID{8970}}}~~
+\raisebox\baseshift{\frame{\CID{8983}\CID{8984}\CID{8985}\CID{8986}\CID{8987}}}~~
+\raisebox\baseshift{\frame{\CID{9015}\CID{9016}\CID{9017}\CID{9018}\CID{9019}}}~~
+\raisebox\baseshift{\frame{\CID{8950}}}~~
+\raisebox\baseshift{\frame{\CID{9101}\CID{9102}\CID{9103}\CID{9104}\CID{9105}}}~~
+\raisebox\baseshift{\frame{\CID{13274}\CID{13275}\CID{13276}\CID{13277}\CID{13278}}}~~
+\raisebox\baseshift{\frame{\CID{13254}\CID{13255}\CID{13256}\CID{13257}\CID{13258}}}~~
+\raisebox\baseshift{\frame{\CID{13302}\CID{13303}\CID{13304}\CID{13305}\CID{13306}\CID{13307}}}~~
+\raisebox\baseshift{\frame{\CID{10185}\CID{10186}\CID{10187}\CID{10188}\CID{10189}}}
+
+% ↓上手く動いていないように見える。
+\CID{10185}\CID{10186}\CID{10187}\CID{10188}\CID{10189}~~~~~~~~~
+=\CID{10185}◇\CID{10186}◇\CID{10187}◇\CID{10188}◇\CID{10189}~~~~~~~~~
+=\CID{10185}.\CID{10186}.\CID{10187}.\CID{10188}.\CID{10189}~~~~~~~~~
+=\CID{10185}\,\CID{10186}$\>$\CID{10187}$\!$\CID{10188}~\CID{10189}~~~~~~~~~
+=\CID{10185}\hspace{0mm}\CID{10186}\hspace{0.001mm}\CID{10187}\hspace{0.01mm}\CID{10188}\hspace{0.1mm}\CID{10189}
+
+
+\bs CIDC: \raisebox\baseshift{\frame{\CIDC{22228}}\frame{\CIDC{22229}}\frame{\CIDC{22230}}\frame{\CIDC{22231}}}~~
+\raisebox\baseshift{\frame{\CIDC{22241}}\frame{\CIDC{22242}}\frame{\CIDC{22243}}\frame{\CIDC{22244}}\frame{\CIDC{22245}}}~~
+\raisebox\baseshift{\frame{\CIDC{22258}}\frame{\CIDC{22259}}\frame{\CIDC{22260}}\frame{\CIDC{22261}}\frame{\CIDC{22262}}}~~
+\raisebox\baseshift{\frame{\CIDC{22290}}\frame{\CIDC{22291}}\frame{\CIDC{22292}}\frame{\CIDC{22293}}\frame{\CIDC{22294}}}~~
+\raisebox\baseshift{\frame{\CIDC{22352}}\frame{\CIDC{29061}}}~~~~~~
+\raisebox\baseshift{\frame{\CIDC{22228}\CIDC{22229}\CIDC{22230}\CIDC{22231}}}~~
+\raisebox\baseshift{\frame{\CIDC{22241}\CIDC{22242}\CIDC{22243}\CIDC{22244}\CIDC{22245}}}~~
+\raisebox\baseshift{\frame{\CIDC{22258}\CIDC{22259}\CIDC{22260}\CIDC{22261}\CIDC{22262}}}~~
+\raisebox\baseshift{\frame{\CIDC{22290}\CIDC{22291}\CIDC{22292}\CIDC{22293}\CIDC{22294}}}~~
+\raisebox\baseshift{\frame{\CIDC{22352}\CIDC{29061}}}
+
+
+\bs CIDT: \raisebox\baseshift{\frame{\CIDT{17509}}\frame{\CIDT{17510}}\frame{\CIDT{17511}}\frame{\CIDT{17512}}}~~
+\raisebox\baseshift{\frame{\CIDT{17522}}\frame{\CIDT{17523}}\frame{\CIDT{17524}}\frame{\CIDT{17525}}\frame{\CIDT{17526}}}~~
+\raisebox\baseshift{\frame{\CIDT{17539}}\frame{\CIDT{17540}}\frame{\CIDT{17541}}\frame{\CIDT{17542}}\frame{\CIDT{17543}}}~~
+\raisebox\baseshift{\frame{\CIDT{17571}}\frame{\CIDT{17572}}\frame{\CIDT{17573}}\frame{\CIDT{17574}}\frame{\CIDT{17575}}}~~
+\raisebox\baseshift{\frame{\CIDT{17506}}\frame{\CIDT{17605}}}~~~~~~
+\raisebox\baseshift{\frame{\CIDT{17509}\CIDT{17510}\CIDT{17511}\CIDT{17512}}}~~
+\raisebox\baseshift{\frame{\CIDT{17522}\CIDT{17523}\CIDT{17524}\CIDT{17525}\CIDT{17526}}}~~
+\raisebox\baseshift{\frame{\CIDT{17539}\CIDT{17540}\CIDT{17541}\CIDT{17542}\CIDT{17543}}}~~
+\raisebox\baseshift{\frame{\CIDT{17571}\CIDT{17572}\CIDT{17573}\CIDT{17574}\CIDT{17575}}}~~
+\raisebox\baseshift{\frame{\CIDT{17506}\CIDT{17605}}}
+
+
+\bs CIDK: \raisebox\baseshift{\frame{\CIDK{18258}}\frame{\CIDK{18259}}\frame{\CIDK{18260}}\frame{\CIDK{18261}}}~~
+\raisebox\baseshift{\frame{\CIDK{18271}}\frame{\CIDK{18272}}\frame{\CIDK{18273}}\frame{\CIDK{18274}}\frame{\CIDK{18275}}}~~
+\raisebox\baseshift{\frame{\CIDK{18288}}\frame{\CIDK{18289}}\frame{\CIDK{18290}}\frame{\CIDK{18291}}\frame{\CIDK{18293}}}~~
+\raisebox\baseshift{\frame{\CIDK{18320}}\frame{\CIDK{18321}}\frame{\CIDK{18322}}\frame{\CIDK{18323}}\frame{\CIDK{18324}}}~~
+\raisebox\baseshift{\frame{\CIDK{18255}}}~~~~~~
+\raisebox\baseshift{\frame{\CIDK{18258}\CIDK{18259}\CIDK{18260}\CIDK{18261}}}~~
+\raisebox\baseshift{\frame{\CIDK{18271}\CIDK{18272}\CIDK{18273}\CIDK{18274}\CIDK{18275}}}~~
+\raisebox\baseshift{\frame{\CIDK{18288}\CIDK{18289}\CIDK{18290}\CIDK{18291}\CIDK{18293}}}~~
+\raisebox\baseshift{\frame{\CIDK{18320}\CIDK{18321}\CIDK{18322}\CIDK{18323}\CIDK{18324}}}~~
+\raisebox\baseshift{\frame{\CIDK{18255}}}
+
+
+\clearpage
+[mc/m]
+
+\input{cid_jp_v}
+\input{cid_gb_v}
+\input{cid_cns_v}
+\input{cid_ks_v}
+
+\fbox{\hbox{\Huge り}}
+~std:\fbox{\hbox{\Huge\CID{915}}}% standard
+~tuned:\fbox{\hbox{\Huge\CID{12351}}}% tuned horizontal
+\fbox{\hbox{\Huge\CID{12534}}}% tuned vertical
+~ruby:\fbox{\hbox{\Huge\CID{12746}}}% ruby
+~UTF:\fbox{\hbox{\Huge\UTF{308A}}}
+\vspace{\baselineskip}
+
+{\bfseries%
+[mc/bx]
+
+\input{cid_jp_v}
+\input{cid_gb_v}
+\input{cid_cns_v}
+\input{cid_ks_v}
+
+}
+
+\ifdeluxe
+{\ltseries%
+[mc/l]
+
+\input{cid_jp_v}
+\input{cid_gb_v}
+\input{cid_cns_v}
+\input{cid_ks_v}
+}
+\fi
+
+{\gtfamily
+[gt/m]
+
+\input{cid_jp_v}
+\input{cid_gb_v}
+\input{cid_cns_v}
+\input{cid_ks_v}
+
+\fbox{\hbox{\Huge り}}
+~std:\fbox{\hbox{\Huge\CID{915}}}% standard
+~tuned:\fbox{\hbox{\Huge\CID{12351}}}% tuned horizontal
+\fbox{\hbox{\Huge\CID{12534}}}% tuned vertical
+~ruby:\fbox{\hbox{\Huge\CID{12746}}}% ruby
+~UTF:\fbox{\hbox{\Huge\UTF{308A}}}
+\vspace{\baselineskip}
+
+{\bfseries%
+[gt/bx]
+
+\input{cid_jp_v}
+\input{cid_gb_v}
+\input{cid_cns_v}
+\input{cid_ks_v}
+}
+
+\ifdeluxe
+{\ebseries%
+[gt/eb]
+
+\input{cid_jp_v}
+\input{cid_gb_v}
+\input{cid_cns_v}
+\input{cid_ks_v}
+}
+\fi
+
+}
+
+{\mgfamily
+[mg/m]
+
+\input{cid_jp_v}
+\input{cid_gb_v}
+\input{cid_cns_v}
+\input{cid_ks_v}
+}
+
+\end{document}
diff --git a/macros/jptex/latex/japanese-otf/doc/test/uplatex/uotf-sp-utf8.tex b/macros/jptex/latex/japanese-otf/doc/test/uplatex/uotf-sp-utf8.tex
index 89b4ef4784..79d0fb9cf8 100644
--- a/macros/jptex/latex/japanese-otf/doc/test/uplatex/uotf-sp-utf8.tex
+++ b/macros/jptex/latex/japanese-otf/doc/test/uplatex/uotf-sp-utf8.tex
@@ -74,12 +74,12 @@
\edef\@opt@{uplatex,\@opt@}
\fi
\ifx\class\@jarticle
- \documentclass[a4paper,titlepage]{\class}
+ \documentclass[a4paper,titlepage,dvipdfmx]{\class}
\else
\ifx\class\@ujarticle
- \documentclass[a4paper,titlepage]{\class}
+ \documentclass[a4paper,titlepage,dvipdfmx]{\class}
\else
- \documentclass[a4paper,titlepage,landscape]{\class}
+ \documentclass[a4paper,titlepage,landscape,dvipdfmx]{\class}
\fi
\fi
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 e8fdc9965e..eec37f62d5 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
@@ -9,7 +9,12 @@
\def\@jarticle{jarticle}
\def\@tarticle{tarticle}
\def\@utarticle{utarticle}
+\def\@deluxe{deluxe}
+\newif\ifdeluxe \deluxefalse
+\@for\@@opt:=\option\do{%
+ \ifx\@@opt\@deluxe\deluxetrue\fi
+}
\ifx\option\@undefined
\def\option{default}
\fi
@@ -33,8 +38,8 @@
\ifuptexmode
\edef\@opt@{uplatex,\@opt@}
\fi
-\documentclass[a4paper,titlepage, draft]{\class}
-%\documentclass[a4paper,titlepage, draft,landscape]{\class}
+\documentclass[a4paper,titlepage,draft,dvipdfmx]{\class}
+%\documentclass[a4paper,titlepage,draft,landscape,dvipdfmx]{\class}
\usepackage[\@opt@]{otf}
@@ -77,8 +82,14 @@
\hline
mc/m & ひらかな & 漢字 & \UTF{9DD7} & \CID{8705} & {\rubyfamily 振りかな}\\
mc/bx & {\bfseries ひらかな} & {\bfseries 漢字} & {\bfseries\UTF{9DD7}} & {\bfseries\CID{8705}} & {\bfseries\rubyfamily 振りかな}\\
+\ifdeluxe
+mc/l & {\ltseries ひらかな} & {\ltseries 漢字} & {\ltseries\UTF{9DD7}} & {\ltseries\CID{8705}} & {\ltseries\rubyfamily 振りかな}\\
+\fi
gt/m & {\gtfamily ひらかな} & {\gtfamily 漢字} & {\gtfamily\UTF{9DD7}} & {\gtfamily\CID{8705}} & {\gtfamily\rubyfamily 振りかな}\\
gt/bx & {\gtfamily\bfseries ひらかな} & {\gtfamily\bfseries 漢字} & {\gtfamily\bfseries\UTF{9DD7}} & {\gtfamily\bfseries\CID{8705}} & {\gtfamily\bfseries\rubyfamily 振りかな}\\
+\ifdeluxe
+gt/eb & {\gtfamily\ebseries ひらかな} & {\gtfamily\ebseries 漢字} & {\gtfamily\ebseries\UTF{9DD7}} & {\gtfamily\ebseries\CID{8705}} & {\gtfamily\ebseries\rubyfamily 振りかな}\\
+\fi
mg/m & {\mgfamily ひらかな} & {\mgfamily 漢字} & {\mgfamily\UTF{9DD7}} & {\mgfamily\CID{8705}} & {\mgfamily\rubyfamily 振りかな}\\
\end{tabular}
\vspace{\baselineskip}
@@ -162,6 +173,26 @@ UTFM:%
“回”、‘回’。“回”,‘回’.
}
+\ifdeluxe
+{\ltseries%
+[mc/lt]
+
+ぁあぃいぅうぇえぉおかがきぎくぐけげこごさざしじすずせぜそぞただちぢっつづてでとどなにぬねのは
+ばぱひびぴふぶぷへべぺほぼぽまみむめもゃやゅゆょよらりるれろゎわゐゑをんヽヾゝゞー
+\ifuptexmode
+ゔゕゖ𛄲
+\fi
+
+ァアィイゥウェエォオカガキギクグケゲコゴサザシジスズセゼソゾタダチヂッツヅテデトドナニヌネノハ
+バパヒビピフブプヘベペホボポマミムメモャヤュユョヨラリルレロヮワヰヱヲンヴヵヶ
+\ifuptexmode
+ヷヸヹヺㇰㇱㇲㇳㇴㇵㇶㇷㇸㇹㇺㇻㇼㇽㇾㇿ𛅕
+\fi
+
+“回”、‘回’。“回”,‘回’.
+}
+\fi
+
{\gtfamily
[gt/m]
@@ -195,7 +226,28 @@ UTFM:%
\fi
“回”、‘回’。“回”,‘回’.
-}}
+}
+
+\ifdeluxe
+{\ebseries%
+[gt/eb]
+
+ぁあぃいぅうぇえぉおかがきぎくぐけげこごさざしじすずせぜそぞただちぢっつづてでとどなにぬねのは
+ばぱひびぴふぶぷへべぺほぼぽまみむめもゃやゅゆょよらりるれろゎわゐゑをんヽヾゝゞー
+\ifuptexmode
+ゔゕゖ𛄲
+\fi
+
+ァアィイゥウェエォオカガキギクグケゲコゴサザシジスズセゼソゾタダチヂッツヅテデトドナニヌネノハ
+バパヒビピフブプヘベペホボポマミムメモャヤュユョヨラリルレロヮワヰヱヲンヴヵヶ
+\ifuptexmode
+ヷヸヹヺㇰㇱㇲㇳㇴㇵㇶㇷㇸㇹㇺㇻㇼㇽㇾㇿ𛅕
+\fi
+
+“回”、‘回’。“回”,‘回’.
+}
+\fi
+}
{\mgfamily
[mg/m]
diff --git a/macros/jptex/latex/japanese-otf/doc/test/uplatex/utfmacro-haranoaji.map b/macros/jptex/latex/japanese-otf/doc/test/uplatex/utfmacro-haranoaji.map
index 3aada8b0bb..19972325b7 100644
--- a/macros/jptex/latex/japanese-otf/doc/test/uplatex/utfmacro-haranoaji.map
+++ b/macros/jptex/latex/japanese-otf/doc/test/uplatex/utfmacro-haranoaji.map
@@ -7,14 +7,14 @@ uprml-v UniJISup-UTF16-V HaranoAjiMincho-Regular.otf
hminr-h H HaranoAjiMincho-Regular.otf
hminb-h H HaranoAjiMincho-Bold.otf
hminl-h H HaranoAjiMincho-Light.otf
-hgothr-h H HaranoAjiGothic-Regular.otf
+hgothr-h H HaranoAjiGothic-Normal.otf
hgothb-h H HaranoAjiGothic-Medium.otf
hgotheb-h H HaranoAjiGothic-Bold.otf
hmgothr-h H HaranoAjiGothic-Heavy.otf
hminr-v V HaranoAjiMincho-Regular.otf
hminb-v V HaranoAjiMincho-Bold.otf
hminl-v V HaranoAjiMincho-Light.otf
-hgothr-v V HaranoAjiGothic-Regular.otf
+hgothr-v V HaranoAjiGothic-Normal.otf
hgothb-v V HaranoAjiGothic-Medium.otf
hgotheb-v V HaranoAjiGothic-Bold.otf
hmgothr-v V HaranoAjiGothic-Heavy.otf
@@ -22,14 +22,14 @@ hmgothr-v V HaranoAjiGothic-Heavy.otf
hminrn-h H HaranoAjiMincho-Regular.otf
hminbn-h H HaranoAjiMincho-Bold.otf
hminln-h H HaranoAjiMincho-Light.otf
-hgothrn-h H HaranoAjiGothic-Regular.otf
+hgothrn-h H HaranoAjiGothic-Normal.otf
hgothbn-h H HaranoAjiGothic-Medium.otf
hgothebn-h H HaranoAjiGothic-Bold.otf
hmgothrn-h H HaranoAjiGothic-Heavy.otf
hminrn-v V HaranoAjiMincho-Regular.otf
hminbn-v V HaranoAjiMincho-Bold.otf
hminln-v V HaranoAjiMincho-Light.otf
-hgothrn-v V HaranoAjiGothic-Regular.otf
+hgothrn-v V HaranoAjiGothic-Normal.otf
hgothbn-v V HaranoAjiGothic-Medium.otf
hgothebn-v V HaranoAjiGothic-Bold.otf
hmgothrn-v V HaranoAjiGothic-Heavy.otf
@@ -37,14 +37,14 @@ hmgothrn-v V HaranoAjiGothic-Heavy.otf
uphminr-h UniJISup-UTF16-H HaranoAjiMincho-Regular.otf
uphminb-h UniJISup-UTF16-H HaranoAjiMincho-Bold.otf
uphminl-h UniJISup-UTF16-H HaranoAjiMincho-Light.otf
-uphgothr-h UniJISup-UTF16-H HaranoAjiGothic-Regular.otf
+uphgothr-h UniJISup-UTF16-H HaranoAjiGothic-Normal.otf
uphgothb-h UniJISup-UTF16-H HaranoAjiGothic-Medium.otf
uphgotheb-h UniJISup-UTF16-H HaranoAjiGothic-Bold.otf
uphmgothr-h UniJISup-UTF16-H HaranoAjiGothic-Heavy.otf
uphminr-v UniJISup-UTF16-V HaranoAjiMincho-Regular.otf
uphminb-v UniJISup-UTF16-V HaranoAjiMincho-Bold.otf
uphminl-v UniJISup-UTF16-V HaranoAjiMincho-Light.otf
-uphgothr-v UniJISup-UTF16-V HaranoAjiGothic-Regular.otf
+uphgothr-v UniJISup-UTF16-V HaranoAjiGothic-Normal.otf
uphgothb-v UniJISup-UTF16-V HaranoAjiGothic-Medium.otf
uphgotheb-v UniJISup-UTF16-V HaranoAjiGothic-Bold.otf
uphmgothr-v UniJISup-UTF16-V HaranoAjiGothic-Heavy.otf
@@ -52,14 +52,14 @@ uphmgothr-v UniJISup-UTF16-V HaranoAjiGothic-Heavy.otf
uphminrn-h UniJIS2004up-UTF16-H HaranoAjiMincho-Regular.otf
uphminbn-h UniJIS2004up-UTF16-H HaranoAjiMincho-Bold.otf
uphminln-h UniJIS2004up-UTF16-H HaranoAjiMincho-Light.otf
-uphgothrn-h UniJIS2004up-UTF16-H HaranoAjiGothic-Regular.otf
+uphgothrn-h UniJIS2004up-UTF16-H HaranoAjiGothic-Normal.otf
uphgothbn-h UniJIS2004up-UTF16-H HaranoAjiGothic-Medium.otf
uphgothebn-h UniJIS2004up-UTF16-H HaranoAjiGothic-Bold.otf
uphmgothrn-h UniJIS2004up-UTF16-H HaranoAjiGothic-Heavy.otf
uphminrn-v UniJIS2004up-UTF16-V HaranoAjiMincho-Regular.otf
uphminbn-v UniJIS2004up-UTF16-V HaranoAjiMincho-Bold.otf
uphminln-v UniJIS2004up-UTF16-V HaranoAjiMincho-Light.otf
-uphgothrn-v UniJIS2004up-UTF16-V HaranoAjiGothic-Regular.otf
+uphgothrn-v UniJIS2004up-UTF16-V HaranoAjiGothic-Normal.otf
uphgothbn-v UniJIS2004up-UTF16-V HaranoAjiGothic-Medium.otf
uphgothebn-v UniJIS2004up-UTF16-V HaranoAjiGothic-Bold.otf
uphmgothrn-v UniJIS2004up-UTF16-V HaranoAjiGothic-Heavy.otf
@@ -67,7 +67,7 @@ uphmgothrn-v UniJIS2004up-UTF16-V HaranoAjiGothic-Heavy.otf
otf-ujmr-h UniJISup-UTF16-H HaranoAjiMincho-Regular.otf
otf-ujmb-h UniJISup-UTF16-H HaranoAjiMincho-Bold.otf
otf-ujml-h UniJISup-UTF16-H HaranoAjiMincho-Light.otf
-otf-ujgr-h UniJISup-UTF16-H HaranoAjiGothic-Regular.otf
+otf-ujgr-h UniJISup-UTF16-H HaranoAjiGothic-Normal.otf
otf-ujgb-h UniJISup-UTF16-H HaranoAjiGothic-Medium.otf
otf-ujge-h UniJISup-UTF16-H HaranoAjiGothic-Bold.otf
otf-ujmgr-h UniJISup-UTF16-H HaranoAjiGothic-Heavy.otf
@@ -75,7 +75,7 @@ otf-ujmgr-h UniJISup-UTF16-H HaranoAjiGothic-Heavy.otf
otf-ujmrn-h UniJIS2004up-UTF16-H HaranoAjiMincho-Regular.otf
otf-ujmbn-h UniJIS2004up-UTF16-H HaranoAjiMincho-Bold.otf
otf-ujmln-h UniJIS2004up-UTF16-H HaranoAjiMincho-Light.otf
-otf-ujgrn-h UniJIS2004up-UTF16-H HaranoAjiGothic-Regular.otf
+otf-ujgrn-h UniJIS2004up-UTF16-H HaranoAjiGothic-Normal.otf
otf-ujgbn-h UniJIS2004up-UTF16-H HaranoAjiGothic-Medium.otf
otf-ujgen-h UniJIS2004up-UTF16-H HaranoAjiGothic-Bold.otf
otf-ujmgrn-h UniJIS2004up-UTF16-H HaranoAjiGothic-Heavy.otf
@@ -83,7 +83,7 @@ otf-ujmgrn-h UniJIS2004up-UTF16-H HaranoAjiGothic-Heavy.otf
otf-ucmr-h UniGB-UTF16-H HaranoAjiMinchoCN-Regular.otf
otf-ucmb-h UniGB-UTF16-H HaranoAjiMinchoCN-Bold.otf
otf-ucml-h UniGB-UTF16-H HaranoAjiMinchoCN-Light.otf
-otf-ucgr-h UniGB-UTF16-H HaranoAjiGothicCN-Regular.otf
+otf-ucgr-h UniGB-UTF16-H HaranoAjiGothicCN-Normal.otf
otf-ucgb-h UniGB-UTF16-H HaranoAjiGothicCN-Medium.otf
otf-ucge-h UniGB-UTF16-H HaranoAjiGothicCN-Bold.otf
otf-ucmgr-h UniGB-UTF16-H HaranoAjiGothicCN-Heavy.otf
@@ -91,7 +91,7 @@ otf-ucmgr-h UniGB-UTF16-H HaranoAjiGothicCN-Heavy.otf
otf-utmr-h UniCNS-UTF16-H HaranoAjiMinchoTW-Regular.otf
otf-utmb-h UniCNS-UTF16-H HaranoAjiMinchoTW-Bold.otf
otf-utml-h UniCNS-UTF16-H HaranoAjiMinchoTW-Light.otf
-otf-utgr-h UniCNS-UTF16-H HaranoAjiGothicTW-Regular.otf
+otf-utgr-h UniCNS-UTF16-H HaranoAjiGothicTW-Normal.otf
otf-utgb-h UniCNS-UTF16-H HaranoAjiGothicTW-Medium.otf
otf-utge-h UniCNS-UTF16-H HaranoAjiGothicTW-Bold.otf
otf-utmgr-h UniCNS-UTF16-H HaranoAjiGothicTW-Heavy.otf
@@ -99,7 +99,7 @@ otf-utmgr-h UniCNS-UTF16-H HaranoAjiGothicTW-Heavy.otf
otf-ukmr-h UniKS-UTF16-H HaranoAjiMinchoK1-Regular.otf
otf-ukmb-h UniKS-UTF16-H HaranoAjiMinchoK1-Bold.otf
otf-ukml-h UniKS-UTF16-H HaranoAjiMinchoK1-Light.otf
-otf-ukgr-h UniKS-UTF16-H HaranoAjiGothicK1-Regular.otf
+otf-ukgr-h UniKS-UTF16-H HaranoAjiGothicK1-Normal.otf
otf-ukgb-h UniKS-UTF16-H HaranoAjiGothicK1-Medium.otf
otf-ukge-h UniKS-UTF16-H HaranoAjiGothicK1-Bold.otf
otf-ukmgr-h UniKS-UTF16-H HaranoAjiGothicK1-Heavy.otf
@@ -107,7 +107,7 @@ otf-ukmgr-h UniKS-UTF16-H HaranoAjiGothicK1-Heavy.otf
otf-ujmr-v UniJISup-UTF16-V HaranoAjiMincho-Regular.otf
otf-ujmb-v UniJISup-UTF16-V HaranoAjiMincho-Bold.otf
otf-ujml-v UniJISup-UTF16-V HaranoAjiMincho-Light.otf
-otf-ujgr-v UniJISup-UTF16-V HaranoAjiGothic-Regular.otf
+otf-ujgr-v UniJISup-UTF16-V HaranoAjiGothic-Normal.otf
otf-ujgb-v UniJISup-UTF16-V HaranoAjiGothic-Medium.otf
otf-ujge-v UniJISup-UTF16-V HaranoAjiGothic-Bold.otf
otf-ujmgr-v UniJISup-UTF16-V HaranoAjiGothic-Heavy.otf
@@ -115,7 +115,7 @@ otf-ujmgr-v UniJISup-UTF16-V HaranoAjiGothic-Heavy.otf
otf-ujmrn-v UniJIS2004up-UTF16-V HaranoAjiMincho-Regular.otf
otf-ujmbn-v UniJIS2004up-UTF16-V HaranoAjiMincho-Bold.otf
otf-ujmln-v UniJIS2004up-UTF16-V HaranoAjiMincho-Light.otf
-otf-ujgrn-v UniJIS2004up-UTF16-V HaranoAjiGothic-Regular.otf
+otf-ujgrn-v UniJIS2004up-UTF16-V HaranoAjiGothic-Normal.otf
otf-ujgbn-v UniJIS2004up-UTF16-V HaranoAjiGothic-Medium.otf
otf-ujgen-v UniJIS2004up-UTF16-V HaranoAjiGothic-Bold.otf
otf-ujmgrn-v UniJIS2004up-UTF16-V HaranoAjiGothic-Heavy.otf
@@ -123,7 +123,7 @@ otf-ujmgrn-v UniJIS2004up-UTF16-V HaranoAjiGothic-Heavy.otf
otf-ucmr-v UniGB-UTF16-V HaranoAjiMinchoCN-Regular.otf
otf-ucmb-v UniGB-UTF16-V HaranoAjiMinchoCN-Bold.otf
otf-ucml-v UniGB-UTF16-V HaranoAjiMinchoCN-Light.otf
-otf-ucgr-v UniGB-UTF16-V HaranoAjiGothicCN-Regular.otf
+otf-ucgr-v UniGB-UTF16-V HaranoAjiGothicCN-Normal.otf
otf-ucgb-v UniGB-UTF16-V HaranoAjiGothicCN-Medium.otf
otf-ucge-v UniGB-UTF16-V HaranoAjiGothicCN-Bold.otf
otf-ucmgr-v UniGB-UTF16-V HaranoAjiGothicCN-Heavy.otf
@@ -131,7 +131,7 @@ otf-ucmgr-v UniGB-UTF16-V HaranoAjiGothicCN-Heavy.otf
otf-utmr-v UniCNS-UTF16-V HaranoAjiMinchoTW-Regular.otf
otf-utmb-v UniCNS-UTF16-V HaranoAjiMinchoTW-Bold.otf
otf-utml-v UniCNS-UTF16-V HaranoAjiMinchoTW-Light.otf
-otf-utgr-v UniCNS-UTF16-V HaranoAjiGothicTW-Regular.otf
+otf-utgr-v UniCNS-UTF16-V HaranoAjiGothicTW-Normal.otf
otf-utgb-v UniCNS-UTF16-V HaranoAjiGothicTW-Medium.otf
otf-utge-v UniCNS-UTF16-V HaranoAjiGothicTW-Bold.otf
otf-utmgr-v UniCNS-UTF16-V HaranoAjiGothicTW-Heavy.otf
@@ -139,7 +139,7 @@ otf-utmgr-v UniCNS-UTF16-V HaranoAjiGothicTW-Heavy.otf
otf-ukmr-v UniKS-UTF16-V HaranoAjiMinchoK1-Regular.otf
otf-ukmb-v UniKS-UTF16-V HaranoAjiMinchoK1-Bold.otf
otf-ukml-v UniKS-UTF16-V HaranoAjiMinchoK1-Light.otf
-otf-ukgr-v UniKS-UTF16-V HaranoAjiGothicK1-Regular.otf
+otf-ukgr-v UniKS-UTF16-V HaranoAjiGothicK1-Normal.otf
otf-ukgb-v UniKS-UTF16-V HaranoAjiGothicK1-Medium.otf
otf-ukge-v UniKS-UTF16-V HaranoAjiGothicK1-Bold.otf
otf-ukmgr-v UniKS-UTF16-V HaranoAjiGothicK1-Heavy.otf
@@ -147,49 +147,79 @@ otf-ukmgr-v UniKS-UTF16-V HaranoAjiGothicK1-Heavy.otf
otf-cjmr-h Identity-H HaranoAjiMincho-Regular.otf
otf-cjmb-h Identity-H HaranoAjiMincho-Bold.otf
otf-cjml-h Identity-H HaranoAjiMincho-Light.otf
-otf-cjgr-h Identity-H HaranoAjiGothic-Regular.otf
+otf-cjgr-h Identity-H HaranoAjiGothic-Normal.otf
otf-cjgb-h Identity-H HaranoAjiGothic-Medium.otf
otf-cjge-h Identity-H HaranoAjiGothic-Bold.otf
otf-cjmgr-h Identity-H HaranoAjiGothic-Heavy.otf
otf-ccmr-h Identity-H HaranoAjiMinchoCN-Regular.otf
-otf-ccgr-h Identity-H HaranoAjiGothicCN-Regular.otf
+otf-ccmb-h Identity-H HaranoAjiMinchoCN-Bold.otf
+otf-ccml-h Identity-H HaranoAjiMinchoCN-Light.otf
+otf-ccgr-h Identity-H HaranoAjiGothicCN-Normal.otf
+otf-ccgb-h Identity-H HaranoAjiGothicCN-Medium.otf
+otf-ccge-h Identity-H HaranoAjiGothicCN-Bold.otf
+otf-ccmgr-h Identity-H HaranoAjiGothicCN-Heavy.otf
otf-ctmr-h Identity-H HaranoAjiMinchoTW-Regular.otf
-otf-ctgr-h Identity-H HaranoAjiGothicTW-Regular.otf
+otf-ctmb-h Identity-H HaranoAjiMinchoTW-Bold.otf
+otf-ctml-h Identity-H HaranoAjiMinchoTW-Light.otf
+otf-ctgr-h Identity-H HaranoAjiGothicTW-Normal.otf
+otf-ctgb-h Identity-H HaranoAjiGothicTW-Medium.otf
+otf-ctge-h Identity-H HaranoAjiGothicTW-Bold.otf
+otf-ctmgr-h Identity-H HaranoAjiGothicTW-Heavy.otf
otf-ckmr-h Identity-H HaranoAjiMinchoK1-Regular.otf
-otf-ckgr-h Identity-H HaranoAjiGothicK1-Regular.otf
+otf-ckmb-h Identity-H HaranoAjiMinchoK1-Bold.otf
+otf-ckml-h Identity-H HaranoAjiMinchoK1-Light.otf
+otf-ckgr-h Identity-H HaranoAjiGothicK1-Normal.otf
+otf-ckgb-h Identity-H HaranoAjiGothicK1-Medium.otf
+otf-ckge-h Identity-H HaranoAjiGothicK1-Bold.otf
+otf-ckmgr-h Identity-H HaranoAjiGothicK1-Heavy.otf
otf-cjmr-v Identity-V HaranoAjiMincho-Regular.otf
otf-cjmb-v Identity-V HaranoAjiMincho-Bold.otf
otf-cjml-v Identity-V HaranoAjiMincho-Light.otf
-otf-cjgr-v Identity-V HaranoAjiGothic-Regular.otf
+otf-cjgr-v Identity-V HaranoAjiGothic-Normal.otf
otf-cjgb-v Identity-V HaranoAjiGothic-Medium.otf
otf-cjge-v Identity-V HaranoAjiGothic-Bold.otf
otf-cjmgr-v Identity-V HaranoAjiGothic-Heavy.otf
otf-ccmr-v Identity-V HaranoAjiMinchoCN-Regular.otf
-otf-ccgr-v Identity-V HaranoAjiGothicCN-Regular.otf
+otf-ccmb-v Identity-V HaranoAjiMinchoCN-Bold.otf
+otf-ccml-v Identity-V HaranoAjiMinchoCN-Light.otf
+otf-ccgr-v Identity-V HaranoAjiGothicCN-Normal.otf
+otf-ccgb-v Identity-V HaranoAjiGothicCN-Medium.otf
+otf-ccge-v Identity-V HaranoAjiGothicCN-Bold.otf
+otf-ccmgr-v Identity-V HaranoAjiGothicCN-Heavy.otf
otf-ctmr-v Identity-V HaranoAjiMinchoTW-Regular.otf
-otf-ctgr-v Identity-V HaranoAjiGothicTW-Regular.otf
+otf-ctmb-v Identity-V HaranoAjiMinchoTW-Bold.otf
+otf-ctml-v Identity-V HaranoAjiMinchoTW-Light.otf
+otf-ctgr-v Identity-V HaranoAjiGothicTW-Normal.otf
+otf-ctgb-v Identity-V HaranoAjiGothicTW-Medium.otf
+otf-ctge-v Identity-V HaranoAjiGothicTW-Bold.otf
+otf-ctmgr-v Identity-V HaranoAjiGothicTW-Heavy.otf
otf-ckmr-v Identity-V HaranoAjiMinchoK1-Regular.otf
-otf-ckgr-v Identity-V HaranoAjiGothicK1-Regular.otf
+otf-ckmb-v Identity-V HaranoAjiMinchoK1-Bold.otf
+otf-ckml-v Identity-V HaranoAjiMinchoK1-Light.otf
+otf-ckgr-v Identity-V HaranoAjiGothicK1-Normal.otf
+otf-ckgb-v Identity-V HaranoAjiGothicK1-Medium.otf
+otf-ckge-v Identity-V HaranoAjiGothicK1-Bold.otf
+otf-ckmgr-v Identity-V HaranoAjiGothicK1-Heavy.otf
upaschminr-h UniGB-UTF16-H HaranoAjiMinchoCN-Regular.otf
upaschminb-h UniGB-UTF16-H HaranoAjiMinchoCN-Bold.otf
upaschminl-h UniGB-UTF16-H HaranoAjiMinchoCN-Light.otf
-upaschgothr-h UniGB-UTF16-H HaranoAjiGothicCN-Regular.otf
+upaschgothr-h UniGB-UTF16-H HaranoAjiGothicCN-Normal.otf
upaschgothb-h UniGB-UTF16-H HaranoAjiGothicCN-Medium.otf
upaschgotheb-h UniGB-UTF16-H HaranoAjiGothicCN-Bold.otf
upaschmgothr-h UniGB-UTF16-H HaranoAjiGothicCN-Heavy.otf
upaschminr-v UniGB-UTF16-V HaranoAjiMinchoCN-Regular.otf
upaschminb-v UniGB-UTF16-V HaranoAjiMinchoCN-Bold.otf
upaschminl-v UniGB-UTF16-V HaranoAjiMinchoCN-Light.otf
-upaschgothr-v UniGB-UTF16-V HaranoAjiGothicCN-Regular.otf
+upaschgothr-v UniGB-UTF16-V HaranoAjiGothicCN-Normal.otf
upaschgothb-v UniGB-UTF16-V HaranoAjiGothicCN-Medium.otf
upaschgotheb-v UniGB-UTF16-V HaranoAjiGothicCN-Bold.otf
upaschmgothr-v UniGB-UTF16-V HaranoAjiGothicCN-Heavy.otf
@@ -197,14 +227,14 @@ upaschmgothr-v UniGB-UTF16-V HaranoAjiGothicCN-Heavy.otf
upatchminr-h UniCNS-UTF16-H HaranoAjiMinchoTW-Regular.otf
upatchminb-h UniCNS-UTF16-H HaranoAjiMinchoTW-Bold.otf
upatchminl-h UniCNS-UTF16-H HaranoAjiMinchoTW-Light.otf
-upatchgothr-h UniCNS-UTF16-H HaranoAjiGothicTW-Regular.otf
+upatchgothr-h UniCNS-UTF16-H HaranoAjiGothicTW-Normal.otf
upatchgothb-h UniCNS-UTF16-H HaranoAjiGothicTW-Medium.otf
upatchgotheb-h UniCNS-UTF16-H HaranoAjiGothicTW-Bold.otf
upatchmgothr-h UniCNS-UTF16-H HaranoAjiGothicTW-Heavy.otf
upatchminr-v UniCNS-UTF16-V HaranoAjiMinchoTW-Regular.otf
upatchminb-v UniCNS-UTF16-V HaranoAjiMinchoTW-Bold.otf
upatchminl-v UniCNS-UTF16-V HaranoAjiMinchoTW-Light.otf
-upatchgothr-v UniCNS-UTF16-V HaranoAjiGothicTW-Regular.otf
+upatchgothr-v UniCNS-UTF16-V HaranoAjiGothicTW-Normal.otf
upatchgothb-v UniCNS-UTF16-V HaranoAjiGothicTW-Medium.otf
upatchgotheb-v UniCNS-UTF16-V HaranoAjiGothicTW-Bold.otf
upatchmgothr-v UniCNS-UTF16-V HaranoAjiGothicTW-Heavy.otf
@@ -212,15 +242,14 @@ upatchmgothr-v UniCNS-UTF16-V HaranoAjiGothicTW-Heavy.otf
upakorminr-h UniKS-UTF16-H HaranoAjiMinchoK1-Regular.otf
upakorminb-h UniKS-UTF16-H HaranoAjiMinchoK1-Bold.otf
upakorminl-h UniKS-UTF16-H HaranoAjiMinchoK1-Light.otf
-upakorgothr-h UniKS-UTF16-H HaranoAjiGothicK1-Regular.otf
+upakorgothr-h UniKS-UTF16-H HaranoAjiGothicK1-Normal.otf
upakorgothb-h UniKS-UTF16-H HaranoAjiGothicK1-Medium.otf
upakorgotheb-h UniKS-UTF16-H HaranoAjiGothicK1-Bold.otf
upakormgothr-h UniKS-UTF16-H HaranoAjiGothicK1-Heavy.otf
upakorminr-v UniKS-UTF16-V HaranoAjiMinchoK1-Regular.otf
upakorminb-v UniKS-UTF16-V HaranoAjiMinchoK1-Bold.otf
upakorminl-v UniKS-UTF16-V HaranoAjiMinchoK1-Light.otf
-upakorgothr-v UniKS-UTF16-V HaranoAjiGothicK1-Regular.otf
+upakorgothr-v UniKS-UTF16-V HaranoAjiGothicK1-Normal.otf
upakorgothb-v UniKS-UTF16-V HaranoAjiGothicK1-Medium.otf
upakorgotheb-v UniKS-UTF16-V HaranoAjiGothicK1-Bold.otf
upakormgothr-v UniKS-UTF16-V HaranoAjiGothicK1-Heavy.otf
-
diff --git a/macros/jptex/latex/japanese-otf/doc/test/uplatex/utfmacro-ibmplex.map b/macros/jptex/latex/japanese-otf/doc/test/uplatex/utfmacro-ibmplex.map
new file mode 100644
index 0000000000..fb785fb77a
--- /dev/null
+++ b/macros/jptex/latex/japanese-otf/doc/test/uplatex/utfmacro-ibmplex.map
@@ -0,0 +1,255 @@
+rml H IBMPlexSansJP-Regular.otf
+rmlv V IBMPlexSansJP-Regular.otf
+
+uprml-h UniJISup-UTF16-H IBMPlexSansJP-Regular.otf
+uprml-v UniJISup-UTF16-V IBMPlexSansJP-Regular.otf
+
+hminr-h H IBMPlexSansJP-Regular.otf
+hminb-h H IBMPlexSansJP-SemiBold.otf
+hminl-h H IBMPlexSansJP-ExtraLight.otf
+hgothr-h H IBMPlexSansJP-Light.otf
+hgothb-h H IBMPlexSansJP-Medium.otf
+hgotheb-h H IBMPlexSansJP-Bold.otf
+hmgothr-h H HaranoAjiGothic-Heavy.otf
+hminr-v V IBMPlexSansJP-Regular.otf
+hminb-v V IBMPlexSansJP-SemiBold.otf
+hminl-v V IBMPlexSansJP-ExtraLight.otf
+hgothr-v V IBMPlexSansJP-Light.otf
+hgothb-v V IBMPlexSansJP-Medium.otf
+hgotheb-v V IBMPlexSansJP-Bold.otf
+hmgothr-v V HaranoAjiGothic-Heavy.otf
+
+hminrn-h H IBMPlexSansJP-Regular.otf
+hminbn-h H IBMPlexSansJP-SemiBold.otf
+hminln-h H IBMPlexSansJP-ExtraLight.otf
+hgothrn-h H IBMPlexSansJP-Light.otf
+hgothbn-h H IBMPlexSansJP-Medium.otf
+hgothebn-h H IBMPlexSansJP-Bold.otf
+hmgothrn-h H HaranoAjiGothic-Heavy.otf
+hminrn-v V IBMPlexSansJP-Regular.otf
+hminbn-v V IBMPlexSansJP-SemiBold.otf
+hminln-v V IBMPlexSansJP-ExtraLight.otf
+hgothrn-v V IBMPlexSansJP-Light.otf
+hgothbn-v V IBMPlexSansJP-Medium.otf
+hgothebn-v V IBMPlexSansJP-Bold.otf
+hmgothrn-v V HaranoAjiGothic-Heavy.otf
+
+uphminr-h UniJISup-UTF16-H IBMPlexSansJP-Regular.otf
+uphminb-h UniJISup-UTF16-H IBMPlexSansJP-SemiBold.otf
+uphminl-h UniJISup-UTF16-H IBMPlexSansJP-ExtraLight.otf
+uphgothr-h UniJISup-UTF16-H IBMPlexSansJP-Light.otf
+uphgothb-h UniJISup-UTF16-H IBMPlexSansJP-Medium.otf
+uphgotheb-h UniJISup-UTF16-H IBMPlexSansJP-Bold.otf
+uphmgothr-h UniJISup-UTF16-H HaranoAjiGothic-Heavy.otf
+uphminr-v UniJISup-UTF16-V IBMPlexSansJP-Regular.otf
+uphminb-v UniJISup-UTF16-V IBMPlexSansJP-SemiBold.otf
+uphminl-v UniJISup-UTF16-V IBMPlexSansJP-ExtraLight.otf
+uphgothr-v UniJISup-UTF16-V IBMPlexSansJP-Light.otf
+uphgothb-v UniJISup-UTF16-V IBMPlexSansJP-Medium.otf
+uphgotheb-v UniJISup-UTF16-V IBMPlexSansJP-Bold.otf
+uphmgothr-v UniJISup-UTF16-V HaranoAjiGothic-Heavy.otf
+
+uphminrn-h UniJIS2004up-UTF16-H IBMPlexSansJP-Regular.otf
+uphminbn-h UniJIS2004up-UTF16-H IBMPlexSansJP-SemiBold.otf
+uphminln-h UniJIS2004up-UTF16-H IBMPlexSansJP-ExtraLight.otf
+uphgothrn-h UniJIS2004up-UTF16-H IBMPlexSansJP-Light.otf
+uphgothbn-h UniJIS2004up-UTF16-H IBMPlexSansJP-Medium.otf
+uphgothebn-h UniJIS2004up-UTF16-H IBMPlexSansJP-Bold.otf
+uphmgothrn-h UniJIS2004up-UTF16-H HaranoAjiGothic-Heavy.otf
+uphminrn-v UniJIS2004up-UTF16-V IBMPlexSansJP-Regular.otf
+uphminbn-v UniJIS2004up-UTF16-V IBMPlexSansJP-SemiBold.otf
+uphminln-v UniJIS2004up-UTF16-V IBMPlexSansJP-ExtraLight.otf
+uphgothrn-v UniJIS2004up-UTF16-V IBMPlexSansJP-Light.otf
+uphgothbn-v UniJIS2004up-UTF16-V IBMPlexSansJP-Medium.otf
+uphgothebn-v UniJIS2004up-UTF16-V IBMPlexSansJP-Bold.otf
+uphmgothrn-v UniJIS2004up-UTF16-V HaranoAjiGothic-Heavy.otf
+
+otf-ujmr-h UniJISup-UTF16-H IBMPlexSansJP-Regular.otf
+otf-ujmb-h UniJISup-UTF16-H IBMPlexSansJP-SemiBold.otf
+otf-ujml-h UniJISup-UTF16-H IBMPlexSansJP-ExtraLight.otf
+otf-ujgr-h UniJISup-UTF16-H IBMPlexSansJP-Light.otf
+otf-ujgb-h UniJISup-UTF16-H IBMPlexSansJP-Medium.otf
+otf-ujge-h UniJISup-UTF16-H IBMPlexSansJP-Bold.otf
+otf-ujmgr-h UniJISup-UTF16-H HaranoAjiGothic-Heavy.otf
+
+otf-ujmrn-h UniJIS2004up-UTF16-H IBMPlexSansJP-Regular.otf
+otf-ujmbn-h UniJIS2004up-UTF16-H IBMPlexSansJP-SemiBold.otf
+otf-ujmln-h UniJIS2004up-UTF16-H IBMPlexSansJP-ExtraLight.otf
+otf-ujgrn-h UniJIS2004up-UTF16-H IBMPlexSansJP-Light.otf
+otf-ujgbn-h UniJIS2004up-UTF16-H IBMPlexSansJP-Medium.otf
+otf-ujgen-h UniJIS2004up-UTF16-H IBMPlexSansJP-Bold.otf
+otf-ujmgrn-h UniJIS2004up-UTF16-H HaranoAjiGothic-Heavy.otf
+
+otf-ucmr-h UniGB-UTF16-H HaranoAjiMinchoCN-Regular.otf
+otf-ucmb-h UniGB-UTF16-H HaranoAjiMinchoCN-Bold.otf
+otf-ucml-h UniGB-UTF16-H HaranoAjiMinchoCN-Light.otf
+otf-ucgr-h UniGB-UTF16-H HaranoAjiGothicCN-Normal.otf
+otf-ucgb-h UniGB-UTF16-H HaranoAjiGothicCN-Medium.otf
+otf-ucge-h UniGB-UTF16-H HaranoAjiGothicCN-Bold.otf
+otf-ucmgr-h UniGB-UTF16-H HaranoAjiGothicCN-Heavy.otf
+
+otf-utmr-h UniCNS-UTF16-H HaranoAjiMinchoTW-Regular.otf
+otf-utmb-h UniCNS-UTF16-H HaranoAjiMinchoTW-Bold.otf
+otf-utml-h UniCNS-UTF16-H HaranoAjiMinchoTW-Light.otf
+otf-utgr-h UniCNS-UTF16-H HaranoAjiGothicTW-Normal.otf
+otf-utgb-h UniCNS-UTF16-H HaranoAjiGothicTW-Medium.otf
+otf-utge-h UniCNS-UTF16-H HaranoAjiGothicTW-Bold.otf
+otf-utmgr-h UniCNS-UTF16-H HaranoAjiGothicTW-Heavy.otf
+
+otf-ukmr-h UniKS-UTF16-H HaranoAjiMinchoK1-Regular.otf
+otf-ukmb-h UniKS-UTF16-H HaranoAjiMinchoK1-Bold.otf
+otf-ukml-h UniKS-UTF16-H HaranoAjiMinchoK1-Light.otf
+otf-ukgr-h UniKS-UTF16-H HaranoAjiGothicK1-Normal.otf
+otf-ukgb-h UniKS-UTF16-H HaranoAjiGothicK1-Medium.otf
+otf-ukge-h UniKS-UTF16-H HaranoAjiGothicK1-Bold.otf
+otf-ukmgr-h UniKS-UTF16-H HaranoAjiGothicK1-Heavy.otf
+
+otf-ujmr-v UniJISup-UTF16-V IBMPlexSansJP-Regular.otf
+otf-ujmb-v UniJISup-UTF16-V IBMPlexSansJP-SemiBold.otf
+otf-ujml-v UniJISup-UTF16-V IBMPlexSansJP-ExtraLight.otf
+otf-ujgr-v UniJISup-UTF16-V IBMPlexSansJP-Light.otf
+otf-ujgb-v UniJISup-UTF16-V IBMPlexSansJP-Medium.otf
+otf-ujge-v UniJISup-UTF16-V IBMPlexSansJP-Bold.otf
+otf-ujmgr-v UniJISup-UTF16-V HaranoAjiGothic-Heavy.otf
+
+otf-ujmrn-v UniJIS2004up-UTF16-V IBMPlexSansJP-Regular.otf
+otf-ujmbn-v UniJIS2004up-UTF16-V IBMPlexSansJP-SemiBold.otf
+otf-ujmln-v UniJIS2004up-UTF16-V IBMPlexSansJP-ExtraLight.otf
+otf-ujgrn-v UniJIS2004up-UTF16-V IBMPlexSansJP-Light.otf
+otf-ujgbn-v UniJIS2004up-UTF16-V IBMPlexSansJP-Medium.otf
+otf-ujgen-v UniJIS2004up-UTF16-V IBMPlexSansJP-Bold.otf
+otf-ujmgrn-v UniJIS2004up-UTF16-V HaranoAjiGothic-Heavy.otf
+
+otf-ucmr-v UniGB-UTF16-V HaranoAjiMinchoCN-Regular.otf
+otf-ucmb-v UniGB-UTF16-V HaranoAjiMinchoCN-Bold.otf
+otf-ucml-v UniGB-UTF16-V HaranoAjiMinchoCN-Light.otf
+otf-ucgr-v UniGB-UTF16-V HaranoAjiGothicCN-Normal.otf
+otf-ucgb-v UniGB-UTF16-V HaranoAjiGothicCN-Medium.otf
+otf-ucge-v UniGB-UTF16-V HaranoAjiGothicCN-Bold.otf
+otf-ucmgr-v UniGB-UTF16-V HaranoAjiGothicCN-Heavy.otf
+
+otf-utmr-v UniCNS-UTF16-V HaranoAjiMinchoTW-Regular.otf
+otf-utmb-v UniCNS-UTF16-V HaranoAjiMinchoTW-Bold.otf
+otf-utml-v UniCNS-UTF16-V HaranoAjiMinchoTW-Light.otf
+otf-utgr-v UniCNS-UTF16-V HaranoAjiGothicTW-Normal.otf
+otf-utgb-v UniCNS-UTF16-V HaranoAjiGothicTW-Medium.otf
+otf-utge-v UniCNS-UTF16-V HaranoAjiGothicTW-Bold.otf
+otf-utmgr-v UniCNS-UTF16-V HaranoAjiGothicTW-Heavy.otf
+
+otf-ukmr-v UniKS-UTF16-V HaranoAjiMinchoK1-Regular.otf
+otf-ukmb-v UniKS-UTF16-V HaranoAjiMinchoK1-Bold.otf
+otf-ukml-v UniKS-UTF16-V HaranoAjiMinchoK1-Light.otf
+otf-ukgr-v UniKS-UTF16-V HaranoAjiGothicK1-Normal.otf
+otf-ukgb-v UniKS-UTF16-V HaranoAjiGothicK1-Medium.otf
+otf-ukge-v UniKS-UTF16-V HaranoAjiGothicK1-Bold.otf
+otf-ukmgr-v UniKS-UTF16-V HaranoAjiGothicK1-Heavy.otf
+
+otf-cjmr-h Identity-H IBMPlexSansJP-Regular.otf
+otf-cjmb-h Identity-H IBMPlexSansJP-SemiBold.otf
+otf-cjml-h Identity-H IBMPlexSansJP-ExtraLight.otf
+otf-cjgr-h Identity-H IBMPlexSansJP-Light.otf
+otf-cjgb-h Identity-H IBMPlexSansJP-Medium.otf
+otf-cjge-h Identity-H IBMPlexSansJP-Bold.otf
+otf-cjmgr-h Identity-H HaranoAjiGothic-Heavy.otf
+
+otf-ccmr-h Identity-H HaranoAjiMinchoCN-Regular.otf
+otf-ccmb-h Identity-H HaranoAjiMinchoCN-Bold.otf
+otf-ccml-h Identity-H HaranoAjiMinchoCN-Light.otf
+otf-ccgr-h Identity-H HaranoAjiGothicCN-Normal.otf
+otf-ccgb-h Identity-H HaranoAjiGothicCN-Medium.otf
+otf-ccge-h Identity-H HaranoAjiGothicCN-Bold.otf
+otf-ccmgr-h Identity-H HaranoAjiGothicCN-Heavy.otf
+
+otf-ctmr-h Identity-H HaranoAjiMinchoTW-Regular.otf
+otf-ctmb-h Identity-H HaranoAjiMinchoTW-Bold.otf
+otf-ctml-h Identity-H HaranoAjiMinchoTW-Light.otf
+otf-ctgr-h Identity-H HaranoAjiGothicTW-Normal.otf
+otf-ctgb-h Identity-H HaranoAjiGothicTW-Medium.otf
+otf-ctge-h Identity-H HaranoAjiGothicTW-Bold.otf
+otf-ctmgr-h Identity-H HaranoAjiGothicTW-Heavy.otf
+
+otf-ckmr-h Identity-H HaranoAjiMinchoK1-Regular.otf
+otf-ckmb-h Identity-H HaranoAjiMinchoK1-Bold.otf
+otf-ckml-h Identity-H HaranoAjiMinchoK1-Light.otf
+otf-ckgr-h Identity-H HaranoAjiGothicK1-Normal.otf
+otf-ckgb-h Identity-H HaranoAjiGothicK1-Medium.otf
+otf-ckge-h Identity-H HaranoAjiGothicK1-Bold.otf
+otf-ckmgr-h Identity-H HaranoAjiGothicK1-Heavy.otf
+
+otf-cjmr-v Identity-V IBMPlexSansJP-Regular.otf
+otf-cjmb-v Identity-V IBMPlexSansJP-SemiBold.otf
+otf-cjml-v Identity-V IBMPlexSansJP-ExtraLight.otf
+otf-cjgr-v Identity-V IBMPlexSansJP-Light.otf
+otf-cjgb-v Identity-V IBMPlexSansJP-Medium.otf
+otf-cjge-v Identity-V IBMPlexSansJP-Bold.otf
+otf-cjmgr-v Identity-V HaranoAjiGothic-Heavy.otf
+
+otf-ccmr-v Identity-V HaranoAjiMinchoCN-Regular.otf
+otf-ccmb-v Identity-V HaranoAjiMinchoCN-Bold.otf
+otf-ccml-v Identity-V HaranoAjiMinchoCN-Light.otf
+otf-ccgr-v Identity-V HaranoAjiGothicCN-Normal.otf
+otf-ccgb-v Identity-V HaranoAjiGothicCN-Medium.otf
+otf-ccge-v Identity-V HaranoAjiGothicCN-Bold.otf
+otf-ccmgr-v Identity-V HaranoAjiGothicCN-Heavy.otf
+
+otf-ctmr-v Identity-V HaranoAjiMinchoTW-Regular.otf
+otf-ctmb-v Identity-V HaranoAjiMinchoTW-Bold.otf
+otf-ctml-v Identity-V HaranoAjiMinchoTW-Light.otf
+otf-ctgr-v Identity-V HaranoAjiGothicTW-Normal.otf
+otf-ctgb-v Identity-V HaranoAjiGothicTW-Medium.otf
+otf-ctge-v Identity-V HaranoAjiGothicTW-Bold.otf
+otf-ctmgr-v Identity-V HaranoAjiGothicTW-Heavy.otf
+
+otf-ckmr-v Identity-V HaranoAjiMinchoK1-Regular.otf
+otf-ckmb-v Identity-V HaranoAjiMinchoK1-Bold.otf
+otf-ckml-v Identity-V HaranoAjiMinchoK1-Light.otf
+otf-ckgr-v Identity-V HaranoAjiGothicK1-Normal.otf
+otf-ckgb-v Identity-V HaranoAjiGothicK1-Medium.otf
+otf-ckge-v Identity-V HaranoAjiGothicK1-Bold.otf
+otf-ckmgr-v Identity-V HaranoAjiGothicK1-Heavy.otf
+
+
+upaschminr-h UniGB-UTF16-H HaranoAjiMinchoCN-Regular.otf
+upaschminb-h UniGB-UTF16-H HaranoAjiMinchoCN-Bold.otf
+upaschminl-h UniGB-UTF16-H HaranoAjiMinchoCN-Light.otf
+upaschgothr-h UniGB-UTF16-H HaranoAjiGothicCN-Normal.otf
+upaschgothb-h UniGB-UTF16-H HaranoAjiGothicCN-Medium.otf
+upaschgotheb-h UniGB-UTF16-H HaranoAjiGothicCN-Bold.otf
+upaschmgothr-h UniGB-UTF16-H HaranoAjiGothicCN-Heavy.otf
+upaschminr-v UniGB-UTF16-V HaranoAjiMinchoCN-Regular.otf
+upaschminb-v UniGB-UTF16-V HaranoAjiMinchoCN-Bold.otf
+upaschminl-v UniGB-UTF16-V HaranoAjiMinchoCN-Light.otf
+upaschgothr-v UniGB-UTF16-V HaranoAjiGothicCN-Normal.otf
+upaschgothb-v UniGB-UTF16-V HaranoAjiGothicCN-Medium.otf
+upaschgotheb-v UniGB-UTF16-V HaranoAjiGothicCN-Bold.otf
+upaschmgothr-v UniGB-UTF16-V HaranoAjiGothicCN-Heavy.otf
+
+upatchminr-h UniCNS-UTF16-H HaranoAjiMinchoTW-Regular.otf
+upatchminb-h UniCNS-UTF16-H HaranoAjiMinchoTW-Bold.otf
+upatchminl-h UniCNS-UTF16-H HaranoAjiMinchoTW-Light.otf
+upatchgothr-h UniCNS-UTF16-H HaranoAjiGothicTW-Normal.otf
+upatchgothb-h UniCNS-UTF16-H HaranoAjiGothicTW-Medium.otf
+upatchgotheb-h UniCNS-UTF16-H HaranoAjiGothicTW-Bold.otf
+upatchmgothr-h UniCNS-UTF16-H HaranoAjiGothicTW-Heavy.otf
+upatchminr-v UniCNS-UTF16-V HaranoAjiMinchoTW-Regular.otf
+upatchminb-v UniCNS-UTF16-V HaranoAjiMinchoTW-Bold.otf
+upatchminl-v UniCNS-UTF16-V HaranoAjiMinchoTW-Light.otf
+upatchgothr-v UniCNS-UTF16-V HaranoAjiGothicTW-Normal.otf
+upatchgothb-v UniCNS-UTF16-V HaranoAjiGothicTW-Medium.otf
+upatchgotheb-v UniCNS-UTF16-V HaranoAjiGothicTW-Bold.otf
+upatchmgothr-v UniCNS-UTF16-V HaranoAjiGothicTW-Heavy.otf
+
+upakorminr-h UniKS-UTF16-H HaranoAjiMinchoK1-Regular.otf
+upakorminb-h UniKS-UTF16-H HaranoAjiMinchoK1-Bold.otf
+upakorminl-h UniKS-UTF16-H HaranoAjiMinchoK1-Light.otf
+upakorgothr-h UniKS-UTF16-H HaranoAjiGothicK1-Normal.otf
+upakorgothb-h UniKS-UTF16-H HaranoAjiGothicK1-Medium.otf
+upakorgotheb-h UniKS-UTF16-H HaranoAjiGothicK1-Bold.otf
+upakormgothr-h UniKS-UTF16-H HaranoAjiGothicK1-Heavy.otf
+upakorminr-v UniKS-UTF16-V HaranoAjiMinchoK1-Regular.otf
+upakorminb-v UniKS-UTF16-V HaranoAjiMinchoK1-Bold.otf
+upakorminl-v UniKS-UTF16-V HaranoAjiMinchoK1-Light.otf
+upakorgothr-v UniKS-UTF16-V HaranoAjiGothicK1-Normal.otf
+upakorgothb-v UniKS-UTF16-V HaranoAjiGothicK1-Medium.otf
+upakorgotheb-v UniKS-UTF16-V HaranoAjiGothicK1-Bold.otf
+upakormgothr-v UniKS-UTF16-V HaranoAjiGothicK1-Heavy.otf
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
index 06050a030c..66702b1639 100644
--- a/macros/jptex/latex/japanese-otf/doc/test/uplatex/utfmacro-kozuka.map
+++ b/macros/jptex/latex/japanese-otf/doc/test/uplatex/utfmacro-kozuka.map
@@ -114,31 +114,137 @@ 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-ucmb-h UniGB-UTF16-H AdobeSongStd-Light.otf
+otf-ucml-h UniGB-UTF16-H AdobeSongStd-Light.otf
otf-ucgr-h UniGB-UTF16-H AdobeHeitiStd-Regular.otf
+otf-ucgb-h UniGB-UTF16-H AdobeHeitiStd-Regular.otf
+otf-ucge-h UniGB-UTF16-H AdobeHeitiStd-Regular.otf
+otf-ucmgr-h UniGB-UTF16-H AdobeHeitiStd-Regular.otf
+otf-ucmr-v UniGB-UTF16-V AdobeSongStd-Light.otf
+otf-ucmb-v UniGB-UTF16-V AdobeSongStd-Light.otf
+otf-ucml-v UniGB-UTF16-V AdobeSongStd-Light.otf
otf-ucgr-v UniGB-UTF16-V AdobeHeitiStd-Regular.otf
+otf-ucgb-v UniGB-UTF16-V AdobeHeitiStd-Regular.otf
+otf-ucge-v UniGB-UTF16-V AdobeHeitiStd-Regular.otf
+otf-ucmgr-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-utmb-h UniCNS-UTF16-H AdobeMingStd-Light.otf
+otf-utml-h UniCNS-UTF16-H AdobeMingStd-Light.otf
otf-utgr-h UniCNS-UTF16-H AdobeFanHeitiStd-Bold.otf
+otf-utgb-h UniCNS-UTF16-H AdobeFanHeitiStd-Bold.otf
+otf-utge-h UniCNS-UTF16-H AdobeFanHeitiStd-Bold.otf
+otf-utmgr-h UniCNS-UTF16-H AdobeFanHeitiStd-Bold.otf
+otf-utmr-v UniCNS-UTF16-V AdobeMingStd-Light.otf
+otf-utmb-v UniCNS-UTF16-V AdobeMingStd-Light.otf
+otf-utml-v UniCNS-UTF16-V AdobeMingStd-Light.otf
otf-utgr-v UniCNS-UTF16-V AdobeFanHeitiStd-Bold.otf
+otf-utgb-v UniCNS-UTF16-V AdobeFanHeitiStd-Bold.otf
+otf-utge-v UniCNS-UTF16-V AdobeFanHeitiStd-Bold.otf
+otf-utmgr-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-ukmb-h UniKS-UTF16-H AdobeMyungjoStd-Medium.otf
+otf-ukml-h UniKS-UTF16-H AdobeMyungjoStd-Medium.otf
otf-ukgr-h UniKS-UTF16-H AdobeMyungjoStd-Medium.otf
+otf-ukgb-h UniKS-UTF16-H AdobeMyungjoStd-Medium.otf
+otf-ukge-h UniKS-UTF16-H AdobeMyungjoStd-Medium.otf
+otf-ukmgr-h UniKS-UTF16-H AdobeMyungjoStd-Medium.otf
+otf-ukmr-v UniKS-UTF16-V AdobeMyungjoStd-Medium.otf
+otf-ukmb-v UniKS-UTF16-V AdobeMyungjoStd-Medium.otf
+otf-ukml-v UniKS-UTF16-V AdobeMyungjoStd-Medium.otf
otf-ukgr-v UniKS-UTF16-V AdobeMyungjoStd-Medium.otf
+otf-ukgb-v UniKS-UTF16-V AdobeMyungjoStd-Medium.otf
+otf-ukge-v UniKS-UTF16-V AdobeMyungjoStd-Medium.otf
+otf-ukmgr-v UniKS-UTF16-V AdobeMyungjoStd-Medium.otf
otf-ccmr-h Identity-H AdobeSongStd-Light.otf
-otf-ccmr-v Identity-V AdobeSongStd-Light.otf
+otf-ccmb-h Identity-H AdobeSongStd-Light.otf
+otf-ccml-h Identity-H AdobeSongStd-Light.otf
otf-ccgr-h Identity-H AdobeHeitiStd-Regular.otf
+otf-ccgb-h Identity-H AdobeHeitiStd-Regular.otf
+otf-ccge-h Identity-H AdobeHeitiStd-Regular.otf
+otf-ccmgr-h Identity-H AdobeHeitiStd-Regular.otf
+otf-ccmr-v Identity-V AdobeSongStd-Light.otf
+otf-ccmb-v Identity-V AdobeSongStd-Light.otf
+otf-ccml-v Identity-V AdobeSongStd-Light.otf
otf-ccgr-v Identity-V AdobeHeitiStd-Regular.otf
+otf-ccgb-v Identity-V AdobeHeitiStd-Regular.otf
+otf-ccge-v Identity-V AdobeHeitiStd-Regular.otf
+otf-ccmgr-v Identity-V AdobeHeitiStd-Regular.otf
otf-ctmr-h Identity-H AdobeMingStd-Light.otf
-otf-ctmr-v Identity-V AdobeMingStd-Light.otf
+otf-ctmb-h Identity-H AdobeMingStd-Light.otf
+otf-ctml-h Identity-H AdobeMingStd-Light.otf
otf-ctgr-h Identity-H AdobeFanHeitiStd-Bold.otf
+otf-ctgb-h Identity-H AdobeFanHeitiStd-Bold.otf
+otf-ctge-h Identity-H AdobeFanHeitiStd-Bold.otf
+otf-ctmgr-h Identity-H AdobeFanHeitiStd-Bold.otf
+otf-ctmr-v Identity-V AdobeMingStd-Light.otf
+otf-ctmb-v Identity-V AdobeMingStd-Light.otf
+otf-ctml-v Identity-V AdobeMingStd-Light.otf
otf-ctgr-v Identity-V AdobeFanHeitiStd-Bold.otf
+otf-ctgb-v Identity-V AdobeFanHeitiStd-Bold.otf
+otf-ctge-v Identity-V AdobeFanHeitiStd-Bold.otf
+otf-ctmgr-v Identity-V AdobeFanHeitiStd-Bold.otf
otf-ckmr-h Identity-H AdobeMyungjoStd-Medium.otf
-otf-ckmr-v Identity-V AdobeMyungjoStd-Medium.otf
+otf-ckmb-h Identity-H AdobeMyungjoStd-Medium.otf
+otf-ckml-h Identity-H AdobeMyungjoStd-Medium.otf
otf-ckgr-h Identity-H AdobeMyungjoStd-Medium.otf
+otf-ckgb-h Identity-H AdobeMyungjoStd-Medium.otf
+otf-ckge-h Identity-H AdobeMyungjoStd-Medium.otf
+otf-ckmgr-h Identity-H AdobeMyungjoStd-Medium.otf
+otf-ckmr-v Identity-V AdobeMyungjoStd-Medium.otf
+otf-ckmb-v Identity-V AdobeMyungjoStd-Medium.otf
+otf-ckml-v Identity-V AdobeMyungjoStd-Medium.otf
otf-ckgr-v Identity-V AdobeMyungjoStd-Medium.otf
+otf-ckgb-v Identity-V AdobeMyungjoStd-Medium.otf
+otf-ckge-v Identity-V AdobeMyungjoStd-Medium.otf
+otf-ckmgr-v Identity-V AdobeMyungjoStd-Medium.otf
+
+
+upaschminr-h UniGB-UTF16-H AdobeSongStd-Light.otf
+upaschminb-h UniGB-UTF16-H AdobeSongStd-Light.otf
+upaschminl-h UniGB-UTF16-H AdobeSongStd-Light.otf
+upaschgothr-h UniGB-UTF16-H AdobeHeitiStd-Regular.otf
+upaschgothb-h UniGB-UTF16-H AdobeHeitiStd-Regular.otf
+upaschgotheb-h UniGB-UTF16-H AdobeHeitiStd-Regular.otf
+upaschmgothr-h UniGB-UTF16-H AdobeHeitiStd-Regular.otf
+upaschminr-v UniGB-UTF16-V AdobeSongStd-Light.otf
+upaschminb-v UniGB-UTF16-V AdobeSongStd-Light.otf
+upaschminl-v UniGB-UTF16-V AdobeSongStd-Light.otf
+upaschgothr-v UniGB-UTF16-V AdobeHeitiStd-Regular.otf
+upaschgothb-v UniGB-UTF16-V AdobeHeitiStd-Regular.otf
+upaschgotheb-v UniGB-UTF16-V AdobeHeitiStd-Regular.otf
+upaschmgothr-v UniGB-UTF16-V AdobeHeitiStd-Regular.otf
+
+upatchminr-h UniCNS-UTF16-H AdobeMingStd-Light.otf
+upatchminb-h UniCNS-UTF16-H AdobeMingStd-Light.otf
+upatchminl-h UniCNS-UTF16-H AdobeMingStd-Light.otf
+upatchgothr-h UniCNS-UTF16-H AdobeFanHeitiStd-Bold.otf
+upatchgothb-h UniCNS-UTF16-H AdobeFanHeitiStd-Bold.otf
+upatchgotheb-h UniCNS-UTF16-H AdobeFanHeitiStd-Bold.otf
+upatchmgothr-h UniCNS-UTF16-H AdobeFanHeitiStd-Bold.otf
+upatchminr-v UniCNS-UTF16-V AdobeMingStd-Light.otf
+upatchminb-v UniCNS-UTF16-V AdobeMingStd-Light.otf
+upatchminl-v UniCNS-UTF16-V AdobeMingStd-Light.otf
+upatchgothr-v UniCNS-UTF16-V AdobeFanHeitiStd-Bold.otf
+upatchgothb-v UniCNS-UTF16-V AdobeFanHeitiStd-Bold.otf
+upatchgotheb-v UniCNS-UTF16-V AdobeFanHeitiStd-Bold.otf
+upatchmgothr-v UniCNS-UTF16-V AdobeFanHeitiStd-Bold.otf
+
+upakorminr-h UniKS-UTF16-H AdobeMyungjoStd-Medium.otf
+upakorminb-h UniKS-UTF16-H AdobeMyungjoStd-Medium.otf
+upakorminl-h UniKS-UTF16-H AdobeMyungjoStd-Medium.otf
+upakorgothr-h UniKS-UTF16-H AdobeMyungjoStd-Medium.otf
+upakorgothb-h UniKS-UTF16-H AdobeMyungjoStd-Medium.otf
+upakorgotheb-h UniKS-UTF16-H AdobeMyungjoStd-Medium.otf
+upakormgothr-h UniKS-UTF16-H AdobeMyungjoStd-Medium.otf
+upakorminr-v UniKS-UTF16-V AdobeMyungjoStd-Medium.otf
+upakorminb-v UniKS-UTF16-V AdobeMyungjoStd-Medium.otf
+upakorminl-v UniKS-UTF16-V AdobeMyungjoStd-Medium.otf
+upakorgothr-v UniKS-UTF16-V AdobeMyungjoStd-Medium.otf
+upakorgothb-v UniKS-UTF16-V AdobeMyungjoStd-Medium.otf
+upakorgotheb-v UniKS-UTF16-V AdobeMyungjoStd-Medium.otf
+upakormgothr-v UniKS-UTF16-V AdobeMyungjoStd-Medium.otf