summaryrefslogtreecommitdiff
path: root/macros/jptex
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
parentaf81f7c9824b89002c882d1425479009b3186b4b (diff)
CTAN sync 202306260301
Diffstat (limited to 'macros/jptex')
-rw-r--r--macros/jptex/latex/japanese-otf/ChangeLog.md28
-rw-r--r--macros/jptex/latex/japanese-otf/README4
-rw-r--r--macros/jptex/latex/japanese-otf/doc/00otf-uptex.txt39
-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
-rw-r--r--macros/jptex/latex/japanese-otf/ofm/otf-cjgb-h.ofmbin372 -> 0 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/ofm/otf-cjgb-v.ofmbin324 -> 0 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/ofm/otf-cjge-h.ofmbin372 -> 0 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/ofm/otf-cjge-v.ofmbin324 -> 0 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/ofm/otf-cjgr-h.ofmbin372 -> 0 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/ofm/otf-cjgr-v.ofmbin324 -> 0 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/ofm/otf-cjmb-h.ofmbin372 -> 0 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/ofm/otf-cjmb-v.ofmbin324 -> 0 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/ofm/otf-cjmgr-h.ofmbin372 -> 0 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/ofm/otf-cjmgr-v.ofmbin324 -> 0 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/ofm/otf-cjml-h.ofmbin372 -> 0 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/ofm/otf-cjml-v.ofmbin324 -> 0 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/ofm/otf-cjmr-h.ofmbin372 -> 0 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/ofm/otf-cjmr-v.ofmbin324 -> 0 bytes
-rwxr-xr-xmacros/jptex/latex/japanese-otf/src/script/umkcidtfm.pl221
-rwxr-xr-xmacros/jptex/latex/japanese-otf/src/script/umkcidvf.pl160
-rwxr-xr-xmacros/jptex/latex/japanese-otf/src/umakeotf4
-rw-r--r--macros/jptex/latex/japanese-otf/sty/mlcid.sty139
-rw-r--r--macros/jptex/latex/japanese-otf/sty/mlutf.sty10
-rw-r--r--macros/jptex/latex/japanese-otf/sty/otf.sty79
-rw-r--r--macros/jptex/latex/japanese-otf/tfm/cidcgb--h.tfmbin0 -> 700 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/tfm/cidcgb--v.tfmbin0 -> 704 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/tfm/cidcge--h.tfmbin0 -> 700 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/tfm/cidcge--v.tfmbin0 -> 704 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/tfm/cidcgr--h.tfmbin0 -> 700 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/tfm/cidcgr--v.tfmbin0 -> 704 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/tfm/cidcmb--h.tfmbin0 -> 700 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/tfm/cidcmb--v.tfmbin0 -> 704 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/tfm/cidcmgr--h.tfmbin0 -> 700 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/tfm/cidcmgr--v.tfmbin0 -> 704 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/tfm/cidcml--h.tfmbin0 -> 700 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/tfm/cidcml--v.tfmbin0 -> 704 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/tfm/cidcmr--h.tfmbin0 -> 700 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/tfm/cidcmr--v.tfmbin0 -> 704 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/tfm/cidjgb--h.tfmbin0 -> 2076 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/tfm/cidjgb--v.tfmbin0 -> 2120 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/tfm/cidjge--h.tfmbin0 -> 2076 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/tfm/cidjge--v.tfmbin0 -> 2120 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/tfm/cidjgr--h.tfmbin0 -> 2076 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/tfm/cidjgr--v.tfmbin0 -> 2120 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/tfm/cidjmb--h.tfmbin0 -> 2076 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/tfm/cidjmb--v.tfmbin0 -> 2120 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/tfm/cidjmgr--h.tfmbin0 -> 2076 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/tfm/cidjmgr--v.tfmbin0 -> 2120 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/tfm/cidjml--h.tfmbin0 -> 2076 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/tfm/cidjml--v.tfmbin0 -> 2120 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/tfm/cidjmr--h.tfmbin0 -> 2076 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/tfm/cidjmr--v.tfmbin0 -> 2120 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/tfm/cidkgb--h.tfmbin0 -> 568 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/tfm/cidkgb--v.tfmbin0 -> 568 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/tfm/cidkge--h.tfmbin0 -> 568 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/tfm/cidkge--v.tfmbin0 -> 568 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/tfm/cidkgr--h.tfmbin0 -> 568 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/tfm/cidkgr--v.tfmbin0 -> 568 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/tfm/cidkmb--h.tfmbin0 -> 568 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/tfm/cidkmb--v.tfmbin0 -> 568 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/tfm/cidkmgr--h.tfmbin0 -> 568 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/tfm/cidkmgr--v.tfmbin0 -> 568 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/tfm/cidkml--h.tfmbin0 -> 568 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/tfm/cidkml--v.tfmbin0 -> 568 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/tfm/cidkmr--h.tfmbin0 -> 568 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/tfm/cidkmr--v.tfmbin0 -> 568 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/tfm/cidtgb--h.tfmbin0 -> 564 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/tfm/cidtgb--v.tfmbin0 -> 564 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/tfm/cidtge--h.tfmbin0 -> 564 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/tfm/cidtge--v.tfmbin0 -> 564 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/tfm/cidtgr--h.tfmbin0 -> 564 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/tfm/cidtgr--v.tfmbin0 -> 564 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/tfm/cidtmb--h.tfmbin0 -> 564 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/tfm/cidtmb--v.tfmbin0 -> 564 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/tfm/cidtmgr--h.tfmbin0 -> 564 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/tfm/cidtmgr--v.tfmbin0 -> 564 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/tfm/cidtml--h.tfmbin0 -> 564 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/tfm/cidtml--v.tfmbin0 -> 564 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/tfm/cidtmr--h.tfmbin0 -> 564 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/tfm/cidtmr--v.tfmbin0 -> 564 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/tfm/otf-ccgb-h.tfmbin0 -> 700 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/tfm/otf-ccgb-v.tfmbin0 -> 704 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/tfm/otf-ccge-h.tfmbin0 -> 700 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/tfm/otf-ccge-v.tfmbin0 -> 704 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/tfm/otf-ccgr-h.tfmbin108 -> 700 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/tfm/otf-ccgr-v.tfmbin108 -> 704 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/tfm/otf-ccmb-h.tfmbin0 -> 700 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/tfm/otf-ccmb-v.tfmbin0 -> 704 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/tfm/otf-ccmgr-h.tfmbin0 -> 700 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/tfm/otf-ccmgr-v.tfmbin0 -> 704 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/tfm/otf-ccml-h.tfmbin0 -> 700 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/tfm/otf-ccml-v.tfmbin0 -> 704 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/tfm/otf-ccmr-h.tfmbin108 -> 700 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/tfm/otf-ccmr-v.tfmbin108 -> 704 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/tfm/otf-cjgb-h.tfmbin108 -> 2076 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/tfm/otf-cjgb-v.tfmbin108 -> 2120 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/tfm/otf-cjge-h.tfmbin108 -> 2076 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/tfm/otf-cjge-v.tfmbin108 -> 2120 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/tfm/otf-cjgr-h.tfmbin108 -> 2076 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/tfm/otf-cjgr-v.tfmbin108 -> 2120 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/tfm/otf-cjmb-h.tfmbin108 -> 2076 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/tfm/otf-cjmb-v.tfmbin108 -> 2120 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/tfm/otf-cjmgr-h.tfmbin108 -> 2076 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/tfm/otf-cjmgr-v.tfmbin108 -> 2120 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/tfm/otf-cjml-h.tfmbin108 -> 2076 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/tfm/otf-cjml-v.tfmbin108 -> 2120 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/tfm/otf-cjmr-h.tfmbin108 -> 2076 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/tfm/otf-cjmr-v.tfmbin108 -> 2120 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/tfm/otf-ckgb-h.tfmbin0 -> 568 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/tfm/otf-ckgb-v.tfmbin0 -> 568 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/tfm/otf-ckge-h.tfmbin0 -> 568 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/tfm/otf-ckge-v.tfmbin0 -> 568 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/tfm/otf-ckgr-h.tfmbin108 -> 568 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/tfm/otf-ckgr-v.tfmbin108 -> 568 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/tfm/otf-ckmb-h.tfmbin0 -> 568 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/tfm/otf-ckmb-v.tfmbin0 -> 568 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/tfm/otf-ckmgr-h.tfmbin0 -> 568 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/tfm/otf-ckmgr-v.tfmbin0 -> 568 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/tfm/otf-ckml-h.tfmbin0 -> 568 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/tfm/otf-ckml-v.tfmbin0 -> 568 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/tfm/otf-ckmr-h.tfmbin108 -> 568 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/tfm/otf-ckmr-v.tfmbin108 -> 568 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/tfm/otf-ctgb-h.tfmbin0 -> 564 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/tfm/otf-ctgb-v.tfmbin0 -> 564 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/tfm/otf-ctge-h.tfmbin0 -> 564 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/tfm/otf-ctge-v.tfmbin0 -> 564 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/tfm/otf-ctgr-h.tfmbin108 -> 564 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/tfm/otf-ctgr-v.tfmbin108 -> 564 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/tfm/otf-ctmb-h.tfmbin0 -> 564 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/tfm/otf-ctmb-v.tfmbin0 -> 564 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/tfm/otf-ctmgr-h.tfmbin0 -> 564 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/tfm/otf-ctmgr-v.tfmbin0 -> 564 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/tfm/otf-ctml-h.tfmbin0 -> 564 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/tfm/otf-ctml-v.tfmbin0 -> 564 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/tfm/otf-ctmr-h.tfmbin108 -> 564 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/tfm/otf-ctmr-v.tfmbin108 -> 564 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/vf/cidcgb--h.vfbin0 -> 2140 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/vf/cidcgb--v.vfbin0 -> 2680 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/vf/cidcge--h.vfbin0 -> 2140 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/vf/cidcge--v.vfbin0 -> 2680 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/vf/cidcgr--h.vfbin0 -> 2140 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/vf/cidcgr--v.vfbin0 -> 2680 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/vf/cidcmb--h.vfbin0 -> 2140 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/vf/cidcmb--v.vfbin0 -> 2680 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/vf/cidcmgr--h.vfbin0 -> 2140 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/vf/cidcmgr--v.vfbin0 -> 2680 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/vf/cidcml--h.vfbin0 -> 2140 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/vf/cidcml--v.vfbin0 -> 2680 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/vf/cidcmr--h.vfbin0 -> 2140 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/vf/cidcmr--v.vfbin0 -> 2680 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/vf/cidjgb--h.vfbin0 -> 7356 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/vf/cidjgb--v.vfbin0 -> 9680 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/vf/cidjge--h.vfbin0 -> 7356 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/vf/cidjge--v.vfbin0 -> 9680 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/vf/cidjgr--h.vfbin0 -> 7356 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/vf/cidjgr--v.vfbin0 -> 9680 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/vf/cidjmb--h.vfbin0 -> 7356 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/vf/cidjmb--v.vfbin0 -> 9680 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/vf/cidjmgr--h.vfbin0 -> 7356 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/vf/cidjmgr--v.vfbin0 -> 9684 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/vf/cidjml--h.vfbin0 -> 7356 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/vf/cidjml--v.vfbin0 -> 9680 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/vf/cidjmr--h.vfbin0 -> 7356 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/vf/cidjmr--v.vfbin0 -> 9680 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/vf/cidkgb--h.vfbin0 -> 1612 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/vf/cidkgb--v.vfbin0 -> 2000 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/vf/cidkge--h.vfbin0 -> 1612 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/vf/cidkge--v.vfbin0 -> 2000 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/vf/cidkgr--h.vfbin0 -> 1612 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/vf/cidkgr--v.vfbin0 -> 2000 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/vf/cidkmb--h.vfbin0 -> 1612 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/vf/cidkmb--v.vfbin0 -> 2000 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/vf/cidkmgr--h.vfbin0 -> 1616 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/vf/cidkmgr--v.vfbin0 -> 2004 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/vf/cidkml--h.vfbin0 -> 1612 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/vf/cidkml--v.vfbin0 -> 2000 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/vf/cidkmr--h.vfbin0 -> 1612 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/vf/cidkmr--v.vfbin0 -> 2000 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/vf/cidtgb--h.vfbin0 -> 1596 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/vf/cidtgb--v.vfbin0 -> 1980 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/vf/cidtge--h.vfbin0 -> 1596 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/vf/cidtge--v.vfbin0 -> 1980 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/vf/cidtgr--h.vfbin0 -> 1596 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/vf/cidtgr--v.vfbin0 -> 1980 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/vf/cidtmb--h.vfbin0 -> 1596 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/vf/cidtmb--v.vfbin0 -> 1980 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/vf/cidtmgr--h.vfbin0 -> 1596 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/vf/cidtmgr--v.vfbin0 -> 1980 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/vf/cidtml--h.vfbin0 -> 1596 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/vf/cidtml--v.vfbin0 -> 1980 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/vf/cidtmr--h.vfbin0 -> 1596 bytes
-rw-r--r--macros/jptex/latex/japanese-otf/vf/cidtmr--v.vfbin0 -> 1980 bytes
208 files changed, 2400 insertions, 153 deletions
diff --git a/macros/jptex/latex/japanese-otf/ChangeLog.md b/macros/jptex/latex/japanese-otf/ChangeLog.md
index f47f957646..37aaa951f3 100644
--- a/macros/jptex/latex/japanese-otf/ChangeLog.md
+++ b/macros/jptex/latex/japanese-otf/ChangeLog.md
@@ -1,3 +1,31 @@
+# 2023-06-25 japanese-otf
+
+Based on japanese-otf-uptex Ver.0.29.
+
+Common between platex and uplatex:
+* otf.sty: Add an option 'noruby' not to use kana glyphs optimized for ruby.
+* Fix bug on *brsgnmlminl, *nmlgotheb.
+* Fix issue related to \kanjishape
+
+japanese-otf-uptex:
+* Extended CID base multi-weight fonts (seven sets of family/series) in \CID{}, \CIDC{}, \CIDT{}, \CIDK{}.
+It enables to typeset multi-weights for macros \CIDC{}, \CIDT{}, \CIDK{}.
+
+
+
+# 2023-02-23 japanese-otf
+
+Based on japanese-otf-uptex Ver.0.28.
+
+Common between platex and uplatex:
+* otf.sty: Set option autodetect-engine default. Add a new option platex to check if engine is platex.
+
+japanese-otf-uptex:
+* Support Kana Letter Small Ko defined by Unicode 15.0.
+* Update reference Unicode Blocks-15.0.0.txt, Adobe-Japan1-7 cid2code.txt (Version 05/18/2022).
+
+
+
# 2022-03-05 japanese-otf
japanese-otf:
diff --git a/macros/jptex/latex/japanese-otf/README b/macros/jptex/latex/japanese-otf/README
index 1d6034b23d..da75f41804 100644
--- a/macros/jptex/latex/japanese-otf/README
+++ b/macros/jptex/latex/japanese-otf/README
@@ -14,7 +14,7 @@ consists of following packages:
- author: Tanaka Takuji
- upstream: http://www.t-lab.opal.ne.jp/tex/uptex_en.html
https://github.com/t-tk/japanese-otf-uptex
- - currently japanese-otf-uptex Ver.0.28 (2023/02/23)
+ - currently japanese-otf-uptex Ver.0.29 (2023/06/25)
- readme by the author: 00otf-uptex.txt
In addition, several patches were applied to support extended
@@ -29,4 +29,4 @@ The contents of this package is under the license given in the
COPYRIGHT file, which is the 3-clause BSD license.
Japanese TeX Development Community
-20230223.0
+20230625.0
diff --git a/macros/jptex/latex/japanese-otf/doc/00otf-uptex.txt b/macros/jptex/latex/japanese-otf/doc/00otf-uptex.txt
index d81e7f80ec..70c2f0a21a 100644
--- a/macros/jptex/latex/japanese-otf/doc/00otf-uptex.txt
+++ b/macros/jptex/latex/japanese-otf/doc/00otf-uptex.txt
@@ -1,5 +1,5 @@
[ Title ]
-japanese-otf-uptex Ver.0.28 2022/02/23
+japanese-otf-uptex Ver.0.29 2023/06/25
[ Abstract ]
@@ -45,9 +45,12 @@ script/sp_list_k.txt : a list of characters on supplementary planes in UniKS-UTF
script/CheckDVICode.pm : perl module checking category of characters
script/umkpkana.pl : perl script making pl, ovp for proportional kana
script/umkvpkana.pl : perl script making pl, ovp for proportional kana
+script/umkcidtfm.pl : perl script making tfm for CIDx macros
+script/umkcidvf.pl : perl script making vf for CIDx macros
sty/otf.sty : basic style file
sty/mlutf.sty : style file for multi option
+sty/mlcid.sty : style file for multi option
test/uplatex/* : test samples.
@@ -120,10 +123,12 @@ Ref. https://github.com/t-tk/japanese-otf-uptex/issues/3
[ About Unicode base multi-weight fonts ]
-japanese-otf-uptex Ver.0.26 has introduced new virtual fonts for
-\UTF{}, \UTFC{}, \UTFT{}, \UTFK{} macros. They are Unicode base
-(conventionally subfont scheme) and support multi-weight fonts
-(seven sets of family/series for all languages,
+japanese-otf-uptex Ver.0.26 has introduced new virtual fonts
+for \UTF{}, \UTFC{}, \UTFT{}, \UTFK{} macros.
+In addition, japanese-otf-uptex Ver.0.29 has introduced new virtual fonts
+for \CID{}, \CIDC{}, \CIDT{}, \CIDK{} macros.
+They are Unicode/CID base (conventionally subfont scheme) and
+support multi-weight fonts (seven sets of family/series for all languages,
conventionally two sets of family/series for Chinese and Korean).
The feature also requires new dviware which support fall back of CJK virtual fonts.
明朝体・細字   \mcfamily\ltseries ml
@@ -134,6 +139,7 @@ The feature also requires new dviware which support fall back of CJK virtual fon
ゴシック体・極太 \gtfamily\ebseries ge
丸ゴシック体   \mgfamily mgr
Ref. https://github.com/t-tk/japanese-otf-uptex/issues/4
+https://github.com/t-tk/japanese-otf-uptex/issues/8
japanese-otf-uptex Ver.0.27 has introduced new virtual fonts for
Chinese/Korean plain texts to support multi-weight fonts.
@@ -484,7 +490,7 @@ https://github.com/t-tk/japanese-otf-uptex
sty/otf.sty, sty/mlutf.sty ::
Bump version number.
Set option autodetect-engine default.
- Add a new option platex to check if engine is platex.
+ Add a new option 'platex' to check if engine is platex.
umkjvf, umakeotf{,_brsg,_jis04,_pre,_prop},
script/{CheckDVICode,MakeSPList}.pm,
script/{mktfm_sp,mkutf32list,mkutfvf_sp,umk{,v}pkana}.pl ::
@@ -502,4 +508,25 @@ https://github.com/t-tk/japanese-otf-uptex
Add new tests for Small Kana Extension & Adobe fonts.
COPYRIGHT ::
Update year.
+2023.06.25 Ver0.29
+ sty/otf.sty, sty/mlutf.sty, sty/mlcid.sty ::
+ Bump version number.
+ sty/otf.sty ::
+ Add a new option 'noruby' not to use kana glyphs optimized for ruby.
+ Fix bug on *brsgnmlminl, *nmlgotheb.
+ Fix issue related to \kanjishape ## Thank @aminophen san.
+ Ref. https://github.com/texjporg/japanese-otf-mirror/issues/7
+ sty/otf.sty, sty/mlcid.sty,
+ umakeotf, script/umkcid{tfm,vf}.pl ::
+ Introduce Unicode base multi-weight virtual fonts
+ for \CID{}, \CIDC{}, \CITT{}, \CIDK{}.
+ test/uplatex/{uotftest-utf8,uotf-sp-utf8,otfscale}.tex ::
+ Add option 'dvipdfmx' to document class declaration.
+ test/uplatex/Makefile, test/uplatex/uotftest-utf8.tex ::
+ Add a new test for option 'noruby'.
+ test/uplatex/Makefile,
+ test/uplatex/utfmacro-{kozuka,haranoaji,ibmplex}.map,
+ test/uplatex/uotf-cid-{h,v}.tex,
+ test/uplatex/cid_{jp,gb,cns,ks}_{h,v}.tex ::
+ Add a new test for multi-weight \CID{}, \CIDC{}, \CIDT{}, \CIDK{}.
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
diff --git a/macros/jptex/latex/japanese-otf/ofm/otf-cjgb-h.ofm b/macros/jptex/latex/japanese-otf/ofm/otf-cjgb-h.ofm
deleted file mode 100644
index ee31393e06..0000000000
--- a/macros/jptex/latex/japanese-otf/ofm/otf-cjgb-h.ofm
+++ /dev/null
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/ofm/otf-cjgb-v.ofm b/macros/jptex/latex/japanese-otf/ofm/otf-cjgb-v.ofm
deleted file mode 100644
index 3b8287581b..0000000000
--- a/macros/jptex/latex/japanese-otf/ofm/otf-cjgb-v.ofm
+++ /dev/null
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/ofm/otf-cjge-h.ofm b/macros/jptex/latex/japanese-otf/ofm/otf-cjge-h.ofm
deleted file mode 100644
index ee31393e06..0000000000
--- a/macros/jptex/latex/japanese-otf/ofm/otf-cjge-h.ofm
+++ /dev/null
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/ofm/otf-cjge-v.ofm b/macros/jptex/latex/japanese-otf/ofm/otf-cjge-v.ofm
deleted file mode 100644
index 3b8287581b..0000000000
--- a/macros/jptex/latex/japanese-otf/ofm/otf-cjge-v.ofm
+++ /dev/null
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/ofm/otf-cjgr-h.ofm b/macros/jptex/latex/japanese-otf/ofm/otf-cjgr-h.ofm
deleted file mode 100644
index ee31393e06..0000000000
--- a/macros/jptex/latex/japanese-otf/ofm/otf-cjgr-h.ofm
+++ /dev/null
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/ofm/otf-cjgr-v.ofm b/macros/jptex/latex/japanese-otf/ofm/otf-cjgr-v.ofm
deleted file mode 100644
index 3b8287581b..0000000000
--- a/macros/jptex/latex/japanese-otf/ofm/otf-cjgr-v.ofm
+++ /dev/null
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/ofm/otf-cjmb-h.ofm b/macros/jptex/latex/japanese-otf/ofm/otf-cjmb-h.ofm
deleted file mode 100644
index ee31393e06..0000000000
--- a/macros/jptex/latex/japanese-otf/ofm/otf-cjmb-h.ofm
+++ /dev/null
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/ofm/otf-cjmb-v.ofm b/macros/jptex/latex/japanese-otf/ofm/otf-cjmb-v.ofm
deleted file mode 100644
index 3b8287581b..0000000000
--- a/macros/jptex/latex/japanese-otf/ofm/otf-cjmb-v.ofm
+++ /dev/null
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/ofm/otf-cjmgr-h.ofm b/macros/jptex/latex/japanese-otf/ofm/otf-cjmgr-h.ofm
deleted file mode 100644
index ee31393e06..0000000000
--- a/macros/jptex/latex/japanese-otf/ofm/otf-cjmgr-h.ofm
+++ /dev/null
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/ofm/otf-cjmgr-v.ofm b/macros/jptex/latex/japanese-otf/ofm/otf-cjmgr-v.ofm
deleted file mode 100644
index 3b8287581b..0000000000
--- a/macros/jptex/latex/japanese-otf/ofm/otf-cjmgr-v.ofm
+++ /dev/null
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/ofm/otf-cjml-h.ofm b/macros/jptex/latex/japanese-otf/ofm/otf-cjml-h.ofm
deleted file mode 100644
index ee31393e06..0000000000
--- a/macros/jptex/latex/japanese-otf/ofm/otf-cjml-h.ofm
+++ /dev/null
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/ofm/otf-cjml-v.ofm b/macros/jptex/latex/japanese-otf/ofm/otf-cjml-v.ofm
deleted file mode 100644
index 3b8287581b..0000000000
--- a/macros/jptex/latex/japanese-otf/ofm/otf-cjml-v.ofm
+++ /dev/null
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/ofm/otf-cjmr-h.ofm b/macros/jptex/latex/japanese-otf/ofm/otf-cjmr-h.ofm
deleted file mode 100644
index ee31393e06..0000000000
--- a/macros/jptex/latex/japanese-otf/ofm/otf-cjmr-h.ofm
+++ /dev/null
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/ofm/otf-cjmr-v.ofm b/macros/jptex/latex/japanese-otf/ofm/otf-cjmr-v.ofm
deleted file mode 100644
index 3b8287581b..0000000000
--- a/macros/jptex/latex/japanese-otf/ofm/otf-cjmr-v.ofm
+++ /dev/null
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/src/script/umkcidtfm.pl b/macros/jptex/latex/japanese-otf/src/script/umkcidtfm.pl
new file mode 100755
index 0000000000..6f830a329c
--- /dev/null
+++ b/macros/jptex/latex/japanese-otf/src/script/umkcidtfm.pl
@@ -0,0 +1,221 @@
+#!/usr/bin/perl -s
+
+=head1 NAME
+
+umkcidtfm.pl
+
+=head1 USAGE
+
+script/umkcidtfm.pl
+script/umkcidtfm.pl -debug
+
+=head1 NOTE
+
+This software is a part of japanese-otf-uptex.
+
+=cut
+
+opendir(PL, "pl") || mkdir("pl",0755) || die "cannot mkdir pl";
+opendir(TFM, "tfm") || mkdir("tfm",0755) || die "cannot mkdir tfm";
+&make_cid_tfm;
+&make_cid_dvips_tfm;
+
+sub make_cid_tfm {
+ my ($lang, $face, $dir, $id, $filename);
+ foreach $lang (qw/j c k t/){#lang
+ foreach $dir (qw/h v/){#direction
+ $id='-';
+ $pl_name="cid$lang$id-$dir";
+ open(OUT, '>', "pl/$pl_name.pl")||die "$!";
+ &fonthead($lang,$dir);
+ &writechar($lang,$dir);
+ &fontfoot($lang,$dir);
+ close(OUT);
+ foreach $face (qw/mr gr mb gb mgr ml ge/){#face
+ $tfm_name="cid$lang$face$id-$dir";
+ system("uppltotf -kanji=uptex pl/$pl_name.pl tfm/$tfm_name.tfm");
+ }
+ unless ($debug){
+ unlink "pl/$pl_name.pl";
+ }
+ }
+ }
+}
+
+sub make_cid_dvips_tfm {
+ my ($lang, $face, $dir, $id, $filename);
+ foreach $lang (qw/j c k t/){#lang
+ foreach $dir (qw/h v/){#direction
+ $pl_name="otf-c$lang-$dir";
+ open(OUT, '>', "pl/$pl_name.pl")||die "$!";
+ &fonthead_dvips($lang,$dir);
+ &writechar($lang,$dir);
+ &fontfoot($lang,$dir);
+ close(OUT);
+ foreach $face (qw/mr gr mb gb mgr ml ge/){#face
+ $tfm_name="otf-c$lang$face-$dir";
+ system("uppltotf -kanji=uptex pl/$pl_name.pl tfm/$tfm_name.tfm");
+ }
+ unless ($debug){
+ unlink "pl/$pl_name.pl";
+ }
+ }
+ }
+}
+
+sub fonthead {
+ my ($lang,$dir) = @_;
+print OUT <<END_OF_DATA if ($dir eq 'v');
+(DIRECTION TATE)
+END_OF_DATA
+print OUT <<END_OF_DATA;
+(FAMILY OTF KANJI)
+(FACE F MRR)
+(CODINGSCHEME TEX KANJI TEXT)
+(DESIGNSIZE R 10.0)
+(CHECKSUM O 0)
+(SEVENBITSAFEFLAG TRUE)
+(FONTDIMEN
+ (SLANT R 0.0)
+ (SPACE R 0.0)
+ (STRETCH R 0.1)
+ (SHRINK R 0.0)
+ (XHEIGHT R 1.0)
+ (QUAD R 1.0)
+ (EXTRASPACE R 0.25)
+ (EXTRASTRETCH R 0.2)
+ (EXTRASHRINK R 0.125)
+ )
+END_OF_DATA
+}
+
+sub fonthead_dvips {
+ my ($lang,$dir) = @_;
+print OUT <<END_OF_DATA if ($dir eq 'v');
+(DIRECTION TATE)
+END_OF_DATA
+print OUT <<END_OF_DATA;
+(FAMILY OTF KANJI)
+(FACE F MRR)
+(CODINGSCHEME TEX KANJI TEXT)
+(DESIGNSIZE R 10.0)
+(CHECKSUM O 0)
+(SEVENBITSAFEFLAG TRUE)
+(FONTDIMEN
+ (SLANT R 0.0)
+ (SPACE R 0.0)
+ (STRETCH R 0.0)
+ (SHRINK R 0.0)
+ (XHEIGHT R 1.0)
+ (QUAD R 1.0)
+ (EXTRASPACE R 0.0)
+ (EXTRASTRETCH R 0.0)
+ (EXTRASHRINK R 0.0)
+ )
+END_OF_DATA
+}
+
+sub fontfoot {
+ my ($lang,$dir) = @_;
+ my ($ht,$dp) = $dir eq 'h' ? (0.88, 0.12) : (0.5, 0.5);
+print OUT <<END_OF_DATA;
+(TYPE O 0
+ (CHARWD R 1.0)
+ (CHARHT R $ht)
+ (CHARDP R $dp)
+ )
+(TYPE O 1
+ (CHARWD R 0.5)
+ (CHARHT R $ht)
+ (CHARDP R $dp)
+ )
+END_OF_DATA
+print OUT <<END_OF_DATA if ($lang eq 'j');
+(TYPE O 2
+ (CHARWD R 0.25)
+ (CHARHT R $ht)
+ (CHARDP R $dp)
+ )
+(TYPE O 3
+ (CHARWD R 0.333333)
+ (CHARHT R $ht)
+ (CHARDP R $dp)
+ )
+END_OF_DATA
+}
+
+sub writechar {
+ my ($lang, $dir) = @_;
+ my (@type_1ov2, @type_1ov3, @type_1ov4);
+
+ if ($lang eq "j") { # Adobe-Japan1-7
+ if ($dir eq "h") {
+ @type_1ov2 = (231 .. 632, 8718, 8719, 12063 .. 12087);
+ @type_1ov4 = (9738 .. 9757);
+ @type_1ov3 = (9758 .. 9778);
+ }
+ if ($dir eq "v") {
+ @type_1ov2 = (8950 .. 9353, 10185 .. 10195, 13295 .. 13319);
+ @type_1ov4 = (13254 .. 13273);
+ @type_1ov3 = (13274 .. 13294);
+ }
+ }
+ if ($lang eq "c") { # Adobe-GB1-5
+ if ($dir eq "h") {
+ @type_1ov2 = (814 .. 939, 7716, 22355 .. 22357);
+ }
+ if ($dir eq "v") {
+ @type_1ov2 = (22226 .. 22352, 29060 .. 29063);
+ }
+ }
+ if ($lang eq "k") { # Adobe-Korea1-2
+ if ($dir eq "h") {
+ @type_1ov2 = (8094 .. 8190);
+ }
+ if ($dir eq "v") {
+ @type_1ov2 = (18255 .. 18351);
+ }
+ }
+ if ($lang eq "t") { # Adobe-CNS1-7
+ if ($dir eq "h") {
+ @type_1ov2 = (13648 .. 13742, 17603);
+ }
+ if ($dir eq "v") {
+ @type_1ov2 = (17506 .. 17600, 17605);
+ }
+ }
+
+ if (@type_1ov2) {
+ print OUT "(CHARSINTYPE O 1\n";
+ my ($i)=0;
+ for $cid (@type_1ov2) {
+ print OUT " " if ($i % 16 == 0);
+ printf OUT " U %04X", $cid;
+ print OUT "\n" if ($i % 16 == 15);
+ $i++;
+ }
+ print OUT "\n )\n";
+ }
+ if (@type_1ov4) {
+ print OUT "(CHARSINTYPE O 2\n";
+ my ($i)=0;
+ for $cid (@type_1ov4) {
+ print OUT " " if ($i % 16 == 0);
+ printf OUT " U %04X", $cid;
+ print OUT "\n" if ($i % 16 == 15);
+ $i++;
+ }
+ print OUT "\n )\n";
+ }
+ if (@type_1ov3) {
+ print OUT "(CHARSINTYPE O 3\n";
+ my ($i)=0;
+ for $cid (@type_1ov3) {
+ print OUT " " if ($i % 16 == 0);
+ printf OUT " U %04X", $cid;
+ print OUT "\n" if ($i % 16 == 15);
+ $i++;
+ }
+ print OUT "\n )\n";
+ }
+}
diff --git a/macros/jptex/latex/japanese-otf/src/script/umkcidvf.pl b/macros/jptex/latex/japanese-otf/src/script/umkcidvf.pl
new file mode 100755
index 0000000000..9cc6e11e1d
--- /dev/null
+++ b/macros/jptex/latex/japanese-otf/src/script/umkcidvf.pl
@@ -0,0 +1,160 @@
+#!/usr/bin/perl -s
+
+=head1 NAME
+
+umkcidvf.pl
+
+=head1 USAGE
+
+script/umkcidvf.pl
+script/umkcidvf.pl -omitfw
+script/umkcidvf.pl -debug
+
+=head1 NOTE
+
+This software is a part of japanese-otf-uptex.
+
+=cut
+
+opendir(OVP, "ovp") || mkdir("ovp",0755) || die "cannot mkdir ovp";
+opendir(VF, "vf") || mkdir("vf",0755) || die "cannot mkdir vf";
+my %adobe_name = (
+ 'j' => 'Adobe-Japan1-7',
+ 'c' => 'Adobe-GB1-5',
+ 'k' => 'Adobe-Korea1-2',
+ 't' => 'Adobe-CNS1-7'
+);
+&make_new_vf;
+
+sub make_new_vf {
+ my ($lang, $face, $dir, $id, $filename);
+ foreach $lang (qw/j c k t/){#lang
+ foreach $face (qw/mr gr mb gb mgr ml ge/){#face
+ foreach $dir (qw/h v/){#direction
+ $id='-';
+ $filename="cid$lang$face$id-$dir";
+ open(OUT, '>', "ovp/$filename.ovp")||die "$!";
+ &writefont($lang,"otf-c$lang$face-$dir");
+ &writechar_cid($lang,$dir);
+ close(OUT);
+ unless ($debug){
+ system("ovp2ovf ovp/$filename.ovp vf/$filename.vf vf/$filename.ofm");
+ unlink "vf/$filename.ofm";
+ }
+ }
+ }
+ }
+}
+
+sub writefont {
+ my ($lang,$name)=@_;
+print OUT <<END_OF_DATA;
+(VTITLE JVF for $adobe_name{$lang})
+(OFMLEVEL D 0)
+(DESIGNSIZE R 10.000000)
+(CHECKSUM O 0)
+(MAPFONT D 0
+ (FONTNAME $name)
+ (FONTCHECKSUM O 0)
+ (FONTAT R 1.0)
+ (FONTDSIZE R 10.000000)
+ )
+END_OF_DATA
+}
+
+sub writechar_cid {
+ my ($lang, $dir) = @_;
+ my ($cidcode, $width, $correction);
+ my ($maxcidcode);
+ if ($lang eq "j") {
+ $maxcidcode = 23059;
+ } elsif ($lang eq "c") {
+ $maxcidcode = 30283;
+ } elsif ($lang eq "k") {
+ $maxcidcode = 18351;
+ } elsif ($lang eq "t") {
+ $maxcidcode = 19178;
+ } else {
+ die "unexpected input!";
+ }
+ foreach $cidcode (0 .. $maxcidcode){
+ $width=1.0;
+ if ($lang eq "j") { # Adobe-Japan1-7
+ if ($dir eq "h") {
+ if (($cidcode >= 231 && $cidcode <= 632)
+ || $cidcode == 8718 || $cidcode == 8719
+ || (12063 <= $cidcode && $cidcode <= 12087)){
+ $width=0.5;
+ }elsif(9738 <= $cidcode && $cidcode <= 9757){
+ $width=0.25;
+ }elsif(9758 <= $cidcode && $cidcode <= 9778){
+ $width=0.333333;
+ }
+ }
+ if ($dir eq "v") {
+ if ((8950 <= $cidcode && $cidcode <= 9353)
+ || (10185 <= $cidcode && $cidcode <= 10195)
+ || (13295 <= $cidcode && $cidcode <= 13319)){
+ $width=0.5;
+ }elsif(13254 <= $cidcode && $cidcode <= 13273){
+ $width=0.25;
+ }elsif(13274 <= $cidcode && $cidcode <= 13294){
+ $width=0.333333;
+ }
+ }
+ }
+ if ($lang eq "c") { # Adobe-GB1-5
+ if ($dir eq "h") {
+ if (($cidcode >= 814 && $cidcode <= 939)
+ || $cidcode == 7716
+ || (22355 <= $cidcode && $cidcode <= 22357)){
+ $width=0.5;
+ }
+ }
+ if ($dir eq "v") {
+ if ((22226 <= $cidcode && $cidcode <= 22352)
+ || (29060 <= $cidcode && $cidcode <= 29063)){
+ $width=0.5;
+ }
+ }
+ }
+ if ($lang eq "k") { # Adobe-Korea1-2
+ if ($dir eq "h") {
+ if (8094 <= $cidcode && $cidcode <= 8190){
+ $width=0.5;
+ }
+ }
+ if ($dir eq "v") {
+ if (18255 <= $cidcode && $cidcode <= 18351){
+ $width=0.5;
+ }
+ }
+ }
+ if ($lang eq "t") { # Adobe-CNS1-7
+ if ($dir eq "h") {
+ if (($cidcode >= 13648 && $cidcode <= 13742)
+ || $cidcode == 17603 ){
+ $width=0.5;
+ }
+ }
+ if ($dir eq "v") {
+ if (($cidcode >= 17506 && $cidcode <= 17600)
+ || $cidcode == 17605 ){
+ $width=0.5;
+ }
+ }
+ }
+ next if ($width==1.0 && defined($omitfw));
+
+ printf OUT "(CHARACTER H %X\n", $cidcode;
+ printf OUT " (CHARWD R %f)\n", $width;
+ print OUT " (MAP\n";
+ printf OUT " (SETCHAR H %X)\n", $cidcode;
+ if (($dir eq "v")&&($width!=1.0)){
+ $correction=1.0-$width;
+ printf OUT " (MOVERIGHT R -%f)\n", $correction;
+ }
+ print OUT " )\n";
+ print OUT " )\n";
+ }
+}
diff --git a/macros/jptex/latex/japanese-otf/src/umakeotf b/macros/jptex/latex/japanese-otf/src/umakeotf
index d675f106d2..bff6a2e29e 100755
--- a/macros/jptex/latex/japanese-otf/src/umakeotf
+++ b/macros/jptex/latex/japanese-otf/src/umakeotf
@@ -98,6 +98,10 @@ echo "making tfm for supplementary plane ..."
perl script/mktfm_sp.pl
echo "making vf for supplementary plane ..."
perl script/mkutfvf_sp.pl
+echo "making new tfm for CID ..."
+perl script/umkcidtfm.pl
+echo "making new vf for CID ..."
+perl script/umkcidvf.pl -omitfw
echo "finishing ..."
diff --git a/macros/jptex/latex/japanese-otf/sty/mlcid.sty b/macros/jptex/latex/japanese-otf/sty/mlcid.sty
index 4964b82d1a..aa2b9f3226 100644
--- a/macros/jptex/latex/japanese-otf/sty/mlcid.sty
+++ b/macros/jptex/latex/japanese-otf/sty/mlcid.sty
@@ -1,35 +1,130 @@
\NeedsTeXFormat{pLaTeX2e}
-\ProvidesPackage{mlcid}[2004/04/17 v1.0.2 psitau]
+\ProvidesPackage{mlcid}[2004/04/17 v1.0.2 psitau, u0.29 ttk]
%force catcode of \" be 12
\count@\catcode`\"
\catcode`\"=12
-\DeclareRobustCommand{\CIDK}[1]{\begingroup%
- \edef\reserved@a{\gtdefault}\ifx\k@family\reserved@a \kanjiseries{bx}\fi%
- \kanjifamily{cidk}\set@character=#1%
- \endgroup%
-}
-\DeclareRobustCommand{\CIDC}[1]{\begingroup%
- \edef\reserved@a{\gtdefault}\ifx\k@family\reserved@a \kanjiseries{bx}\fi%
- \kanjifamily{cidc}\set@character=#1%
- \endgroup%
-}
-\DeclareRobustCommand{\CIDT}[1]{\begingroup%
- \edef\reserved@a{\gtdefault}\ifx\k@family\reserved@a \kanjiseries{bx}\fi%
- \kanjifamily{cidt}\set@character=#1%
- \endgroup%
-}
+\if@otf@uplatex
+\if@deluxe
+ \DeclareRobustCommand{\CIDK}[1]{\begingroup%
+ \edef\reserved@a{\gtdefault}\edef\reserved@b{\mgdefault}%
+ \ifx\k@family\reserved@a \kanjifamily{cidkg}\else\ifx\k@family\reserved@b
+ \kanjifamily{cidkmg}\else\kanjifamily{cidk}\fi\fi%
+ \set@character@=#1%
+ \endgroup%
+ }
+ \DeclareRobustCommand{\CIDC}[1]{\begingroup%
+ \edef\reserved@a{\gtdefault}\edef\reserved@b{\mgdefault}%
+ \ifx\k@family\reserved@a \kanjifamily{cidcg}\else\ifx\k@family\reserved@b
+ \kanjifamily{cidcmg}\else\kanjifamily{cidc}\fi\fi%
+ \set@character@=#1%
+ \endgroup%
+ }
+ \DeclareRobustCommand{\CIDT}[1]{\begingroup%
+ \edef\reserved@a{\gtdefault}\edef\reserved@b{\mgdefault}%
+ \ifx\k@family\reserved@a \kanjifamily{cidtg}\else\ifx\k@family\reserved@b
+ \kanjifamily{cidtmg}\else\kanjifamily{cidt}\fi\fi%
+ \set@character@=#1%
+ \endgroup%
+ }
+\else
+ \DeclareRobustCommand{\CIDK}[1]{\begingroup%
+ \edef\reserved@a{\gtdefault}\ifx\k@family\reserved@a \kanjiseries{bx}\fi%
+ \kanjifamily{cidk}\set@character@=#1%
+ \endgroup%
+ }
+ \DeclareRobustCommand{\CIDC}[1]{\begingroup%
+ \edef\reserved@a{\gtdefault}\ifx\k@family\reserved@a \kanjiseries{bx}\fi%
+ \kanjifamily{cidc}\set@character@=#1%
+ \endgroup%
+ }
+ \DeclareRobustCommand{\CIDT}[1]{\begingroup%
+ \edef\reserved@a{\gtdefault}\ifx\k@family\reserved@a \kanjiseries{bx}\fi%
+ \kanjifamily{cidt}\set@character@=#1%
+ \endgroup%
+ }
+\fi
+\else% for pLaTeX
+ \DeclareRobustCommand{\CIDK}[1]{\begingroup%
+ \edef\reserved@a{\gtdefault}\ifx\k@family\reserved@a \kanjiseries{bx}\fi%
+ \kanjifamily{cidk}\set@character=#1%
+ \endgroup%
+ }
+ \DeclareRobustCommand{\CIDC}[1]{\begingroup%
+ \edef\reserved@a{\gtdefault}\ifx\k@family\reserved@a \kanjiseries{bx}\fi%
+ \kanjifamily{cidc}\set@character=#1%
+ \endgroup%
+ }
+ \DeclareRobustCommand{\CIDT}[1]{\begingroup%
+ \edef\reserved@a{\gtdefault}\ifx\k@family\reserved@a \kanjiseries{bx}\fi%
+ \kanjifamily{cidt}\set@character=#1%
+ \endgroup%
+ }
+\fi
\catcode`\"=\count@
%end of changing catcode of \"
\DeclareKanjiFamily{\otf@JYn}{cidk}{}
\DeclareKanjiFamily{\otf@JTn}{cidk}{}
-\Declare@FontShape{cidk}{m}{01234}{cidkmr}
-\Declare@FontShape{cidk}{bx}{01234}{cidkgr}
\DeclareKanjiFamily{\otf@JYn}{cidc}{}
\DeclareKanjiFamily{\otf@JTn}{cidc}{}
-\Declare@FontShape{cidc}{m}{01234567}{cidcmr}
-\Declare@FontShape{cidc}{bx}{01234567}{cidcgr}
\DeclareKanjiFamily{\otf@JYn}{cidt}{}
\DeclareKanjiFamily{\otf@JTn}{cidt}{}
-\Declare@FontShape{cidt}{m}{01234}{cidtmr}
-\Declare@FontShape{cidt}{bx}{01234}{cidtgr}
+\if@otf@uplatex
+ \Declare@FontShape{cidk}{m}{-}{cidkmr}
+ \Declare@FontShape{cidc}{m}{-}{cidcmr}
+ \Declare@FontShape{cidt}{m}{-}{cidtmr}
+ \if@deluxe
+ \Declare@FontShape{cidk}{bx}{-}{cidkmb}
+ \DeclareKanjiFamily{\otf@JYn}{cidkg}{}
+ \DeclareKanjiFamily{\otf@JTn}{cidkg}{}
+ \Declare@FontShape{cidkg}{m}{-}{cidkgr}
+ \Declare@FontShape{cidkg}{bx}{-}{cidkgb}
+ \Declare@FontShape{cidkg}{eb}{-}{cidkge}
+ \DeclareKanjiFamily{\otf@JYn}{cidkmg}{}
+ \DeclareKanjiFamily{\otf@JTn}{cidkmg}{}
+ \Declare@FontShape{cidkmg}{m}{-}{cidkmgr}
+ \Declare@FontShape{cidk}{l}{-}{cidkml}
+ \Declare@FontShape{cidc}{bx}{-}{cidcmb}
+ \DeclareKanjiFamily{\otf@JYn}{cidcg}{}
+ \DeclareKanjiFamily{\otf@JTn}{cidcg}{}
+ \Declare@FontShape{cidcg}{m}{-}{cidcgr}
+ \Declare@FontShape{cidcg}{bx}{-}{cidcgb}
+ \Declare@FontShape{cidcg}{eb}{-}{cidcge}
+ \DeclareKanjiFamily{\otf@JYn}{cidcmg}{}
+ \DeclareKanjiFamily{\otf@JTn}{cidcmg}{}
+ \Declare@FontShape{cidcmg}{m}{-}{cidcmgr}
+ \Declare@FontShape{cidc}{l}{-}{cidcml}
+ \Declare@FontShape{cidt}{bx}{-}{cidtmb}
+ \DeclareKanjiFamily{\otf@JYn}{cidtg}{}
+ \DeclareKanjiFamily{\otf@JTn}{cidtg}{}
+ \Declare@FontShape{cidtg}{m}{-}{cidtgr}
+ \Declare@FontShape{cidtg}{bx}{-}{cidtgb}
+ \Declare@FontShape{cidtg}{eb}{-}{cidtge}
+ \DeclareKanjiFamily{\otf@JYn}{cidtmg}{}
+ \DeclareKanjiFamily{\otf@JTn}{cidtmg}{}
+ \Declare@FontShape{cidtmg}{m}{-}{cidtmgr}
+ \Declare@FontShape{cidt}{l}{-}{cidtml}
+ \else
+ \if@bold
+ \Declare@FontShape{cidk}{bx}{-}{cidkgb}
+ \Declare@FontShape{cidc}{bx}{-}{cidcgb}
+ \Declare@FontShape{cidt}{bx}{-}{cidtgb}
+ \else
+ \Declare@FontShape{cidk}{bx}{-}{cidkgr}
+ \Declare@FontShape{cidc}{bx}{-}{cidcgr}
+ \Declare@FontShape{cidt}{bx}{-}{cidtgr}
+ \fi
+ \fi
+\else
+ \if@deluxe
+ \Declare@FontShape{cidk}{l}{01234}{cidkmr}
+ \Declare@FontShape{cidc}{l}{01234567}{cidcmr}
+ \Declare@FontShape{cidt}{l}{01234}{cidtmr}
+ \fi
+ \Declare@FontShape{cidk}{m}{01234}{cidkmr}
+ \Declare@FontShape{cidk}{bx}{01234}{cidkgr}
+ \Declare@FontShape{cidc}{m}{01234567}{cidcmr}
+ \Declare@FontShape{cidc}{bx}{01234567}{cidcgr}
+ \Declare@FontShape{cidt}{m}{01234}{cidtmr}
+ \Declare@FontShape{cidt}{bx}{01234}{cidtgr}
+\fi
\endinput
diff --git a/macros/jptex/latex/japanese-otf/sty/mlutf.sty b/macros/jptex/latex/japanese-otf/sty/mlutf.sty
index 28538d0d28..e777a9c398 100644
--- a/macros/jptex/latex/japanese-otf/sty/mlutf.sty
+++ b/macros/jptex/latex/japanese-otf/sty/mlutf.sty
@@ -1,5 +1,5 @@
\NeedsTeXFormat{pLaTeX2e}
-\ProvidesPackage{mlutf}[2004/04/17 v1.1.2 psitau, u0.28 ttk]
+\ProvidesPackage{mlutf}[2004/04/17 v1.1.2 psitau, u0.29 ttk]
%force catcode of \" be 12
\count@\catcode`\"
\catcode`\"=12
@@ -134,6 +134,11 @@
\fi
\fi
\else
+ \if@deluxe
+ \Declare@FontShape{utfk}{l}{0123456789abcdef}{utfkmr}
+ \Declare@FontShape{utfc}{l}{0123456789abcdefklmo}{utfcmr}
+ \Declare@FontShape{utft}{l}{0123456789abcdefklmnopqrstuvwxz}{utftmr}
+ \fi
\Declare@FontShape{utfk}{m}{0123456789abcdef}{utfkmr}
\Declare@FontShape{utfk}{bx}{0123456789abcdef}{utfkgr}
\Declare@FontShape{utfc}{m}{0123456789abcdefklmo}{utfcmr}
@@ -143,6 +148,9 @@
\fi
\DeclareKanjiFamily{\otf@JYn}{utf}{}
\DeclareKanjiFamily{\otf@JTn}{utf}{}
+\if@deluxe
+ \Declare@FontShape{utf}{l}{0123456789abcdefjklmnopqrstuvwxyz}{utfmr}
+\fi
\Declare@FontShape{utf}{m}{0123456789abcdefjklmnopqrstuvwxyz}{utfmr}
\Declare@FontShape{utf}{bx}{0123456789abcdefjklmnopqrstuvwxyz}{utfgr}
\endinput
diff --git a/macros/jptex/latex/japanese-otf/sty/otf.sty b/macros/jptex/latex/japanese-otf/sty/otf.sty
index 27ceb01d0d..39a2beaa90 100644
--- a/macros/jptex/latex/japanese-otf/sty/otf.sty
+++ b/macros/jptex/latex/japanese-otf/sty/otf.sty
@@ -1,8 +1,9 @@
\NeedsTeXFormat{pLaTeX2e}
-\ProvidesPackage{otf}[2023/02/23 TeX JP org, v1.7b8 psitau, u0.28 ttk]
+\ProvidesPackage{otf}[2023/06/25 TeX JP org, v1.7b8 psitau, u0.29 ttk]
\RequirePackage{keyval}
%for processing options
\newif\if@kana \@kanafalse
+\newif\if@ruby \@rubytrue
\newif\if@macro \@macrotrue
\newif\if@deluxe \@deluxefalse
\newif\if@replace \@replacetrue
@@ -16,6 +17,7 @@
\DeclareOption{nomacro}{\@macrofalse}
\DeclareOption{nomacros}{\@macrofalse}
\DeclareOption{noreplace}{\@replacefalse}
+\DeclareOption{noruby}{\@rubyfalse}
\DeclareOption{bold}{\@replacetrue\@boldtrue}
\DeclareOption{expert}{\@replacetrue\@kanatrue}
\DeclareOption{deluxe}{\@boldfalse\@replacetrue\@deluxetrue}
@@ -36,6 +38,7 @@
\def\otf@OTorT{\if@otf@uplatex T\else OT\fi}
\def\otf@pfx@{\if@otf@uplatex up\else \fi}
\def\brsg@pfx@{\if@burasage brsg\else\fi}
+\def\ruby@pfx@{\if@ruby ruby\else nml\fi}
\def\nlck@sfx@{\if@newglyph n\else\fi}
\ProcessOptions\relax
@@ -94,7 +97,8 @@
\edef\reserved@a{\gtdefault}\edef\reserved@b{\mgdefault}%
\ifx\k@family\reserved@a \kanjifamily{cidjg}\else\ifx\k@family\reserved@b
\kanjifamily{cidjmg}\else\kanjifamily{cidj}\fi\fi%
- \set@character=#1%
+% \set@character=#1% (1) pLaTeX, upLaTeXともに\CID{}に従来のsubfontを使う
+ \if@otf@uplatex\set@character@\else\set@character\fi=#1% (2) upLaTeXでは\CID{}に新vfを使う
\endgroup%
}
\else
@@ -107,7 +111,9 @@
}
\DeclareRobustCommand{\CID}[1]{\begingroup%
\edef\reserved@a{\gtdefault}\ifx\k@family\reserved@a \kanjiseries{bx}\fi%
- \kanjifamily{cidj}\set@character=#1%
+ \kanjifamily{cidj}%
+% \set@character=#1% (1) pLaTeX, upLaTeXともに\CID{}に従来のsubfontを使う
+ \if@otf@uplatex\set@character@\else\set@character\fi=#1% (2) upLaTeXでは\CID{}に新vfを使う
\endgroup%
}
\fi
@@ -251,11 +257,16 @@
\AtBeginDocument{\Redefine@UTF}
%internal macros
%macros by iNOUE Koich!
+\ifx\kanjishapeforce\@undefined
+ \let\otf@kanjishape\kanjishape
+\else
+ \let\otf@kanjishape\kanjishapeforce
+\fi
\newcommand\set@character{\afterassignment\put@character\@tempcnta}
\newcommand\put@character{%
\@tempcntb=\@tempcnta
\divide\@tempcntb by "1000
- \kanjishape{\ifcase\@tempcntb0\or1\or2\or3\or4\or5\or6\or7\or8\or9\or a\or b\or c\or d\or e\or f\or
+ \otf@kanjishape{\ifcase\@tempcntb0\or1\or2\or3\or4\or5\or6\or7\or8\or9\or a\or b\or c\or d\or e\or f\or
\or \or \or \or \or \or \or \or \or \or \or g\or \or h\or i\or j\or
k\or l\or m\or n\or o\or p\or q\or r\or s\or t\or u\or v\or w\or x\or y\or z\fi}%
\selectfont%
@@ -275,7 +286,7 @@
}
\newcommand\set@character@{\afterassignment\put@character@\@tempcnta}
\newcommand\put@character@{%
- \kanjishape{-}\selectfont%
+ \otf@kanjishape{-}\selectfont%
\kchar\@tempcnta%
}
\catcode`\"=\count@
@@ -364,8 +375,8 @@
\if@kana
\DeclareFontShape{\otf@JYn}{hmc}{m}{n}{<-> s * [\utf@sc@le] \otf@pfx@ \brsg@pfx@ expminr\nlck@sfx@-h}{}
\DeclareFontShape{\otf@JTn}{hmc}{m}{n}{<-> s * [\utf@sc@le] \otf@pfx@ \brsg@pfx@ expminr\nlck@sfx@-v}{}
- \DeclareFontShape{\otf@JYn}{ruby}{m}{n}{<-> s * [\utf@sc@le] \otf@pfx@ rubyminr-h}{}
- \DeclareFontShape{\otf@JTn}{ruby}{m}{n}{<-> s * [\utf@sc@le] \otf@pfx@ rubyminr-v}{}
+ \DeclareFontShape{\otf@JYn}{ruby}{m}{n}{<-> s * [\utf@sc@le] \otf@pfx@ \ruby@pfx@ minr-h}{}
+ \DeclareFontShape{\otf@JTn}{ruby}{m}{n}{<-> s * [\utf@sc@le] \otf@pfx@ \ruby@pfx@ minr-v}{}
\else
\if@replace
\DeclareFontShape{\otf@JYn}{hmc}{m}{n}{<-> s * [\utf@sc@le] \otf@pfx@ \brsg@pfx@ nmlminr\nlck@sfx@-h}{}
@@ -380,12 +391,12 @@
\DeclareFontShape{\otf@JTn}{hgt}{m}{n}{<-> s * [\utf@sc@le] \otf@pfx@ \brsg@pfx@ expgothr\nlck@sfx@-v}{}
\DeclareFontShape{\otf@JYn}{hgt}{bx}{n}{<-> s * [\utf@sc@le] \otf@pfx@ \brsg@pfx@ expgothb\nlck@sfx@-h}{}
\DeclareFontShape{\otf@JTn}{hgt}{bx}{n}{<-> s * [\utf@sc@le] \otf@pfx@ \brsg@pfx@ expgothb\nlck@sfx@-v}{}
- \DeclareFontShape{\otf@JYn}{ruby}{bx}{n}{<-> s * [\utf@sc@le] \otf@pfx@ rubyminb-h}{}
- \DeclareFontShape{\otf@JTn}{ruby}{bx}{n}{<-> s * [\utf@sc@le] \otf@pfx@ rubyminb-v}{}
- \DeclareFontShape{\otf@JYn}{rubyg}{m}{n}{<-> s * [\utf@sc@le] \otf@pfx@ rubygothr-h}{}
- \DeclareFontShape{\otf@JTn}{rubyg}{m}{n}{<-> s * [\utf@sc@le] \otf@pfx@ rubygothr-v}{}
- \DeclareFontShape{\otf@JYn}{rubyg}{bx}{n}{<-> s * [\utf@sc@le] \otf@pfx@ rubygothb-h}{}
- \DeclareFontShape{\otf@JTn}{rubyg}{bx}{n}{<-> s * [\utf@sc@le] \otf@pfx@ rubygothb-v}{}
+ \DeclareFontShape{\otf@JYn}{ruby}{bx}{n}{<-> s * [\utf@sc@le] \otf@pfx@ \ruby@pfx@ minb-h}{}
+ \DeclareFontShape{\otf@JTn}{ruby}{bx}{n}{<-> s * [\utf@sc@le] \otf@pfx@ \ruby@pfx@ minb-v}{}
+ \DeclareFontShape{\otf@JYn}{rubyg}{m}{n}{<-> s * [\utf@sc@le] \otf@pfx@ \ruby@pfx@ gothr-h}{}
+ \DeclareFontShape{\otf@JTn}{rubyg}{m}{n}{<-> s * [\utf@sc@le] \otf@pfx@ \ruby@pfx@ gothr-v}{}
+ \DeclareFontShape{\otf@JYn}{rubyg}{bx}{n}{<-> s * [\utf@sc@le] \otf@pfx@ \ruby@pfx@ gothb-h}{}
+ \DeclareFontShape{\otf@JTn}{rubyg}{bx}{n}{<-> s * [\utf@sc@le] \otf@pfx@ \ruby@pfx@ gothb-v}{}
\else
\DeclareFontShape{\otf@JYn}{hmc}{bx}{n}{<-> s * [\utf@sc@le] \otf@pfx@ \brsg@pfx@ nmlminb\nlck@sfx@-h}{}
\DeclareFontShape{\otf@JTn}{hmc}{bx}{n}{<-> s * [\utf@sc@le] \otf@pfx@ \brsg@pfx@ nmlminb\nlck@sfx@-v}{}
@@ -399,13 +410,13 @@
\if@bold
\DeclareFontShape{\otf@JYn}{hgt}{m}{n}{<-> s * [\utf@sc@le] \otf@pfx@ \brsg@pfx@ expgothb\nlck@sfx@-h}{}
\DeclareFontShape{\otf@JTn}{hgt}{m}{n}{<-> s * [\utf@sc@le] \otf@pfx@ \brsg@pfx@ expgothb\nlck@sfx@-v}{}
- \DeclareFontShape{\otf@JYn}{ruby}{bx}{n}{<-> s * [\utf@sc@le] \otf@pfx@ rubygothb-h}{}
- \DeclareFontShape{\otf@JTn}{ruby}{bx}{n}{<-> s * [\utf@sc@le] \otf@pfx@ rubygothb-v}{}
+ \DeclareFontShape{\otf@JYn}{ruby}{bx}{n}{<-> s * [\utf@sc@le] \otf@pfx@ \ruby@pfx@ gothb-h}{}
+ \DeclareFontShape{\otf@JTn}{ruby}{bx}{n}{<-> s * [\utf@sc@le] \otf@pfx@ \ruby@pfx@ gothb-v}{}
\else
\DeclareFontShape{\otf@JYn}{hgt}{m}{n}{<-> s * [\utf@sc@le] \otf@pfx@ \brsg@pfx@ expgothr\nlck@sfx@-h}{}
\DeclareFontShape{\otf@JTn}{hgt}{m}{n}{<-> s * [\utf@sc@le] \otf@pfx@ \brsg@pfx@ expgothr\nlck@sfx@-v}{}
- \DeclareFontShape{\otf@JYn}{ruby}{bx}{n}{<-> s * [\utf@sc@le] \otf@pfx@ rubygothr-h}{}
- \DeclareFontShape{\otf@JTn}{ruby}{bx}{n}{<-> s * [\utf@sc@le] \otf@pfx@ rubygothr-v}{}
+ \DeclareFontShape{\otf@JYn}{ruby}{bx}{n}{<-> s * [\utf@sc@le] \otf@pfx@ \ruby@pfx@ gothr-h}{}
+ \DeclareFontShape{\otf@JTn}{ruby}{bx}{n}{<-> s * [\utf@sc@le] \otf@pfx@ \ruby@pfx@ gothr-v}{}
\fi
\else
\if@bold
@@ -451,22 +462,22 @@
\if@kana
\DeclareFontShape{\otf@JYn}{mg}{m}{n}{<-> s * [\utf@sc@le] \otf@pfx@ \brsg@pfx@ expmgothr\nlck@sfx@-h}{}
\DeclareFontShape{\otf@JTn}{mg}{m}{n}{<-> s * [\utf@sc@le] \otf@pfx@ \brsg@pfx@ expmgothr\nlck@sfx@-v}{}
- \DeclareFontShape{\otf@JYn}{rubymg}{m}{n}{<-> s * [\utf@sc@le] \otf@pfx@ rubymgothr-h}{}
- \DeclareFontShape{\otf@JTn}{rubymg}{m}{n}{<-> s * [\utf@sc@le] \otf@pfx@ rubymgothr-v}{}
+ \DeclareFontShape{\otf@JYn}{rubymg}{m}{n}{<-> s * [\utf@sc@le] \otf@pfx@ \ruby@pfx@ mgothr-h}{}
+ \DeclareFontShape{\otf@JTn}{rubymg}{m}{n}{<-> s * [\utf@sc@le] \otf@pfx@ \ruby@pfx@ mgothr-v}{}
\DeclareFontShape{\otf@JYn}{hmc}{l}{n}{<-> s * [\utf@sc@le] \otf@pfx@ \brsg@pfx@ expminl\nlck@sfx@-h}{}
\DeclareFontShape{\otf@JTn}{hmc}{l}{n}{<-> s * [\utf@sc@le] \otf@pfx@ \brsg@pfx@ expminl\nlck@sfx@-v}{}
\DeclareFontShape{\otf@JYn}{hgt}{eb}{n}{<-> s * [\utf@sc@le] \otf@pfx@ \brsg@pfx@ expgotheb\nlck@sfx@-h}{}
\DeclareFontShape{\otf@JTn}{hgt}{eb}{n}{<-> s * [\utf@sc@le] \otf@pfx@ \brsg@pfx@ expgotheb\nlck@sfx@-v}{}
- \DeclareFontShape{\otf@JYn}{ruby}{l}{n}{<-> s * [\utf@sc@le] \otf@pfx@ rubyminl-h}{}
- \DeclareFontShape{\otf@JTn}{ruby}{l}{n}{<-> s * [\utf@sc@le] \otf@pfx@ rubyminl-v}{}
+ \DeclareFontShape{\otf@JYn}{ruby}{l}{n}{<-> s * [\utf@sc@le] \otf@pfx@ \ruby@pfx@ minl-h}{}
+ \DeclareFontShape{\otf@JTn}{ruby}{l}{n}{<-> s * [\utf@sc@le] \otf@pfx@ \ruby@pfx@ minl-v}{}
\else
\DeclareFontShape{\otf@JYn}{mg}{m}{n}{<-> s * [\utf@sc@le] \otf@pfx@ \brsg@pfx@ nmlmgothr\nlck@sfx@-h}{}
\DeclareFontShape{\otf@JTn}{mg}{m}{n}{<-> s * [\utf@sc@le] \otf@pfx@ \brsg@pfx@ nmlmgothr\nlck@sfx@-v}{}
- \DeclareFontShape{\otf@JYn}{hmc}{l}{n}{<-> s * [\utf@sc@le] \otf@pfx@ nmlminl\nlck@sfx@-h}{}
- \DeclareFontShape{\otf@JTn}{hmc}{l}{n}{<-> s * [\utf@sc@le] \otf@pfx@ nmlminl\nlck@sfx@-v}{}
+ \DeclareFontShape{\otf@JYn}{hmc}{l}{n}{<-> s * [\utf@sc@le] \otf@pfx@ \brsg@pfx@ nmlminl\nlck@sfx@-h}{}
+ \DeclareFontShape{\otf@JTn}{hmc}{l}{n}{<-> s * [\utf@sc@le] \otf@pfx@ \brsg@pfx@ nmlminl\nlck@sfx@-v}{}
+ \DeclareFontShape{\otf@JYn}{hgt}{eb}{n}{<-> s * [\utf@sc@le] \otf@pfx@ \brsg@pfx@ nmlgotheb\nlck@sfx@-h}{}
+ \DeclareFontShape{\otf@JTn}{hgt}{eb}{n}{<-> s * [\utf@sc@le] \otf@pfx@ \brsg@pfx@ nmlgotheb\nlck@sfx@-v}{}
\fi
- \DeclareFontShape{\otf@JYn}{hgt}{eb}{n}{<-> s * [\utf@sc@le] \otf@pfx@ \brsg@pfx@ nmlgotheb\nlck@sfx@-h}{}
- \DeclareFontShape{\otf@JTn}{hgt}{eb}{n}{<-> s * [\utf@sc@le] \otf@pfx@ \brsg@pfx@ nmlgotheb\nlck@sfx@-v}{}
\DeclareFontShape{\otf@JYn}{hmc}{m}{prp}{<-> s * [\utf@sc@le] \otf@pfx@ phiraminw3-h}{}
\DeclareFontShape{\otf@JYn}{hmc}{bx}{prp}{<-> s * [\utf@sc@le] \otf@pfx@ phiraminw6-h}{}
\DeclareFontShape{\otf@JYn}{hgt}{m}{prp}{<-> s * [\utf@sc@le] \otf@pfx@ phirakakuw3-h}{}
@@ -484,36 +495,36 @@
\DeclareKanjiFamily{\otf@JYn}{cidj}{}
\DeclareKanjiFamily{\otf@JTn}{cidj}{}
\Declare@FontShape{utfj}{m}{0123456789abcdefjklmnopqrstuvxyz-}{utfjmr\nlck@sfx@}
-\Declare@FontShape{cidj}{m}{012345}{cidjmr}
+\Declare@FontShape{cidj}{m}{012345-}{cidjmr}
%definition of other utf/cid fonts
\if@deluxe
\Declare@FontShape{utfj}{bx}{0123456789abcdefjklmnopqrstuvxyz-}{utfjmb\nlck@sfx@}
- \Declare@FontShape{cidj}{bx}{012345}{cidjmb}
+ \Declare@FontShape{cidj}{bx}{012345-}{cidjmb}
\DeclareKanjiFamily{\otf@JYn}{utfjg}{}
\DeclareKanjiFamily{\otf@JTn}{utfjg}{}
\DeclareKanjiFamily{\otf@JYn}{cidjg}{}
\DeclareKanjiFamily{\otf@JTn}{cidjg}{}
\Declare@FontShape{utfjg}{m}{0123456789abcdefjklmnopqrstuvxyz-}{utfjgr\nlck@sfx@}
- \Declare@FontShape{cidjg}{m}{012345}{cidjgr}
+ \Declare@FontShape{cidjg}{m}{012345-}{cidjgr}
\Declare@FontShape{utfjg}{bx}{0123456789abcdefjklmnopqrstuvxyz-}{utfjgb\nlck@sfx@}
- \Declare@FontShape{cidjg}{bx}{012345}{cidjgb}
+ \Declare@FontShape{cidjg}{bx}{012345-}{cidjgb}
\Declare@FontShape{utfjg}{eb}{0123456789abcdefjklmnopqrstuvxyz-}{utfjge\nlck@sfx@}
- \Declare@FontShape{cidjg}{eb}{012345}{cidjge}
+ \Declare@FontShape{cidjg}{eb}{012345-}{cidjge}
\DeclareKanjiFamily{\otf@JYn}{utfjmg}{}
\DeclareKanjiFamily{\otf@JTn}{utfjmg}{}
\DeclareKanjiFamily{\otf@JYn}{cidjmg}{}
\DeclareKanjiFamily{\otf@JTn}{cidjmg}{}
\Declare@FontShape{utfjmg}{m}{0123456789abcdefjklmnopqrstuvxyz-}{utfjmgr\nlck@sfx@}
- \Declare@FontShape{cidjmg}{m}{012345}{cidjmgr}
+ \Declare@FontShape{cidjmg}{m}{012345-}{cidjmgr}
\Declare@FontShape{utfj}{l}{0123456789abcdefjklmnopqrstuvxyz-}{utfjml\nlck@sfx@}
- \Declare@FontShape{cidj}{l}{012345}{cidjml}
+ \Declare@FontShape{cidj}{l}{012345-}{cidjml}
\else
\if@bold
\Declare@FontShape{utfj}{bx}{0123456789abcdefjklmnopqrstuvxyz-}{utfjgb\nlck@sfx@}
- \Declare@FontShape{cidj}{bx}{012345}{cidjgb}
+ \Declare@FontShape{cidj}{bx}{012345-}{cidjgb}
\else
\Declare@FontShape{utfj}{bx}{0123456789abcdefjklmnopqrstuvxyz-}{utfjgr\nlck@sfx@}
- \Declare@FontShape{cidj}{bx}{012345}{cidjgr}
+ \Declare@FontShape{cidj}{bx}{012345-}{cidjgr}
\fi
\fi
\if@macro
diff --git a/macros/jptex/latex/japanese-otf/tfm/cidcgb--h.tfm b/macros/jptex/latex/japanese-otf/tfm/cidcgb--h.tfm
new file mode 100644
index 0000000000..7605b9f219
--- /dev/null
+++ b/macros/jptex/latex/japanese-otf/tfm/cidcgb--h.tfm
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/tfm/cidcgb--v.tfm b/macros/jptex/latex/japanese-otf/tfm/cidcgb--v.tfm
new file mode 100644
index 0000000000..64e9b4547b
--- /dev/null
+++ b/macros/jptex/latex/japanese-otf/tfm/cidcgb--v.tfm
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/tfm/cidcge--h.tfm b/macros/jptex/latex/japanese-otf/tfm/cidcge--h.tfm
new file mode 100644
index 0000000000..7605b9f219
--- /dev/null
+++ b/macros/jptex/latex/japanese-otf/tfm/cidcge--h.tfm
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/tfm/cidcge--v.tfm b/macros/jptex/latex/japanese-otf/tfm/cidcge--v.tfm
new file mode 100644
index 0000000000..64e9b4547b
--- /dev/null
+++ b/macros/jptex/latex/japanese-otf/tfm/cidcge--v.tfm
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/tfm/cidcgr--h.tfm b/macros/jptex/latex/japanese-otf/tfm/cidcgr--h.tfm
new file mode 100644
index 0000000000..7605b9f219
--- /dev/null
+++ b/macros/jptex/latex/japanese-otf/tfm/cidcgr--h.tfm
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/tfm/cidcgr--v.tfm b/macros/jptex/latex/japanese-otf/tfm/cidcgr--v.tfm
new file mode 100644
index 0000000000..64e9b4547b
--- /dev/null
+++ b/macros/jptex/latex/japanese-otf/tfm/cidcgr--v.tfm
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/tfm/cidcmb--h.tfm b/macros/jptex/latex/japanese-otf/tfm/cidcmb--h.tfm
new file mode 100644
index 0000000000..7605b9f219
--- /dev/null
+++ b/macros/jptex/latex/japanese-otf/tfm/cidcmb--h.tfm
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/tfm/cidcmb--v.tfm b/macros/jptex/latex/japanese-otf/tfm/cidcmb--v.tfm
new file mode 100644
index 0000000000..64e9b4547b
--- /dev/null
+++ b/macros/jptex/latex/japanese-otf/tfm/cidcmb--v.tfm
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/tfm/cidcmgr--h.tfm b/macros/jptex/latex/japanese-otf/tfm/cidcmgr--h.tfm
new file mode 100644
index 0000000000..7605b9f219
--- /dev/null
+++ b/macros/jptex/latex/japanese-otf/tfm/cidcmgr--h.tfm
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/tfm/cidcmgr--v.tfm b/macros/jptex/latex/japanese-otf/tfm/cidcmgr--v.tfm
new file mode 100644
index 0000000000..64e9b4547b
--- /dev/null
+++ b/macros/jptex/latex/japanese-otf/tfm/cidcmgr--v.tfm
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/tfm/cidcml--h.tfm b/macros/jptex/latex/japanese-otf/tfm/cidcml--h.tfm
new file mode 100644
index 0000000000..7605b9f219
--- /dev/null
+++ b/macros/jptex/latex/japanese-otf/tfm/cidcml--h.tfm
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/tfm/cidcml--v.tfm b/macros/jptex/latex/japanese-otf/tfm/cidcml--v.tfm
new file mode 100644
index 0000000000..64e9b4547b
--- /dev/null
+++ b/macros/jptex/latex/japanese-otf/tfm/cidcml--v.tfm
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/tfm/cidcmr--h.tfm b/macros/jptex/latex/japanese-otf/tfm/cidcmr--h.tfm
new file mode 100644
index 0000000000..7605b9f219
--- /dev/null
+++ b/macros/jptex/latex/japanese-otf/tfm/cidcmr--h.tfm
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/tfm/cidcmr--v.tfm b/macros/jptex/latex/japanese-otf/tfm/cidcmr--v.tfm
new file mode 100644
index 0000000000..64e9b4547b
--- /dev/null
+++ b/macros/jptex/latex/japanese-otf/tfm/cidcmr--v.tfm
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/tfm/cidjgb--h.tfm b/macros/jptex/latex/japanese-otf/tfm/cidjgb--h.tfm
new file mode 100644
index 0000000000..f4b3c1de2f
--- /dev/null
+++ b/macros/jptex/latex/japanese-otf/tfm/cidjgb--h.tfm
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/tfm/cidjgb--v.tfm b/macros/jptex/latex/japanese-otf/tfm/cidjgb--v.tfm
new file mode 100644
index 0000000000..3a04d4a4ac
--- /dev/null
+++ b/macros/jptex/latex/japanese-otf/tfm/cidjgb--v.tfm
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/tfm/cidjge--h.tfm b/macros/jptex/latex/japanese-otf/tfm/cidjge--h.tfm
new file mode 100644
index 0000000000..f4b3c1de2f
--- /dev/null
+++ b/macros/jptex/latex/japanese-otf/tfm/cidjge--h.tfm
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/tfm/cidjge--v.tfm b/macros/jptex/latex/japanese-otf/tfm/cidjge--v.tfm
new file mode 100644
index 0000000000..3a04d4a4ac
--- /dev/null
+++ b/macros/jptex/latex/japanese-otf/tfm/cidjge--v.tfm
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/tfm/cidjgr--h.tfm b/macros/jptex/latex/japanese-otf/tfm/cidjgr--h.tfm
new file mode 100644
index 0000000000..f4b3c1de2f
--- /dev/null
+++ b/macros/jptex/latex/japanese-otf/tfm/cidjgr--h.tfm
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/tfm/cidjgr--v.tfm b/macros/jptex/latex/japanese-otf/tfm/cidjgr--v.tfm
new file mode 100644
index 0000000000..3a04d4a4ac
--- /dev/null
+++ b/macros/jptex/latex/japanese-otf/tfm/cidjgr--v.tfm
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/tfm/cidjmb--h.tfm b/macros/jptex/latex/japanese-otf/tfm/cidjmb--h.tfm
new file mode 100644
index 0000000000..f4b3c1de2f
--- /dev/null
+++ b/macros/jptex/latex/japanese-otf/tfm/cidjmb--h.tfm
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/tfm/cidjmb--v.tfm b/macros/jptex/latex/japanese-otf/tfm/cidjmb--v.tfm
new file mode 100644
index 0000000000..3a04d4a4ac
--- /dev/null
+++ b/macros/jptex/latex/japanese-otf/tfm/cidjmb--v.tfm
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/tfm/cidjmgr--h.tfm b/macros/jptex/latex/japanese-otf/tfm/cidjmgr--h.tfm
new file mode 100644
index 0000000000..f4b3c1de2f
--- /dev/null
+++ b/macros/jptex/latex/japanese-otf/tfm/cidjmgr--h.tfm
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/tfm/cidjmgr--v.tfm b/macros/jptex/latex/japanese-otf/tfm/cidjmgr--v.tfm
new file mode 100644
index 0000000000..3a04d4a4ac
--- /dev/null
+++ b/macros/jptex/latex/japanese-otf/tfm/cidjmgr--v.tfm
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/tfm/cidjml--h.tfm b/macros/jptex/latex/japanese-otf/tfm/cidjml--h.tfm
new file mode 100644
index 0000000000..f4b3c1de2f
--- /dev/null
+++ b/macros/jptex/latex/japanese-otf/tfm/cidjml--h.tfm
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/tfm/cidjml--v.tfm b/macros/jptex/latex/japanese-otf/tfm/cidjml--v.tfm
new file mode 100644
index 0000000000..3a04d4a4ac
--- /dev/null
+++ b/macros/jptex/latex/japanese-otf/tfm/cidjml--v.tfm
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/tfm/cidjmr--h.tfm b/macros/jptex/latex/japanese-otf/tfm/cidjmr--h.tfm
new file mode 100644
index 0000000000..f4b3c1de2f
--- /dev/null
+++ b/macros/jptex/latex/japanese-otf/tfm/cidjmr--h.tfm
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/tfm/cidjmr--v.tfm b/macros/jptex/latex/japanese-otf/tfm/cidjmr--v.tfm
new file mode 100644
index 0000000000..3a04d4a4ac
--- /dev/null
+++ b/macros/jptex/latex/japanese-otf/tfm/cidjmr--v.tfm
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/tfm/cidkgb--h.tfm b/macros/jptex/latex/japanese-otf/tfm/cidkgb--h.tfm
new file mode 100644
index 0000000000..2f6203d91e
--- /dev/null
+++ b/macros/jptex/latex/japanese-otf/tfm/cidkgb--h.tfm
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/tfm/cidkgb--v.tfm b/macros/jptex/latex/japanese-otf/tfm/cidkgb--v.tfm
new file mode 100644
index 0000000000..3ff9b70be6
--- /dev/null
+++ b/macros/jptex/latex/japanese-otf/tfm/cidkgb--v.tfm
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/tfm/cidkge--h.tfm b/macros/jptex/latex/japanese-otf/tfm/cidkge--h.tfm
new file mode 100644
index 0000000000..2f6203d91e
--- /dev/null
+++ b/macros/jptex/latex/japanese-otf/tfm/cidkge--h.tfm
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/tfm/cidkge--v.tfm b/macros/jptex/latex/japanese-otf/tfm/cidkge--v.tfm
new file mode 100644
index 0000000000..3ff9b70be6
--- /dev/null
+++ b/macros/jptex/latex/japanese-otf/tfm/cidkge--v.tfm
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/tfm/cidkgr--h.tfm b/macros/jptex/latex/japanese-otf/tfm/cidkgr--h.tfm
new file mode 100644
index 0000000000..2f6203d91e
--- /dev/null
+++ b/macros/jptex/latex/japanese-otf/tfm/cidkgr--h.tfm
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/tfm/cidkgr--v.tfm b/macros/jptex/latex/japanese-otf/tfm/cidkgr--v.tfm
new file mode 100644
index 0000000000..3ff9b70be6
--- /dev/null
+++ b/macros/jptex/latex/japanese-otf/tfm/cidkgr--v.tfm
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/tfm/cidkmb--h.tfm b/macros/jptex/latex/japanese-otf/tfm/cidkmb--h.tfm
new file mode 100644
index 0000000000..2f6203d91e
--- /dev/null
+++ b/macros/jptex/latex/japanese-otf/tfm/cidkmb--h.tfm
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/tfm/cidkmb--v.tfm b/macros/jptex/latex/japanese-otf/tfm/cidkmb--v.tfm
new file mode 100644
index 0000000000..3ff9b70be6
--- /dev/null
+++ b/macros/jptex/latex/japanese-otf/tfm/cidkmb--v.tfm
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/tfm/cidkmgr--h.tfm b/macros/jptex/latex/japanese-otf/tfm/cidkmgr--h.tfm
new file mode 100644
index 0000000000..2f6203d91e
--- /dev/null
+++ b/macros/jptex/latex/japanese-otf/tfm/cidkmgr--h.tfm
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/tfm/cidkmgr--v.tfm b/macros/jptex/latex/japanese-otf/tfm/cidkmgr--v.tfm
new file mode 100644
index 0000000000..3ff9b70be6
--- /dev/null
+++ b/macros/jptex/latex/japanese-otf/tfm/cidkmgr--v.tfm
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/tfm/cidkml--h.tfm b/macros/jptex/latex/japanese-otf/tfm/cidkml--h.tfm
new file mode 100644
index 0000000000..2f6203d91e
--- /dev/null
+++ b/macros/jptex/latex/japanese-otf/tfm/cidkml--h.tfm
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/tfm/cidkml--v.tfm b/macros/jptex/latex/japanese-otf/tfm/cidkml--v.tfm
new file mode 100644
index 0000000000..3ff9b70be6
--- /dev/null
+++ b/macros/jptex/latex/japanese-otf/tfm/cidkml--v.tfm
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/tfm/cidkmr--h.tfm b/macros/jptex/latex/japanese-otf/tfm/cidkmr--h.tfm
new file mode 100644
index 0000000000..2f6203d91e
--- /dev/null
+++ b/macros/jptex/latex/japanese-otf/tfm/cidkmr--h.tfm
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/tfm/cidkmr--v.tfm b/macros/jptex/latex/japanese-otf/tfm/cidkmr--v.tfm
new file mode 100644
index 0000000000..3ff9b70be6
--- /dev/null
+++ b/macros/jptex/latex/japanese-otf/tfm/cidkmr--v.tfm
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/tfm/cidtgb--h.tfm b/macros/jptex/latex/japanese-otf/tfm/cidtgb--h.tfm
new file mode 100644
index 0000000000..fb94aed19a
--- /dev/null
+++ b/macros/jptex/latex/japanese-otf/tfm/cidtgb--h.tfm
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/tfm/cidtgb--v.tfm b/macros/jptex/latex/japanese-otf/tfm/cidtgb--v.tfm
new file mode 100644
index 0000000000..fa31ee5a58
--- /dev/null
+++ b/macros/jptex/latex/japanese-otf/tfm/cidtgb--v.tfm
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/tfm/cidtge--h.tfm b/macros/jptex/latex/japanese-otf/tfm/cidtge--h.tfm
new file mode 100644
index 0000000000..fb94aed19a
--- /dev/null
+++ b/macros/jptex/latex/japanese-otf/tfm/cidtge--h.tfm
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/tfm/cidtge--v.tfm b/macros/jptex/latex/japanese-otf/tfm/cidtge--v.tfm
new file mode 100644
index 0000000000..fa31ee5a58
--- /dev/null
+++ b/macros/jptex/latex/japanese-otf/tfm/cidtge--v.tfm
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/tfm/cidtgr--h.tfm b/macros/jptex/latex/japanese-otf/tfm/cidtgr--h.tfm
new file mode 100644
index 0000000000..fb94aed19a
--- /dev/null
+++ b/macros/jptex/latex/japanese-otf/tfm/cidtgr--h.tfm
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/tfm/cidtgr--v.tfm b/macros/jptex/latex/japanese-otf/tfm/cidtgr--v.tfm
new file mode 100644
index 0000000000..fa31ee5a58
--- /dev/null
+++ b/macros/jptex/latex/japanese-otf/tfm/cidtgr--v.tfm
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/tfm/cidtmb--h.tfm b/macros/jptex/latex/japanese-otf/tfm/cidtmb--h.tfm
new file mode 100644
index 0000000000..fb94aed19a
--- /dev/null
+++ b/macros/jptex/latex/japanese-otf/tfm/cidtmb--h.tfm
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/tfm/cidtmb--v.tfm b/macros/jptex/latex/japanese-otf/tfm/cidtmb--v.tfm
new file mode 100644
index 0000000000..fa31ee5a58
--- /dev/null
+++ b/macros/jptex/latex/japanese-otf/tfm/cidtmb--v.tfm
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/tfm/cidtmgr--h.tfm b/macros/jptex/latex/japanese-otf/tfm/cidtmgr--h.tfm
new file mode 100644
index 0000000000..fb94aed19a
--- /dev/null
+++ b/macros/jptex/latex/japanese-otf/tfm/cidtmgr--h.tfm
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/tfm/cidtmgr--v.tfm b/macros/jptex/latex/japanese-otf/tfm/cidtmgr--v.tfm
new file mode 100644
index 0000000000..fa31ee5a58
--- /dev/null
+++ b/macros/jptex/latex/japanese-otf/tfm/cidtmgr--v.tfm
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/tfm/cidtml--h.tfm b/macros/jptex/latex/japanese-otf/tfm/cidtml--h.tfm
new file mode 100644
index 0000000000..fb94aed19a
--- /dev/null
+++ b/macros/jptex/latex/japanese-otf/tfm/cidtml--h.tfm
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/tfm/cidtml--v.tfm b/macros/jptex/latex/japanese-otf/tfm/cidtml--v.tfm
new file mode 100644
index 0000000000..fa31ee5a58
--- /dev/null
+++ b/macros/jptex/latex/japanese-otf/tfm/cidtml--v.tfm
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/tfm/cidtmr--h.tfm b/macros/jptex/latex/japanese-otf/tfm/cidtmr--h.tfm
new file mode 100644
index 0000000000..fb94aed19a
--- /dev/null
+++ b/macros/jptex/latex/japanese-otf/tfm/cidtmr--h.tfm
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/tfm/cidtmr--v.tfm b/macros/jptex/latex/japanese-otf/tfm/cidtmr--v.tfm
new file mode 100644
index 0000000000..fa31ee5a58
--- /dev/null
+++ b/macros/jptex/latex/japanese-otf/tfm/cidtmr--v.tfm
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/tfm/otf-ccgb-h.tfm b/macros/jptex/latex/japanese-otf/tfm/otf-ccgb-h.tfm
new file mode 100644
index 0000000000..cfa40c9ac0
--- /dev/null
+++ b/macros/jptex/latex/japanese-otf/tfm/otf-ccgb-h.tfm
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/tfm/otf-ccgb-v.tfm b/macros/jptex/latex/japanese-otf/tfm/otf-ccgb-v.tfm
new file mode 100644
index 0000000000..d9dc883031
--- /dev/null
+++ b/macros/jptex/latex/japanese-otf/tfm/otf-ccgb-v.tfm
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/tfm/otf-ccge-h.tfm b/macros/jptex/latex/japanese-otf/tfm/otf-ccge-h.tfm
new file mode 100644
index 0000000000..cfa40c9ac0
--- /dev/null
+++ b/macros/jptex/latex/japanese-otf/tfm/otf-ccge-h.tfm
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/tfm/otf-ccge-v.tfm b/macros/jptex/latex/japanese-otf/tfm/otf-ccge-v.tfm
new file mode 100644
index 0000000000..d9dc883031
--- /dev/null
+++ b/macros/jptex/latex/japanese-otf/tfm/otf-ccge-v.tfm
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/tfm/otf-ccgr-h.tfm b/macros/jptex/latex/japanese-otf/tfm/otf-ccgr-h.tfm
index 1db09ae81c..cfa40c9ac0 100644
--- a/macros/jptex/latex/japanese-otf/tfm/otf-ccgr-h.tfm
+++ b/macros/jptex/latex/japanese-otf/tfm/otf-ccgr-h.tfm
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/tfm/otf-ccgr-v.tfm b/macros/jptex/latex/japanese-otf/tfm/otf-ccgr-v.tfm
index dddd977640..d9dc883031 100644
--- a/macros/jptex/latex/japanese-otf/tfm/otf-ccgr-v.tfm
+++ b/macros/jptex/latex/japanese-otf/tfm/otf-ccgr-v.tfm
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/tfm/otf-ccmb-h.tfm b/macros/jptex/latex/japanese-otf/tfm/otf-ccmb-h.tfm
new file mode 100644
index 0000000000..cfa40c9ac0
--- /dev/null
+++ b/macros/jptex/latex/japanese-otf/tfm/otf-ccmb-h.tfm
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/tfm/otf-ccmb-v.tfm b/macros/jptex/latex/japanese-otf/tfm/otf-ccmb-v.tfm
new file mode 100644
index 0000000000..d9dc883031
--- /dev/null
+++ b/macros/jptex/latex/japanese-otf/tfm/otf-ccmb-v.tfm
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/tfm/otf-ccmgr-h.tfm b/macros/jptex/latex/japanese-otf/tfm/otf-ccmgr-h.tfm
new file mode 100644
index 0000000000..cfa40c9ac0
--- /dev/null
+++ b/macros/jptex/latex/japanese-otf/tfm/otf-ccmgr-h.tfm
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/tfm/otf-ccmgr-v.tfm b/macros/jptex/latex/japanese-otf/tfm/otf-ccmgr-v.tfm
new file mode 100644
index 0000000000..d9dc883031
--- /dev/null
+++ b/macros/jptex/latex/japanese-otf/tfm/otf-ccmgr-v.tfm
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/tfm/otf-ccml-h.tfm b/macros/jptex/latex/japanese-otf/tfm/otf-ccml-h.tfm
new file mode 100644
index 0000000000..cfa40c9ac0
--- /dev/null
+++ b/macros/jptex/latex/japanese-otf/tfm/otf-ccml-h.tfm
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/tfm/otf-ccml-v.tfm b/macros/jptex/latex/japanese-otf/tfm/otf-ccml-v.tfm
new file mode 100644
index 0000000000..d9dc883031
--- /dev/null
+++ b/macros/jptex/latex/japanese-otf/tfm/otf-ccml-v.tfm
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/tfm/otf-ccmr-h.tfm b/macros/jptex/latex/japanese-otf/tfm/otf-ccmr-h.tfm
index 1db09ae81c..cfa40c9ac0 100644
--- a/macros/jptex/latex/japanese-otf/tfm/otf-ccmr-h.tfm
+++ b/macros/jptex/latex/japanese-otf/tfm/otf-ccmr-h.tfm
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/tfm/otf-ccmr-v.tfm b/macros/jptex/latex/japanese-otf/tfm/otf-ccmr-v.tfm
index dddd977640..d9dc883031 100644
--- a/macros/jptex/latex/japanese-otf/tfm/otf-ccmr-v.tfm
+++ b/macros/jptex/latex/japanese-otf/tfm/otf-ccmr-v.tfm
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/tfm/otf-cjgb-h.tfm b/macros/jptex/latex/japanese-otf/tfm/otf-cjgb-h.tfm
index 1db09ae81c..0c6f24cf76 100644
--- a/macros/jptex/latex/japanese-otf/tfm/otf-cjgb-h.tfm
+++ b/macros/jptex/latex/japanese-otf/tfm/otf-cjgb-h.tfm
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/tfm/otf-cjgb-v.tfm b/macros/jptex/latex/japanese-otf/tfm/otf-cjgb-v.tfm
index dddd977640..2ae4bdcc90 100644
--- a/macros/jptex/latex/japanese-otf/tfm/otf-cjgb-v.tfm
+++ b/macros/jptex/latex/japanese-otf/tfm/otf-cjgb-v.tfm
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/tfm/otf-cjge-h.tfm b/macros/jptex/latex/japanese-otf/tfm/otf-cjge-h.tfm
index 1db09ae81c..0c6f24cf76 100644
--- a/macros/jptex/latex/japanese-otf/tfm/otf-cjge-h.tfm
+++ b/macros/jptex/latex/japanese-otf/tfm/otf-cjge-h.tfm
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/tfm/otf-cjge-v.tfm b/macros/jptex/latex/japanese-otf/tfm/otf-cjge-v.tfm
index dddd977640..2ae4bdcc90 100644
--- a/macros/jptex/latex/japanese-otf/tfm/otf-cjge-v.tfm
+++ b/macros/jptex/latex/japanese-otf/tfm/otf-cjge-v.tfm
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/tfm/otf-cjgr-h.tfm b/macros/jptex/latex/japanese-otf/tfm/otf-cjgr-h.tfm
index 1db09ae81c..0c6f24cf76 100644
--- a/macros/jptex/latex/japanese-otf/tfm/otf-cjgr-h.tfm
+++ b/macros/jptex/latex/japanese-otf/tfm/otf-cjgr-h.tfm
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/tfm/otf-cjgr-v.tfm b/macros/jptex/latex/japanese-otf/tfm/otf-cjgr-v.tfm
index dddd977640..2ae4bdcc90 100644
--- a/macros/jptex/latex/japanese-otf/tfm/otf-cjgr-v.tfm
+++ b/macros/jptex/latex/japanese-otf/tfm/otf-cjgr-v.tfm
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/tfm/otf-cjmb-h.tfm b/macros/jptex/latex/japanese-otf/tfm/otf-cjmb-h.tfm
index 1db09ae81c..0c6f24cf76 100644
--- a/macros/jptex/latex/japanese-otf/tfm/otf-cjmb-h.tfm
+++ b/macros/jptex/latex/japanese-otf/tfm/otf-cjmb-h.tfm
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/tfm/otf-cjmb-v.tfm b/macros/jptex/latex/japanese-otf/tfm/otf-cjmb-v.tfm
index dddd977640..2ae4bdcc90 100644
--- a/macros/jptex/latex/japanese-otf/tfm/otf-cjmb-v.tfm
+++ b/macros/jptex/latex/japanese-otf/tfm/otf-cjmb-v.tfm
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/tfm/otf-cjmgr-h.tfm b/macros/jptex/latex/japanese-otf/tfm/otf-cjmgr-h.tfm
index 1db09ae81c..0c6f24cf76 100644
--- a/macros/jptex/latex/japanese-otf/tfm/otf-cjmgr-h.tfm
+++ b/macros/jptex/latex/japanese-otf/tfm/otf-cjmgr-h.tfm
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/tfm/otf-cjmgr-v.tfm b/macros/jptex/latex/japanese-otf/tfm/otf-cjmgr-v.tfm
index dddd977640..2ae4bdcc90 100644
--- a/macros/jptex/latex/japanese-otf/tfm/otf-cjmgr-v.tfm
+++ b/macros/jptex/latex/japanese-otf/tfm/otf-cjmgr-v.tfm
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/tfm/otf-cjml-h.tfm b/macros/jptex/latex/japanese-otf/tfm/otf-cjml-h.tfm
index 1db09ae81c..0c6f24cf76 100644
--- a/macros/jptex/latex/japanese-otf/tfm/otf-cjml-h.tfm
+++ b/macros/jptex/latex/japanese-otf/tfm/otf-cjml-h.tfm
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/tfm/otf-cjml-v.tfm b/macros/jptex/latex/japanese-otf/tfm/otf-cjml-v.tfm
index dddd977640..2ae4bdcc90 100644
--- a/macros/jptex/latex/japanese-otf/tfm/otf-cjml-v.tfm
+++ b/macros/jptex/latex/japanese-otf/tfm/otf-cjml-v.tfm
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/tfm/otf-cjmr-h.tfm b/macros/jptex/latex/japanese-otf/tfm/otf-cjmr-h.tfm
index 1db09ae81c..0c6f24cf76 100644
--- a/macros/jptex/latex/japanese-otf/tfm/otf-cjmr-h.tfm
+++ b/macros/jptex/latex/japanese-otf/tfm/otf-cjmr-h.tfm
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/tfm/otf-cjmr-v.tfm b/macros/jptex/latex/japanese-otf/tfm/otf-cjmr-v.tfm
index dddd977640..2ae4bdcc90 100644
--- a/macros/jptex/latex/japanese-otf/tfm/otf-cjmr-v.tfm
+++ b/macros/jptex/latex/japanese-otf/tfm/otf-cjmr-v.tfm
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/tfm/otf-ckgb-h.tfm b/macros/jptex/latex/japanese-otf/tfm/otf-ckgb-h.tfm
new file mode 100644
index 0000000000..20e9930b14
--- /dev/null
+++ b/macros/jptex/latex/japanese-otf/tfm/otf-ckgb-h.tfm
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/tfm/otf-ckgb-v.tfm b/macros/jptex/latex/japanese-otf/tfm/otf-ckgb-v.tfm
new file mode 100644
index 0000000000..d06466621d
--- /dev/null
+++ b/macros/jptex/latex/japanese-otf/tfm/otf-ckgb-v.tfm
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/tfm/otf-ckge-h.tfm b/macros/jptex/latex/japanese-otf/tfm/otf-ckge-h.tfm
new file mode 100644
index 0000000000..20e9930b14
--- /dev/null
+++ b/macros/jptex/latex/japanese-otf/tfm/otf-ckge-h.tfm
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/tfm/otf-ckge-v.tfm b/macros/jptex/latex/japanese-otf/tfm/otf-ckge-v.tfm
new file mode 100644
index 0000000000..d06466621d
--- /dev/null
+++ b/macros/jptex/latex/japanese-otf/tfm/otf-ckge-v.tfm
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/tfm/otf-ckgr-h.tfm b/macros/jptex/latex/japanese-otf/tfm/otf-ckgr-h.tfm
index 1db09ae81c..20e9930b14 100644
--- a/macros/jptex/latex/japanese-otf/tfm/otf-ckgr-h.tfm
+++ b/macros/jptex/latex/japanese-otf/tfm/otf-ckgr-h.tfm
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/tfm/otf-ckgr-v.tfm b/macros/jptex/latex/japanese-otf/tfm/otf-ckgr-v.tfm
index dddd977640..d06466621d 100644
--- a/macros/jptex/latex/japanese-otf/tfm/otf-ckgr-v.tfm
+++ b/macros/jptex/latex/japanese-otf/tfm/otf-ckgr-v.tfm
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/tfm/otf-ckmb-h.tfm b/macros/jptex/latex/japanese-otf/tfm/otf-ckmb-h.tfm
new file mode 100644
index 0000000000..20e9930b14
--- /dev/null
+++ b/macros/jptex/latex/japanese-otf/tfm/otf-ckmb-h.tfm
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/tfm/otf-ckmb-v.tfm b/macros/jptex/latex/japanese-otf/tfm/otf-ckmb-v.tfm
new file mode 100644
index 0000000000..d06466621d
--- /dev/null
+++ b/macros/jptex/latex/japanese-otf/tfm/otf-ckmb-v.tfm
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/tfm/otf-ckmgr-h.tfm b/macros/jptex/latex/japanese-otf/tfm/otf-ckmgr-h.tfm
new file mode 100644
index 0000000000..20e9930b14
--- /dev/null
+++ b/macros/jptex/latex/japanese-otf/tfm/otf-ckmgr-h.tfm
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/tfm/otf-ckmgr-v.tfm b/macros/jptex/latex/japanese-otf/tfm/otf-ckmgr-v.tfm
new file mode 100644
index 0000000000..d06466621d
--- /dev/null
+++ b/macros/jptex/latex/japanese-otf/tfm/otf-ckmgr-v.tfm
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/tfm/otf-ckml-h.tfm b/macros/jptex/latex/japanese-otf/tfm/otf-ckml-h.tfm
new file mode 100644
index 0000000000..20e9930b14
--- /dev/null
+++ b/macros/jptex/latex/japanese-otf/tfm/otf-ckml-h.tfm
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/tfm/otf-ckml-v.tfm b/macros/jptex/latex/japanese-otf/tfm/otf-ckml-v.tfm
new file mode 100644
index 0000000000..d06466621d
--- /dev/null
+++ b/macros/jptex/latex/japanese-otf/tfm/otf-ckml-v.tfm
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/tfm/otf-ckmr-h.tfm b/macros/jptex/latex/japanese-otf/tfm/otf-ckmr-h.tfm
index 1db09ae81c..20e9930b14 100644
--- a/macros/jptex/latex/japanese-otf/tfm/otf-ckmr-h.tfm
+++ b/macros/jptex/latex/japanese-otf/tfm/otf-ckmr-h.tfm
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/tfm/otf-ckmr-v.tfm b/macros/jptex/latex/japanese-otf/tfm/otf-ckmr-v.tfm
index dddd977640..d06466621d 100644
--- a/macros/jptex/latex/japanese-otf/tfm/otf-ckmr-v.tfm
+++ b/macros/jptex/latex/japanese-otf/tfm/otf-ckmr-v.tfm
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/tfm/otf-ctgb-h.tfm b/macros/jptex/latex/japanese-otf/tfm/otf-ctgb-h.tfm
new file mode 100644
index 0000000000..687d522a70
--- /dev/null
+++ b/macros/jptex/latex/japanese-otf/tfm/otf-ctgb-h.tfm
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/tfm/otf-ctgb-v.tfm b/macros/jptex/latex/japanese-otf/tfm/otf-ctgb-v.tfm
new file mode 100644
index 0000000000..7a530891fa
--- /dev/null
+++ b/macros/jptex/latex/japanese-otf/tfm/otf-ctgb-v.tfm
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/tfm/otf-ctge-h.tfm b/macros/jptex/latex/japanese-otf/tfm/otf-ctge-h.tfm
new file mode 100644
index 0000000000..687d522a70
--- /dev/null
+++ b/macros/jptex/latex/japanese-otf/tfm/otf-ctge-h.tfm
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/tfm/otf-ctge-v.tfm b/macros/jptex/latex/japanese-otf/tfm/otf-ctge-v.tfm
new file mode 100644
index 0000000000..7a530891fa
--- /dev/null
+++ b/macros/jptex/latex/japanese-otf/tfm/otf-ctge-v.tfm
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/tfm/otf-ctgr-h.tfm b/macros/jptex/latex/japanese-otf/tfm/otf-ctgr-h.tfm
index 1db09ae81c..687d522a70 100644
--- a/macros/jptex/latex/japanese-otf/tfm/otf-ctgr-h.tfm
+++ b/macros/jptex/latex/japanese-otf/tfm/otf-ctgr-h.tfm
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/tfm/otf-ctgr-v.tfm b/macros/jptex/latex/japanese-otf/tfm/otf-ctgr-v.tfm
index dddd977640..7a530891fa 100644
--- a/macros/jptex/latex/japanese-otf/tfm/otf-ctgr-v.tfm
+++ b/macros/jptex/latex/japanese-otf/tfm/otf-ctgr-v.tfm
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/tfm/otf-ctmb-h.tfm b/macros/jptex/latex/japanese-otf/tfm/otf-ctmb-h.tfm
new file mode 100644
index 0000000000..687d522a70
--- /dev/null
+++ b/macros/jptex/latex/japanese-otf/tfm/otf-ctmb-h.tfm
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/tfm/otf-ctmb-v.tfm b/macros/jptex/latex/japanese-otf/tfm/otf-ctmb-v.tfm
new file mode 100644
index 0000000000..7a530891fa
--- /dev/null
+++ b/macros/jptex/latex/japanese-otf/tfm/otf-ctmb-v.tfm
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/tfm/otf-ctmgr-h.tfm b/macros/jptex/latex/japanese-otf/tfm/otf-ctmgr-h.tfm
new file mode 100644
index 0000000000..687d522a70
--- /dev/null
+++ b/macros/jptex/latex/japanese-otf/tfm/otf-ctmgr-h.tfm
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/tfm/otf-ctmgr-v.tfm b/macros/jptex/latex/japanese-otf/tfm/otf-ctmgr-v.tfm
new file mode 100644
index 0000000000..7a530891fa
--- /dev/null
+++ b/macros/jptex/latex/japanese-otf/tfm/otf-ctmgr-v.tfm
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/tfm/otf-ctml-h.tfm b/macros/jptex/latex/japanese-otf/tfm/otf-ctml-h.tfm
new file mode 100644
index 0000000000..687d522a70
--- /dev/null
+++ b/macros/jptex/latex/japanese-otf/tfm/otf-ctml-h.tfm
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/tfm/otf-ctml-v.tfm b/macros/jptex/latex/japanese-otf/tfm/otf-ctml-v.tfm
new file mode 100644
index 0000000000..7a530891fa
--- /dev/null
+++ b/macros/jptex/latex/japanese-otf/tfm/otf-ctml-v.tfm
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/tfm/otf-ctmr-h.tfm b/macros/jptex/latex/japanese-otf/tfm/otf-ctmr-h.tfm
index 1db09ae81c..687d522a70 100644
--- a/macros/jptex/latex/japanese-otf/tfm/otf-ctmr-h.tfm
+++ b/macros/jptex/latex/japanese-otf/tfm/otf-ctmr-h.tfm
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/tfm/otf-ctmr-v.tfm b/macros/jptex/latex/japanese-otf/tfm/otf-ctmr-v.tfm
index dddd977640..7a530891fa 100644
--- a/macros/jptex/latex/japanese-otf/tfm/otf-ctmr-v.tfm
+++ b/macros/jptex/latex/japanese-otf/tfm/otf-ctmr-v.tfm
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/vf/cidcgb--h.vf b/macros/jptex/latex/japanese-otf/vf/cidcgb--h.vf
new file mode 100644
index 0000000000..92a25eb7a0
--- /dev/null
+++ b/macros/jptex/latex/japanese-otf/vf/cidcgb--h.vf
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/vf/cidcgb--v.vf b/macros/jptex/latex/japanese-otf/vf/cidcgb--v.vf
new file mode 100644
index 0000000000..692fe41fd9
--- /dev/null
+++ b/macros/jptex/latex/japanese-otf/vf/cidcgb--v.vf
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/vf/cidcge--h.vf b/macros/jptex/latex/japanese-otf/vf/cidcge--h.vf
new file mode 100644
index 0000000000..e5442bb2cb
--- /dev/null
+++ b/macros/jptex/latex/japanese-otf/vf/cidcge--h.vf
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/vf/cidcge--v.vf b/macros/jptex/latex/japanese-otf/vf/cidcge--v.vf
new file mode 100644
index 0000000000..f662d182b7
--- /dev/null
+++ b/macros/jptex/latex/japanese-otf/vf/cidcge--v.vf
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/vf/cidcgr--h.vf b/macros/jptex/latex/japanese-otf/vf/cidcgr--h.vf
new file mode 100644
index 0000000000..c78ea3f306
--- /dev/null
+++ b/macros/jptex/latex/japanese-otf/vf/cidcgr--h.vf
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/vf/cidcgr--v.vf b/macros/jptex/latex/japanese-otf/vf/cidcgr--v.vf
new file mode 100644
index 0000000000..243fded67c
--- /dev/null
+++ b/macros/jptex/latex/japanese-otf/vf/cidcgr--v.vf
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/vf/cidcmb--h.vf b/macros/jptex/latex/japanese-otf/vf/cidcmb--h.vf
new file mode 100644
index 0000000000..1eddf2c77a
--- /dev/null
+++ b/macros/jptex/latex/japanese-otf/vf/cidcmb--h.vf
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/vf/cidcmb--v.vf b/macros/jptex/latex/japanese-otf/vf/cidcmb--v.vf
new file mode 100644
index 0000000000..13e9ca7851
--- /dev/null
+++ b/macros/jptex/latex/japanese-otf/vf/cidcmb--v.vf
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/vf/cidcmgr--h.vf b/macros/jptex/latex/japanese-otf/vf/cidcmgr--h.vf
new file mode 100644
index 0000000000..189ba2befb
--- /dev/null
+++ b/macros/jptex/latex/japanese-otf/vf/cidcmgr--h.vf
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/vf/cidcmgr--v.vf b/macros/jptex/latex/japanese-otf/vf/cidcmgr--v.vf
new file mode 100644
index 0000000000..6117ee4323
--- /dev/null
+++ b/macros/jptex/latex/japanese-otf/vf/cidcmgr--v.vf
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/vf/cidcml--h.vf b/macros/jptex/latex/japanese-otf/vf/cidcml--h.vf
new file mode 100644
index 0000000000..060175d773
--- /dev/null
+++ b/macros/jptex/latex/japanese-otf/vf/cidcml--h.vf
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/vf/cidcml--v.vf b/macros/jptex/latex/japanese-otf/vf/cidcml--v.vf
new file mode 100644
index 0000000000..23a6ffb1aa
--- /dev/null
+++ b/macros/jptex/latex/japanese-otf/vf/cidcml--v.vf
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/vf/cidcmr--h.vf b/macros/jptex/latex/japanese-otf/vf/cidcmr--h.vf
new file mode 100644
index 0000000000..bc78829bf9
--- /dev/null
+++ b/macros/jptex/latex/japanese-otf/vf/cidcmr--h.vf
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/vf/cidcmr--v.vf b/macros/jptex/latex/japanese-otf/vf/cidcmr--v.vf
new file mode 100644
index 0000000000..f84172b154
--- /dev/null
+++ b/macros/jptex/latex/japanese-otf/vf/cidcmr--v.vf
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/vf/cidjgb--h.vf b/macros/jptex/latex/japanese-otf/vf/cidjgb--h.vf
new file mode 100644
index 0000000000..1da0b6e9df
--- /dev/null
+++ b/macros/jptex/latex/japanese-otf/vf/cidjgb--h.vf
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/vf/cidjgb--v.vf b/macros/jptex/latex/japanese-otf/vf/cidjgb--v.vf
new file mode 100644
index 0000000000..81f426677f
--- /dev/null
+++ b/macros/jptex/latex/japanese-otf/vf/cidjgb--v.vf
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/vf/cidjge--h.vf b/macros/jptex/latex/japanese-otf/vf/cidjge--h.vf
new file mode 100644
index 0000000000..731b1834c8
--- /dev/null
+++ b/macros/jptex/latex/japanese-otf/vf/cidjge--h.vf
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/vf/cidjge--v.vf b/macros/jptex/latex/japanese-otf/vf/cidjge--v.vf
new file mode 100644
index 0000000000..e05129a02e
--- /dev/null
+++ b/macros/jptex/latex/japanese-otf/vf/cidjge--v.vf
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/vf/cidjgr--h.vf b/macros/jptex/latex/japanese-otf/vf/cidjgr--h.vf
new file mode 100644
index 0000000000..a2b46fc0a3
--- /dev/null
+++ b/macros/jptex/latex/japanese-otf/vf/cidjgr--h.vf
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/vf/cidjgr--v.vf b/macros/jptex/latex/japanese-otf/vf/cidjgr--v.vf
new file mode 100644
index 0000000000..c0490889e4
--- /dev/null
+++ b/macros/jptex/latex/japanese-otf/vf/cidjgr--v.vf
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/vf/cidjmb--h.vf b/macros/jptex/latex/japanese-otf/vf/cidjmb--h.vf
new file mode 100644
index 0000000000..70801b959d
--- /dev/null
+++ b/macros/jptex/latex/japanese-otf/vf/cidjmb--h.vf
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/vf/cidjmb--v.vf b/macros/jptex/latex/japanese-otf/vf/cidjmb--v.vf
new file mode 100644
index 0000000000..e918131273
--- /dev/null
+++ b/macros/jptex/latex/japanese-otf/vf/cidjmb--v.vf
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/vf/cidjmgr--h.vf b/macros/jptex/latex/japanese-otf/vf/cidjmgr--h.vf
new file mode 100644
index 0000000000..4d8f8faa66
--- /dev/null
+++ b/macros/jptex/latex/japanese-otf/vf/cidjmgr--h.vf
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/vf/cidjmgr--v.vf b/macros/jptex/latex/japanese-otf/vf/cidjmgr--v.vf
new file mode 100644
index 0000000000..3b59600cc2
--- /dev/null
+++ b/macros/jptex/latex/japanese-otf/vf/cidjmgr--v.vf
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/vf/cidjml--h.vf b/macros/jptex/latex/japanese-otf/vf/cidjml--h.vf
new file mode 100644
index 0000000000..fd392f241a
--- /dev/null
+++ b/macros/jptex/latex/japanese-otf/vf/cidjml--h.vf
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/vf/cidjml--v.vf b/macros/jptex/latex/japanese-otf/vf/cidjml--v.vf
new file mode 100644
index 0000000000..168fc87374
--- /dev/null
+++ b/macros/jptex/latex/japanese-otf/vf/cidjml--v.vf
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/vf/cidjmr--h.vf b/macros/jptex/latex/japanese-otf/vf/cidjmr--h.vf
new file mode 100644
index 0000000000..74be8004db
--- /dev/null
+++ b/macros/jptex/latex/japanese-otf/vf/cidjmr--h.vf
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/vf/cidjmr--v.vf b/macros/jptex/latex/japanese-otf/vf/cidjmr--v.vf
new file mode 100644
index 0000000000..c614dafaaf
--- /dev/null
+++ b/macros/jptex/latex/japanese-otf/vf/cidjmr--v.vf
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/vf/cidkgb--h.vf b/macros/jptex/latex/japanese-otf/vf/cidkgb--h.vf
new file mode 100644
index 0000000000..86801ee9c2
--- /dev/null
+++ b/macros/jptex/latex/japanese-otf/vf/cidkgb--h.vf
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/vf/cidkgb--v.vf b/macros/jptex/latex/japanese-otf/vf/cidkgb--v.vf
new file mode 100644
index 0000000000..6492dd115a
--- /dev/null
+++ b/macros/jptex/latex/japanese-otf/vf/cidkgb--v.vf
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/vf/cidkge--h.vf b/macros/jptex/latex/japanese-otf/vf/cidkge--h.vf
new file mode 100644
index 0000000000..62dc5fb3bc
--- /dev/null
+++ b/macros/jptex/latex/japanese-otf/vf/cidkge--h.vf
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/vf/cidkge--v.vf b/macros/jptex/latex/japanese-otf/vf/cidkge--v.vf
new file mode 100644
index 0000000000..131a3df388
--- /dev/null
+++ b/macros/jptex/latex/japanese-otf/vf/cidkge--v.vf
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/vf/cidkgr--h.vf b/macros/jptex/latex/japanese-otf/vf/cidkgr--h.vf
new file mode 100644
index 0000000000..ec00627c45
--- /dev/null
+++ b/macros/jptex/latex/japanese-otf/vf/cidkgr--h.vf
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/vf/cidkgr--v.vf b/macros/jptex/latex/japanese-otf/vf/cidkgr--v.vf
new file mode 100644
index 0000000000..392a877978
--- /dev/null
+++ b/macros/jptex/latex/japanese-otf/vf/cidkgr--v.vf
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/vf/cidkmb--h.vf b/macros/jptex/latex/japanese-otf/vf/cidkmb--h.vf
new file mode 100644
index 0000000000..0e38e7e927
--- /dev/null
+++ b/macros/jptex/latex/japanese-otf/vf/cidkmb--h.vf
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/vf/cidkmb--v.vf b/macros/jptex/latex/japanese-otf/vf/cidkmb--v.vf
new file mode 100644
index 0000000000..683f938e8c
--- /dev/null
+++ b/macros/jptex/latex/japanese-otf/vf/cidkmb--v.vf
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/vf/cidkmgr--h.vf b/macros/jptex/latex/japanese-otf/vf/cidkmgr--h.vf
new file mode 100644
index 0000000000..9fa9019159
--- /dev/null
+++ b/macros/jptex/latex/japanese-otf/vf/cidkmgr--h.vf
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/vf/cidkmgr--v.vf b/macros/jptex/latex/japanese-otf/vf/cidkmgr--v.vf
new file mode 100644
index 0000000000..1d24916b57
--- /dev/null
+++ b/macros/jptex/latex/japanese-otf/vf/cidkmgr--v.vf
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/vf/cidkml--h.vf b/macros/jptex/latex/japanese-otf/vf/cidkml--h.vf
new file mode 100644
index 0000000000..742f75ccf5
--- /dev/null
+++ b/macros/jptex/latex/japanese-otf/vf/cidkml--h.vf
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/vf/cidkml--v.vf b/macros/jptex/latex/japanese-otf/vf/cidkml--v.vf
new file mode 100644
index 0000000000..3fd72ed3eb
--- /dev/null
+++ b/macros/jptex/latex/japanese-otf/vf/cidkml--v.vf
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/vf/cidkmr--h.vf b/macros/jptex/latex/japanese-otf/vf/cidkmr--h.vf
new file mode 100644
index 0000000000..c8e203ae25
--- /dev/null
+++ b/macros/jptex/latex/japanese-otf/vf/cidkmr--h.vf
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/vf/cidkmr--v.vf b/macros/jptex/latex/japanese-otf/vf/cidkmr--v.vf
new file mode 100644
index 0000000000..41c5d80005
--- /dev/null
+++ b/macros/jptex/latex/japanese-otf/vf/cidkmr--v.vf
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/vf/cidtgb--h.vf b/macros/jptex/latex/japanese-otf/vf/cidtgb--h.vf
new file mode 100644
index 0000000000..e5bebb0e7e
--- /dev/null
+++ b/macros/jptex/latex/japanese-otf/vf/cidtgb--h.vf
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/vf/cidtgb--v.vf b/macros/jptex/latex/japanese-otf/vf/cidtgb--v.vf
new file mode 100644
index 0000000000..506c0f64b6
--- /dev/null
+++ b/macros/jptex/latex/japanese-otf/vf/cidtgb--v.vf
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/vf/cidtge--h.vf b/macros/jptex/latex/japanese-otf/vf/cidtge--h.vf
new file mode 100644
index 0000000000..c51ad91fe5
--- /dev/null
+++ b/macros/jptex/latex/japanese-otf/vf/cidtge--h.vf
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/vf/cidtge--v.vf b/macros/jptex/latex/japanese-otf/vf/cidtge--v.vf
new file mode 100644
index 0000000000..cccf898172
--- /dev/null
+++ b/macros/jptex/latex/japanese-otf/vf/cidtge--v.vf
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/vf/cidtgr--h.vf b/macros/jptex/latex/japanese-otf/vf/cidtgr--h.vf
new file mode 100644
index 0000000000..e070640eb7
--- /dev/null
+++ b/macros/jptex/latex/japanese-otf/vf/cidtgr--h.vf
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/vf/cidtgr--v.vf b/macros/jptex/latex/japanese-otf/vf/cidtgr--v.vf
new file mode 100644
index 0000000000..be8d534820
--- /dev/null
+++ b/macros/jptex/latex/japanese-otf/vf/cidtgr--v.vf
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/vf/cidtmb--h.vf b/macros/jptex/latex/japanese-otf/vf/cidtmb--h.vf
new file mode 100644
index 0000000000..f077dc53e4
--- /dev/null
+++ b/macros/jptex/latex/japanese-otf/vf/cidtmb--h.vf
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/vf/cidtmb--v.vf b/macros/jptex/latex/japanese-otf/vf/cidtmb--v.vf
new file mode 100644
index 0000000000..90fd228ba1
--- /dev/null
+++ b/macros/jptex/latex/japanese-otf/vf/cidtmb--v.vf
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/vf/cidtmgr--h.vf b/macros/jptex/latex/japanese-otf/vf/cidtmgr--h.vf
new file mode 100644
index 0000000000..6c6d647a55
--- /dev/null
+++ b/macros/jptex/latex/japanese-otf/vf/cidtmgr--h.vf
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/vf/cidtmgr--v.vf b/macros/jptex/latex/japanese-otf/vf/cidtmgr--v.vf
new file mode 100644
index 0000000000..b7f0632061
--- /dev/null
+++ b/macros/jptex/latex/japanese-otf/vf/cidtmgr--v.vf
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/vf/cidtml--h.vf b/macros/jptex/latex/japanese-otf/vf/cidtml--h.vf
new file mode 100644
index 0000000000..141b5b1270
--- /dev/null
+++ b/macros/jptex/latex/japanese-otf/vf/cidtml--h.vf
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/vf/cidtml--v.vf b/macros/jptex/latex/japanese-otf/vf/cidtml--v.vf
new file mode 100644
index 0000000000..c2b15038a6
--- /dev/null
+++ b/macros/jptex/latex/japanese-otf/vf/cidtml--v.vf
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/vf/cidtmr--h.vf b/macros/jptex/latex/japanese-otf/vf/cidtmr--h.vf
new file mode 100644
index 0000000000..a7cbedb3a0
--- /dev/null
+++ b/macros/jptex/latex/japanese-otf/vf/cidtmr--h.vf
Binary files differ
diff --git a/macros/jptex/latex/japanese-otf/vf/cidtmr--v.vf b/macros/jptex/latex/japanese-otf/vf/cidtmr--v.vf
new file mode 100644
index 0000000000..b1a63c3969
--- /dev/null
+++ b/macros/jptex/latex/japanese-otf/vf/cidtmr--v.vf
Binary files differ