From 861e1d06658a3f3e120b33f6a2c9d867bba3018e Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 30 Sep 2020 21:26:33 +0000 Subject: uplatex (30sep20) git-svn-id: svn://tug.org/texlive/trunk@56488 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/uplatex/base/ujarticle.cls | 8 ++++---- Master/texmf-dist/tex/uplatex/base/ujbk10.clo | 2 +- Master/texmf-dist/tex/uplatex/base/ujbk11.clo | 2 +- Master/texmf-dist/tex/uplatex/base/ujbk12.clo | 2 +- Master/texmf-dist/tex/uplatex/base/ujbook.cls | 8 ++++---- Master/texmf-dist/tex/uplatex/base/ujreport.cls | 8 ++++---- Master/texmf-dist/tex/uplatex/base/ujsize10.clo | 2 +- Master/texmf-dist/tex/uplatex/base/ujsize11.clo | 2 +- Master/texmf-dist/tex/uplatex/base/ujsize12.clo | 2 +- Master/texmf-dist/tex/uplatex/base/ukinsoku.tex | 1 + Master/texmf-dist/tex/uplatex/base/uplatex.ltx | 1 + Master/texmf-dist/tex/uplatex/base/uplcore.ltx | 2 +- Master/texmf-dist/tex/uplatex/base/utarticle.cls | 8 ++++---- Master/texmf-dist/tex/uplatex/base/utbk10.clo | 2 +- Master/texmf-dist/tex/uplatex/base/utbk11.clo | 2 +- Master/texmf-dist/tex/uplatex/base/utbk12.clo | 2 +- Master/texmf-dist/tex/uplatex/base/utbook.cls | 8 ++++---- Master/texmf-dist/tex/uplatex/base/utreport.cls | 8 ++++---- Master/texmf-dist/tex/uplatex/base/utsize10.clo | 2 +- Master/texmf-dist/tex/uplatex/base/utsize11.clo | 2 +- Master/texmf-dist/tex/uplatex/base/utsize12.clo | 2 +- 21 files changed, 39 insertions(+), 37 deletions(-) (limited to 'Master/texmf-dist/tex/uplatex') diff --git a/Master/texmf-dist/tex/uplatex/base/ujarticle.cls b/Master/texmf-dist/tex/uplatex/base/ujarticle.cls index 0c98c34a2ee..496887b7412 100644 --- a/Master/texmf-dist/tex/uplatex/base/ujarticle.cls +++ b/Master/texmf-dist/tex/uplatex/base/ujarticle.cls @@ -16,7 +16,7 @@ %% File: ujclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesClass{ujarticle} - [2020/01/03 v1.8e-u00 + [2020/09/30 v1.8f-u00 Standard upLaTeX class] \newcounter{@paper} \newif\if@landscape \@landscapefalse @@ -671,9 +671,9 @@ \def\addcontentsline#1#2#3{% \protected@write\@auxout {\let\label\@gobble \let\index\@gobble \let\glossary\@gobble - \@temptokena{\thepage}}% - {\string\@writefile{#1}% - {\protect\contentsline{#2}{#3}{\the\@temptokena}% + \@temptokena{\thepage}% + }{\string\@writefile{#1}% + {\protect\contentsline{#2}{#3}{\the\@temptokena}{}% \protected@file@percent}}% } \newcommand{\tableofcontents}{% diff --git a/Master/texmf-dist/tex/uplatex/base/ujbk10.clo b/Master/texmf-dist/tex/uplatex/base/ujbk10.clo index d2e8e099f48..f0f4933e89c 100644 --- a/Master/texmf-dist/tex/uplatex/base/ujbk10.clo +++ b/Master/texmf-dist/tex/uplatex/base/ujbk10.clo @@ -16,7 +16,7 @@ %% File: ujclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{ujbk10.clo} - [2020/01/03 v1.8e-u00 + [2020/09/30 v1.8f-u00 Standard upLaTeX file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xpt{15}% diff --git a/Master/texmf-dist/tex/uplatex/base/ujbk11.clo b/Master/texmf-dist/tex/uplatex/base/ujbk11.clo index 472bed49708..430bbd3f3e9 100644 --- a/Master/texmf-dist/tex/uplatex/base/ujbk11.clo +++ b/Master/texmf-dist/tex/uplatex/base/ujbk11.clo @@ -16,7 +16,7 @@ %% File: ujclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{ujbk11.clo} - [2020/01/03 v1.8e-u00 + [2020/09/30 v1.8f-u00 Standard upLaTeX file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xipt{15.5}% diff --git a/Master/texmf-dist/tex/uplatex/base/ujbk12.clo b/Master/texmf-dist/tex/uplatex/base/ujbk12.clo index 8f19a855807..2c992a2bbd3 100644 --- a/Master/texmf-dist/tex/uplatex/base/ujbk12.clo +++ b/Master/texmf-dist/tex/uplatex/base/ujbk12.clo @@ -16,7 +16,7 @@ %% File: ujclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{ujbk12.clo} - [2020/01/03 v1.8e-u00 + [2020/09/30 v1.8f-u00 Standard upLaTeX file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xiipt{16.5}% diff --git a/Master/texmf-dist/tex/uplatex/base/ujbook.cls b/Master/texmf-dist/tex/uplatex/base/ujbook.cls index b7725e24d66..d12720cf5ca 100644 --- a/Master/texmf-dist/tex/uplatex/base/ujbook.cls +++ b/Master/texmf-dist/tex/uplatex/base/ujbook.cls @@ -16,7 +16,7 @@ %% File: ujclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesClass{ujbook} - [2020/01/03 v1.8e-u00 + [2020/09/30 v1.8f-u00 Standard upLaTeX class] \newcounter{@paper} \newif\if@landscape \@landscapefalse @@ -764,9 +764,9 @@ \def\addcontentsline#1#2#3{% \protected@write\@auxout {\let\label\@gobble \let\index\@gobble \let\glossary\@gobble - \@temptokena{\thepage}}% - {\string\@writefile{#1}% - {\protect\contentsline{#2}{#3}{\the\@temptokena}% + \@temptokena{\thepage}% + }{\string\@writefile{#1}% + {\protect\contentsline{#2}{#3}{\the\@temptokena}{}% \protected@file@percent}}% } \newcommand{\tableofcontents}{% diff --git a/Master/texmf-dist/tex/uplatex/base/ujreport.cls b/Master/texmf-dist/tex/uplatex/base/ujreport.cls index 271577bb720..ff8ff5ed68e 100644 --- a/Master/texmf-dist/tex/uplatex/base/ujreport.cls +++ b/Master/texmf-dist/tex/uplatex/base/ujreport.cls @@ -16,7 +16,7 @@ %% File: ujclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesClass{ujreport} - [2020/01/03 v1.8e-u00 + [2020/09/30 v1.8f-u00 Standard upLaTeX class] \newcounter{@paper} \newif\if@landscape \@landscapefalse @@ -760,9 +760,9 @@ \def\addcontentsline#1#2#3{% \protected@write\@auxout {\let\label\@gobble \let\index\@gobble \let\glossary\@gobble - \@temptokena{\thepage}}% - {\string\@writefile{#1}% - {\protect\contentsline{#2}{#3}{\the\@temptokena}% + \@temptokena{\thepage}% + }{\string\@writefile{#1}% + {\protect\contentsline{#2}{#3}{\the\@temptokena}{}% \protected@file@percent}}% } \newcommand{\tableofcontents}{% diff --git a/Master/texmf-dist/tex/uplatex/base/ujsize10.clo b/Master/texmf-dist/tex/uplatex/base/ujsize10.clo index 5d7c28c9856..230056f211e 100644 --- a/Master/texmf-dist/tex/uplatex/base/ujsize10.clo +++ b/Master/texmf-dist/tex/uplatex/base/ujsize10.clo @@ -16,7 +16,7 @@ %% File: ujclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{ujsize10.clo} - [2020/01/03 v1.8e-u00 + [2020/09/30 v1.8f-u00 Standard upLaTeX file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xpt{15}% diff --git a/Master/texmf-dist/tex/uplatex/base/ujsize11.clo b/Master/texmf-dist/tex/uplatex/base/ujsize11.clo index 33091809937..f3ba2f507a1 100644 --- a/Master/texmf-dist/tex/uplatex/base/ujsize11.clo +++ b/Master/texmf-dist/tex/uplatex/base/ujsize11.clo @@ -16,7 +16,7 @@ %% File: ujclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{ujsize11.clo} - [2020/01/03 v1.8e-u00 + [2020/09/30 v1.8f-u00 Standard upLaTeX file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xipt{15.5}% diff --git a/Master/texmf-dist/tex/uplatex/base/ujsize12.clo b/Master/texmf-dist/tex/uplatex/base/ujsize12.clo index 251b7c62ff2..16003cfd778 100644 --- a/Master/texmf-dist/tex/uplatex/base/ujsize12.clo +++ b/Master/texmf-dist/tex/uplatex/base/ujsize12.clo @@ -16,7 +16,7 @@ %% File: ujclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{ujsize12.clo} - [2020/01/03 v1.8e-u00 + [2020/09/30 v1.8f-u00 Standard upLaTeX file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xiipt{16.5}% diff --git a/Master/texmf-dist/tex/uplatex/base/ukinsoku.tex b/Master/texmf-dist/tex/uplatex/base/ukinsoku.tex index d09870106c3..672e46a492f 100644 --- a/Master/texmf-dist/tex/uplatex/base/ukinsoku.tex +++ b/Master/texmf-dist/tex/uplatex/base/ukinsoku.tex @@ -339,6 +339,7 @@ \inhibitxspcode`.=1 \inhibitxspcode`;=1 \inhibitxspcode`?=1 +\inhibitxspcode`!=1 \inhibitxspcode`)=1 \inhibitxspcode`(=2 \inhibitxspcode`]=1 diff --git a/Master/texmf-dist/tex/uplatex/base/uplatex.ltx b/Master/texmf-dist/tex/uplatex/base/uplatex.ltx index 25a838c076e..6ce3ebf5648 100644 --- a/Master/texmf-dist/tex/uplatex/base/uplatex.ltx +++ b/Master/texmf-dist/tex/uplatex/base/uplatex.ltx @@ -30,6 +30,7 @@ * Local config file upldefs.cfg used^^J% *************************************}}% {\input{upldefs.ltx}} +\ifx\code@after@pldefs\@undefined\else \code@after@pldefs \fi \everyjob\expandafter{% \the\everyjob \IfFileExists{uplatex.cfg}{% diff --git a/Master/texmf-dist/tex/uplatex/base/uplcore.ltx b/Master/texmf-dist/tex/uplatex/base/uplcore.ltx index 1f0b313646f..e2b3516a754 100644 --- a/Master/texmf-dist/tex/uplatex/base/uplcore.ltx +++ b/Master/texmf-dist/tex/uplatex/base/uplcore.ltx @@ -35,7 +35,7 @@ otherwise upLaTeX2e setup will^^Jnever succeed}\@@end \fi \fi -\def\uppatch@level{u03} +\def\uppatch@level{u04} \edef\pfmtversion{\pfmtversion\uppatch@level} %% File: uplvers.dtx \def\documentstyle{% diff --git a/Master/texmf-dist/tex/uplatex/base/utarticle.cls b/Master/texmf-dist/tex/uplatex/base/utarticle.cls index c7784093160..9645bb6672f 100644 --- a/Master/texmf-dist/tex/uplatex/base/utarticle.cls +++ b/Master/texmf-dist/tex/uplatex/base/utarticle.cls @@ -16,7 +16,7 @@ %% File: ujclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesClass{utarticle} - [2020/01/03 v1.8e-u00 + [2020/09/30 v1.8f-u00 Standard upLaTeX class] \newcounter{@paper} \newif\if@landscape \@landscapefalse @@ -675,9 +675,9 @@ \def\addcontentsline#1#2#3{% \protected@write\@auxout {\let\label\@gobble \let\index\@gobble \let\glossary\@gobble - \@temptokena{\rensuji{\thepage}}}% - {\string\@writefile{#1}% - {\protect\contentsline{#2}{#3}{\the\@temptokena}% + \@temptokena{\rensuji{\thepage}}% + }{\string\@writefile{#1}% + {\protect\contentsline{#2}{#3}{\the\@temptokena}{}% \protected@file@percent}}% } \newcommand{\tableofcontents}{% diff --git a/Master/texmf-dist/tex/uplatex/base/utbk10.clo b/Master/texmf-dist/tex/uplatex/base/utbk10.clo index 3a54d099b7a..5eba8a634e9 100644 --- a/Master/texmf-dist/tex/uplatex/base/utbk10.clo +++ b/Master/texmf-dist/tex/uplatex/base/utbk10.clo @@ -16,7 +16,7 @@ %% File: ujclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{utbk10.clo} - [2020/01/03 v1.8e-u00 + [2020/09/30 v1.8f-u00 Standard upLaTeX file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xpt{17}% diff --git a/Master/texmf-dist/tex/uplatex/base/utbk11.clo b/Master/texmf-dist/tex/uplatex/base/utbk11.clo index d942807202b..35e87b54cc9 100644 --- a/Master/texmf-dist/tex/uplatex/base/utbk11.clo +++ b/Master/texmf-dist/tex/uplatex/base/utbk11.clo @@ -16,7 +16,7 @@ %% File: ujclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{utbk11.clo} - [2020/01/03 v1.8e-u00 + [2020/09/30 v1.8f-u00 Standard upLaTeX file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xipt{17}% diff --git a/Master/texmf-dist/tex/uplatex/base/utbk12.clo b/Master/texmf-dist/tex/uplatex/base/utbk12.clo index 57096af4a45..de067039c35 100644 --- a/Master/texmf-dist/tex/uplatex/base/utbk12.clo +++ b/Master/texmf-dist/tex/uplatex/base/utbk12.clo @@ -16,7 +16,7 @@ %% File: ujclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{utbk12.clo} - [2020/01/03 v1.8e-u00 + [2020/09/30 v1.8f-u00 Standard upLaTeX file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xiipt{18}% diff --git a/Master/texmf-dist/tex/uplatex/base/utbook.cls b/Master/texmf-dist/tex/uplatex/base/utbook.cls index 6c83c66dcd1..40b63c815ac 100644 --- a/Master/texmf-dist/tex/uplatex/base/utbook.cls +++ b/Master/texmf-dist/tex/uplatex/base/utbook.cls @@ -16,7 +16,7 @@ %% File: ujclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesClass{utbook} - [2020/01/03 v1.8e-u00 + [2020/09/30 v1.8f-u00 Standard upLaTeX class] \newcounter{@paper} \newif\if@landscape \@landscapefalse @@ -768,9 +768,9 @@ \def\addcontentsline#1#2#3{% \protected@write\@auxout {\let\label\@gobble \let\index\@gobble \let\glossary\@gobble - \@temptokena{\rensuji{\thepage}}}% - {\string\@writefile{#1}% - {\protect\contentsline{#2}{#3}{\the\@temptokena}% + \@temptokena{\rensuji{\thepage}}% + }{\string\@writefile{#1}% + {\protect\contentsline{#2}{#3}{\the\@temptokena}{}% \protected@file@percent}}% } \newcommand{\tableofcontents}{% diff --git a/Master/texmf-dist/tex/uplatex/base/utreport.cls b/Master/texmf-dist/tex/uplatex/base/utreport.cls index 84068451bdc..ad0909246e2 100644 --- a/Master/texmf-dist/tex/uplatex/base/utreport.cls +++ b/Master/texmf-dist/tex/uplatex/base/utreport.cls @@ -16,7 +16,7 @@ %% File: ujclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesClass{utreport} - [2020/01/03 v1.8e-u00 + [2020/09/30 v1.8f-u00 Standard upLaTeX class] \newcounter{@paper} \newif\if@landscape \@landscapefalse @@ -764,9 +764,9 @@ \def\addcontentsline#1#2#3{% \protected@write\@auxout {\let\label\@gobble \let\index\@gobble \let\glossary\@gobble - \@temptokena{\rensuji{\thepage}}}% - {\string\@writefile{#1}% - {\protect\contentsline{#2}{#3}{\the\@temptokena}% + \@temptokena{\rensuji{\thepage}}% + }{\string\@writefile{#1}% + {\protect\contentsline{#2}{#3}{\the\@temptokena}{}% \protected@file@percent}}% } \newcommand{\tableofcontents}{% diff --git a/Master/texmf-dist/tex/uplatex/base/utsize10.clo b/Master/texmf-dist/tex/uplatex/base/utsize10.clo index 3e2d5c0cf19..b8a3212b142 100644 --- a/Master/texmf-dist/tex/uplatex/base/utsize10.clo +++ b/Master/texmf-dist/tex/uplatex/base/utsize10.clo @@ -16,7 +16,7 @@ %% File: ujclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{utsize10.clo} - [2020/01/03 v1.8e-u00 + [2020/09/30 v1.8f-u00 Standard upLaTeX file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xpt{17}% diff --git a/Master/texmf-dist/tex/uplatex/base/utsize11.clo b/Master/texmf-dist/tex/uplatex/base/utsize11.clo index 333d341d1f5..8ef3adf5a8e 100644 --- a/Master/texmf-dist/tex/uplatex/base/utsize11.clo +++ b/Master/texmf-dist/tex/uplatex/base/utsize11.clo @@ -16,7 +16,7 @@ %% File: ujclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{utsize11.clo} - [2020/01/03 v1.8e-u00 + [2020/09/30 v1.8f-u00 Standard upLaTeX file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xipt{17}% diff --git a/Master/texmf-dist/tex/uplatex/base/utsize12.clo b/Master/texmf-dist/tex/uplatex/base/utsize12.clo index cf9d7f01af0..9deeaa0105b 100644 --- a/Master/texmf-dist/tex/uplatex/base/utsize12.clo +++ b/Master/texmf-dist/tex/uplatex/base/utsize12.clo @@ -16,7 +16,7 @@ %% File: ujclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{utsize12.clo} - [2020/01/03 v1.8e-u00 + [2020/09/30 v1.8f-u00 Standard upLaTeX file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xiipt{18}% -- cgit v1.2.3