uptex-base (1mar20)

git-svn-id: svn://tug.org/texlive/trunk@54043 c570f23f-e606-0410-a88d-b1316a301751

8 files changed, 241 insertions, 179 deletions

diff --git a/Master/texmf-dist/doc/uptex/uptex-base/00readme_uptex.txt b/Master/texmf-dist/doc/uptex/uptex-base/00readme_uptex.txt
index be76b253794..99972d0a2c4 100644
--- a/Master/texmf-dist/doc/uptex/uptex-base/00readme_uptex.txt
+++ b/Master/texmf-dist/doc/uptex/uptex-base/00readme_uptex.txt
@@ -1,5 +1,5 @@
 upTeX, upLaTeX  --- unicode version of ASCII pTeX, pLaTeX
-2019.05.12 Ver1.25
+2020.02.22 Ver1.26
 TANAKA, Takuji   ttk(at)t-lab(dot)opal(dot)ne(dot)jp
 
 [ Contents ]
@@ -24,6 +24,7 @@ No warranty.
     ASCII MEDIA WORKS
     http://ascii.asciimw.jp/pb/ptex/ (dead link)
     https://web.archive.org/web/20161229061414/http://ascii.asciimw.jp/pb/ptex/ (web archive)
+    https://asciidwango.github.io/ptex/ (by DWANGO Co., Ltd.)
 [2] upTeX, upLaTeX ― unicode version of pTeX, pLaTeX
     http://www.t-lab.opal.ne.jp/tex/uptex_en.html
 
diff --git a/Master/texmf-dist/doc/uptex/uptex-base/01uptex_doc_utf8.txt b/Master/texmf-dist/doc/uptex/uptex-base/01uptex_doc_utf8.txt
index 525bbd1fe52..aebc0e62e93 100644
--- a/Master/texmf-dist/doc/uptex/uptex-base/01uptex_doc_utf8.txt
+++ b/Master/texmf-dist/doc/uptex/uptex-base/01uptex_doc_utf8.txt
@@ -1,5 +1,5 @@
 upTeX, upLaTeX  --- 内部unicode版 pTeX, pLaTeX の実装
-2019.05.12 Ver1.25
+2020.02.22 Ver1.26
 TANAKA, Takuji   ttk(at)t-lab(dot)opal(dot)ne(dot)jp
 
 ◇ upTeX開発のねらい
@@ -176,7 +176,7 @@ pTeX を中心に推移してきた日本の TeX ユーザーが
    この仕様は pTeX でも同様となっている。
 <14> 新しく \kchar, \kchardef プリミティヴをを追加。
    \char`<文字>, \chardef では文字コードが255以下の場合には欧文動作、
-   265以上の場合には和文動作となる。
+   256以上の場合には和文動作となる。
    \kchar`<文字>, \kchardef では文字コード範囲によらず和文動作となる。
 <15> 従来デフォルトのフォントはset2の範囲で済むようにし、
    set3を含むフォント(vf)はオプションとしていたが、
@@ -451,15 +451,16 @@ kcatcodeは原則としてUnicodeのblock毎に与えられる。
  (0x92)  0xAC00.. 0xD7AF  <19>  Hangul Syllables
  (0x93)  0xD7B0.. 0xD7FF  <19>  Hangul Jamo Extended-B
  (0x98)  0xF900.. 0xFAFF  <16>  CJK Compatibility Ideographs
