From fb2abeda084752c0b5e4464f60631328e433c942 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 20 Jun 2016 22:22:26 +0000 Subject: uplatex (20jun16) git-svn-id: svn://tug.org/texlive/trunk@41505 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/uplatex/base/README.md | 2 +- Master/texmf-dist/doc/uplatex/base/uplatex.pdf | Bin 226921 -> 227672 bytes Master/texmf-dist/doc/uplatex/base/upldoc.pdf | Bin 570711 -> 571196 bytes Master/texmf-dist/source/uplatex/base/Makefile | 18 +++++------------- Master/texmf-dist/source/uplatex/base/uplatex.dtx | 16 ++++++++++------ Master/texmf-dist/source/uplatex/base/uplfonts.dtx | 10 ++++++---- Master/texmf-dist/source/uplatex/base/uplvers.dtx | 12 ++++++++++-- Master/texmf-dist/tex/uplatex/base/uplcore.ltx | 1 + Master/texmf-dist/tex/uplatex/base/upldefs.ltx | 4 ++-- 9 files changed, 35 insertions(+), 28 deletions(-) diff --git a/Master/texmf-dist/doc/uplatex/base/README.md b/Master/texmf-dist/doc/uplatex/base/README.md index 99f77760f89..23135a6b5e2 100644 --- a/Master/texmf-dist/doc/uplatex/base/README.md +++ b/Master/texmf-dist/doc/uplatex/base/README.md @@ -17,6 +17,6 @@ the 3-clause BSD license (see [LICENSE](./LICENSE)). ## Release Date -2016-06-10 +2016-06-19 Japanese TeX Development Community diff --git a/Master/texmf-dist/doc/uplatex/base/uplatex.pdf b/Master/texmf-dist/doc/uplatex/base/uplatex.pdf index 64aba657fd5..e9400da38dd 100644 Binary files a/Master/texmf-dist/doc/uplatex/base/uplatex.pdf and b/Master/texmf-dist/doc/uplatex/base/uplatex.pdf differ diff --git a/Master/texmf-dist/doc/uplatex/base/upldoc.pdf b/Master/texmf-dist/doc/uplatex/base/upldoc.pdf index 8c77108b7d7..fa99fef638b 100644 Binary files a/Master/texmf-dist/doc/uplatex/base/upldoc.pdf and b/Master/texmf-dist/doc/uplatex/base/upldoc.pdf differ diff --git a/Master/texmf-dist/source/uplatex/base/Makefile b/Master/texmf-dist/source/uplatex/base/Makefile index b7e5b3a1b29..ee912165186 100644 --- a/Master/texmf-dist/source/uplatex/base/Makefile +++ b/Master/texmf-dist/source/uplatex/base/Makefile @@ -24,16 +24,12 @@ PLDOC_SRC = uplatex.dtx uplvers.dtx uplfonts.dtx \ ukinsoku.dtx ujclasses.dtx uplatex.ltx: $(PLFMT_SRC) - for x in $(PLFMT); do \ - if [ -e $$x ]; then rm $$x; fi \ - done + rm -f $(PLFMT) uplatex $(KANJI) uplfmt.ins rm uplfmt.log ujarticle.cls: $(PLCLS_SRC) - for x in $(PLCLS); do \ - if [ -e $$x ]; then rm $$x; fi \ - done + rm -f $(PLCLS) uplatex $(KANJI) uplcls.ins rm uplcls.log @@ -46,9 +42,7 @@ uplatex.pdf: $(INTRODOC_SRC) rm uplatex.glo uplatex.gls uplatex.ilg upldoc.pdf: $(PLDOC_SRC) - for x in upldoc.tex Xins.ins; do \ - if [ -e $$x ]; then rm $$x; fi \ - done + rm -f upldoc.tex Xins.ins uplatex $(KANJI) upldocs.ins uplatex $(KANJI) Xins.ins sh mkpldoc.sh @@ -59,8 +53,6 @@ upldoc.pdf: $(PLDOC_SRC) .PHONY: clean clean: - for x in $(PLFMT) $(PLCLS) \ + rm -f $(PLFMT) $(PLCLS) \ uplatex.pdf upldoc.pdf \ - upldoc.tex Xins.ins; do \ - if [ -e $$x ]; then rm $$x; fi \ - done + upldoc.tex Xins.ins diff --git a/Master/texmf-dist/source/uplatex/base/uplatex.dtx b/Master/texmf-dist/source/uplatex/base/uplatex.dtx index 33da8539d7a..4b5e923efe4 100644 --- a/Master/texmf-dist/source/uplatex/base/uplatex.dtx +++ b/Master/texmf-dist/source/uplatex/base/uplatex.dtx @@ -14,7 +14,7 @@ % % \fi % -% \CheckSum{377} +% \CheckSum{382} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z @@ -68,13 +68,15 @@ % \changes{v1.0k}{2016/05/21}{変更履歴も出力するようにした} % \changes{v1.0k-u00}{2016/05/21}{p\LaTeX{}の変更に追随。} % \changes{v1.0k-u01}{2016/06/06}{up\LaTeX{}用にドキュメントを全体的に改訂} +% \changes{v1.0l}{2016/06/19}{パッチレベルを\file{plvers.dtx}から取得} +% \changes{v1.0l-u01}{2016/06/19}{p\LaTeX{}の変更に追随。} % \fi % % \iffalse %<*driver> \NeedsTeXFormat{pLaTeX2e} % \fi -\ProvidesFile{uplatex.dtx}[2016/06/06 v1.0k-u01 upLaTeX document file] +\ProvidesFile{uplatex.dtx}[2016/06/19 v1.0l-u01 upLaTeX document file] % \iffalse \documentclass{jltxdoc} \usepackage{plext} @@ -602,6 +604,7 @@ % ここからが本文ページとなります。 % ^^AA \changes{v1.0c}{1997/01/29}{Rename pltpatch to plpatch.} % \changes{v1.0h-u00}{2016/05/08}{ドキュメントから\file{uplpatch.ltx}を除外} +% \changes{v1.0l}{2016/06/19}{パッチレベルを\file{plvers.dtx}から取得} % \begin{macrocode} \begin{document} \title{The up\LaTeXe\ Sources} @@ -617,11 +620,12 @@ Things we did wrong\ldots \IndexInput{uplpatch.ltx}} -% Get the date from uplvers.dtx +% Get the date and patch level from uplvers.dtx \makeatletter -\def\patchdate{0}%% Modified (May 8, 2016) +\let\patchdate=\@empty \begingroup - \def\ProvidesFile#1\pfmtversion#2{\date{#2}\endinput} + \def\ProvidesFile#1\pfmtversion#2#3\ppatch@level#4{% + \date{#2}\xdef\patchdate{#4}\endinput} \input{uplvers.dtx} \global\let\X@date=\@date @@ -637,7 +641,7 @@ \ifx\@date\X@date \def\Xpatch{0} \ifx\patchdate\Xpatch\else - \edef\@date{\@date\space Patch level\patchdate} + \edef\@date{\@date\space Patch level\space\patchdate} \fi \else \@warning{uplpatch.ltx does not match uplvers.dtx!} diff --git a/Master/texmf-dist/source/uplatex/base/uplfonts.dtx b/Master/texmf-dist/source/uplatex/base/uplfonts.dtx index 05845476674..61aeaf62327 100644 --- a/Master/texmf-dist/source/uplatex/base/uplfonts.dtx +++ b/Master/texmf-dist/source/uplatex/base/uplfonts.dtx @@ -14,7 +14,7 @@ % % \fi % -% \CheckSum{2030} +% \CheckSum{2029} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z @@ -78,13 +78,14 @@ % \changes{v1.6c}{2016/06/06}{v1.6aでの修正で\'e など全てのアクセント付き文字で % 周囲に\cs{xkanjiskip}が入らなくなっていたのを修正。} % \changes{v1.6c-u00}{2016/06/06}{p\LaTeX{}の変更に追随。} +% \changes{v1.6d}{2016/06/19}{アクセント付き文字をさらに修正(forum:1951)} % \fi % % \iffalse %<*driver> \NeedsTeXFormat{pLaTeX2e} % \fi -\ProvidesFile{uplfonts.dtx}[2016/06/06 v1.6c-u00 upLaTeX New Font Selection Scheme] +\ProvidesFile{uplfonts.dtx}[2016/06/19 v1.6d-u00 upLaTeX New Font Selection Scheme] % \iffalse \documentclass{jltxdoc} \GetFileInfo{uplfonts.dtx} @@ -1646,7 +1647,7 @@ % \begin{macrocode} %<*pldefs> \ProvidesFile{upldefs.ltx} - [2016/06/06 v1.6c-u00 upLaTeX Kernel (Default settings)] + [2016/06/19 v1.6d-u00 upLaTeX Kernel (Default settings)] % % \end{macrocode} % @@ -1671,13 +1672,14 @@ % 第一引数のマクロ(|#1|)の置換テキストが、カテゴリコード11か12の文字トークン1文字であった % 場合に第二引数の内容に展開され、そうでない場合は第三引数の内容に展開されます。 % \changes{v1.6c}{2016/06/06}{マクロ追加} +% \changes{v1.6d}{2016/06/19}{アクセント付き文字をさらに修正(forum:1951)} % \begin{macrocode} \def\pltx@mark{\pltx@mark@} \let\pltx@scanstop\relax \long\def\pltx@cond#1\fi{% #1\expandafter\@firstoftwo\else\expandafter\@secondoftwo\fi} \long\def\pltx@isletter#1{% - \expandafter\pltx@isletter@i\romannumeral-`0#1\pltx@scanstop} + \expandafter\pltx@isletter@i#1\pltx@scanstop} \long\def\pltx@isletter@i#1\pltx@scanstop{% \pltx@cond\ifx\pltx@mark#1\pltx@mark\fi{\@firstoftwo}% {\pltx@isletter@ii\pltx@scanstop#1\pltx@scanstop{}#1\pltx@mark}} diff --git a/Master/texmf-dist/source/uplatex/base/uplvers.dtx b/Master/texmf-dist/source/uplatex/base/uplvers.dtx index 147a9026e61..3f8afb6a4f5 100644 --- a/Master/texmf-dist/source/uplatex/base/uplvers.dtx +++ b/Master/texmf-dist/source/uplatex/base/uplvers.dtx @@ -14,7 +14,7 @@ % % \fi % -% \CheckSum{192} +% \CheckSum{194} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z @@ -70,12 +70,14 @@ % 元の\LaTeX{}のバナーから取得するコードを\file{uplatex.ini}から取り入れた} % \changes{v1.0w-u01}{2016/05/21}{サポート外の\LaTeX~2.09互換モードが % 使われた場合に明確なエラーを出すようにした。} +% \changes{v1.0x}{2016/06/19}{パッチレベルを\file{plvers.dtx}で設定} +% \changes{v1.0x-u01}{2016/06/19}{p\LaTeX{}の変更に追随。} % \fi % % \iffalse %<*driver> % \fi -\ProvidesFile{uplvers.dtx}[2016/05/21 v1.0w-u01 upLaTeX Kernel (Version Info)] +\ProvidesFile{uplvers.dtx}[2016/06/19 v1.0x-u01 upLaTeX Kernel (Version Info)] % \iffalse \documentclass{jltxdoc} \GetFileInfo{uplvers.dtx} @@ -129,7 +131,9 @@ % % \begin{macro}{\pfmtname} % \begin{macro}{\pfmtversion} +% \begin{macro}{\ppatch@level} % up\LaTeXe{}のフォーマットファイル名とバージョンです。 +% \changes{v1.0x}{2016/06/19}{パッチレベルを\file{plvers.dtx}で設定} % \begin{macrocode} %<*plcore> \def\pfmtname{pLaTeX2e} @@ -139,9 +143,13 @@ %<*plcore|platexrelease> {2016/06/10u01} % +%<*plcore> +\def\ppatch@level{1} +% % \end{macrocode} % \end{macro} % \end{macro} +% \end{macro} % % \subsection{\LaTeX~2.09互換モードの抑制} % diff --git a/Master/texmf-dist/tex/uplatex/base/uplcore.ltx b/Master/texmf-dist/tex/uplatex/base/uplcore.ltx index bda26827b4e..4b874fbff61 100644 --- a/Master/texmf-dist/tex/uplatex/base/uplcore.ltx +++ b/Master/texmf-dist/tex/uplatex/base/uplcore.ltx @@ -36,6 +36,7 @@ \def\pfmtname{pLaTeX2e} \def\pfmtversion {2016/06/10u01} +\def\ppatch@level{1} \def\plIncludeInRelease#1{\kernel@ifnextchar[% {\@plIncludeInRelease{#1}} {\@plIncludeInRelease{#1}[#1]}} diff --git a/Master/texmf-dist/tex/uplatex/base/upldefs.ltx b/Master/texmf-dist/tex/uplatex/base/upldefs.ltx index 87b0215a2a0..f8b22882d96 100644 --- a/Master/texmf-dist/tex/uplatex/base/upldefs.ltx +++ b/Master/texmf-dist/tex/uplatex/base/upldefs.ltx @@ -31,14 +31,14 @@ %% Right brace \} Tilde \~} %% \ProvidesFile{upldefs.ltx} - [2016/06/06 v1.6c-u00 upLaTeX Kernel (Default settings)] + [2016/06/19 v1.6d-u00 upLaTeX Kernel (Default settings)] \def\g@tlastchart@#1{#1\ifx\lastnodechar\@undefined\m@ne\else\lastnodechar\fi} \def\pltx@mark{\pltx@mark@} \let\pltx@scanstop\relax \long\def\pltx@cond#1\fi{% #1\expandafter\@firstoftwo\else\expandafter\@secondoftwo\fi} \long\def\pltx@isletter#1{% - \expandafter\pltx@isletter@i\romannumeral-`0#1\pltx@scanstop} + \expandafter\pltx@isletter@i#1\pltx@scanstop} \long\def\pltx@isletter@i#1\pltx@scanstop{% \pltx@cond\ifx\pltx@mark#1\pltx@mark\fi{\@firstoftwo}% {\pltx@isletter@ii\pltx@scanstop#1\pltx@scanstop{}#1\pltx@mark}} -- cgit v1.2.3