Merge branch 'upTeX-1.23-pre'

00readme_uptex.txt

@@ -1,18 +1,18 @@
 upTeX, upLaTeX  --- unicode version of ASCII pTeX, pLaTeX
-2017.01.15 Ver1.22
+2018.02.24 Ver1.23
 TANAKA, Takuji   ttk(at)t-lab(dot)opal(dot)ne(dot)jp
 
 [ Contents ]
 00readme_uptex.txt :: This file
 01uptex_doc_utf8.txt :: A document (in Japanese)
 02uptex_changelog_utf8.txt :: Change Log
 under Build/ ::  sources of binaries
-under Master/ :: macros, classes, fonts. etc.
+under Master/ :: ini file etc.
 under bin/ :: utility
 under samples/ :: samples for test
 
 [ Building upTeX ]
-The sources work with TeXLive svn r42954 .
+The sources work with TeXLive svn r46727 .
 Ref. TeXLive and Subversion  http://www.tug.org/texlive/svn/
 
 [ Status ]
@@ -22,7 +22,7 @@ No warranty.
 [ References ]
 [1] ASCII Nihongo TeX (Publishing TeX)
     ASCII MEDIA WORKS
-    http://ascii.asciimw.jp/pb/ptex/
+    http://ascii.asciimw.jp/pb/ptex/ (dead link)
 [2] upTeX, upLaTeX ― unicode version of pTeX, pLaTeX
     http://www.t-lab.opal.ne.jp/tex/uptex_en.html
 

02uptex_changelog_utf8.txt

@@ -1,5 +1,39 @@
 ### ChangeLog / 変更履歴
 
+2018.02.24 Ver1.23-20180224a
+  TeXLive svn r46727 base
+  Build/source/texk/web2c/uptexdir:
+    * uptex-m.ch, uppltotf.ch, uptftopl.ch, updvitype.ch, upbibtex.ch,
+      uptex_version.h:
+      Update upTeX version number.
+    * uptex-m.ch, kanji.c:
+      Update reference of Unicode blocks to
+      "Blocks-10.0.0.txt Date: 2017-04-12, 17:30:00 GMT [KW]".
+      Exclude Latin-1 letters from "Latin-1 Supplement" block.
+      Set kcatcode of "Latin-1 letters", "Latin Extended-A" 15 (not_cjk).
+    * uppltotf.ch, uptftopl.ch:
+      Adapt to extend format of JFM to accept 24bit characters for chartype>0.
+      (from TeX Live, Thanks to Yamashita san)
+    * uptex-m.ch:
+      New primitives: \uptexversion and \uptexrevision.
+      (from TeX Live, Thanks to Kitagawa san)
+    * COPYRIGHT, COPYRIGHT.ja:
+      Update copyright year.
+  Build/source/texk/makejvf:
+    * Removed. Now it is distributed at
+      https://github.com/texjporg/tex-jp-build
+  Master/texmf-dist/{,source/}fonts/*:
+    * Removed. Now it is distributed at
+      https://github.com/texjporg/uptex-fonts
+      https://www.ctan.org/pkg/uptex-fonts
+  bin/convbkmk.rb:
+    * Removed. Now it is distributed at
+      https://ctan.org/pkg/convbkmk
+  samples:
+    Update.
+  01uptex_doc_utf8.txt:
+    Update.
+
 2017.01.15 Ver1.22-20170115a
   TeXLive svn r42954 base
   Build/source/texk/web2c/uptexdir:

LICENSE

@@ -1,6 +1,6 @@
 Copyright (c) 2010 ASCII MEDIA WORKS
-Copyright (c) 2016-2017 Takuji Tanaka
-Copyright (c) 2016-2017 Japanese TeX Development Community
+Copyright (c) 2016-2018 Takuji Tanaka
+Copyright (c) 2016-2018 Japanese TeX Development Community
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

Makefile

@@ -0,0 +1,21 @@
+KANJI = -kanji=utf8
+FONTMAP = -f ipaex.map -f uptex-ipaex.map
+TEXMF = $(shell kpsewhich -var-value=TEXMFHOME)
+
+all:
+	echo Nothing to be built.
+
+.PHONY: install
+install:
+	mkdir -p ${TEXMF}/doc/uptex/uptex-base
+	cp ./LICENSE ${TEXMF}/doc/uptex/uptex-base/
+	cp ./README.md ${TEXMF}/doc/uptex/uptex-base/
+	cp ./*.txt ${TEXMF}/doc/uptex/uptex-base/
+	cp ./Makefile ${TEXMF}/doc/uptex/uptex-base/
+	mkdir -p ${TEXMF}/doc/uptex/uptex-base/samples
+	cp ./samples/* ${TEXMF}/doc/uptex/uptex-base/samples/
+	mkdir -p ${TEXMF}/tex/uptex/uptex-base
+	cp ./uptex.tex ${TEXMF}/tex/uptex/uptex-base/
+	cp ./ukinsoku.tex ${TEXMF}/tex/uptex/uptex-base/
+	cp ./*.ini ${TEXMF}/tex/uptex/uptex-base/
+	cp ./euptex.src ${TEXMF}/tex/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,

samples/Makefile

@@ -19,6 +19,23 @@ 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 eplatex texxet
 
@@ -35,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:
@@ -44,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:
@@ -59,7 +78,7 @@ widow:
 	$(PLATEX) widow
 	mv widow.dvi widow-platex.dvi
 	$(DVIPDFMX) widow-platex.dvi
-	$(UPLATEX) --kanji-internal=euc widow
+	$(UPLATEX_EUC) widow
 	mv widow.dvi widow-u-euc.dvi
 	$(DVIPDFMX) widow-u-euc.dvi
 	$(UPLATEX) widow
@@ -121,16 +140,17 @@ greek:
 
 encswitch: encswitchj encswitchp encswitchu
 
+### "platex on uptex" for test
 encswitchj:
 	for ie in euc sjis; do \
-		$(PLATEX) -kanji=$$ie --kanji-internal=$$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 \
-		$(PLATEX) -kanji=$$fe --kanji-internal=$$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 ; \
@@ -141,6 +161,7 @@ encswitchj:
 	done ; \
 	done
 
+### platex
 encswitchp:
 	for fe in jis euc sjis utf8; do \
 		$(PLATEX) -kanji=$$fe simple-$$fe.tex ; \
@@ -151,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 ; \
@@ -186,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 \
-		$(PLATEX) -kanji=$$fe --kanji-internal=$$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 --kanji-internal=$$ie jbib1-jis.tex ; \
-		$(PLATEX) -kanji=$$fe --kanji-internal=$$ie jbib1-jis.tex ; \
+		$(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 ; \
@@ -205,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 ; \
+		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 --kanji-internal=$$ie jbib2-utf8.tex ; \
-		$(UPLATEX) -kanji=$$fe --kanji-internal=$$ie jbib2-utf8.tex ; \
+		$(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 ; \
@@ -224,7 +254,6 @@ jbibu:
 		mv jbib2-utf8.blg jbib2-$$fe-$$be.blg ; \
 		$(DVIPDFMX) jbib2-$$fe-$$be.dvi ; \
 	done ; \
-	done ; \
 	done
 
 pmpost: pmpostj pmpostu
@@ -322,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; do \
-		rm bkmk-$$en.aux bkmk-$$en.out ; \
+		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 ; \
@@ -367,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 ; \
@@ -376,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; 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 ; \
@@ -390,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
 

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
 

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
 

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