- (0xFD)  0x1B000..0x1B0FF <17>  Kana Supplement
- (0xFE)  0x1B100..0x1B12F <17>  Kana Extended-A
- (0xFF)  0x1B130..0x1B16F <17>  Small Kana Extension
- (0x122) 0x20000..0x2A6FF <16>  CJK Unified Ideographs Extension B
- (0x123) 0x2A700..0x2B73F <16>  CJK Unified Ideographs Extension C
- (0x124) 0x2B740..0x2B81F <16>  CJK Unified Ideographs Extension D
- (0x125) 0x2B820..0x2CEAF <16>  CJK Unified Ideographs Extension E
- (0x126) 0x2CEB0..0x2F7FF <16>  CJK Unified Ideographs Extension F
- (0x127) 0x2F800..0x2FFFF <16>  CJK Compatibility Ideographs Supplement
+ (0x103) 0x1B000..0x1B0FF <17>  Kana Supplement
+ (0x104) 0x1B100..0x1B12F <17>  Kana Extended-A
+ (0x105) 0x1B130..0x1B16F <17>  Small Kana Extension
+ (0x129) 0x20000..0x2A6FF <16>  CJK Unified Ideographs Extension B
+ (0x12A) 0x2A700..0x2B73F <16>  CJK Unified Ideographs Extension C
+ (0x12B) 0x2B740..0x2B81F <16>  CJK Unified Ideographs Extension D
+ (0x12C) 0x2B820..0x2CEAF <16>  CJK Unified Ideographs Extension E
+ (0x12D) 0x2CEB0..0x2F7FF <16>  CJK Unified Ideographs Extension F
+ (0x12E) 0x2F800..0x2FFFF <16>  CJK Compatibility Ideographs Supplement
+ (0x12F) 0x30000..0x3134F <16>  CJK Unified Ideographs Extension G
 (上記の文字の範囲は実装に基づいており、Blocks.txtに記述されている範囲より広い場合がある)
 ○Unicode blockの例外
  (0x1FD) 0xAA, 0xBA, 0xC0..0xD6, 0xD8..0xF6, 0xF8..0xFF <15>  Latin-1 Letters
@@ -498,8 +499,6 @@ updvitype 動いている。無問題。
 upbibtex  ほぼ動いている。しかし、jalpha.bst 使用時に
   一部のエントリーでeuc動作と同等にならない問題がある。
 ukinsoku.tex  JIS X 0213 に対応した。
-CMap UTF8-UTF16
-  TeX Live svn に r26540 で取り込まれた。
 ◎ 別の配布に含めたもの
 otfパッケージ  japanese-otf-uptex として公開、CTANに登録した。
   (以前は otfbeta-uptex-x.xx.tar.xz として公開していた。)
@@ -512,6 +511,11 @@ convbkmk.rb   dvipsでのbookmark作成のためのrubyスクリプト。
   convbkmk としてCTANに登録した。
   https://ctan.org/pkg/convbkmk
   https://github.com/t-tk/convbkmk
+CMap UTF8-UTF16
+  TeX Live svn に r26540 で取り込まれた。
+  一次配布は http://www.t-lab.opal.ne.jp/tex/uptex.html
+  uptex-fonts の配布に含まれている。
+  https://github.com/texjporg/uptex-fonts
 ◎ 日本語TeX開発コミュニティに移管したもの
 upjisr-h.tfmなど
   JIS X 0208の範囲ではほぼUnicodeに移植出来ていると思う。
@@ -541,20 +545,23 @@ dvipdfmx  TeX Live svn に r24509 あたりで取り込まれた。
   set3も含めて動いている。
   ただし、set3で、「内部コードがUTF-32, CMapがUniXXX-UTF16」であること
   を仮定したハードコーディングになっているおり、柔軟性は乏しい。
-  bookmark 作成は UTF8-UCS2, UTF8-UTF16 の CMAP または、
+  bookmark 作成は UTF8-UCS2, UTF8-UTF16 の CMap または、
   convbkmk.rbの-oオプションを必要とする。
 dvi2tty   TeX Live svn に r24634 あたりで取り込まれた。
   dvi2tty の NTT JTeX/pTeX 対応版を upTeX 対応にした。
   オプション -J を変更し、 -U, -E を新設した。
   さらに、T1,TS1,OT2,T2A,T2B,T2C,X2エンコーディング対応機能が
   TeX Live に r39942 あたりで取り込まれた。
+  https://github.com/t-tk/dvi2tty
 mendex    TeX Live r33962 あたりで、見出しをUnicode対応とした。
   さらに r47721 あたりで見出しのデフォルトエンコーディングをUTF-8とした。
