From 334e6afcc530e6f2463ca4cf8e9a5f6d5e0cfe1f Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 8 Apr 2018 20:03:22 +0000 Subject: uplatex (8apr18) git-svn-id: svn://tug.org/texlive/trunk@47376 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/uplatex/base/README.md | 2 +- Master/texmf-dist/doc/uplatex/base/uplatex-en.pdf | Bin 103186 -> 103889 bytes Master/texmf-dist/doc/uplatex/base/uplatex.pdf | Bin 213378 -> 215490 bytes Master/texmf-dist/doc/uplatex/base/upldoc.pdf | Bin 527074 -> 528629 bytes Master/texmf-dist/source/uplatex/base/ukinsoku.dtx | 30 ++++++++++++++------- Master/texmf-dist/source/uplatex/base/uplatex.dtx | 27 ++++++++++++++----- Master/texmf-dist/tex/uplatex/base/ukinsoku.tex | 16 +++++------ Master/texmf-dist/tex/uplatex/base/uplatex.ltx | 1 - 8 files changed, 51 insertions(+), 25 deletions(-) diff --git a/Master/texmf-dist/doc/uplatex/base/README.md b/Master/texmf-dist/doc/uplatex/base/README.md index fde17fc40c0..1f6991dfada 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 -2018-03-31 +2018-04-08 Japanese TeX Development Community diff --git a/Master/texmf-dist/doc/uplatex/base/uplatex-en.pdf b/Master/texmf-dist/doc/uplatex/base/uplatex-en.pdf index 732d6be517f..fc7b80e5ff7 100644 Binary files a/Master/texmf-dist/doc/uplatex/base/uplatex-en.pdf and b/Master/texmf-dist/doc/uplatex/base/uplatex-en.pdf differ diff --git a/Master/texmf-dist/doc/uplatex/base/uplatex.pdf b/Master/texmf-dist/doc/uplatex/base/uplatex.pdf index afc0d2999bb..3a2c8617cc1 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 fc6579b9535..4a16715341a 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/ukinsoku.dtx b/Master/texmf-dist/source/uplatex/base/ukinsoku.dtx index deffad0c7e7..ec9c0975598 100644 --- a/Master/texmf-dist/source/uplatex/base/ukinsoku.dtx +++ b/Master/texmf-dist/source/uplatex/base/ukinsoku.dtx @@ -28,13 +28,14 @@ % \changes{v1.0b-u02}{2018/01/27}{up\TeX{}の将来の変更に備え、 % Latin-1 Supplementのうち属性がLatinのもの % (Latin-1 letters)をコードポイントで指定} +% \changes{v1.0b-u03}{2018/04/08}{\LaTeX\ 2018-04-01対策} % \fi % % \iffalse %<*driver> \NeedsTeXFormat{pLaTeX2e} % \fi -\ProvidesFile{ukinsoku.dtx}[2018/01/27 v1.0b-u02 upLaTeX Kernel] +\ProvidesFile{ukinsoku.dtx}[2018/04/08 v1.0b-u03 upLaTeX Kernel] % \iffalse \documentclass{jltxdoc} \GetFileInfo{ukinsoku.dtx} @@ -129,6 +130,17 @@ % Latin-1 Supplementのうち属性がLatinのもの % (Latin-1 letters)をコードポイントで指定} % +% なお、以下で複数回登場する |"AA| と |"BA| はそれぞれªとºですが、 +% \LaTeXe\ 2018-04-01でUTF-8入力になった影響で、これらの文字は +% |macrocode| 環境内のコードに(たとえ |%| に続くコメントであっても) +% 書けなくなってしまったようです。これらの文字で +% docstrip処理中にエラー +%\begin{verbatim} +% ! Argument of \@font@info has an extra }. +%\end{verbatim} +% が出ないように、コメントからも削除しました。 +% \changes{v1.0b-u03}{2018/04/08}{\LaTeX\ 2018-04-01対策} +% % \begin{macrocode} %%全角文字 \prebreakpenalty`、=10000 @@ -234,8 +246,8 @@ \postbreakpenalty`¿=10000 \prebreakpenalty`ː=10000 \prebreakpenalty`·=10000 -\prebreakpenalty"AA=10000% ª -\prebreakpenalty"BA=10000% º +\prebreakpenalty"AA=10000 +\prebreakpenalty"BA=10000 \prebreakpenalty`¹=10000 \prebreakpenalty`²=10000 \prebreakpenalty`³=10000 @@ -264,8 +276,8 @@ %% %%\postbreakpenalty`¡=10000 %%\postbreakpenalty`¿=10000 -%%\prebreakpenalty"BA=10000% º -%%\prebreakpenalty"AA=10000% ª +%%\prebreakpenalty"BA=10000 +%%\prebreakpenalty"AA=10000 \prebreakpenalty`™=10000 %% %% kinsoku 半角片仮名 @@ -519,8 +531,8 @@ \inhibitxspcode`⁉=1 \inhibitxspcode`¡=2 \inhibitxspcode`¿=2 -\inhibitxspcode"AA=1% ª -\inhibitxspcode"BA=1% º +\inhibitxspcode"AA=1 +\inhibitxspcode"BA=1 \inhibitxspcode`¹=1 \inhibitxspcode`²=1 \inhibitxspcode`³=1 @@ -530,8 +542,8 @@ %% %%\inhibitxspcode`¡=2 %%\inhibitxspcode`¿=2 -%%\inhibitxspcode"BA=1% º -%%\inhibitxspcode"AA=1% ª +%%\inhibitxspcode"BA=1 +%%\inhibitxspcode"AA=1 \inhibitxspcode`™=1 %% %% inhibitxspcode 半角片仮名 diff --git a/Master/texmf-dist/source/uplatex/base/uplatex.dtx b/Master/texmf-dist/source/uplatex/base/uplatex.dtx index bfc9b906c1a..ba4ef11a7e4 100644 --- a/Master/texmf-dist/source/uplatex/base/uplatex.dtx +++ b/Master/texmf-dist/source/uplatex/base/uplatex.dtx @@ -81,6 +81,9 @@ % \file{plcore.ltx}を読み込むようにした(最近の\pLaTeX{}が前提)} % \changes{v1.0u-u02}{2018/02/18}{\pLaTeX{}の変更に追随。 % (based on platex.dtx 2018/02/18 v1.0u)} +% \changes{v1.0w-u02}{2018/04/08}{安全のためフォーマット作成時の +% バナー表示をやめた +% (based on platex.dtx 2018/04/08 v1.0w)} %\else % \changes{v1.0c-u00}{2011/05/07}{Created \upLaTeX\ version based on \pLaTeX\ one % (based on platex.dtx 1997/01/29 v1.0c)} @@ -110,6 +113,9 @@ % \file{uplcore.ltx} (recent version of \pLaTeX\ is assumed)} % \changes{v1.0u-u02}{2018/02/18}{Sync with \pLaTeX. % (based on platex.dtx 2018/02/18 v1.0u)} +% \changes{v1.0w-u02}{2018/04/08}{Stop showing banner during +% format generation for safety +% (based on platex.dtx 2018/04/08 v1.0w)} %\fi % \fi % @@ -117,7 +123,7 @@ %<*driver> \NeedsTeXFormat{pLaTeX2e} % \fi -\ProvidesFile{uplatex.dtx}[2018/02/18 v1.0u-u02 upLaTeX document file] +\ProvidesFile{uplatex.dtx}[2018/04/08 v1.0w-u02 upLaTeX document file] % \iffalse \documentclass{jltxdoc} \usepackage{plext} @@ -460,14 +466,23 @@ % \end{macrocode} % %\ifJAPANESE -% フォーマット作成時に\upLaTeX{}のバージョンがわかるように、 -% 端末に表示します。 +% 以前のバージョンでは、フォーマット作成時に\upLaTeX{}のバージョンが +% わかるように、端末に表示していましたが、|\everyjob| にバナー表示 +% 以外のコードが含まれる可能性を考慮し、安全のためやめました。 +% \changes{v1.0w-u02}{2018/04/08}{安全のためフォーマット作成時の +% バナー表示をやめた +% (based on platex.dtx 2018/04/08 v1.0w)} %\else -% Display \upLaTeX\ version on the terminal, so that -% it can be easily recognized during format creation. +% In the previous version, we displayed \upLaTeX\ version +% on the terminal, so that it can be easily recognized +% during format creation; however |\everyjob| can contain +% any code other than showing a banner, so now disabled. +% \changes{v1.0w-u02}{2018/04/08}{Stop showing banner during +% format generation for safety +% (based on platex.dtx 2018/04/08 v1.0w)} %\fi % \begin{macrocode} -\the\everyjob +%\the\everyjob % \end{macrocode} % %\ifJAPANESE diff --git a/Master/texmf-dist/tex/uplatex/base/ukinsoku.tex b/Master/texmf-dist/tex/uplatex/base/ukinsoku.tex index f763959b86b..d16eac1743c 100644 --- a/Master/texmf-dist/tex/uplatex/base/ukinsoku.tex +++ b/Master/texmf-dist/tex/uplatex/base/ukinsoku.tex @@ -143,8 +143,8 @@ \postbreakpenalty`¿=10000 \prebreakpenalty`ː=10000 \prebreakpenalty`·=10000 -\prebreakpenalty"AA=10000% ª -\prebreakpenalty"BA=10000% º +\prebreakpenalty"AA=10000 +\prebreakpenalty"BA=10000 \prebreakpenalty`¹=10000 \prebreakpenalty`²=10000 \prebreakpenalty`³=10000 @@ -173,8 +173,8 @@ %% %%\postbreakpenalty`¡=10000 %%\postbreakpenalty`¿=10000 -%%\prebreakpenalty"BA=10000% º -%%\prebreakpenalty"AA=10000% ª +%%\prebreakpenalty"BA=10000 +%%\prebreakpenalty"AA=10000 \prebreakpenalty`™=10000 %% %% kinsoku 半角片仮名 @@ -386,8 +386,8 @@ \inhibitxspcode`⁉=1 \inhibitxspcode`¡=2 \inhibitxspcode`¿=2 -\inhibitxspcode"AA=1% ª -\inhibitxspcode"BA=1% º +\inhibitxspcode"AA=1 +\inhibitxspcode"BA=1 \inhibitxspcode`¹=1 \inhibitxspcode`²=1 \inhibitxspcode`³=1 @@ -397,8 +397,8 @@ %% %%\inhibitxspcode`¡=2 %%\inhibitxspcode`¿=2 -%%\inhibitxspcode"BA=1% º -%%\inhibitxspcode"AA=1% ª +%%\inhibitxspcode"BA=1 +%%\inhibitxspcode"AA=1 \inhibitxspcode`™=1 %% %% inhibitxspcode 半角片仮名 diff --git a/Master/texmf-dist/tex/uplatex/base/uplatex.ltx b/Master/texmf-dist/tex/uplatex/base/uplatex.ltx index 1754980afc5..25a838c076e 100644 --- a/Master/texmf-dist/tex/uplatex/base/uplatex.ltx +++ b/Master/texmf-dist/tex/uplatex/base/uplatex.ltx @@ -30,7 +30,6 @@ * Local config file upldefs.cfg used^^J% *************************************}}% {\input{upldefs.ltx}} -\the\everyjob \everyjob\expandafter{% \the\everyjob \IfFileExists{uplatex.cfg}{% -- cgit v1.2.3