summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/doc/uptex/uptex-base/samples
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2018-02-24 22:54:21 +0000
committerKarl Berry <karl@freefriends.org>2018-02-24 22:54:21 +0000
commite79b69ab69a86d2b1d87fa756683477bee296216 (patch)
tree6e56a5642dc5edefac738848872aa214de8b6877 /Master/texmf-dist/doc/uptex/uptex-base/samples
parent6ebd31bbb47745c530a012a18d0532d70eebac88 (diff)
uptex-base (24feb18)
git-svn-id: svn://tug.org/texlive/trunk@46733 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/doc/uptex/uptex-base/samples')
-rw-r--r--Master/texmf-dist/doc/uptex/uptex-base/samples/00readme_uptex_samples.txt2
-rw-r--r--Master/texmf-dist/doc/uptex/uptex-base/samples/Makefile166
-rw-r--r--Master/texmf-dist/doc/uptex/uptex-base/samples/adobe-cns-utf8.tex3
-rw-r--r--Master/texmf-dist/doc/uptex/uptex-base/samples/adobe-gb-utf8.tex3
-rw-r--r--Master/texmf-dist/doc/uptex/uptex-base/samples/adobe-jp-utf8.tex3
-rw-r--r--Master/texmf-dist/doc/uptex/uptex-base/samples/adobe-kr-utf8.tex8
-rw-r--r--Master/texmf-dist/doc/uptex/uptex-base/samples/box-jis.eps34
-rw-r--r--Master/texmf-dist/doc/uptex/uptex-base/samples/check_enc.pl2
-rw-r--r--Master/texmf-dist/doc/uptex/uptex-base/samples/cjk_babel.tex50
-rw-r--r--Master/texmf-dist/doc/uptex/uptex-base/samples/greek-uplatex.tex20
-rw-r--r--Master/texmf-dist/doc/uptex/uptex-base/samples/jbib2-utf8.tex10
-rw-r--r--Master/texmf-dist/doc/uptex/uptex-base/samples/jbtest.bib8
-rw-r--r--Master/texmf-dist/doc/uptex/uptex-base/samples/misc-check-h-utf8.tex30
-rw-r--r--Master/texmf-dist/doc/uptex/uptex-base/samples/misc-check-v-utf8.tex36
-rw-r--r--Master/texmf-dist/doc/uptex/uptex-base/samples/otfsmpl-uplatex.tex10
-rw-r--r--Master/texmf-dist/doc/uptex/uptex-base/samples/sangoku-uplatex.tex2
-rw-r--r--Master/texmf-dist/doc/uptex/uptex-base/samples/set3-check-h-utf8.tex35
-rw-r--r--Master/texmf-dist/doc/uptex/uptex-base/samples/simple-u-jis.tex2
-rw-r--r--Master/texmf-dist/doc/uptex/uptex-base/samples/simple-u-utf8.tex7
-rw-r--r--Master/texmf-dist/doc/uptex/uptex-base/samples/uotftest-utf8.tex291
-rw-r--r--Master/texmf-dist/doc/uptex/uptex-base/samples/uotftest.tex191
21 files changed, 280 insertions, 633 deletions
diff --git a/Master/texmf-dist/doc/uptex/uptex-base/samples/00readme_uptex_samples.txt b/Master/texmf-dist/doc/uptex/uptex-base/samples/00readme_uptex_samples.txt
index 47770ee8469..09b835b116f 100644
--- a/Master/texmf-dist/doc/uptex/uptex-base/samples/00readme_uptex_samples.txt
+++ b/Master/texmf-dist/doc/uptex/uptex-base/samples/00readme_uptex_samples.txt
@@ -60,7 +60,7 @@ jis_uni_variation.tex
min10x.tfm, umin10x.tfm
: test for {p,up}tftopl, {p,up}pltotf
-utfsmpl-uplatex.tex, otfsmpl-uplatex.tex, uotftest.tex
+utfsmpl-uplatex.tex, otfsmpl-uplatex.tex
: test for UTF / OTF (japanese-otf) package by psitau-san
bkmk-jis.tex, bkmk-utf8.tex, bkmk-docinfo.txt,
diff --git a/Master/texmf-dist/doc/uptex/uptex-base/samples/Makefile b/Master/texmf-dist/doc/uptex/uptex-base/samples/Makefile
index d968d66a72d..93488673221 100644
--- a/Master/texmf-dist/doc/uptex/uptex-base/samples/Makefile
+++ b/Master/texmf-dist/doc/uptex/uptex-base/samples/Makefile
@@ -1,23 +1,43 @@
-PTEX = ptex
UPTEX = uptex
+PTEX = ptex
UPLATEX = uplatex
PLATEX = platex
+UPBIBTEX = upbibtex
+PBIBTEX = pbibtex
DVIPS = dvips
DVIPDFMX = dvipdfmx
UPDVITYPE = updvitype
PDVITYPE = pdvitype
UPMPOST = upmpost
+PMPOST = pmpost
DVI2TTYJ = dvi2tty -J
DVI2TTYA = dvi2tty -A
DVI2TTYU = dvi2tty -U
EUPLATEX = uplatex
EPLATEX = platex
-CONVBKMK = convbkmk.rb -g
-CONVBKMKO = convbkmk.rb -g -o
+CONVBKMK = convbkmk -g
+CONVBKMKO = convbkmk -g -o
PS2PDF = ps2pdf
+####
+#### "platex on uptex"
+#### These are for test purpose.
+#### uplatex-euc : platex (kanji-internal=euc) on e-uptex
+#### uplatex-sjis : platex (kanji-internal=sjis) on e-uptex
+UPLATEX_EUC = euptex -progname=uplatex-euc
+UPLATEX_SJIS = euptex -progname=uplatex-sjis
+
+uplatex-euc.fmt:
+ euptex -ini -etex -jobname=uplatex-euc -progname=uplatex-euc -kanji=utf8 --kanji-internal=euc platex.ini
+
+uplatex-sjis.fmt:
+ euptex -ini -etex -jobname=uplatex-sjis -progname=uplatex-sjis -kanji=utf8 --kanji-internal=sjis platex.ini
+
+####
+####
+
all: misc kin widow uptex uplatex aozora adobe encswitch \
- jscman tfpl otf jbib jisuni dvi2tty bkmk consio
+ jscman tfpl otf jbib jisuni dvi2tty bkmk consio eplatex texxet
misc: misch miscv
@@ -32,6 +52,7 @@ misch:
$(UPLATEX) "\def\withhyperref{dvips}\input" $$f-check-h-utf8.tex ; \
$(DVIPS) $$f-check-h-utf8 ; \
$(CONVBKMK) $$f-check-h-utf8.ps ; \
+ $(PS2PDF) $$f-check-h-utf8-convbkmk.ps ; \
done
miscv:
@@ -41,10 +62,11 @@ miscv:
$(UPLATEX) "\def\withhyperref{dvipdfmx}\input" $$f-check-v-utf8.tex ; \
$(UPDVITYPE) $$f-check-v-utf8.dvi > $$f-check-v-utf8.pdvitype ; \
perl check_enc.pl utf8 $$f-check-v-utf8.log $$f-check-v-utf8.aux $$f-check-v-utf8.out $$f-check-v-utf8.pdvitype ; \
- $(DVIPDFMX) -l $$f-check-v-utf8 ; \
+ $(DVIPDFMX) $$f-check-v-utf8 ; \
$(UPLATEX) "\def\withhyperref{dvips}\input" $$f-check-v-utf8.tex ; \
- $(DVIPS) -t landscape $$f-check-v-utf8 ; \
+ $(DVIPS) $$f-check-v-utf8 ; \
$(CONVBKMK) $$f-check-v-utf8.ps ; \
+ $(PS2PDF) $$f-check-v-utf8-convbkmk.ps ; \
done
kin:
@@ -53,13 +75,13 @@ kin:
$(DVIPS) kinsoku-chk-utf8
widow:
- platex widow
+ $(PLATEX) widow
mv widow.dvi widow-platex.dvi
$(DVIPDFMX) widow-platex.dvi
- uplatex-euc --kanji-internal=euc widow
+ $(UPLATEX_EUC) widow
mv widow.dvi widow-u-euc.dvi
$(DVIPDFMX) widow-u-euc.dvi
- uplatex widow
+ $(UPLATEX) widow
mv widow.dvi widow-u-uptex.dvi
$(DVIPDFMX) widow-u-uptex.dvi
@@ -118,16 +140,17 @@ greek:
encswitch: encswitchj encswitchp encswitchu
+### "platex on uptex" for test
encswitchj:
for ie in euc sjis; do \
- uptex -kanji=$$ie --kanji-internal=$$ie -fmt=uplatex-$$ie simple-jis.tex ; \
+ euptex -kanji=$$ie --kanji-internal=$$ie -fmt=uplatex-$$ie simple-jis.tex ; \
perl check_enc.pl $$ie simple-jis.log simple-jis.aux || exit ; \
mv simple-jis.dvi simple-jis0-$$ie.dvi ; \
mv simple-jis.log simple-jis0-$$ie.log ; \
mv simple-jis.aux simple-jis0-$$ie.aux ; \
$(DVIPDFMX) simple-jis0-$$ie.dvi ; \
for fe in jis euc sjis utf8; do \
- uptex -kanji=$$fe --kanji-internal=$$ie -fmt=uplatex-$$ie simple-$$fe.tex ; \
+ euptex -kanji=$$fe --kanji-internal=$$ie -fmt=uplatex-$$ie simple-$$fe.tex ; \
perl check_enc.pl $$fe simple-$$fe.log simple-$$fe.aux || exit ; \
mv simple-$$fe.dvi simple-$$fe-$$ie.dvi ; \
mv simple-$$fe.log simple-$$fe-$$ie.log ; \
@@ -138,6 +161,7 @@ encswitchj:
done ; \
done
+### platex
encswitchp:
for fe in jis euc sjis utf8; do \
$(PLATEX) -kanji=$$fe simple-$$fe.tex ; \
@@ -148,12 +172,13 @@ encswitchp:
$(DVIPDFMX) simple-$$fe-platex.dvi ; \
$(PDVITYPE) -kanji=$$fe simple-$$fe-platex.dvi > simple-$$fe-platex.pdvitype ; \
perl check_enc.pl $$fe simple-$$fe-platex.pdvitype || exit ; \
- done ; \
+ done
+### uplatex
encswitchu:
for ie in uptex; do \
for fe in jis utf8; do \
- uplatex -kanji=utf8 --kanji-internal=$$ie simple-u-$$fe.tex ; \
+ $(UPLATEX) -kanji=utf8 simple-u-$$fe.tex ; \
perl check_enc.pl $$ie simple-u-$$fe.log simple-u-$$fe.aux || exit ; \
mv simple-u-$$fe.dvi simple-u-$$fe-$$ie.dvi ; \
mv simple-u-$$fe.log simple-u-$$fe-$$ie.log ; \
@@ -183,17 +208,25 @@ dvi2ttyu: encswitchu
perl check_enc.pl $$fe simple-u-jis-uptex-$$fe-u.dvi2tty || exit ; \
diff simple-u-jis-uptex-$$fe-j.dvi2tty simple-u-jis-uptex-$$fe-u.dvi2tty || exit ; \
done
+ for fe in u; do \
+ $(DVI2TTYJ) -w 62 -o simple-u-utf8-uptex-$$fe-j.dvi2tty -E $$fe simple-u-utf8-uptex.dvi ; \
+ perl check_enc.pl $$fe simple-u-utf8-uptex-$$fe-j.dvi2tty || exit ; \
+ $(DVI2TTYU) -w 62 -o simple-u-utf8-uptex-$$fe-u.dvi2tty -E $$fe simple-u-utf8-uptex.dvi ; \
+ perl check_enc.pl $$fe simple-u-utf8-uptex-$$fe-u.dvi2tty || exit ; \
+ diff simple-u-utf8-uptex-$$fe-j.dvi2tty simple-u-utf8-uptex-$$fe-u.dvi2tty || exit ; \
+ done
-jbib: jbibj jbibu
+jbib: jbibp jbibu
-jbibj:
- for ie in euc ; do \
+### platex & upbibtex
+jbibp:
for be in euc uptex; do \
for fe in jis euc sjis utf8; do \
- uptex -kanji=$$fe --kanji-internal=$$ie -fmt=uplatex-$$ie jbib1-jis.tex ; \
- upbibtex -kanji=$$fe --kanji-internal=$$be jbib1-jis ; \
- uptex -kanji=$$fe --kanji-internal=$$ie -fmt=uplatex-$$ie jbib1-jis.tex ; \
- uptex -kanji=$$fe --kanji-internal=$$ie -fmt=uplatex-$$ie jbib1-jis.tex ; \
+ rm -f jbib1-jis.aux jbib1-jis.bbl ; \
+ $(PLATEX) -kanji=$$fe jbib1-jis.tex ; \
+ $(UPBIBTEX) -kanji=$$fe --kanji-internal=$$be jbib1-jis ; \
+ $(PLATEX) -kanji=$$fe jbib1-jis.tex ; \
+ $(PLATEX) -kanji=$$fe jbib1-jis.tex ; \
perl check_enc.pl $$fe jbib1-jis.aux jbib1-jis.bbl || exit ; \
mv jbib1-jis.dvi jbib1-$$fe-$$be.dvi ; \
mv jbib1-jis.log jbib1-$$fe-$$be.log ; \
@@ -202,17 +235,17 @@ jbibj:
mv jbib1-jis.blg jbib1-$$fe-$$be.blg ; \
$(DVIPDFMX) jbib1-$$fe-$$be.dvi ; \
done ; \
- done ; \
done
+### uplatex & upbibtex
jbibu:
- for ie in uptex; do \
for be in uptex; do \
for fe in utf8; do \
- uplatex -kanji=$$fe --kanji-internal=$$ie jbib2-utf8.tex ; \
- upbibtex -kanji=$$fe --kanji-internal=$$be jbib2-utf8 ; \
- uplatex -kanji=$$fe --kanji-internal=$$ie jbib2-utf8.tex ; \
- uplatex -kanji=$$fe --kanji-internal=$$ie jbib2-utf8.tex ; \
+ rm -f jbib2-utf8.aux jbib2-utf8.bbl ; \
+ $(UPLATEX) -kanji=$$fe jbib2-utf8.tex ; \
+ $(UPBIBTEX) -kanji=$$fe --kanji-internal=$$be jbib2-utf8 ; \
+ $(UPLATEX) -kanji=$$fe jbib2-utf8.tex ; \
+ $(UPLATEX) -kanji=$$fe jbib2-utf8.tex ; \
perl check_enc.pl $$fe jbib2-utf8.aux jbib2-utf8.bbl || exit ; \
mv jbib2-utf8.dvi jbib2-$$fe-$$be.dvi ; \
mv jbib2-utf8.log jbib2-$$fe-$$be.log ; \
@@ -221,7 +254,6 @@ jbibu:
mv jbib2-utf8.blg jbib2-$$fe-$$be.blg ; \
$(DVIPDFMX) jbib2-$$fe-$$be.dvi ; \
done ; \
- done ; \
done
pmpost: pmpostj pmpostu
@@ -229,8 +261,8 @@ pmpost: pmpostj pmpostu
pmpostj:
for fe in jis euc sjis utf8; do \
for fn in area jstr; do \
- $(UPMPOST) -kanji=$$fe -tex=uplatex-$$fe $$fn-$$fe.mp ; \
- uplatex-$$fe $$fn-$$fe-incl.tex ; \
+ $(UPMPOST) -kanji=$$fe -tex="uplatex -kanji=$$fe" $$fn-$$fe.mp ; \
+ $(UPLATEX) -kanji=$$fe $$fn-$$fe-incl.tex ; \
$(DVIPS) $$fn-$$fe-incl.dvi ; \
$(DVIPDFMX) $$fn-$$fe-incl.dvi ; \
done ; \
@@ -241,7 +273,7 @@ pmpostu:
for fe in uptex; do \
for fn in area jstr; do \
$(UPMPOST) -kanji=$$fe -tex=uplatex $$fn-$$fe.mp ; \
- uplatex $$fn-$$fe-incl.tex ; \
+ $(UPLATEX) $$fn-$$fe-incl.tex ; \
$(DVIPS) $$fn-$$fe-incl.dvi ; \
$(DVIPDFMX) $$fn-$$fe-incl.dvi ; \
done ; \
@@ -319,40 +351,22 @@ utf_sample:
$(DVIPS) utfsmpl-uplatex
# It requires japanese-otf package by psitau-san.
-otf: otf_sample otf_uplatex otf_platex
+otf: otf_sample
otf_sample:
$(UPLATEX) otfsmpl-uplatex
$(DVIPDFMX) otfsmpl-uplatex
$(DVIPS) otfsmpl-uplatex
-otf_uplatex:
- for opt in default deluxe expert bold noreplace; do \
- $(UPLATEX) "\def\option{$$opt}\def\class{ujarticle}\input" uotftest-utf8.tex ; \
- mv uotftest-utf8.dvi uotftest-$$opt-h-uplatex.dvi ; \
- $(DVIPDFMX) uotftest-$$opt-h-uplatex.dvi ; \
- $(UPLATEX) "\def\option{$$opt}\def\class{utarticle}\input" uotftest-utf8.tex ; \
- mv uotftest-utf8.dvi uotftest-$$opt-v-uplatex.dvi ; \
- $(DVIPDFMX) uotftest-$$opt-v-uplatex.dvi ; \
- done
-
-otf_platex:
- for opt in default deluxe expert bold noreplace; do \
- $(PLATEX) "\def\option{$$opt}\def\class{jarticle}\input" uotftest.tex ; \
- mv uotftest.dvi uotftest-$$opt-h-platex.dvi ; \
- $(DVIPDFMX) uotftest-$$opt-h-platex.dvi ; \
- $(PLATEX) "\def\option{$$opt}\def\class{tarticle}\input" uotftest.tex ; \
- mv uotftest.dvi uotftest-$$opt-v-platex.dvi ; \
- $(DVIPDFMX) uotftest-$$opt-v-platex.dvi ; \
- done
-
# It requires ruby.
bkmk: bkmk_jis bkmk_utf8
+bkmk_jis: bkmk_jis_dvipdfmx bkmk_jis_dvips
+bkmk_utf8: bkmk_utf8_dvipdfmx bkmk_utf8_dvips
-bkmk_jis: bkmk_docinfo
+bkmk_jis_dvipdfmx: bkmk_docinfo
for en in jis ; do \
- for up in platex uplatex-sjis uplatex-euc uplatex; do \
- rm bkmk-$$en.aux bkmk-$$en.out ; \
+ for up in platex uplatex; do \
+ rm -f bkmk-$$en.aux bkmk-$$en.out ; \
$$up bkmk-$$en.tex ; \
$$up "\def\withhyperref{dvipdfmx}\input" bkmk-$$en.tex ; \
$$up "\def\withhyperref{dvipdfmx}\input" bkmk-$$en.tex ; \
@@ -364,6 +378,13 @@ bkmk_jis: bkmk_docinfo
$$up "\def\withhyperref{dvipdfmx}\def\nocmap{true}\input" bkmk-$$en.tex ; \
mv bkmk-$$en.dvi bkmk-$$en-pd2-$$up.dvi ; \
$(DVIPDFMX) bkmk-$$en-pd2-$$up.dvi ; \
+ done \
+ done
+
+bkmk_jis_dvips: bkmk_docinfo
+ for en in jis ; do \
+ for up in platex uplatex; do \
+ rm -f bkmk-$$en.aux bkmk-$$en.out ; \
$$up "\def\withhyperref{dvips}\input" bkmk-$$en.tex ; \
$$up "\def\withhyperref{dvips}\input" bkmk-$$en.tex ; \
mv bkmk-$$en.dvi bkmk-$$en-ps-$$up.dvi ; \
@@ -373,10 +394,10 @@ bkmk_jis: bkmk_docinfo
done \
done
-bkmk_utf8: bkmk_docinfo
+bkmk_utf8_dvipdfmx: bkmk_docinfo
for en in utf8; do \
- for up in uplatex-utf8 uplatex; do \
- rm bkmk-$$en.aux bkmk-$$en.out ; \
+ for up in platex uplatex; do \
+ rm -f bkmk-$$en.aux bkmk-$$en.out ; \
$$up "\def\withhyperref{dvipdfmx}\input" bkmk-$$en.tex ; \
$$up "\def\withhyperref{dvipdfmx}\input" bkmk-$$en.tex ; \
mv bkmk-$$en.dvi bkmk-$$en-pd-$$up.dvi ; \
@@ -387,13 +408,19 @@ bkmk_utf8: bkmk_docinfo
$$up "\def\withhyperref{dvipdfmx}\def\nocmap{true}\input" bkmk-$$en.tex ; \
mv bkmk-$$en.dvi bkmk-$$en-pd2-$$up.dvi ; \
$(DVIPDFMX) bkmk-$$en-pd2-$$up.dvi ; \
+ done \
+ done
+
+bkmk_utf8_dvips: bkmk_docinfo
+ for en in utf8; do \
+ for up in platex uplatex; do \
+ rm -f bkmk-$$en.aux bkmk-$$en.out ; \
$$up "\def\withhyperref{dvips}\input" bkmk-$$en.tex ; \
$$up "\def\withhyperref{dvips}\input" bkmk-$$en.tex ; \
mv bkmk-$$en.dvi bkmk-$$en-ps-$$up.dvi ; \
$(DVIPS) bkmk-$$en-ps-$$up.dvi ; \
$(CONVBKMK) bkmk-$$en-ps-$$up.ps ; \
$(PS2PDF) bkmk-$$en-ps-$$up-convbkmk.ps ; \
- rm bkmk-$$en.aux bkmk-$$en.out ; \
done \
done
@@ -430,13 +457,20 @@ texxet_eplatex:
$(DVIPDFMX) texxet-jis-eplatex.dvi ; \
$(DVI2TTYA) -w 62 -o texxet-jis-eplatex.dvi2tty -E u texxet-jis-eplatex.dvi
-# Following files are in the eptex distribution eptex-*.tar.bz2
-# eptexdoc.tex fam256p.tex fam256d.tex styles.tex
-eptexdoc: eptexdoc.tex fam256p.tex fam256d.tex styles.tex
- $(EPLATEX) -kanji=utf8 eptexdoc.tex ; \
- $(EPLATEX) -kanji=utf8 eptexdoc.tex ; \
- $(DVIPDFMX) eptexdoc.dvi
+# Following files are in ptex-base
+eptexdoc-uplatex.tex:
+ cat `kpsewhich -format=doc eptexdoc.tex` | \
+ sed -e "s/]{jsarticle}/,uplatex]{jsarticle}/" > eptexdoc-uplatex.tex
+ cp -p `kpsewhich -format=doc fam256p.tex` .
+ cp -p `kpsewhich -format=doc fam256d.tex` .
+
+eptexdoc: eptexdoc-uplatex.tex
+ $(EUPLATEX) -kanji=utf8 eptexdoc-uplatex.tex ; \
+ $(EUPLATEX) -kanji=utf8 eptexdoc-uplatex.tex ; \
+ $(DVIPDFMX) eptexdoc-uplatex.dvi
+
clean:
- rm *.aux *.log *.dvi *.ps *.pdf *.mpx *.1 \
- min10x-* umin10x-* *.out *.blg *.bbl *.pdvitype *.dvi2tty
+ rm -f *.aux *.log *.dvi *.ps *.pdf *.mpx *.1 \
+ min10x-* umin10x-* *.out *.blg *.bbl *.pdvitype *.dvi2tty \
+ jsclasses-uplatex.dtx eptexdoc-uplatex.tex fam256*.tex
diff --git a/Master/texmf-dist/doc/uptex/uptex-base/samples/adobe-cns-utf8.tex b/Master/texmf-dist/doc/uptex/uptex-base/samples/adobe-cns-utf8.tex
index befccc54a55..fc279fa1736 100644
--- a/Master/texmf-dist/doc/uptex/uptex-base/samples/adobe-cns-utf8.tex
+++ b/Master/texmf-dist/doc/uptex/uptex-base/samples/adobe-cns-utf8.tex
@@ -9,6 +9,9 @@
%
% A newer CMap may be required for some code points.
%
+\kcatcode"C0=18% U+00C0:À (Latin-1 Supplement, Latin-1 letters)
+\kcatcode"100=18% U+0100:Ā (Latin Extended-A)
+
\font\uptchrm = uptchrm-h at 9.62216pt
\uptchrm
diff --git a/Master/texmf-dist/doc/uptex/uptex-base/samples/adobe-gb-utf8.tex b/Master/texmf-dist/doc/uptex/uptex-base/samples/adobe-gb-utf8.tex
index f03f1550ca8..b1538bc2f78 100644
--- a/Master/texmf-dist/doc/uptex/uptex-base/samples/adobe-gb-utf8.tex
+++ b/Master/texmf-dist/doc/uptex/uptex-base/samples/adobe-gb-utf8.tex
@@ -9,6 +9,9 @@
%
% A newer CMap may be required for some code points.
%
+\kcatcode"C0=18% U+00C0:À (Latin-1 Supplement, Latin-1 letters)
+\kcatcode"100=18% U+0100:Ā (Latin Extended-A)
+
\font\upschrm = upschrm-h at 9.62216pt
\upschrm
diff --git a/Master/texmf-dist/doc/uptex/uptex-base/samples/adobe-jp-utf8.tex b/Master/texmf-dist/doc/uptex/uptex-base/samples/adobe-jp-utf8.tex
index 97557704376..41b21b779a4 100644
--- a/Master/texmf-dist/doc/uptex/uptex-base/samples/adobe-jp-utf8.tex
+++ b/Master/texmf-dist/doc/uptex/uptex-base/samples/adobe-jp-utf8.tex
@@ -9,6 +9,9 @@
%
% A newer CMap may be required for some code points.
%
+\kcatcode"C0=18% U+00C0:À (Latin-1 Supplement, Latin-1 letters)
+\kcatcode"100=18% U+0100:Ā (Latin Extended-A)
+
\font\upjpnrm = upjpnrm-h at 9.62216pt
\upjpnrm
diff --git a/Master/texmf-dist/doc/uptex/uptex-base/samples/adobe-kr-utf8.tex b/Master/texmf-dist/doc/uptex/uptex-base/samples/adobe-kr-utf8.tex
index fde820504f8..55a162b5659 100644
--- a/Master/texmf-dist/doc/uptex/uptex-base/samples/adobe-kr-utf8.tex
+++ b/Master/texmf-dist/doc/uptex/uptex-base/samples/adobe-kr-utf8.tex
@@ -9,10 +9,12 @@
%
% A newer CMap may be required for some code points.
%
+\kcatcode"C0=18% U+00C0:À (Latin-1 Supplement, Latin-1 letters)
+\kcatcode"100=18% U+0100:Ā (Latin Extended-A)
%% to ignore linebreak
-\kcatcode"1100=18% Hangul Jamo
-\kcatcode"3130=18% Hangul Compatibility Jamo
-\kcatcode"AC00=18% Hangul Syllables
+\kcatcode"1100=18% U+1100:ᄀ (Hangul Jamo)
+\kcatcode"3131=18% U+3131:ㄱ (Hangul Compatibility Jamo)
+\kcatcode"AC00=18% U+AC00:가 (Hangul Syllables)
\font\upkorrm = upkorrm-h at 9.62216pt
\upkorrm
diff --git a/Master/texmf-dist/doc/uptex/uptex-base/samples/box-jis.eps b/Master/texmf-dist/doc/uptex/uptex-base/samples/box-jis.eps
index 63f441f2be3..951fc8ed7a5 100644
--- a/Master/texmf-dist/doc/uptex/uptex-base/samples/box-jis.eps
+++ b/Master/texmf-dist/doc/uptex/uptex-base/samples/box-jis.eps
@@ -1,17 +1,17 @@
-%!PS-Adobe-2.0-EPSF
-%%BoundingBox: 0 0 600 600
-10 10 moveto
-590 10 lineto
-590 590 lineto
-10 590 lineto
-closepath
-stroke
-100 380 moveto
-/Ryumin-Light-H findfont 70 scalefont setfont
-(%F%9%H) show
-100 280 moveto
-/Helvetica findfont 70 scalefont setfont
-(JIS) show
-100 180 moveto
-/Ryumin-Light-H findfont 70 scalefont setfont
-($GId9f2=) show
+%!PS-Adobe-2.0-EPSF
+%%BoundingBox: 0 0 600 600
+10 10 moveto
+590 10 lineto
+590 590 lineto
+10 590 lineto
+closepath
+stroke
+100 380 moveto
+/Ryumin-Light-H findfont 70 scalefont setfont
+(%F%9%H) show
+100 280 moveto
+/Helvetica findfont 70 scalefont setfont
+(JIS) show
+100 180 moveto
+/Ryumin-Light-H findfont 70 scalefont setfont
+($GId9f2=) show
diff --git a/Master/texmf-dist/doc/uptex/uptex-base/samples/check_enc.pl b/Master/texmf-dist/doc/uptex/uptex-base/samples/check_enc.pl
index 221073f61b1..70e184e6b6d 100644
--- a/Master/texmf-dist/doc/uptex/uptex-base/samples/check_enc.pl
+++ b/Master/texmf-dist/doc/uptex/uptex-base/samples/check_enc.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
# This software is public domain.
diff --git a/Master/texmf-dist/doc/uptex/uptex-base/samples/cjk_babel.tex b/Master/texmf-dist/doc/uptex/uptex-base/samples/cjk_babel.tex
index 37de94a9095..d3e62de3063 100644
--- a/Master/texmf-dist/doc/uptex/uptex-base/samples/cjk_babel.tex
+++ b/Master/texmf-dist/doc/uptex/uptex-base/samples/cjk_babel.tex
@@ -14,6 +14,17 @@
\usepackage[OT2,T2A,T2B,T2C,T1]{fontenc}
\usepackage[french,german,czech,russian,japanese]{babel}
+%%% Setting of kcatcode %%%
+%%% kcatcode 15: not cjk, 16: kanji, 17: kana, 18: other cjk char
+\kcatcode"A7=15% U+00A7:§ (Latin-1 Supplement, Common)
+%\kcatcode"C0=15% U+00C0:À (Latin-1 Supplement, Latin-1 letters)
+%\kcatcode"100=15% U+0100:Ā (Latin Extended-A)
+\kcatcode`П=15% U+041F:П (Cyrillic)
+\kcatcode`“=15% U+201C:“ (General Punctuation)
+%
+% pxcjkcat package https://ctan.org/pkg/pxcjkcat
+%\usepackage[prefernoncjk]{pxcjkcat}
+
\DeclareFontFamily{JY2}{jpnrm}{}
\DeclareFontFamily{JY2}{schrm}{}
\DeclareFontFamily{JY2}{tchrm}{}
@@ -32,10 +43,6 @@
\DeclareRobustCommand\korrm{\kanjifamily{korrm}\selectfont}
\begin{document}
-\kcatcode`ç=15% not cjk character
-\kcatcode`Ŕ=15
-\kcatcode`П=15
-\kcatcode`“=15
\selectlanguage{french}
\section{フランス語 Français}
@@ -106,6 +113,29 @@ in fluffy souffl\'es?''
often naïve vis-à-vis the dæmonic phœnix’s official rôle
in fluffy soufflés?”
+\noindent
+\kcatcode"2423=15% U+2423: ␣ (Control Pictures)
+T1 with UTF-8 direct input:\\
+\begin{center}\begin{tabular}{r|l|l|}
+00:&(`)()()()()()()()&()()()(¸)()(‚)(‹)(›)\\
+10:&(“)(”)(„)(«)(»)(–)(—)()&()(ı)()()()()()()\\
+20:&(␣)(!)(")()()()()(’)&()()(*)(+)(,)()(.)(/)\\
+30:&(0)(1)(2)(3)(4)(5)(6)(7)&(8)(9)(:)(;)()(=)()(?)\\
+40:&(@)(A)(B)(C)(D)(E)(F)(G)&(H)(I)(J)(K)(L)(M)(N)(O)\\
+50:&(P)(Q)(R)(S)(T)(U)(V)(W)&(X)(Y)(Z)([)()(])()()\\
+60:&(‘)(a)(b)(c)(d)(e)(f)(g)&(h)(i)(j)(k)(l)(m)(n)(o)\\
+70:&(p)(q)(r)(s)(t)(u)(v)(w)&(x)(y)(z)()(|)()()(‐)\\
+80:&(Ă)(Ą)(Ć)(Č)(Ď)(Ě)(Ę)(Ğ)&(Ĺ)(Ľ)(Ł)(Ń)(Ň)(Ŋ)(Ő)(Ŕ)\\
+90:&(Ř)(Ś)(Š)(Ş)(Ť)(Ţ)(Ű)(Ů)&(Ÿ)(Ź)(Ž)(Ż)(IJ)(İ)(đ)(§)\\
+A0:&(ă)(ą)(ć)(č)(ď)(ě)(ę)(ğ)&(ĺ)(ľ)(ł)(ń)(ň)(ŋ)(ő)(ŕ)\\
+B0:&(ř)(ś)(š)(ş)(ť)(ţ)(ű)(ů)&(ÿ)(ź)(ž)(ż)(ij)(¡)(¿)(£)\\
+C0:&(À)(Á)(Â)(Ã)(Ä)(Å)(Æ)(Ç)&(È)(É)(Ê)(Ë)(Ì)(Í)(Î)(Ï)\\
+D0:&(Ð)(Ñ)(Ò)(Ó)(Ô)(Õ)(Ö)(Œ)&(Ø)(Ù)(Ú)(Û)(Ü)(Ý)(Þ)()\\
+E0:&(à)(á)(â)(ã)(ä)(å)(æ)(ç)&(è)(é)(ê)(ë)(ì)(í)(î)(ï)\\
+F0:&(ð)(ñ)(ò)(ó)(ô)(õ)(ö)(œ)&(ø)(ù)(ú)(û)(ü)(ý)(þ)(ß)\\
+\end{tabular}\end{center}
+
+
\selectlanguage{russian}
\section{ロシア語 \fontencoding{T2A}\selectfont{}Русский}
\fontencoding{T2A}\selectfont
@@ -165,7 +195,7 @@ T2A:\\
可参考「如何阅读本问答集及了解其编排结构」该项中的说明。
\def\today{%
- \number\year 年
+ \number\year 年
\number\month 月
\number\day 日
}
@@ -183,7 +213,7 @@ T2A:\\
可參考「如何閱讀本問答集及了解其編排結構」該項中的說明。
\def\today{%
- \number\year 年
+ \number\year 年
\number\month 月
\number\day 日
}
@@ -200,17 +230,17 @@ T2A:\\
% Ref. http://project.ktug.or.kr/omega-cjk/tug2004-preprint.pdf
이 FAQ은 자주 반복되는
질문과 그에 대한 대답을
-간단명료한
-양식으로%
+간단명료한 양식으로
모아 엮어졌습니다.
이 FAQ의 구조는 지난 판에 비하여
-획기적으로변경되었습니다.
+획기적으로 변경% (A space is NOT inserted here.)
+되었습니다.
상세한 것은 ``이 FAQ을 어떻게 읽을
것인가'' 라는 대목을 참조하시기 바랍니다.
\def\today{%
- \number\year 연%
+ \number\year 년%
\number\month 월%
\number\day 일%
}
diff --git a/Master/texmf-dist/doc/uptex/uptex-base/samples/greek-uplatex.tex b/Master/texmf-dist/doc/uptex/uptex-base/samples/greek-uplatex.tex
index 9a2cf2445a8..56b93898776 100644
--- a/Master/texmf-dist/doc/uptex/uptex-base/samples/greek-uplatex.tex
+++ b/Master/texmf-dist/doc/uptex/uptex-base/samples/greek-uplatex.tex
@@ -8,20 +8,22 @@
% and is modified for upLaTeX
%
\documentclass[a4j]{ujarticle}
-
-\kcatcode`ç=15% not cjk character
-%\kcatcode`Ŕ=15
-%\kcatcode`П=15
-%\kcatcode`“=15
-\kcatcode`α=15
-\kcatcode`ἀ=15
-\kcatcode`’=15
-
\usepackage{ucs}
\usepackage[utf8x]{inputenc}
\usepackage[10pt]{type1ec}
\usepackage[T1]{fontenc}
\usepackage[polutonikogreek]{babel}
+
+%%% Setting of kcatcode %%%
+%%% kcatcode 15: not cjk, 16: kanji, 17: kana, 18: other cjk char
+%\kcatcode"E7=15% U+00E7:ç (Latin-1 Supplement, Latin-1 letters)
+\kcatcode`α=15% U+03B1:α (Greek)
+\kcatcode`ἀ=15% U+1F00: ἀ (Greek Extended)
+\kcatcode`’=15% U+2019: ’ (General Punctuation)
+%
+% pxcjkcat package https://ctan.org/pkg/pxcjkcat
+%\usepackage[prefernoncjk]{pxcjkcat}
+
\begin{document}
\selectlanguage{polutonikogreek}
diff --git a/Master/texmf-dist/doc/uptex/uptex-base/samples/jbib2-utf8.tex b/Master/texmf-dist/doc/uptex/uptex-base/samples/jbib2-utf8.tex
index a5defce1355..802304e5ef0 100644
--- a/Master/texmf-dist/doc/uptex/uptex-base/samples/jbib2-utf8.tex
+++ b/Master/texmf-dist/doc/uptex/uptex-base/samples/jbib2-utf8.tex
@@ -4,11 +4,11 @@
% set3 関連の制御をコマンドラインから行う
% ①,② のどれかを実行すればよい。
% ① without set3
-% $ uplatex jbib2-utf8.tex
+% $ uplatex "\def\withsetthree{no}\input" jbib2-utf8.tex
% ② with set3
-% $ uplatex "\def\withsetthree{yes}\input" jbib2-utf8.tex
+% $ uplatex jbib2-utf8.tex
%%%%%%
-\def\withsetthreetmp{yes}
+\def\withsetthreetmp{no}
\def\noop#1{}
\def\JLaTeX{J\LaTeX}
@@ -134,7 +134,7 @@ jbibtexのテスト\cite{改行位置3a}。
jbibtexのテスト\cite{改行位置3b}。
jbibtexのテスト\cite{改行位置3c}。
% set3対応フォント+dviwareなら、「𠮷」もUTF-8で直接書ける。
-\ifx\withsetthree\withsetthreetmp
+\ifx\withsetthree\withsetthreetmp\else
jbibtexのテスト\cite{改行位置4a}。
jbibtexのテスト\cite{改行位置4b}。
jbibtexのテスト\cite{改行位置4c}。
@@ -150,7 +150,7 @@ jbibtexのテスト\cite{test:misc0}。
jbibtexのテスト\cite{test:misc1}。
jbibtexのテスト\cite{test:misc2}。
% set3対応フォント+dviwareなら、「𠮷」もUTF-8で直接書ける。
-\ifx\withsetthree\withsetthreetmp
+\ifx\withsetthree\withsetthreetmp\else
jbibtexのテスト\cite{髙島𠮷野}。
\fi
diff --git a/Master/texmf-dist/doc/uptex/uptex-base/samples/jbtest.bib b/Master/texmf-dist/doc/uptex/uptex-base/samples/jbtest.bib
index 652c17fd165..41f4491d861 100644
--- a/Master/texmf-dist/doc/uptex/uptex-base/samples/jbtest.bib
+++ b/Master/texmf-dist/doc/uptex/uptex-base/samples/jbtest.bib
@@ -1,13 +1,17 @@
@book{森鷗外:百物語,
yomi = "Mori Ogai",
author = "森 鷗外",
- title = "百物語"
+ title = "百物語",
+ publisher = "中央公論",
+ year = 1911
}
@book{里見弴:極楽とんぼ,
yomi = "Satomi Ton",
author = "里見 弴",
- title = "極楽とんぼ"
+ title = "極楽とんぼ",
+ publisher = "岩波文庫",
+ year = 1961
}
diff --git a/Master/texmf-dist/doc/uptex/uptex-base/samples/misc-check-h-utf8.tex b/Master/texmf-dist/doc/uptex/uptex-base/samples/misc-check-h-utf8.tex
index 256770ba895..1287affbda7 100644
--- a/Master/texmf-dist/doc/uptex/uptex-base/samples/misc-check-h-utf8.tex
+++ b/Master/texmf-dist/doc/uptex/uptex-base/samples/misc-check-h-utf8.tex
@@ -18,7 +18,7 @@
%% for hyperref + dvipdfmx
\usepackage[dvipdfm,bookmarks=true,bookmarksnumbered=true,%
bookmarkstype=toc]{hyperref}
-\AtBeginDvi{\special{pdf:tounicode UTF8-UCS2}}
+\AtBeginDvi{\special{pdf:tounicode UTF8-UTF16}}
%%
\fi
@@ -116,8 +116,8 @@ upjisr-h.tfm &
\end{tabular}
-\section{括弧類}
-\subsection{JIS X 0208にあるもの}
+\section{約物}
+\subsection{JIS X 0208にある括弧類}
‘回’ “回” (回) 〔回〕 [回] {回} 〈回〉 《回》 「回」 『回』 【回】
{\gt
@@ -126,14 +126,33 @@ upjisr-h.tfm &
%‘回’ “回” は、upTeX-0.13 で改善した。
-\subsection{JIS X 0213で追加されたもの}
+\subsection{JIS X 0213で追加された括弧類}
⦅回⦆ 〘回〙 〖回〗 〝回〟
{\gt
⦅回⦆ 〘回〙 〖回〗 〝回〟
}
-{\gt 〖回〗} は、KozGoProVI-Medium.otfならうまくいくはず。
+% {\gt 〖回〗} は、KozGoProVI-Medium.otfならうまくいくはず。
+
+\subsection{縦組みでの動作が気になるもの}
+回回:回回;回回、回回。回回,回回.
+
+㍾㍽㍼㍻ ㍉㌔㌢㍍㌘㌧㌃㌶㍑㍗㌍㌦㌣㌫㍊㌻
+
+→←↑↓ ☞☜☝☟ ⇨⇦⇧⇩ ➡⬅⬆⬇⮕
+
+①=① ②≒② ③≠③ ④≡④ ⑤―⑤ ⑥−⑥ ⑦‐⑦ ⑧゠⑧ ⑨‥⑨ ⑩…⑩ ⑪〜⑪ ⑫ー⑫
+
+{\gt
+回回:回回;回回、回回。回回,回回.
+
+㍾㍽㍼㍻ ㍉㌔㌢㍍㌘㌧㌃㌶㍑㍗㌍㌦㌣㌫㍊㌻
+
+→←↑↓ ☞☜☝☟ ⇨⇦⇧⇩ ➡⬅⬆⬇⮕
+
+①=① ②≒② ③≠③ ④≡④ ⑤―⑤ ⑥−⑥ ⑦‐⑦ ⑧゠⑧ ⑨‥⑨ ⑩…⑩ ⑪〜⑪ ⑫ー⑫
+}
\section{いわゆる『JIS外字』←不正確な言い方だが}
JIS X 0208, JIS X 0213では、別のコードポイントの文字に包摂されている
@@ -177,6 +196,7 @@ B: 啞焰鷗嚙俠軀鹼麴屢繡蔣醬蟬搔驒簞摑塡顚禱瀆囊潑醱頰
}
\subsection{JIS X 0213:2004追加漢字 (10字)}
+\noindent
俱剝%𠮟
吞噓姸屛幷瘦繫 (1字はextension B (BMP外))
diff --git a/Master/texmf-dist/doc/uptex/uptex-base/samples/misc-check-v-utf8.tex b/Master/texmf-dist/doc/uptex/uptex-base/samples/misc-check-v-utf8.tex
index d5ae18739ef..df332765ae5 100644
--- a/Master/texmf-dist/doc/uptex/uptex-base/samples/misc-check-v-utf8.tex
+++ b/Master/texmf-dist/doc/uptex/uptex-base/samples/misc-check-v-utf8.tex
@@ -1,4 +1,4 @@
-\documentclass{utarticle}
+\documentclass[landscape]{utarticle}
%%%%%%%%
% hyperref 関連の制御をコマンドラインから行う
@@ -18,7 +18,7 @@
%% for hyperref + dvipdfmx
\usepackage[dvipdfm,bookmarks=true,bookmarksnumbered=true,%
bookmarkstype=toc]{hyperref}
-\AtBeginDvi{\special{pdf:tounicode UTF8-UCS2}}
+\AtBeginDvi{\special{pdf:tounicode UTF8-UTF16}}
%%
\fi
@@ -116,24 +116,45 @@ upjisr-v.tfm &
\end{tabular}
-\section{括弧類}
-\subsection{JIS X 0208にあるもの}
+\section{約物}
+\subsection{JIS X 0208にある括弧類}
‘回’ “回” (回) 〔回〕 [回] {回} 〈回〉 《回》 「回」 『回』 【回】
{\gt
‘回’ “回” (回) 〔回〕 [回] {回} 〈回〉 《回》 「回」 『回』 【回】
}
-%‘回’ “回” は、縦組ではうまくいかない。
+%‘回’ “回” は、縦組では UniJISup-UTF16-V により改善する。
-\subsection{JIS X 0213で追加されたもの}
+\subsection{JIS X 0213で追加された括弧類}
⦅回⦆ 〘回〙 〖回〗 〝回〟
{\gt
⦅回⦆ 〘回〙 〖回〗 〝回〟
}
-{\gt 〖回〗} は、KozGoProVI-Medium.otfならうまくいくはず。
+% {\gt 〖回〗} は、KozGoProVI-Medium.otfならうまくいくはず。
+
+\subsection{縦組みでの動作が気になるもの}
+回回:回回;回回、回回。回回,回回.
+
+㍾㍽㍼㍻ ㍉㌔㌢㍍㌘㌧㌃㌶㍑㍗㌍㌦㌣㌫㍊㌻
+
+→←↑↓ ☞☜☝☟ ⇨⇦⇧⇩ ➡⬅⬆⬇⮕
+
+①=① ②≒② ③≠③ ④≡④ ⑤―⑤ ⑥−⑥ ⑦‐⑦ ⑧゠⑧ ⑨‥⑨ ⑩…⑩ ⑪〜⑪ ⑫ー⑫
+
+{\gt
+回回:回回;回回、回回。回回,回回.
+
+㍾㍽㍼㍻ ㍉㌔㌢㍍㌘㌧㌃㌶㍑㍗㌍㌦㌣㌫㍊㌻
+
+→←↑↓ ☞☜☝☟ ⇨⇦⇧⇩ ➡⬅⬆⬇⮕
+
+①=① ②≒② ③≠③ ④≡④ ⑤―⑤ ⑥−⑥ ⑦‐⑦ ⑧゠⑧ ⑨‥⑨ ⑩…⑩ ⑪〜⑪ ⑫ー⑫
+}
+
+% 一部は UniJISup-UTF16-V により改善する。
\section{いわゆる『JIS外字』←不正確な言い方だが}
JIS X 0208, JIS X 0213では、別のコードポイントの文字に包摂されている
@@ -177,6 +198,7 @@ B: 啞焰鷗嚙俠軀鹼麴屢繡蔣醬蟬搔驒簞摑塡顚禱瀆囊潑醱頰
}
\subsection{JIS X 0213:2004追加漢字 (10字)}
+\noindent
俱剝%𠮟
吞噓姸屛幷瘦繫 (1字はextension B (BMP外))
diff --git a/Master/texmf-dist/doc/uptex/uptex-base/samples/otfsmpl-uplatex.tex b/Master/texmf-dist/doc/uptex/uptex-base/samples/otfsmpl-uplatex.tex
index fe006d6a3b2..8f7aeb9f459 100644
--- a/Master/texmf-dist/doc/uptex/uptex-base/samples/otfsmpl-uplatex.tex
+++ b/Master/texmf-dist/doc/uptex/uptex-base/samples/otfsmpl-uplatex.tex
@@ -25,8 +25,12 @@
\kchar"9AD9橋さん\textbf{\kchar"9AD9橋さん}
鼻濁音「\CID{16382}」とか\textbf{「\CID{13706}野家」}とかも出せます。
+
% set3対応フォント+dviwareなら、「𠮷野家」もUTF-8で直接書ける。
-%\textbf{𠮷野家\char"20BB7野家\kchar"20BB7野家}
+\UTF{20BB7}野家\textbf{\UTF{20BB7}野家}%
+\CID{13706}野家\textbf{\CID{13706}野家}\\%
+𠮷野家\textbf{𠮷野家}\char"20BB7野家\textbf{\char"20BB7野家}%
+\kchar"20BB7野家\textbf{\kchar"20BB7野家}
\CID{239}\CID{331}∀\CID{331}\CID{240}\CID{344}\CID{344}~~
\CID{239}\CID{326}\CID{389}Д\CID{389}\CID{240}\CID{373}\CID{355}\CID{388}\CID{342}
@@ -51,8 +55,8 @@ U+9593 & 間 & \char"9593 & \kchar"9593 & \UTF{9593} & \CID{1554} & 日間 \\
U+9592 & 閒 & \char"9592 & \kchar"9592 & \UTF{9592} & \CID{8685} & 月間 \\
U+9AD8 & 高 & \char"9AD8 & \kchar"9AD8 & \UTF{9AD8} & \CID{2036} & 口高 \\
U+9AD9 & 髙 & \char"9AD9 & \kchar"9AD9 & \UTF{9AD9} & \CID{8705} & 梯子高 \\
-%U+5409 & 吉 & \char"5409 & \kchar"5409 & \UTF{5409} & \CID{1634} & 士吉 \\
-%U+20BB7 & 𠮷 & \char"20BB7 & \kchar"20BB7 & --- & \CID{13706} & 土吉 \\
+U+5409 & 吉 & \char"5409 & \kchar"5409 & \UTF{5409} & \CID{1634} & 士吉 \\
+U+20BB7 & 𠮷 & \char"20BB7 & \kchar"20BB7 & \UTF{20BB7} & \CID{13706} & 土吉 \\
\end{tabular}
\vskip2zh
diff --git a/Master/texmf-dist/doc/uptex/uptex-base/samples/sangoku-uplatex.tex b/Master/texmf-dist/doc/uptex/uptex-base/samples/sangoku-uplatex.tex
index 976f0121efa..94b1ca87095 100644
--- a/Master/texmf-dist/doc/uptex/uptex-base/samples/sangoku-uplatex.tex
+++ b/Master/texmf-dist/doc/uptex/uptex-base/samples/sangoku-uplatex.tex
@@ -1,4 +1,4 @@
-\documentclass[twocolumn]{utarticle}
+\documentclass[twocolumn]{utarticle}
\usepackage{color}
diff --git a/Master/texmf-dist/doc/uptex/uptex-base/samples/set3-check-h-utf8.tex b/Master/texmf-dist/doc/uptex/uptex-base/samples/set3-check-h-utf8.tex
index d39be821624..15c62a0ca0e 100644
--- a/Master/texmf-dist/doc/uptex/uptex-base/samples/set3-check-h-utf8.tex
+++ b/Master/texmf-dist/doc/uptex/uptex-base/samples/set3-check-h-utf8.tex
@@ -18,7 +18,7 @@
%% for hyperref + dvipdfmx
\usepackage[dvipdfm,bookmarks=true,bookmarksnumbered=true,%
bookmarkstype=toc]{hyperref}
-\AtBeginDvi{\special{pdf:tounicode UTF8-UCS2}}
+\AtBeginDvi{\special{pdf:tounicode UTF8-UTF16}}
%%
\fi
@@ -39,18 +39,18 @@ bookmarkstype=toc]{hyperref}
\textwidth162mm
\textheight245mm
-\DeclareFontFamily{JY2}{mcw}{}
-\DeclareFontFamily{JY2}{gtw}{}
-\DeclareFontShape{JY2}{mcw}{m}{n}{<->s*[0.962216]upjpnrm-h}{}
-\DeclareFontShape{JY2}{gtw}{m}{n}{<->s*[0.962216]upjpngt-h}{}
-\DeclareFontShape{JY2}{gt}{m}{n}{<->s*[0.962216]upjpngt-h}{}
-\DeclareFontShape{JY2}{mcw}{bx}{n}{<->ssub*gt/m/n}{}
-\DeclareFontShape{JY2}{gtw}{bx}{n}{<->ssub*gt/m/n}{}
-\DeclareFontShape{JY2}{gt}{bx}{n}{<->ssub*gt/m/n}{}
-\DeclareRobustCommand\mcw{\kanjifamily{mcw}\selectfont}
-\DeclareRobustCommand\gtw{\kanjifamily{gtw}\selectfont}
-\renewcommand\mcdefault{mcw}
-\renewcommand\gtdefault{gtw}
+%\DeclareFontFamily{JY2}{mcw}{}
+%\DeclareFontFamily{JY2}{gtw}{}
+%\DeclareFontShape{JY2}{mcw}{m}{n}{<->s*[0.962216]upjpnrm-h}{}
+%\DeclareFontShape{JY2}{gtw}{m}{n}{<->s*[0.962216]upjpngt-h}{}
+%\DeclareFontShape{JY2}{gt}{m}{n}{<->s*[0.962216]upjpngt-h}{}
+%\DeclareFontShape{JY2}{mcw}{bx}{n}{<->ssub*gt/m/n}{}
+%\DeclareFontShape{JY2}{gtw}{bx}{n}{<->ssub*gt/m/n}{}
+%\DeclareFontShape{JY2}{gt}{bx}{n}{<->ssub*gt/m/n}{}
+%\DeclareRobustCommand\mcw{\kanjifamily{mcw}\selectfont}
+%\DeclareRobustCommand\gtw{\kanjifamily{gtw}\selectfont}
+%\renewcommand\mcdefault{mcw}
+%\renewcommand\gtdefault{gtw}
\begin{document}
@@ -75,10 +75,11 @@ JIS X 0208, JIS X 0213では、別のコードポイントの文字に包摂さ
\section{いわゆる『新JIS』『JIS2004』}
\subsection{JIS X 0213:2004追加漢字 (10字)}
+\noindent
俱剝𠮟吞噓姸屛幷瘦繫
\subsection{Extension B (BMP外)の文字(303字): 𠀋𠆢𠘨𡈽𠮟など}
-
+\noindent
𠂉𠀋𠂢𠂤𠆢𠈓𠌫𠎁𠍱𠏹𠑊𠔉𠗖𠘨𠝏𠠇𠠺𠢹𠥼𠦝
𠫓𠬝𠵅𠷡𠺕𠹭𠹤𠽟𡈁𡈽𡉕𡉻𡉴𡋤𡋗𡌛𡋽𡌶𡍄𡏄
𡑮𡑭𡗗𦰩𡙇𡜆𡝂𡢽𡧃𡱖𡴭𡚴𡵅𡵸𡵢𡶡𡶜𡶒𡶷𡷠
@@ -155,14 +156,10 @@ abcABC \¥¥
\土の𠮷true\test土の𠮷\quad\土の𠮷false\test土の𠮷
-% 以下の例は、uptex-0.04 までは改行位置が壊れ破綻していた。 kcode_pos の対処が不完全だったため。大丈夫になったはず。
-
+% kcode_pos などのテスト。
\typeout{𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷}
-
\typeout{a𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷}
-
\typeout{ab𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷}
-
\typeout{abc𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷}
\end{document}
diff --git a/Master/texmf-dist/doc/uptex/uptex-base/samples/simple-u-jis.tex b/Master/texmf-dist/doc/uptex/uptex-base/samples/simple-u-jis.tex
index 4ca100aaea6..e472920e94a 100644
--- a/Master/texmf-dist/doc/uptex/uptex-base/samples/simple-u-jis.tex
+++ b/Master/texmf-dist/doc/uptex/uptex-base/samples/simple-u-jis.tex
@@ -7,7 +7,7 @@
$BFbIt%3!<%I$O(B
\ifnum\jis"2121="3000
- UTF32$B2~(B%
+ UTF32$B2~(B(uptex)%
\else
????%
\fi
diff --git a/Master/texmf-dist/doc/uptex/uptex-base/samples/simple-u-utf8.tex b/Master/texmf-dist/doc/uptex/uptex-base/samples/simple-u-utf8.tex
index 7d455b9bc7b..de35011d73e 100644
--- a/Master/texmf-dist/doc/uptex/uptex-base/samples/simple-u-utf8.tex
+++ b/Master/texmf-dist/doc/uptex/uptex-base/samples/simple-u-utf8.tex
@@ -7,7 +7,7 @@
内部コードは
\ifnum\jis"2121="3000
- UTF32改%
+ UTF32改(uptex)%
\else
????%
\fi
@@ -69,6 +69,11 @@ a一二三四五六七八九〇一二三四五六七八九〇一二三四五六
ab一二三四五六七八九〇一二三四五六七八九〇一二三四五六七八九〇\\
abc一二三四五六七八九〇一二三四五六七八九〇一二三四五六七八九〇\\
+𠂉𠀋𠂢𠂤𠆢𠈓𠌫𠎁𠍱𠏹𠂉𠀋𠂢𠂤𠆢𠈓𠌫𠎁𠍱𠏹𠂉𠀋𠂢𠂤𠆢𠈓𠌫𠎁𠍱𠏹\\
+a𠂉𠀋𠂢𠂤𠆢𠈓𠌫𠎁𠍱𠏹𠂉𠀋𠂢𠂤𠆢𠈓𠌫𠎁𠍱𠏹𠂉𠀋𠂢𠂤𠆢𠈓𠌫𠎁𠍱𠏹\\
+ab𠂉𠀋𠂢𠂤𠆢𠈓𠌫𠎁𠍱𠏹𠂉𠀋𠂢𠂤𠆢𠈓𠌫𠎁𠍱𠏹𠂉𠀋𠂢𠂤𠆢𠈓𠌫𠎁𠍱𠏹\\
+abc𠂉𠀋𠂢𠂤𠆢𠈓𠌫𠎁𠍱𠏹𠂉𠀋𠂢𠂤𠆢𠈓𠌫𠎁𠍱𠏹𠂉𠀋𠂢𠂤𠆢𠈓𠌫𠎁𠍱𠏹\\
+
\begin{flushleft}
left left\\
左左左
diff --git a/Master/texmf-dist/doc/uptex/uptex-base/samples/uotftest-utf8.tex b/Master/texmf-dist/doc/uptex/uptex-base/samples/uotftest-utf8.tex
deleted file mode 100644
index b7c8a5f5f54..00000000000
--- a/Master/texmf-dist/doc/uptex/uptex-base/samples/uotftest-utf8.tex
+++ /dev/null
@@ -1,291 +0,0 @@
-% -*- coding: utf-8 -*-
-\newif\ifuptexmode\uptexmodefalse
-\ifnum\jis"2121="3000 \uptexmodetrue\fi
-
-\makeatletter
-
-\def\@opt@{multi}
-\def\@default{default}
-\def\@jarticle{jarticle}
-\def\@tarticle{tarticle}
-\def\@utarticle{utarticle}
-
-\ifx\option\@undefined
- \def\option{default}
-\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}
-\ifx\class\@tarticle\def\baseshift{-.5zh}\fi
-\ifx\class\@utarticle\def\baseshift{-.5zh}\fi
-
-\ifuptexmode
- \edef\@opt@{uplatex,\@opt@}
-\fi
-\documentclass[a4paper,titlepage, draft]{\class}
-%\documentclass[a4paper,titlepage, draft,landscape]{\class}
-
-\usepackage[\@opt@]{otf}
-
-%
-% furikana.sty があれば読み込む
-\newread\@istheresuchafile
-\openin\@istheresuchafile furikana.sty
-\ifeof\@istheresuchafile\relax
-\else\closein\@istheresuchafile\relax
-\usepackage{furikana}% found
-\fi
-
-\makeatother
-
-\usepackage{redeffont}
-
-
-\AtBeginDvi{\special{papersize=\the\paperwidth,\the\paperheight}}
-\ajCIDVarDef{り}{12746}
-\ajCIDVarDef{高}{8705}
-\ajUTFVarDef{鴎}{9DD7}
-\pagestyle{empty}
-\makeatletter
-\ifx\rubyfamily\@undefined\let\rubyfamily=\relax\fi
-\ifx\mgfamily\@undefined\let\mgfamily=\relax\fi
-\makeatother
-\begin{document}
-\section{見出し}
-
-クラス:\texttt{\class}\\
-オプション:\texttt{\option}
-
-\vspace{\baselineskip}
-\begin{tabular}{l||ccccc}
-フォント & 仮名 & 漢字 & UTF & CID & ルビ\\
-\hline
-mc/m & ひらかな & 漢字 & \UTF{9DD7} & \CID{8705} & {\rubyfamily 振りかな}\\
-mc/bx & {\bfseries ひらかな} & {\bfseries 漢字} & {\bfseries\UTF{9DD7}} & {\bfseries\CID{8705}} & {\bfseries\rubyfamily 振りかな}\\
-gt/m & {\gtfamily ひらかな} & {\gtfamily 漢字} & {\gtfamily\UTF{9DD7}} & {\gtfamily\CID{8705}} & {\gtfamily\rubyfamily 振りかな}\\
-gt/bx & {\gtfamily\bfseries ひらかな} & {\gtfamily\bfseries 漢字} & {\gtfamily\bfseries\UTF{9DD7}} & {\gtfamily\bfseries\CID{8705}} & {\gtfamily\bfseries\rubyfamily 振りかな}\\
-mg/m & {\mgfamily ひらかな} & {\mgfamily 漢字} & {\mgfamily\UTF{9DD7}} & {\mgfamily\CID{8705}} & {\mgfamily\rubyfamily 振りかな}\\
-\end{tabular}
-\vspace{\baselineskip}
-
-日本:\UTF{9aa8} 簡体字:\UTFC{9aa8} 繁體字:\UTFT{9aa8} 朝鮮:\UTFK{9aa8}
-
-日本:\UTF{6d77} 簡体字:\UTFC{6d77} 繁體字:\UTFT{6d77} 朝鮮:\UTFK{6d77}
-
-% with furikana.sty
-\makeatletter
-\ifx\kana\@undefined
-\else
-\kana{漢字}{振りかな}{\bfseries \kana{漢字}{振りかな}}%
-{\gtfamily\kana{漢字}{振りかな}\bfseries \kana{漢字}{振りかな}}
-{\mgfamily\kana{漢字}{振りかな}}
-
-\kana{\UTF{9DD7}}{かな}\kana{鴎}{かな}
-
-\Kana[3]{\UTFK{c548},\UTFK{b155},\UTFK{d558},\UTFK{c138},\UTFK{c694}}{アン,ニョン,ハ,セ,ヨ}
-\fi
-\makeatother
-
-\vspace{\baselineskip}
-
-アイウエオ\raisebox\baseshift{\frame{ア}\frame{イ}\frame{ウ}\frame{エ}\frame{オ}}
-
-アイウエオ\raisebox\baseshift{\frame{ア}\frame{イ}\frame{ウ}\frame{エ}\frame{オ}}
-
-
-\clearpage
-[mc/m]
-
-ぁあぃいぅうぇえぉおかがきぎくぐけげこごさざしじすずせぜそぞただちぢっつづてでとどなにぬねのは
-ばぱひびぴふぶぷへべぺほぼぽまみむめもゃやゅゆょよらりるれろゎわゐゑをんヽヾゝゞー
-\ifuptexmode
-ゔゕゖ
-\fi
-
-ァアィイゥウェエォオカガキギクグケゲコゴサザシジスズセゼソゾタダチヂッツヅテデトドナニヌネノハ
-バパヒビピフブプヘベペホボポマミムメモャヤュユョヨラリルレロヮワヰヱヲンヴヵヶ
-\ifuptexmode
-ヷヸヹヺㇰㇱㇲㇳㇴㇵㇶㇷㇸㇹㇺㇻㇼㇽㇾㇿ
-\fi
-
-“回”、‘回’。“回”,‘回’.
-
-{\bfseries%
-[mc/bx]
-
-ぁあぃいぅうぇえぉおかがきぎくぐけげこごさざしじすずせぜそぞただちぢっつづてでとどなにぬねのは
-ばぱひびぴふぶぷへべぺほぼぽまみむめもゃやゅゆょよらりるれろゎわゐゑをんヽヾゝゞー
-\ifuptexmode
-ゔゕゖ
-\fi
-
-ァアィイゥウェエォオカガキギクグケゲコゴサザシジスズセゼソゾタダチヂッツヅテデトドナニヌネノハ
-バパヒビピフブプヘベペホボポマミムメモャヤュユョヨラリルレロヮワヰヱヲンヴヵヶ
-\ifuptexmode
-ヷヸヹヺㇰㇱㇲㇳㇴㇵㇶㇷㇸㇹㇺㇻㇼㇽㇾㇿ
-\fi
-
-“回”、‘回’。“回”,‘回’.
-}
-
-{\gtfamily
-[gt/m]
-
-ぁあぃいぅうぇえぉおかがきぎくぐけげこごさざしじすずせぜそぞただちぢっつづてでとどなにぬねのは
-ばぱひびぴふぶぷへべぺほぼぽまみむめもゃやゅゆょよらりるれろゎわゐゑをんヽヾゝゞー
-\ifuptexmode
-ゔゕゖ
-\fi
-
-ァアィイゥウェエォオカガキギクグケゲコゴサザシジスズセゼソゾタダチヂッツヅテデトドナニヌネノハ
-バパヒビピフブプヘベペホボポマミムメモャヤュユョヨラリルレロヮワヰヱヲンヴヵヶ
-\ifuptexmode
-ヷヸヹヺㇰㇱㇲㇳㇴㇵㇶㇷㇸㇹㇺㇻㇼㇽㇾㇿ
-\fi
-
-“回”、‘回’。“回”,‘回’.
-
-{\bfseries%
-[gt/bx]
-
-ぁあぃいぅうぇえぉおかがきぎくぐけげこごさざしじすずせぜそぞただちぢっつづてでとどなにぬねのは
-ばぱひびぴふぶぷへべぺほぼぽまみむめもゃやゅゆょよらりるれろゎわゐゑをんヽヾゝゞー
-\ifuptexmode
-ゔゕゖ
-\fi
-
-ァアィイゥウェエォオカガキギクグケゲコゴサザシジスズセゼソゾタダチヂッツヅテデトドナニヌネノハ
-バパヒビピフブプヘベペホボポマミムメモャヤュユョヨラリルレロヮワヰヱヲンヴヵヶ
-\ifuptexmode
-ヷヸヹヺㇰㇱㇲㇳㇴㇵㇶㇷㇸㇹㇺㇻㇼㇽㇾㇿ
-\fi
-
-“回”、‘回’。“回”,‘回’.
-}}
-
-{\mgfamily
-[mg/m]
-
-ぁあぃいぅうぇえぉおかがきぎくぐけげこごさざしじすずせぜそぞただちぢっつづてでとどなにぬねのは
-ばぱひびぴふぶぷへべぺほぼぽまみむめもゃやゅゆょよらりるれろゎわゐゑをんヽヾゝゞー
-\ifuptexmode
-ゔゕゖ
-\fi
-
-ァアィイゥウェエォオカガキギクグケゲコゴサザシジスズセゼソゾタダチヂッツヅテデトドナニヌネノハ
-バパヒビピフブプヘベペホボポマミムメモャヤュユョヨラリルレロヮワヰヱヲンヴヵヶ
-\ifuptexmode
-ヷヸヹヺㇰㇱㇲㇳㇴㇵㇶㇷㇸㇹㇺㇻㇼㇽㇾㇿ
-\fi
-
-“回”、‘回’。“回”,‘回’.
-}
-
-{\rubyfamily%
-[ruby/m]
-
-ぁあぃいぅうぇえぉおかがきぎくぐけげこごさざしじすずせぜそぞただちぢっつづてでとどなにぬねのは
-ばぱひびぴふぶぷへべぺほぼぽまみむめもゃやゅゆょよらりるれろゎわゐゑをんヽヾゝゞー
-\ifuptexmode
-ゔゕゖ
-
-\fbox{\hbox{\tate\Huge ㇰ}}
-
-\fbox{\hbox{\yoko\Huge ㇰ}}
-
-\fi
-
-ァアィイゥウェエォオカガキギクグケゲコゴサザシジスズセゼソゾタダチヂッツヅテデトドナニヌネノハ
-バパヒビピフブプヘベペホボポマミムメモャヤュユョヨラリルレロヮワヰヱヲンヴヵヶ
-\ifuptexmode
-ヷヸヹヺㇰㇱㇲㇳㇴㇵㇶㇷㇸㇹㇺㇻㇼㇽㇾㇿ
-\fi
-
-“回”、‘回’。“回”,‘回’.
-
-{\bfseries%
-[ruby/bx]
-
-ぁあぃいぅうぇえぉおかがきぎくぐけげこごさざしじすずせぜそぞただちぢっつづてでとどなにぬねのは
-ばぱひびぴふぶぷへべぺほぼぽまみむめもゃやゅゆょよらりるれろゎわゐゑをんヽヾゝゞー
-\ifuptexmode
-ゔゕゖ
-\fi
-
-ァアィイゥウェエォオカガキギクグケゲコゴサザシジスズセゼソゾタダチヂッツヅテデトドナニヌネノハ
-バパヒビピフブプヘベペホボポマミムメモャヤュユョヨラリルレロヮワヰヱヲンヴヵヶ
-\ifuptexmode
-ヷヸヹヺㇰㇱㇲㇳㇴㇵㇶㇷㇸㇹㇺㇻㇼㇽㇾㇿ
-\fi
-
-“回”、‘回’。“回”,‘回’.
-}}
-
-{\gtfamily\rubyfamily%
-[rubyg/m]
-
-ぁあぃいぅうぇえぉおかがきぎくぐけげこごさざしじすずせぜそぞただちぢっつづてでとどなにぬねのは
-ばぱひびぴふぶぷへべぺほぼぽまみむめもゃやゅゆょよらりるれろゎわゐゑをんヽヾゝゞー
-\ifuptexmode
-ゔゕゖ
-\fi
-
-ァアィイゥウェエォオカガキギクグケゲコゴサザシジスズセゼソゾタダチヂッツヅテデトドナニヌネノハ
-バパヒビピフブプヘベペホボポマミムメモャヤュユョヨラリルレロヮワヰヱヲンヴヵヶ
-\ifuptexmode
-ヷヸヹヺㇰㇱㇲㇳㇴㇵㇶㇷㇸㇹㇺㇻㇼㇽㇾㇿ
-\fi
-
-“回”、‘回’。“回”,‘回’.
-
-{\gtfamily\rubyfamily\bfseries%
-[rubyg/bx]
-
-\fbox{\hbox{\tate\Huge ぁ}}
-
-\fbox{\hbox{\yoko\Huge ぁ}}
-
-ぁあぃいぅうぇえぉおかがきぎくぐけげこごさざしじすずせぜそぞただちぢっつづてでとどなにぬねのは
-ばぱひびぴふぶぷへべぺほぼぽまみむめもゃやゅゆょよらりるれろゎわゐゑをんヽヾゝゞー
-\ifuptexmode
-ゔゕゖ
-\fi
-
-ァアィイゥウェエォオカガキギクグケゲコゴサザシジスズセゼソゾタダチヂッツヅテデトドナニヌネノハ
-バパヒビピフブプヘベペホボポマミムメモャヤュユョヨラリルレロヮワヰヱヲンヴヵヶ
-\ifuptexmode
-ヷヸヹヺㇰㇱㇲㇳㇴㇵㇶㇷㇸㇹㇺㇻㇼㇽㇾㇿ
-\fi
-
-“回”、‘回’。“回”,‘回’.
-}}
-
-{\mgfamily\rubyfamily%
-[rubymg/m]
-
-ぁあぃいぅうぇえぉおかがきぎくぐけげこごさざしじすずせぜそぞただちぢっつづてでとどなにぬねのは
-ばぱひびぴふぶぷへべぺほぼぽまみむめもゃやゅゆょよらりるれろゎわゐゑをんヽヾゝゞー
-\ifuptexmode
-ゔゕゖ
-\fi
-
-ァアィイゥウェエォオカガキギクグケゲコゴサザシジスズセゼソゾタダチヂッツヅテデトドナニヌネノハ
-バパヒビピフブプヘベペホボポマミムメモャヤュユョヨラリルレロヮワヰヱヲンヴヵヶ
-\ifuptexmode
-ヷヸヹヺㇰㇱㇲㇳㇴㇵㇶㇷㇸㇹㇺㇻㇼㇽㇾㇿ
-\fi
-
-“回”、‘回’。“回”,‘回’.
-}
-\end{document}
diff --git a/Master/texmf-dist/doc/uptex/uptex-base/samples/uotftest.tex b/Master/texmf-dist/doc/uptex/uptex-base/samples/uotftest.tex
deleted file mode 100644
index afe549dd0e1..00000000000
--- a/Master/texmf-dist/doc/uptex/uptex-base/samples/uotftest.tex
+++ /dev/null
@@ -1,191 +0,0 @@
-\makeatletter
-
-\def\@opt@{multi}
-\def\@default{default}
-\def\@jarticle{jarticle}
-\def\@tarticle{tarticle}
-
-\ifx\option\@undefined
- \def\option{default}
-\fi
-\ifx\option\@default
-\else
- \edef\@opt@{\option,\@opt@}
-\fi
-
-\ifx\class\@undefined
- \def\class{jarticle}
-\fi
-\ifx\class\@jarticle
-\else
- \ifx\class\@tarticle
- \else
- \edef\@opt@{uplatex,\@opt@}
- \fi
-\fi
-
-\documentclass[a4paper,titlepage, draft]{\class}
-%\documentclass[a4paper,titlepage, draft,landscape]{\class}
-
-\usepackage[\@opt@]{otf}
-
-%
-% furikana.sty $B$,$"$l$PFI$_9~$`(B
-\newread\@istheresuchafile
-\openin\@istheresuchafile furikana.sty
-\ifeof\@istheresuchafile\relax
-\else\closein\@istheresuchafile\relax
-\usepackage{furikana}% found
-\fi
-
-\makeatother
-
-\usepackage{redeffont}
-
-
-\AtBeginDvi{\special{papersize=\the\paperwidth,\the\paperheight}}
-\ajCIDVarDef{$B$j(B}{12746}
-\ajCIDVarDef{$B9b(B}{8705}
-\ajUTFVarDef{$B2*(B}{9DD7}
-\pagestyle{empty}
-\makeatletter
-\ifx\rubyfamily\@undefined\let\rubyfamily=\relax\fi
-\ifx\mgfamily\@undefined\let\mgfamily=\relax\fi
-\makeatother
-\begin{document}
-\section{$B8+=P$7(B}
-
-$B%/%i%9!'(B\texttt{\class}\\
-$B%*%W%7%g%s!'(B\texttt{\option}
-
-\vspace{\baselineskip}
-\begin{tabular}{l||ccccc}
-$B%U%)%s%H(B & $B2>L>(B & $B4A;z(B & UTF & CID & $B%k%S(B\\
-\hline
-mc/m & $B$R$i$+$J(B & $B4A;z(B & \UTF{9DD7} & \CID{8705} & {\rubyfamily $B?6$j$+$J(B}\\
-mc/bx & {\bfseries $B$R$i$+$J(B} & {\bfseries $B4A;z(B} & {\bfseries\UTF{9DD7}} & {\bfseries\CID{8705}} & {\bfseries\rubyfamily $B?6$j$+$J(B}\\
-gt/m & {\gtfamily $B$R$i$+$J(B} & {\gtfamily $B4A;z(B} & {\gtfamily\UTF{9DD7}} & {\gtfamily\CID{8705}} & {\gtfamily\rubyfamily $B?6$j$+$J(B}\\
-gt/bx & {\gtfamily\bfseries $B$R$i$+$J(B} & {\gtfamily\bfseries $B4A;z(B} & {\gtfamily\bfseries\UTF{9DD7}} & {\gtfamily\bfseries\CID{8705}} & {\gtfamily\bfseries\rubyfamily $B?6$j$+$J(B}\\
-mg/m & {\mgfamily $B$R$i$+$J(B} & {\mgfamily $B4A;z(B} & {\mgfamily\UTF{9DD7}} & {\mgfamily\CID{8705}} & {\mgfamily\rubyfamily $B?6$j$+$J(B}\\
-\end{tabular}
-\vspace{\baselineskip}
-
-$BF|K\!'(B\UTF{9aa8}$B!!4JBN;z!'(B\UTFC{9aa8}$B!!HKqs;z!'(B\UTFT{9aa8}$B!!D+A/!'(B\UTFK{9aa8}
-
-$BF|K\!'(B\UTF{6d77}$B!!4JBN;z!'(B\UTFC{6d77}$B!!HKqs;z!'(B\UTFT{6d77}$B!!D+A/!'(B\UTFK{6d77}
-
-% with furikana.sty
-\makeatletter
-\ifx\kana\@undefined
-\else
-\kana{$B4A;z(B}{$B?6$j$+$J(B}{\bfseries \kana{$B4A;z(B}{$B?6$j$+$J(B}}%
-{\gtfamily\kana{$B4A;z(B}{$B?6$j$+$J(B}\bfseries \kana{$B4A;z(B}{$B?6$j$+$J(B}}
-{\mgfamily\kana{$B4A;z(B}{$B?6$j$+$J(B}}
-
-\kana{\UTF{9DD7}}{$B$+$J(B}\kana{$B2*(B}{$B$+$J(B}
-
-\Kana[3]{\UTFK{c548},\UTFK{b155},\UTFK{d558},\UTFK{c138},\UTFK{c694}}{$B%"%s(B,$B%K%g%s(B,$B%O(B,$B%;(B,$B%h(B}
-\fi
-\makeatother
-
-
-\clearpage
-[mc/m]
-
-$B$!$"$#$$$%$&$'$($)$*$+$,$-$.$/$0$1$2$3$4$5$6$7$8$9$:$;$<$=$>$?$@$A$B$C$D$E$F$G$H$I$J$K$L$M$N$O(B
-$B$P$Q$R$S$T$U$V$W$X$Y$Z$[$\$]$^$_$`$a$b$c$d$e$f$g$h$i$j$k$l$m$n$o$p$q$r$s!3!4!5!6!<(B
-
-$B%!%"%#%$%%%&%'%(%)%*%+%,%-%.%/%0%1%2%3%4%5%6%7%8%9%:%;%<%=%>%?%@%A%B%C%D%E%F%G%H%I%J%K%L%M%N%O(B
-$B%P%Q%R%S%T%U%V%W%X%Y%Z%[%\%]%^%_%`%a%b%c%d%e%f%g%h%i%j%k%l%m%n%o%p%q%r%s%t%u%v(B
-
-{\bfseries%
-[mc/bx]
-
-$B$!$"$#$$$%$&$'$($)$*$+$,$-$.$/$0$1$2$3$4$5$6$7$8$9$:$;$<$=$>$?$@$A$B$C$D$E$F$G$H$I$J$K$L$M$N$O(B
-$B$P$Q$R$S$T$U$V$W$X$Y$Z$[$\$]$^$_$`$a$b$c$d$e$f$g$h$i$j$k$l$m$n$o$p$q$r$s!3!4!5!6!<(B
-
-$B%!%"%#%$%%%&%'%(%)%*%+%,%-%.%/%0%1%2%3%4%5%6%7%8%9%:%;%<%=%>%?%@%A%B%C%D%E%F%G%H%I%J%K%L%M%N%O(B
-$B%P%Q%R%S%T%U%V%W%X%Y%Z%[%\%]%^%_%`%a%b%c%d%e%f%g%h%i%j%k%l%m%n%o%p%q%r%s%t%u%v(B
-}
-
-{\gtfamily
-[gt/m]
-
-$B$!$"$#$$$%$&$'$($)$*$+$,$-$.$/$0$1$2$3$4$5$6$7$8$9$:$;$<$=$>$?$@$A$B$C$D$E$F$G$H$I$J$K$L$M$N$O(B
-$B$P$Q$R$S$T$U$V$W$X$Y$Z$[$\$]$^$_$`$a$b$c$d$e$f$g$h$i$j$k$l$m$n$o$p$q$r$s!3!4!5!6!<(B
-
-$B%!%"%#%$%%%&%'%(%)%*%+%,%-%.%/%0%1%2%3%4%5%6%7%8%9%:%;%<%=%>%?%@%A%B%C%D%E%F%G%H%I%J%K%L%M%N%O(B
-$B%P%Q%R%S%T%U%V%W%X%Y%Z%[%\%]%^%_%`%a%b%c%d%e%f%g%h%i%j%k%l%m%n%o%p%q%r%s%t%u%v(B
-
-{\bfseries%
-[gt/bx]
-
-$B$!$"$#$$$%$&$'$($)$*$+$,$-$.$/$0$1$2$3$4$5$6$7$8$9$:$;$<$=$>$?$@$A$B$C$D$E$F$G$H$I$J$K$L$M$N$O(B
-$B$P$Q$R$S$T$U$V$W$X$Y$Z$[$\$]$^$_$`$a$b$c$d$e$f$g$h$i$j$k$l$m$n$o$p$q$r$s!3!4!5!6!<(B
-
-$B%!%"%#%$%%%&%'%(%)%*%+%,%-%.%/%0%1%2%3%4%5%6%7%8%9%:%;%<%=%>%?%@%A%B%C%D%E%F%G%H%I%J%K%L%M%N%O(B
-$B%P%Q%R%S%T%U%V%W%X%Y%Z%[%\%]%^%_%`%a%b%c%d%e%f%g%h%i%j%k%l%m%n%o%p%q%r%s%t%u%v(B
-}}
-
-{\mgfamily
-[mg/m]
-
-$B$!$"$#$$$%$&$'$($)$*$+$,$-$.$/$0$1$2$3$4$5$6$7$8$9$:$;$<$=$>$?$@$A$B$C$D$E$F$G$H$I$J$K$L$M$N$O(B
-$B$P$Q$R$S$T$U$V$W$X$Y$Z$[$\$]$^$_$`$a$b$c$d$e$f$g$h$i$j$k$l$m$n$o$p$q$r$s!3!4!5!6!<(B
-
-$B%!%"%#%$%%%&%'%(%)%*%+%,%-%.%/%0%1%2%3%4%5%6%7%8%9%:%;%<%=%>%?%@%A%B%C%D%E%F%G%H%I%J%K%L%M%N%O(B
-$B%P%Q%R%S%T%U%V%W%X%Y%Z%[%\%]%^%_%`%a%b%c%d%e%f%g%h%i%j%k%l%m%n%o%p%q%r%s%t%u%v(B
-}
-
-{\rubyfamily%
-[ruby/m]
-
-$B$!$"$#$$$%$&$'$($)$*$+$,$-$.$/$0$1$2$3$4$5$6$7$8$9$:$;$<$=$>$?$@$A$B$C$D$E$F$G$H$I$J$K$L$M$N$O(B
-$B$P$Q$R$S$T$U$V$W$X$Y$Z$[$\$]$^$_$`$a$b$c$d$e$f$g$h$i$j$k$l$m$n$o$p$q$r$s!3!4!5!6!<(B
-
-$B%!%"%#%$%%%&%'%(%)%*%+%,%-%.%/%0%1%2%3%4%5%6%7%8%9%:%;%<%=%>%?%@%A%B%C%D%E%F%G%H%I%J%K%L%M%N%O(B
-$B%P%Q%R%S%T%U%V%W%X%Y%Z%[%\%]%^%_%`%a%b%c%d%e%f%g%h%i%j%k%l%m%n%o%p%q%r%s%t%u%v(B
-
-{\bfseries%
-[ruby/bx]
-
-$B$!$"$#$$$%$&$'$($)$*$+$,$-$.$/$0$1$2$3$4$5$6$7$8$9$:$;$<$=$>$?$@$A$B$C$D$E$F$G$H$I$J$K$L$M$N$O(B
-$B$P$Q$R$S$T$U$V$W$X$Y$Z$[$\$]$^$_$`$a$b$c$d$e$f$g$h$i$j$k$l$m$n$o$p$q$r$s!3!4!5!6!<(B
-
-$B%!%"%#%$%%%&%'%(%)%*%+%,%-%.%/%0%1%2%3%4%5%6%7%8%9%:%;%<%=%>%?%@%A%B%C%D%E%F%G%H%I%J%K%L%M%N%O(B
-$B%P%Q%R%S%T%U%V%W%X%Y%Z%[%\%]%^%_%`%a%b%c%d%e%f%g%h%i%j%k%l%m%n%o%p%q%r%s%t%u%v(B
-}}
-
-{\gtfamily\rubyfamily%
-[rubyg/m]
-
-$B$!$"$#$$$%$&$'$($)$*$+$,$-$.$/$0$1$2$3$4$5$6$7$8$9$:$;$<$=$>$?$@$A$B$C$D$E$F$G$H$I$J$K$L$M$N$O(B
-$B$P$Q$R$S$T$U$V$W$X$Y$Z$[$\$]$^$_$`$a$b$c$d$e$f$g$h$i$j$k$l$m$n$o$p$q$r$s!3!4!5!6!<(B
-
-$B%!%"%#%$%%%&%'%(%)%*%+%,%-%.%/%0%1%2%3%4%5%6%7%8%9%:%;%<%=%>%?%@%A%B%C%D%E%F%G%H%I%J%K%L%M%N%O(B
-$B%P%Q%R%S%T%U%V%W%X%Y%Z%[%\%]%^%_%`%a%b%c%d%e%f%g%h%i%j%k%l%m%n%o%p%q%r%s%t%u%v(B
-
-{\gtfamily\rubyfamily\bfseries%
-[rubyg/bx]
-
-\fbox{\hbox{\tate\Huge $B$!(B}}
-
-\fbox{\hbox{\yoko\Huge $B$!(B}}
-
-$B$!$"$#$$$%$&$'$($)$*$+$,$-$.$/$0$1$2$3$4$5$6$7$8$9$:$;$<$=$>$?$@$A$B$C$D$E$F$G$H$I$J$K$L$M$N$O(B
-$B$P$Q$R$S$T$U$V$W$X$Y$Z$[$\$]$^$_$`$a$b$c$d$e$f$g$h$i$j$k$l$m$n$o$p$q$r$s!3!4!5!6!<(B
-
-$B%!%"%#%$%%%&%'%(%)%*%+%,%-%.%/%0%1%2%3%4%5%6%7%8%9%:%;%<%=%>%?%@%A%B%C%D%E%F%G%H%I%J%K%L%M%N%O(B
-$B%P%Q%R%S%T%U%V%W%X%Y%Z%[%\%]%^%_%`%a%b%c%d%e%f%g%h%i%j%k%l%m%n%o%p%q%r%s%t%u%v(B
-}}
-
-{\mgfamily\rubyfamily%
-[rubymg/m]
-
-$B$!$"$#$$$%$&$'$($)$*$+$,$-$.$/$0$1$2$3$4$5$6$7$8$9$:$;$<$=$>$?$@$A$B$C$D$E$F$G$H$I$J$K$L$M$N$O(B
-$B$P$Q$R$S$T$U$V$W$X$Y$Z$[$\$]$^$_$`$a$b$c$d$e$f$g$h$i$j$k$l$m$n$o$p$q$r$s!3!4!5!6!<(B
-
-$B%!%"%#%$%%%&%'%(%)%*%+%,%-%.%/%0%1%2%3%4%5%6%7%8%9%:%;%<%=%>%?%@%A%B%C%D%E%F%G%H%I%J%K%L%M%N%O(B
-$B%P%Q%R%S%T%U%V%W%X%Y%Z%[%\%]%^%_%`%a%b%c%d%e%f%g%h%i%j%k%l%m%n%o%p%q%r%s%t%u%v(B
-}
-\end{document}