+  https://github.com/texjporg/tex-jp-build
 upmendex  mendex をベースに新規に作成した。
   mendex の内部コードをUnicode化し、ICUによるソート、
   読みをJIS X 0213のかなに対応、CJK対応、ラテン文字(含非英語)対応、
   キリル文字対応、ギリシャ文字対応となっている。
   TeX Live svn に r39638 あたりで取り込まれた。
+  https://github.com/t-tk/upmendex-package
 upmpost   TeX Live r35188 あたりでupmetapostの名前で取り込まれ、
   現在upmpostの名前になっている。
   ただし、おそらくuptex-0.30の頃と同様、
diff --git a/Master/texmf-dist/doc/uptex/uptex-base/02uptex_changelog_utf8.txt b/Master/texmf-dist/doc/uptex/uptex-base/02uptex_changelog_utf8.txt
index 672cbcdcd58..63c6b74d0cb 100644
--- a/Master/texmf-dist/doc/uptex/uptex-base/02uptex_changelog_utf8.txt
+++ b/Master/texmf-dist/doc/uptex/uptex-base/02uptex_changelog_utf8.txt
@@ -1,12 +1,30 @@
 ### ChangeLog / 変更履歴
 
-2019.09.22
+2020.02.29 Ver1.26-20200229a
+  samples:
+    Update.
+  01uptex_doc_utf8.txt:
+    Update.
+
+2020.02.22 Ver1.26-20200222a
+  TeXLive svn r53078 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-13.0.0.txt Date: 2019-07-10, 19:06:00 GMT [KW]".
+    * COPYRIGHT, COPYRIGHT.ja:
+      Update copyright year.
   Master/texmf-dist/tex/uptex/uptex-base:
     * ukinsoku.tex:
-      Revert setting of kcatcode for block
-      "Halfwidth and Fullwidth Forms" to work around
-      for bug of Ver1.24
-      https://github.com/texjporg/uptex-base/issues/3
+      Import from GitHub
+      https://github.com/texjporg/uptex-base
+  samples:
+    Update.
+  00readme_uptex.txt, 01uptex_doc_utf8.txt:
+    Update.
 
 2019.05.12 Ver1.25-20190512a
   TeXLive svn r51021 base
diff --git a/Master/texmf-dist/doc/uptex/uptex-base/LICENSE b/Master/texmf-dist/doc/uptex/uptex-base/LICENSE
index f6c6963da16..ef637253483 100644
--- a/Master/texmf-dist/doc/uptex/uptex-base/LICENSE
+++ b/Master/texmf-dist/doc/uptex/uptex-base/LICENSE
@@ -1,6 +1,6 @@
 Copyright (c) 2010 ASCII MEDIA WORKS
-Copyright (c) 2016-2019 Takuji Tanaka
-Copyright (c) 2016-2019 Japanese TeX Development Community
+Copyright (c) 2016-2020 Takuji Tanaka
+Copyright (c) 2016-2020 Japanese TeX Development Community
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/Master/texmf-dist/doc/uptex/uptex-base/README.md b/Master/texmf-dist/doc/uptex/uptex-base/README.md
index 6338b9fa797..b8168c0a585 100644
--- a/Master/texmf-dist/doc/uptex/uptex-base/README.md
+++ b/Master/texmf-dist/doc/uptex/uptex-base/README.md
@@ -17,6 +17,6 @@ the 3-clause BSD license (see [LICENSE](./LICENSE)).
 
 ## Release Date
 
-2019-09-22
+2020-02-29
 
 Japanese TeX Development Community
diff --git a/Master/texmf-dist/doc/uptex/uptex-base/samples/show_kcat.tex b/Master/texmf-dist/doc/uptex/uptex-base/samples/show_kcat.tex
index f68bfffa390..618bc40830c 100644
--- a/Master/texmf-dist/doc/uptex/uptex-base/samples/show_kcat.tex
+++ b/Master/texmf-dist/doc/uptex/uptex-base/samples/show_kcat.tex
@@ -33,6 +33,7 @@
 \message{\kc{𫠠}{2B820}}% U+2B820 CJK Unified Ideographs Extension E
 \message{\kc{𬺰}{2CEB0}}% U+2CEB0 CJK Unified Ideographs Extension F
 \message{\kc{丽}{2F800}}% U+2F800 CJK Compatibility Ideographs Supplement
+\message{\kc{𰀀}{30000}}% U+30000 CJK Unified Ideographs Extension G
 
 \message{kana:}
 \message{\kc{あ}{3042}}% U+3042 Hiragana
@@ -238,8 +239,10 @@
 \message{\kco{10C80}}% Old Hungarian
 \message{\kco{10D00}}% Hanifi Rohingya
 \message{\kco{10E60}}% Rumi Numeral Symbols
+\message{\kco{10E80}}% Yezidi
 \message{\kco{10F00}}% Old Sogdian
 \message{\kco{10F30}}% Sogdian
+\message{\kco{10FB0}}% Chorasmian
 \message{\kco{10FE0}}% Elymaic
 \message{\kco{11000}}% Brahmi
 \message{\kco{11080}}% Kaithi
@@ -261,6 +264,7 @@
 \message{\kco{11700}}% Ahom
 \message{\kco{11800}}% Dogra
 \message{\kco{118A0}}% Warang Citi
+\message{\kco{11900}}% Dives Akuru
 \message{\kco{119A0}}% Nandinagari
 \message{\kco{11A00}}% Zanabazar Square
 \message{\kco{11A50}}% Soyombo
@@ -270,6 +274,7 @@
 \message{\kco{11D00}}% Masaram Gondi
 \message{\kco{11D60}}% Gunjala Gondi
 \message{\kco{11EE0}}% Makasar
+\message{\kco{11FB0}}% Lisu Supplement
 \message{\kco{11FC0}}% Tamil Supplement
 \message{\kco{12000}}% Cuneiform
 \message{\kco{12400}}% Cuneiform Numbers and Punctuation
@@ -286,6 +291,8 @@
 \message{\kco{16FE0}}% Ideographic Symbols and Punctuation
 \message{\kco{17000}}% Tangut
 \message{\kco{18800}}% Tangut Components
+\message{\kco{18B00}}% Khitan Small Script
+\message{\kco{18D00}}% Tangut Supplement
 \message{\kco{1B170}}% Nushu
 \message{\kco{1BC00}}% Duployan
 \message{\kco{1BCA0}}% Shorthand Format Controls
@@ -320,9 +327,59 @@
 \message{\kco{1F900}}% Supplemental Symbols and Pictographs
 \message{\kco{1FA00}}% Chess Symbols
 \message{\kco{1FA70}}% Symbols and Pictographs Extended-A
+\message{\kco{1FB00}}% Symbols for Legacy Computing
 \message{\kco{E0000}}% Tags
 \message{\kco{E0100}}% Variation Selectors Supplement
 \message{\kco{F0000}}% Supplementary Private Use Area-A
 \message{\kco{100000}}% Supplementary Private Use Area-B
 
+
+%%% block separation
+\message{check block separation default:}
+\message{\KC{§}{00A7}}% U+00A7 Latin-1 Supplement
+\message{\KC{À}{00C0}}% U+00C0 "Latin-1 Letters" in Latin-1 Supplement
+\message{\KC{０}{FF10}}% U+FF10 "Fullwidth ASCII variants" in Halfwidth and Fullwidth Forms
+\message{\KC{＠}{FF20}}% U+FF20 Halfwidth and Fullwidth Forms
+\message{\KC{ｦ}{FF66}}% U+FF66 "Halfwidth Katakana variants" in Halfwidth and Fullwidth Forms
+
+
+\message{1st:}
+\kcatcode"00A7=18% U+00A7+§  Latin-1 Supplement, symbols
+\kcatcode"00C0=18% U+00C0:À  Latin-1 Supplement, Latin-1 letters
+\kcatcode"FF10=18% U+FF10:０  "Fullwidth ASCII variants" in Halfwidth and Fullwidth Forms
+\kcatcode"FF20=18% U+FF20:＠  Halfwidth and Fullwidth Forms
+\kcatcode"FF66=18% U+FF66:ｦ  "Halfwidth Katakana variants" in Halfwidth and Fullwidth Forms
+\message{\KC{§}{00A7}}% U+00A7 Latin-1 Supplement
+\message{\KC{À}{00C0}}% U+00C0 "Latin-1 Letters" in Latin-1 Supplement
+\message{\KC{０}{FF10}}% U+FF10 "Fullwidth ASCII variants" in Halfwidth and Fullwidth Forms
+\message{\KC{＠}{FF20}}% U+FF20 Halfwidth and Fullwidth Forms
+\message{\KC{ｦ}{FF66}}% U+FF66 "Halfwidth Katakana variants" in Halfwidth and Fullwidth Forms
+
+
+\message{2nd:}
+\kcatcode"00A7=17% U+00A7+§  Latin-1 Supplement, symbols
+\kcatcode"00C0=18% U+00C0:À  Latin-1 Supplement, Latin-1 letters
+\kcatcode"FF10=16% U+FF10:０  "Fullwidth ASCII variants" in Halfwidth and Fullwidth Forms
+\kcatcode"FF20=17% U+FF20:＠  Halfwidth and Fullwidth Forms
+\kcatcode"FF66=18% U+FF66:ｦ  "Halfwidth Katakana variants" in Halfwidth and Fullwidth Forms
+\message{\KC{§}{00A7}}% U+00A7 Latin-1 Supplement
+\message{\KC{À}{00C0}}% U+00C0 "Latin-1 Letters" in Latin-1 Supplement
+\message{\KC{０}{FF10}}% U+FF10 "Fullwidth ASCII variants" in Halfwidth and Fullwidth Forms
+\message{\KC{＠}{FF20}}% U+FF20 Halfwidth and Fullwidth Forms
+\message{\KC{ｦ}{FF66}}% U+FF66 "Halfwidth Katakana variants" in Halfwidth and Fullwidth Forms
+
+
+\message{3rd:}
+\kcatcode"00A7=18% U+00A7+§  Latin-1 Supplement, symbols
+\kcatcode"00C0=17% U+00C0:À  Latin-1 Supplement, Latin-1 letters
+\kcatcode"FF10=19% U+FF10:０  "Fullwidth ASCII variants" in Halfwidth and Fullwidth Forms
+\kcatcode"FF20=18% U+FF20:＠  Halfwidth and Fullwidth Forms
+\kcatcode"FF66=17% U+FF66:ｦ  "Halfwidth Katakana variants" in Halfwidth and Fullwidth Forms
+\message{\KC{§}{00A7}}% U+00A7 Latin-1 Supplement
+\message{\KC{À}{00C0}}% U+00C0 "Latin-1 Letters" in Latin-1 Supplement
+\message{\KC{０}{FF10}}% U+FF10 "Fullwidth ASCII variants" in Halfwidth and Fullwidth Forms
+\message{\KC{＠}{FF20}}% U+FF20 Halfwidth and Fullwidth Forms
+\message{\KC{ｦ}{FF66}}% U+FF66 "Halfwidth Katakana variants" in Halfwidth and Fullwidth Forms
+
+
 \end
diff --git a/Master/texmf-dist/doc/uptex/uptex-base/samples/testrun.bat b/Master/texmf-dist/doc/uptex/uptex-base/samples/testrun.bat
index ca3d43f07a0..2d68b95c765 100755
--- a/Master/texmf-dist/doc/uptex/uptex-base/samples/testrun.bat
+++ b/Master/texmf-dist/doc/uptex/uptex-base/samples/testrun.bat
@@ -1,135 +1,135 @@
-del *.dvi *.aux *.log *.ps *.pdf *.1 *.mpx
-
-rem misc
-for %%f in (misc set3) ^
-do ( ^
-uplatex %%f-check-utf8 && ^
-uplatex "\def\withhyperref{dvipdfmx}\input" %%f-check-utf8.tex && ^
-uplatex "\def\withhyperref{dvipdfmx}\input" %%f-check-utf8.tex && ^
-updvitype -kanji=uptex %%f-check-utf8.dvi > %%f-check-utf8.pdvitype && ^
-updvipdfmx %%f-check-utf8 && ^
-uplatex "\def\withhyperref{dvips}\input" %%f-check-utf8.tex && ^
-updvips %%f-check-utf8 && ^
-uplatex %%f-check-utf8 )
-for %%f in (misc) ^
-do ( ^
-uplatex %%f-check-v-utf8 && ^
-uplatex "\def\withhyperref{dvipdfmx}\input" %%f-check-v-utf8.tex && ^
-uplatex "\def\withhyperref{dvipdfmx}\input" %%f-check-v-utf8.tex && ^
-updvitype -kanji=uptex %%f-check-v-utf8.dvi > %%f-check-v-utf8.pdvitype && ^
-updvipdfmx -l %%f-check-v-utf8 && ^
-uplatex "\def\withhyperref{dvips}\input" %%f-check-v-utf8.tex && ^
-updvips -t landscape %%f-check-v-utf8 && ^
-uplatex %%f-check-v-utf8 )
-
-rem kinsoku
-uplatex kinsoku-chk-utf8
-dvipdfmx kinsoku-chk-utf8
-updvips kinsoku-chk-utf8
-
-rem widow
-platex widow
-move widow.dvi widow-platex.dvi
-dvipdfmx widow-platex.dvi
-uplatex widow
-move widow.dvi widow-u-uptex.dvi
-dvipdfmx widow-u-uptex.dvi
-
-rem uptex
-uptex sangoku-uptex
-dvipdfmx sangoku-uptex
-updvips sangoku-uptex
-
-rem uplatex
-uplatex sangoku-uplatex
-dvipdfmx sangoku-uplatex
-updvips sangoku-uplatex
-
-rem aozora
-for %%c in (ujarticle ujreport ujbook utarticle utreport utbook) ^
-do ( ^
-uplatex aozora-%%c-utf8 && ^
-dvipdfmx aozora-%%c-utf8 && ^
-updvips aozora-%%c-utf8 )
-
-rem adobe
-for %%c in (jp kr gb cns) ^
-do ( ^
-uptex adobe-%%c-utf8 && ^
-updvipdfmx adobe-%%c-utf8 && ^
-updvips adobe-%%c-utf8 )
-
-rem jbib
-uplatex jbib2-utf8.tex
-upjbibtex -kanji=uptex --kanji-internal=uptex jbib2-utf8
-uplatex jbib2-utf8.tex
-uplatex jbib2-utf8.tex
-
-rem jmpost
-for %%f in (area jstr) ^
-do ( ^
-upjmpost -kanji=uptex -tex=uplatex %%f-uptex.mp && ^
-uplatex %%f-uptex-incl.tex && ^
-updvips %%f-uptex-incl.dvi && ^
-updvipdfmx %%f-uptex-incl.dvi )
-
-rem updvi2tty
-platex -kanji=jis simple-jis.tex
-move simple-jis.dvi simple-jis-platex.dvi
-for %%f in (j e s u) ^
-do ( ^
-updvi2tty -w 62 -o simple-jis-platex-%%f.dvi2tty -E %%f simple-jis-platex.dvi )
-uplatex simple-u-jis.tex
-move simple-u-jis.dvi simple-u-jis-uptex.dvi
-for %%f in (j e s u) ^
-do ( ^
-updvi2tty -w 62 -o simple-u-jis-uptex-%%f.dvi2tty -E %%f simple-u-jis-uptex.dvi )
-
-
-rem
-rem following samples require the utf package
-rem 
-
-rem utf
-uplatex utfsmpl-uplatex
-updvipdfmx utfsmpl-uplatex
-updvips utfsmpl-uplatex
-
-rem
-rem following samples require the otf package
-rem 
-
-rem otf
-uplatex otfsmpl-uplatex
-updvipdfmx otfsmpl-uplatex
-updvips otfsmpl-uplatex
-
-rem adobe
-for %%c in (jp kr gb cns) ^
-do ( ^
-uplatex "\def\adobe{%%c}\input" adobe-cid && ^
-move adobe-cid.dvi adobe-%%c-mc-cid.dvi && ^
-updvipdfmx adobe-%%c-mc-cid && ^
-updvips adobe-%%c-mc-cid )
-for %%c in (jp kr cns) ^
-do ( ^
-uplatex "\def\adobe{%%c}\def\family{gt}\input" adobe-cid && ^
-move adobe-cid.dvi adobe-%%c-gt-cid.dvi && ^
-updvipdfmx adobe-%%c-gt-cid && ^
-updvips adobe-%%c-gt-cid )
-
-rem uotftest
-for %%o in (default deluxe expert bold noreplace) ^
-do ( ^
-uplatex "\def\option{%%o}\def\class{ujarticle}\input" uotftest-utf8.tex && ^
-move uotftest-utf8.dvi uotftest-%%o-h-uplatex.dvi && ^
-updvipdfmx uotftest-%%o-h-uplatex.dvi && ^
-uplatex "\def\option{%%o}\def\class{utarticle}\input" uotftest-utf8.tex && ^
-move uotftest-utf8.dvi uotftest-%%o-v-uplatex.dvi && ^
-updvipdfmx uotftest-%%o-v-uplatex.dvi && ^
-platex "\def\option{%%o}\def\class{jarticle}\input" uotftest.tex && ^
-move uotftest.dvi uotftest-%%o-h-platex.dvi && ^
-dvipdfmx uotftest-%%o-h-platex.dvi && ^
-platex "\def\option{%%o}\def\class{tarticle}\input" uotftest.tex && ^
-move uotftest.dvi uotftest-%%o-v-platex.dvi && ^
-dvipdfmx uotftest-%%o-v-platex.dvi )
+del *.dvi *.aux *.log *.ps *.pdf *.1 *.mpx

+

+rem misc

+for %%f in (misc set3) ^

+do ( ^

+uplatex %%f-check-utf8 && ^

+uplatex "\def\withhyperref{dvipdfmx}\input" %%f-check-utf8.tex && ^

+uplatex "\def\withhyperref{dvipdfmx}\input" %%f-check-utf8.tex && ^

+updvitype -kanji=uptex %%f-check-utf8.dvi > %%f-check-utf8.pdvitype && ^

+updvipdfmx %%f-check-utf8 && ^

+uplatex "\def\withhyperref{dvips}\input" %%f-check-utf8.tex && ^

+updvips %%f-check-utf8 && ^

+uplatex %%f-check-utf8 )

+for %%f in (misc) ^

+do ( ^

+uplatex %%f-check-v-utf8 && ^

+uplatex "\def\withhyperref{dvipdfmx}\input" %%f-check-v-utf8.tex && ^

+uplatex "\def\withhyperref{dvipdfmx}\input" %%f-check-v-utf8.tex && ^

+updvitype -kanji=uptex %%f-check-v-utf8.dvi > %%f-check-v-utf8.pdvitype && ^

+updvipdfmx -l %%f-check-v-utf8 && ^

+uplatex "\def\withhyperref{dvips}\input" %%f-check-v-utf8.tex && ^

+updvips -t landscape %%f-check-v-utf8 && ^

+uplatex %%f-check-v-utf8 )

+

+rem kinsoku

+uplatex kinsoku-chk-utf8

+dvipdfmx kinsoku-chk-utf8

+updvips kinsoku-chk-utf8

+

+rem widow

+platex widow

+move widow.dvi widow-platex.dvi

+dvipdfmx widow-platex.dvi

+uplatex widow

+move widow.dvi widow-u-uptex.dvi

+dvipdfmx widow-u-uptex.dvi

+

+rem uptex

+uptex sangoku-uptex

+dvipdfmx sangoku-uptex

+updvips sangoku-uptex

+

+rem uplatex

+uplatex sangoku-uplatex

+dvipdfmx sangoku-uplatex

+updvips sangoku-uplatex

+

+rem aozora

+for %%c in (ujarticle ujreport ujbook utarticle utreport utbook) ^

+do ( ^

+uplatex aozora-%%c-utf8 && ^

+dvipdfmx aozora-%%c-utf8 && ^

+updvips aozora-%%c-utf8 )

+

+rem adobe

+for %%c in (jp kr gb cns) ^

+do ( ^

+uptex adobe-%%c-utf8 && ^

+updvipdfmx adobe-%%c-utf8 && ^

+updvips adobe-%%c-utf8 )

+

+rem jbib

+uplatex jbib2-utf8.tex

+upjbibtex -kanji=uptex --kanji-internal=uptex jbib2-utf8

+uplatex jbib2-utf8.tex

+uplatex jbib2-utf8.tex

+

+rem jmpost

+for %%f in (area jstr) ^

+do ( ^

+upjmpost -kanji=uptex -tex=uplatex %%f-uptex.mp && ^

+uplatex %%f-uptex-incl.tex && ^

+updvips %%f-uptex-incl.dvi && ^

+updvipdfmx %%f-uptex-incl.dvi )

+

+rem updvi2tty

+platex -kanji=jis simple-jis.tex

+move simple-jis.dvi simple-jis-platex.dvi

+for %%f in (j e s u) ^

+do ( ^

+updvi2tty -w 62 -o simple-jis-platex-%%f.dvi2tty -E %%f simple-jis-platex.dvi )

+uplatex simple-u-jis.tex

+move simple-u-jis.dvi simple-u-jis-uptex.dvi

+for %%f in (j e s u) ^

+do ( ^

+updvi2tty -w 62 -o simple-u-jis-uptex-%%f.dvi2tty -E %%f simple-u-jis-uptex.dvi )

+

+

+rem

+rem following samples require the utf package

+rem 

+

+rem utf

+uplatex utfsmpl-uplatex

+updvipdfmx utfsmpl-uplatex

+updvips utfsmpl-uplatex

+

+rem

+rem following samples require the otf package

+rem 

+

+rem otf

+uplatex otfsmpl-uplatex

+updvipdfmx otfsmpl-uplatex

+updvips otfsmpl-uplatex

+

+rem adobe

+for %%c in (jp kr gb cns) ^

+do ( ^

+uplatex "\def\adobe{%%c}\input" adobe-cid && ^

+move adobe-cid.dvi adobe-%%c-mc-cid.dvi && ^

+updvipdfmx adobe-%%c-mc-cid && ^

+updvips adobe-%%c-mc-cid )

+for %%c in (jp kr cns) ^

+do ( ^

+uplatex "\def\adobe{%%c}\def\family{gt}\input" adobe-cid && ^

+move adobe-cid.dvi adobe-%%c-gt-cid.dvi && ^

+updvipdfmx adobe-%%c-gt-cid && ^

+updvips adobe-%%c-gt-cid )

+

+rem uotftest

+for %%o in (default deluxe expert bold noreplace) ^

+do ( ^

+uplatex "\def\option{%%o}\def\class{ujarticle}\input" uotftest-utf8.tex && ^

+move uotftest-utf8.dvi uotftest-%%o-h-uplatex.dvi && ^

+updvipdfmx uotftest-%%o-h-uplatex.dvi && ^

+uplatex "\def\option{%%o}\def\class{utarticle}\input" uotftest-utf8.tex && ^

+move uotftest-utf8.dvi uotftest-%%o-v-uplatex.dvi && ^

+updvipdfmx uotftest-%%o-v-uplatex.dvi && ^

+platex "\def\option{%%o}\def\class{jarticle}\input" uotftest.tex && ^

+move uotftest.dvi uotftest-%%o-h-platex.dvi && ^

+dvipdfmx uotftest-%%o-h-platex.dvi && ^

+platex "\def\option{%%o}\def\class{tarticle}\input" uotftest.tex && ^

+move uotftest.dvi uotftest-%%o-v-platex.dvi && ^

+dvipdfmx uotftest-%%o-v-platex.dvi )

diff --git a/Master/texmf-dist/source/latex/uptex-base/Makefile b/Master/texmf-dist/source/latex/uptex-base/Makefile
deleted file mode 100644
index 507a3c53e70..00000000000
--- a/Master/texmf-dist/source/latex/uptex-base/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-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/