From 7fd315978151f63192546999b685d7f534d86b1d Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 16 Apr 2017 22:06:05 +0000 Subject: uplatex (16apr17) git-svn-id: svn://tug.org/texlive/trunk@43853 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/uplatex/base/ujarticle.cls | 44 +++++++++-- 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 | 96 ++++++++++++++++++------ Master/texmf-dist/tex/uplatex/base/ujreport.cls | 69 ++++++++++++++--- 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/uplcore.ltx | 58 ++++++++++---- Master/texmf-dist/tex/uplatex/base/uptrace.sty | 60 ++++++++++++--- Master/texmf-dist/tex/uplatex/base/utarticle.cls | 44 +++++++++-- 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 | 96 ++++++++++++++++++------ Master/texmf-dist/tex/uplatex/base/utreport.cls | 69 ++++++++++++++--- 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 +- 20 files changed, 447 insertions(+), 113 deletions(-) (limited to 'Master/texmf-dist/tex') diff --git a/Master/texmf-dist/tex/uplatex/base/ujarticle.cls b/Master/texmf-dist/tex/uplatex/base/ujarticle.cls index 89ea31d81a6..cf0ecff859b 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} - [2016/11/22 v1.7b-u00 + [2017/03/05 v1.7e-u00 Standard upLaTeX class] \newcounter{@paper} \newif\if@landscape \@landscapefalse @@ -81,8 +81,8 @@ \tombowtrue \tombowdatetrue \setlength{\@tombowwidth}{.1\p@}% \@bannertoken{% - \jobname\space:\space\number\year/\number\month/\number\day - (\number\hour:\number\minute)} + \jobname\space(\number\year-\two@digits\month-\two@digits\day + \space\two@digits\hour:\two@digits\minute)}% \maketombowbox} \DeclareOption{tombo}{% \tombowtrue \tombowdatefalse @@ -148,6 +148,40 @@ \renewcommand{\floatpagefraction}{.5} \renewcommand{\dbltopfraction}{.7} \renewcommand{\dblfloatpagefraction}{.5} +\def\pltx@cleartorightpage{\clearpage\if@twoside + \ifodd\c@page + \iftdir + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi + \else + \ifydir + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi + \fi\fi} +\def\pltx@cleartoleftpage{\clearpage\if@twoside + \ifodd\c@page + \ifydir + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi + \else + \iftdir + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi + \fi\fi} +\def\pltx@cleartooddpage{\clearpage\if@twoside + \ifodd\c@page\else + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi\fi} +\def\pltx@cleartoevenpage{\clearpage\if@twoside + \ifodd\c@page + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi\fi} \def\ps@plain{\let\@mkboth\@gobbletwo \let\ps@jpl@in\ps@plain \let\@oddhead\@empty @@ -239,7 +273,7 @@ \@restonecolfalse\newpage \fi \thispagestyle{empty}% - \setcounter{page}\@ne + \ifodd\c@page\setcounter{page}\@ne\else\setcounter{page}\z@\fi %% 2017/02/15 }% {\if@restonecol\twocolumn \else \newpage \fi \if@twoside\else @@ -249,7 +283,7 @@ \fi \def\p@thanks#1{\footnotemark \protected@xdef\@thanks{\@thanks - \protect{\noindent$\m@th^\thefootnote$~#1\protect\par}}} + \protect{\noindent\hbox{\yoko$\m@th^\thefootnote$}#1\protect\par}}} \if@titlepage \newcommand{\maketitle}{\begin{titlepage}% \let\footnotesize\small diff --git a/Master/texmf-dist/tex/uplatex/base/ujbk10.clo b/Master/texmf-dist/tex/uplatex/base/ujbk10.clo index 23a5f49f606..b14ac969486 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} - [2016/11/22 v1.7b-u00 + [2017/03/05 v1.7e-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 1990b4acca7..438870173a7 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} - [2016/11/22 v1.7b-u00 + [2017/03/05 v1.7e-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 05222981faf..0ffade94b17 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} - [2016/11/22 v1.7b-u00 + [2017/03/05 v1.7e-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 ec010d418d2..8d7a5963259 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} - [2016/11/22 v1.7b-u00 + [2017/03/05 v1.7e-u00 Standard upLaTeX class] \newcounter{@paper} \newif\if@landscape \@landscapefalse @@ -25,6 +25,7 @@ \newif\if@titlepage \@titlepagetrue \newif\if@openright +\newif\if@openleft \newif\if@mainmatter \@mainmattertrue \hour\time \divide\hour by 60\relax \@tempcnta\hour \multiply\@tempcnta 60\relax @@ -83,8 +84,8 @@ \tombowtrue \tombowdatetrue \setlength{\@tombowwidth}{.1\p@}% \@bannertoken{% - \jobname\space:\space\number\year/\number\month/\number\day - (\number\hour:\number\minute)} + \jobname\space(\number\year-\two@digits\month-\two@digits\day + \space\two@digits\hour:\two@digits\minute)}% \maketombowbox} \DeclareOption{tombo}{% \tombowtrue \tombowdatefalse @@ -107,8 +108,9 @@ \if@compatibility \@openrighttrue \else -\DeclareOption{openright}{\@openrighttrue} -\DeclareOption{openany}{\@openrightfalse} +\DeclareOption{openright}{\@openrighttrue\@openleftfalse} +\DeclareOption{openleft}{\@openlefttrue\@openrightfalse} +\DeclareOption{openany}{\@openrightfalse\@openleftfalse} \fi \DeclareOption{leqno}{\input{leqno.clo}} \DeclareOption{fleqn}{\input{fleqn.clo}} @@ -156,6 +158,45 @@ \renewcommand{\floatpagefraction}{.5} \renewcommand{\dbltopfraction}{.7} \renewcommand{\dblfloatpagefraction}{.5} +\def\pltx@cleartorightpage{\clearpage\if@twoside + \ifodd\c@page + \iftdir + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi + \else + \ifydir + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi + \fi\fi} +\def\pltx@cleartoleftpage{\clearpage\if@twoside + \ifodd\c@page + \ifydir + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi + \else + \iftdir + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi + \fi\fi} +\def\pltx@cleartooddpage{\clearpage\if@twoside + \ifodd\c@page\else + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi\fi} +\def\pltx@cleartoevenpage{\clearpage\if@twoside + \ifodd\c@page + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi\fi} +\if@openleft + \let\cleardoublepage\pltx@cleartoleftpage +\else\if@openright + \let\cleardoublepage\pltx@cleartorightpage +\fi\fi \def\ps@plain{\let\@mkboth\@gobbletwo \let\ps@jpl@in\ps@plain \let\@oddhead\@empty @@ -181,9 +222,9 @@ \let\@mkboth\markboth \def\chaptermark##1{\markboth{% \ifnum \c@secnumdepth >\m@ne - \if@mainmatter + \if@mainmatter \@chapapp\thechapter\@chappos\hskip1zw - \fi + \fi \fi ##1}{}}% \def\sectionmark##1{\markright{% @@ -197,9 +238,9 @@ \let\@mkboth\markboth \def\chaptermark##1{\markright{% \ifnum \c@secnumdepth >\m@ne - \if@mainmatter + \if@mainmatter \@chapapp\thechapter\@chappos\hskip1zw - \fi + \fi \fi ##1}}% } @@ -213,9 +254,9 @@ \let\@mkboth\markboth \def\chaptermark##1{\markboth{% \ifnum \c@secnumdepth >\m@ne - \if@mainmatter + \if@mainmatter \@chapapp\thechapter\@chappos\hskip1zw - \fi + \fi \fi ##1}{}}% \def\sectionmark##1{\markright{% @@ -229,9 +270,9 @@ \let\@mkboth\markboth \def\chaptermark##1{\markright{% \ifnum \c@secnumdepth >\m@ne - \if@mainmatter + \if@mainmatter \@chapapp\thechapter\@chappos\hskip1zw - \fi + \fi \fi ##1}}% } @@ -247,7 +288,7 @@ \if@compatibility \newenvironment{titlepage} {% - \cleardoublepage + \cleardoublepage \if@twocolumn\@restonecoltrue\onecolumn \else\@restonecolfalse\newpage\fi \thispagestyle{empty}% @@ -258,14 +299,14 @@ \else \newenvironment{titlepage} {% - \cleardoublepage + \pltx@cleartooddpage %% 2017/02/15 \if@twocolumn \@restonecoltrue\onecolumn \else \@restonecolfalse\newpage \fi \thispagestyle{empty}% - \setcounter{page}\@ne + \ifodd\c@page\setcounter{page}\@ne\else\setcounter{page}\z@\fi %% 2017/02/15 }% {\if@restonecol\twocolumn \else \newpage \fi \if@twoside\else @@ -275,7 +316,7 @@ \fi \def\p@thanks#1{\footnotemark \protected@xdef\@thanks{\@thanks - \protect{\noindent$\m@th^\thefootnote$~#1\protect\par}}} + \protect{\noindent\hbox{\yoko$\m@th^\thefootnote$}#1\protect\par}}} \if@titlepage \newcommand{\maketitle}{\begin{titlepage}% \let\footnotesize\small @@ -381,16 +422,18 @@ \newcommand{\@chapapp}{\prechaptername} \newcommand{\@chappos}{\postchaptername} \newcommand{\frontmatter}{% - \if@openright \cleardoublepage \else \clearpage \fi + \pltx@cleartooddpage \@mainmatterfalse\pagenumbering{roman}} \newcommand{\mainmatter}{% - \if@openright \cleardoublepage \else \clearpage \fi + \pltx@cleartooddpage \@mainmattertrue\pagenumbering{arabic}} \newcommand{\backmatter}{% - \if@openright \cleardoublepage \else \clearpage \fi + \if@openleft \cleardoublepage \else + \if@openright \cleardoublepage \else \clearpage \fi \fi \@mainmatterfalse} \newcommand{\part}{% - \if@openright \cleardoublepage \else \clearpage \fi + \if@openleft \cleardoublepage \else + \if@openright \cleardoublepage \else \clearpage \fi \fi \thispagestyle{empty}% \if@twocolumn\onecolumn\@tempswatrue\else\@tempswafalse\fi \null\vfil @@ -418,10 +461,17 @@ \Huge\bfseries#1\par}% \@endpart} \def\@endpart{\vfil\newpage - \if@twoside\null\thispagestyle{empty}\newpage\fi + \if@twoside + \if@openleft %% \if@openleft added (2017/02/15) + \null\thispagestyle{empty}\newpage + \else\if@openright %% \if@openright added (2016/12/18) + \null\thispagestyle{empty}\newpage + \fi\fi %% added (2016/12/18, 2017/02/15) + \fi \if@tempswa\twocolumn\fi} \newcommand{\chapter}{% - \if@openright\cleardoublepage\else\clearpage\fi + \if@openleft \cleardoublepage \else + \if@openright \cleardoublepage \else \clearpage \fi \fi \thispagestyle{jpl@in}% \global\@topnum\z@ \@afterindenttrue diff --git a/Master/texmf-dist/tex/uplatex/base/ujreport.cls b/Master/texmf-dist/tex/uplatex/base/ujreport.cls index 8da8be2a163..1726dc8ff52 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} - [2016/11/22 v1.7b-u00 + [2017/03/05 v1.7e-u00 Standard upLaTeX class] \newcounter{@paper} \newif\if@landscape \@landscapefalse @@ -25,6 +25,7 @@ \newif\if@titlepage \@titlepagetrue \newif\if@openright +\newif\if@openleft \hour\time \divide\hour by 60\relax \@tempcnta\hour \multiply\@tempcnta 60\relax \minute\time \advance\minute-\@tempcnta @@ -82,8 +83,8 @@ \tombowtrue \tombowdatetrue \setlength{\@tombowwidth}{.1\p@}% \@bannertoken{% - \jobname\space:\space\number\year/\number\month/\number\day - (\number\hour:\number\minute)} + \jobname\space(\number\year-\two@digits\month-\two@digits\day + \space\two@digits\hour:\two@digits\minute)}% \maketombowbox} \DeclareOption{tombo}{% \tombowtrue \tombowdatefalse @@ -105,8 +106,9 @@ \DeclareOption{notitlepage}{\@titlepagefalse} \if@compatibility \else -\DeclareOption{openright}{\@openrighttrue} -\DeclareOption{openany}{\@openrightfalse} +\DeclareOption{openright}{\@openrighttrue\@openleftfalse} +\DeclareOption{openleft}{\@openlefttrue\@openrightfalse} +\DeclareOption{openany}{\@openrightfalse\@openleftfalse} \fi \DeclareOption{leqno}{\input{leqno.clo}} \DeclareOption{fleqn}{\input{fleqn.clo}} @@ -154,6 +156,45 @@ \renewcommand{\floatpagefraction}{.5} \renewcommand{\dbltopfraction}{.7} \renewcommand{\dblfloatpagefraction}{.5} +\def\pltx@cleartorightpage{\clearpage\if@twoside + \ifodd\c@page + \iftdir + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi + \else + \ifydir + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi + \fi\fi} +\def\pltx@cleartoleftpage{\clearpage\if@twoside + \ifodd\c@page + \ifydir + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi + \else + \iftdir + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi + \fi\fi} +\def\pltx@cleartooddpage{\clearpage\if@twoside + \ifodd\c@page\else + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi\fi} +\def\pltx@cleartoevenpage{\clearpage\if@twoside + \ifodd\c@page + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi\fi} +\if@openleft + \let\cleardoublepage\pltx@cleartoleftpage +\else\if@openright + \let\cleardoublepage\pltx@cleartorightpage +\fi\fi \def\ps@plain{\let\@mkboth\@gobbletwo \let\ps@jpl@in\ps@plain \let\@oddhead\@empty @@ -253,7 +294,7 @@ \@restonecolfalse\newpage \fi \thispagestyle{empty}% - \setcounter{page}\@ne + \ifodd\c@page\setcounter{page}\@ne\else\setcounter{page}\z@\fi %% 2017/02/15 }% {\if@restonecol\twocolumn \else \newpage \fi \if@twoside\else @@ -263,7 +304,7 @@ \fi \def\p@thanks#1{\footnotemark \protected@xdef\@thanks{\@thanks - \protect{\noindent$\m@th^\thefootnote$~#1\protect\par}}} + \protect{\noindent\hbox{\yoko$\m@th^\thefootnote$}#1\protect\par}}} \if@titlepage \newcommand{\maketitle}{\begin{titlepage}% \let\footnotesize\small @@ -391,7 +432,8 @@ \newcommand{\@chapapp}{\prechaptername} \newcommand{\@chappos}{\postchaptername} \newcommand{\part}{% - \if@openright \cleardoublepage \else \clearpage \fi + \if@openleft \cleardoublepage \else + \if@openright \cleardoublepage \else \clearpage \fi \fi \thispagestyle{empty}% \if@twocolumn\onecolumn\@tempswatrue\else\@tempswafalse\fi \null\vfil @@ -419,10 +461,17 @@ \Huge\bfseries#1\par}% \@endpart} \def\@endpart{\vfil\newpage - \if@twoside\null\thispagestyle{empty}\newpage\fi + \if@twoside + \if@openleft %% \if@openleft added (2017/02/15) + \null\thispagestyle{empty}\newpage + \else\if@openright %% \if@openright added (2016/12/18) + \null\thispagestyle{empty}\newpage + \fi\fi %% added (2016/12/18, 2017/02/15) + \fi \if@tempswa\twocolumn\fi} \newcommand{\chapter}{% - \if@openright\cleardoublepage\else\clearpage\fi + \if@openleft \cleardoublepage \else + \if@openright \cleardoublepage \else \clearpage \fi \fi \thispagestyle{jpl@in}% \global\@topnum\z@ \@afterindenttrue diff --git a/Master/texmf-dist/tex/uplatex/base/ujsize10.clo b/Master/texmf-dist/tex/uplatex/base/ujsize10.clo index 5036e50c6a7..88b5a3004e3 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} - [2016/11/22 v1.7b-u00 + [2017/03/05 v1.7e-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 e12a2b2d143..0d9b4ec5d70 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} - [2016/11/22 v1.7b-u00 + [2017/03/05 v1.7e-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 bbaa8514a1a..9cbeaf4f39d 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} - [2016/11/22 v1.7b-u00 + [2017/03/05 v1.7e-u00 Standard upLaTeX file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xiipt{16.5}% diff --git a/Master/texmf-dist/tex/uplatex/base/uplcore.ltx b/Master/texmf-dist/tex/uplatex/base/uplcore.ltx index aeeb9c746b3..6fd6af1b9e1 100644 --- a/Master/texmf-dist/tex/uplatex/base/uplcore.ltx +++ b/Master/texmf-dist/tex/uplatex/base/uplcore.ltx @@ -19,7 +19,7 @@ %% File: uplvers.dtx \def\pfmtname{pLaTeX2e} \def\pfmtversion - {2016/11/29u01} + {2017/04/08u01} \def\ppatch@level{0} \def\plIncludeInRelease#1{\kernel@ifnextchar[% {\@plIncludeInRelease{#1}} @@ -83,9 +83,11 @@ \let\notffam@list\kfam@list \newbox\tstrutbox \newbox\zstrutbox +\newbox\ystrutbox +\def\strutbox{\iftdir\tstrutbox\else\ystrutbox\fi} \def\strut{\relax \ifydir - \ifmmode\copy\strutbox\else\unhcopy\strutbox\fi + \ifmmode\copy\ystrutbox\else\unhcopy\ystrutbox\fi \else \ifmmode\copy\tstrutbox\else\unhcopy\tstrutbox\fi \fi} @@ -93,6 +95,8 @@ \ifmmode\copy\tstrutbox\else\unhcopy\tstrutbox\fi}} \def\zstrut{\relax\hbox{\tate \ifmmode\copy\zstrutbox\else\unhcopy\zstrutbox\fi}} +\def\ystrut{\relax\hbox{\yoko + \ifmmode\copy\ystrutbox\else\unhcopy\ystrutbox\fi}} \def\DeclareFontEncoding{% \begingroup \nfss@catcodes @@ -428,7 +432,7 @@ \baselineskip\f@linespread\baselineskip \normalbaselineskip\baselineskip \adjustbaseline - \setbox\strutbox\hbox{\yoko + \setbox\ystrutbox\hbox{\yoko \vrule\@width\z@ \@height.7\baselineskip \@depth.3\baselineskip}% \setbox\tstrutbox\hbox{\tate @@ -633,7 +637,9 @@ \@onlypreamble\kanjiprocess@table \DeclareTextCommandDefault{\textunderscore}{% \leavevmode\kern.06em - \iftdir\raise-\tbaselineshift\fi + \raise-\iftdir\ifmdir\ybaselineshift + \else\tbaselineshift\fi + \else\ybaselineshift\fi \vbox{\hrule\@width.3em}} \InputIfFileExists{upldefs.cfg} {\typeout{*************************************^^J% @@ -690,9 +696,25 @@ \fi} \gdef\@makecol{% \setbox\@outputbox\box\@cclv% + \let\@elt\relax % added on LaTeX (ltoutput.dtx 2003/12/16 v1.2k) \xdef\@freelist{\@freelist\@midlist}% \global \let \@midlist \@empty \@combinefloats + \let\pltx@textbottom\@textbottom % save (pLaTeX 2017/02/25) + \ifvoid\footins\else % changed (pLaTeX 2017/02/25) + \setbox\@outputbox \vbox {% + \boxmaxdepth \@maxdepth + \unvbox \@outputbox + \@textbottom % inserted here (pLaTeX 2017/02/25) + \vskip \skip\footins + \color@begingroup + \normalcolor + \footnoterule + \unvbox \footins + \color@endgroup + }% + \let\@textbottom\relax % disable temporarily (pLaTeX 2017/02/25) + \fi \ifvbox\@kludgeins \@makespecialcolbox \else @@ -703,16 +725,9 @@ \iftdir\vbox{\hskip\z@}\fi \vskip -\dimen@ \@textbottom - \ifvoid\footins\else % for pLaTeX - \vskip \skip\footins - \color@begingroup - \normalcolor - \footnoterule - \unvbox \footins - \color@endgroup - \fi }% \fi + \let\@textbottom\pltx@textbottom % restore (pLaTeX 2017/02/25) \global \maxdepth \@maxdepth } \gdef\@makespecialcolbox{% @@ -850,6 +865,7 @@ \dimen\z@\textwidth \textwidth\textheight \textheight\dimen\z@ \fi \let \protect \noexpand + \language\document@default@language \@resetactivechars \global\let\@@if@newlist\if@newlist \global\@newlistfalse @@ -964,13 +980,14 @@ \@latex@warning{Reference `#3' on page \thepage \space undefined}% \else - \expandafter#2#1\relax% change \null to \relax + \expandafter#2#1\relax{}% change \null to \relax{} \fi} \if@compatibility\else \def\verb{\relax\ifmmode\hbox\else\leavevmode\fi \bgroup \verb@eol@error \let\do\@makeother \dospecials \verbatim@font\@noligs + \language\l@nohyphenation \@ifstar\@sverb\@verb} \fi \gdef\@stopfield{\null\color@endgroup\egroup} @@ -1029,7 +1046,14 @@ \fi %% File: uplvers.dtx \def\documentstyle{% - \@latex@error{upLaTeX does NOT support LaTeX 2.09 compatibility mode}\@ehc + \@latex@error{upLaTeX does NOT support LaTeX 2.09 compatibility + mode.\MessageBreak Use \noexpand\documentclass instead}{% + \noexpand\documentstyle is an old convention of LaTeX 2.09, + which has been\MessageBreak obsolete since 1995. upLaTeX is + first released in 2007, so we do\MessageBreak not provide any + emulation of the LaTeX 2.09 author environment.\MessageBreak + New documents should use Standard LaTeX conventions, and + start\MessageBreak with the \noexpand\documentclass command.}% \documentclass} \ifx\patch@level\@undefined % fallback if undefined in LaTeX \def\patch@level{0}\fi @@ -1062,6 +1086,12 @@ } \expandafter \endgroup \platexTMP +\ifx\l@nohyphenation \@undefined + \newlanguage\l@nohyphenation +\fi +\ifx\document@default@language \@undefined + \let\document@default@language\m@ne +\fi \AtBeginDocument{% \@ifpackageloaded{latexrelease}{% \@ifpackageloaded{platexrelease}{}{% diff --git a/Master/texmf-dist/tex/uplatex/base/uptrace.sty b/Master/texmf-dist/tex/uplatex/base/uptrace.sty index c2aafd9bf6a..793da2e868c 100644 --- a/Master/texmf-dist/tex/uplatex/base/uptrace.sty +++ b/Master/texmf-dist/tex/uplatex/base/uptrace.sty @@ -16,7 +16,7 @@ %% File: uplfonts.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesPackage{uptrace} - [2016/04/30 v1.6b-u00 Standard upLaTeX package (font tracing)] + [2017/03/05 v1.6f-u00 Standard upLaTeX package (font tracing)] \RequirePackageWithOptions{tracefnt} \DeclareRobustCommand\selectfont{% \let\tmp@error@fontshape\error@fontshape @@ -75,6 +75,43 @@ \size@update} \def\KanjiEncodingPair#1#2{\@namedef{t@enc@#1}{#2}\@namedef{y@enc@#2}{#1}} \KanjiEncodingPair{JY2}{JT2} +\plIncludeInRelease{2017/04/08}{\set@fontsize} + {Construct \ystrutbox}% +\def\set@fontsize#1#2#3{% + \@defaultunits\@tempdimb#2pt\relax\@nnil + \edef\f@size{\strip@pt\@tempdimb}% + \@defaultunits\@tempskipa#3pt\relax\@nnil + \edef\f@baselineskip{\the\@tempskipa}% + \edef\f@linespread{#1}% + \let\baselinestretch\f@linespread + \def\size@update{% + \baselineskip\f@baselineskip\relax + \baselineskip\f@linespread\baselineskip + \normalbaselineskip\baselineskip + \adjustbaseline + \setbox\ystrutbox\hbox{\yoko + \vrule\@width\z@ + \@height.7\baselineskip \@depth.3\baselineskip}% + \setbox\tstrutbox\hbox{\tate + \vrule\@width\z@ + \@height.5\baselineskip \@depth.5\baselineskip}% + \setbox\zstrutbox\hbox{\tate + \vrule\@width\z@ + \@height.7\baselineskip \@depth.3\baselineskip}% + \ifnum \tracingfonts>\tw@ + \ifx\f@linespread\@empty + \let\reserved@a\@empty + \else + \def\reserved@a{\f@linespread x}% + \fi + \@font@info{Changing size to\space + \f@size/\reserved@a \f@baselineskip}% + \aftergroup\type@restoreinfo + \fi + \let\size@update\relax}} +\plEndIncludeInRelease +\plIncludeInRelease{0000/00/00}{\set@fontsize} + {Construct \ystrutbox}% \def\set@fontsize#1#2#3{% \@defaultunits\@tempdimb#2pt\relax\@nnil \edef\f@size{\strip@pt\@tempdimb}% @@ -96,17 +133,18 @@ \setbox\zstrutbox\hbox{\tate \vrule\@width\z@ \@height.7\baselineskip \@depth.3\baselineskip}% - \ifnum \tracingfonts>\tw@ - \ifx\f@linespread\@empty - \let\reserved@a\@empty - \else - \def\reserved@a{\f@linespread x}% - \fi - \@font@info{Changing size to\space - \f@size/\reserved@a \f@baselineskip}% - \aftergroup\type@restoreinfo - \fi + \ifnum \tracingfonts>\tw@ + \ifx\f@linespread\@empty + \let\reserved@a\@empty + \else + \def\reserved@a{\f@linespread x}% + \fi + \@font@info{Changing size to\space + \f@size/\reserved@a \f@baselineskip}% + \aftergroup\type@restoreinfo + \fi \let\size@update\relax}} +\plEndIncludeInRelease \newbox\adjust@box \newdimen\adjust@dimen \def\adjustbaseline{% diff --git a/Master/texmf-dist/tex/uplatex/base/utarticle.cls b/Master/texmf-dist/tex/uplatex/base/utarticle.cls index bf288306eee..ac2bf61cee1 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} - [2016/11/22 v1.7b-u00 + [2017/03/05 v1.7e-u00 Standard upLaTeX class] \newcounter{@paper} \newif\if@landscape \@landscapefalse @@ -81,8 +81,8 @@ \tombowtrue \tombowdatetrue \setlength{\@tombowwidth}{.1\p@}% \@bannertoken{% - \jobname\space:\space\number\year/\number\month/\number\day - (\number\hour:\number\minute)} + \jobname\space(\number\year-\two@digits\month-\two@digits\day + \space\two@digits\hour:\two@digits\minute)}% \maketombowbox} \DeclareOption{tombo}{% \tombowtrue \tombowdatefalse @@ -149,6 +149,40 @@ \renewcommand{\floatpagefraction}{.5} \renewcommand{\dbltopfraction}{.7} \renewcommand{\dblfloatpagefraction}{.5} +\def\pltx@cleartorightpage{\clearpage\if@twoside + \ifodd\c@page + \iftdir + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi + \else + \ifydir + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi + \fi\fi} +\def\pltx@cleartoleftpage{\clearpage\if@twoside + \ifodd\c@page + \ifydir + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi + \else + \iftdir + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi + \fi\fi} +\def\pltx@cleartooddpage{\clearpage\if@twoside + \ifodd\c@page\else + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi\fi} +\def\pltx@cleartoevenpage{\clearpage\if@twoside + \ifodd\c@page + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi\fi} \def\ps@plain{\let\@mkboth\@gobbletwo \let\ps@jpl@in\ps@plain \let\@oddhead\@empty @@ -240,7 +274,7 @@ \@restonecolfalse\newpage \fi \thispagestyle{empty}% - \setcounter{page}\@ne + \ifodd\c@page\setcounter{page}\@ne\else\setcounter{page}\z@\fi %% 2017/02/15 }% {\if@restonecol\twocolumn \else \newpage \fi \if@twoside\else @@ -250,7 +284,7 @@ \fi \def\p@thanks#1{\footnotemark \protected@xdef\@thanks{\@thanks - \protect{\noindent$\m@th^\thefootnote$~#1\protect\par}}} + \protect{\noindent\hbox{\yoko$\m@th^\thefootnote$}#1\protect\par}}} \if@titlepage \newcommand{\maketitle}{\begin{titlepage}% \let\footnotesize\small diff --git a/Master/texmf-dist/tex/uplatex/base/utbk10.clo b/Master/texmf-dist/tex/uplatex/base/utbk10.clo index ba672892634..0f1974790a5 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} - [2016/11/22 v1.7b-u00 + [2017/03/05 v1.7e-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 64422782329..ef0241aaa9e 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} - [2016/11/22 v1.7b-u00 + [2017/03/05 v1.7e-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 0b533b2fd7f..071ffc80115 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} - [2016/11/22 v1.7b-u00 + [2017/03/05 v1.7e-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 2628cf2b812..d4c3d839f22 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} - [2016/11/22 v1.7b-u00 + [2017/03/05 v1.7e-u00 Standard upLaTeX class] \newcounter{@paper} \newif\if@landscape \@landscapefalse @@ -25,6 +25,7 @@ \newif\if@titlepage \@titlepagetrue \newif\if@openright +\newif\if@openleft \newif\if@mainmatter \@mainmattertrue \hour\time \divide\hour by 60\relax \@tempcnta\hour \multiply\@tempcnta 60\relax @@ -83,8 +84,8 @@ \tombowtrue \tombowdatetrue \setlength{\@tombowwidth}{.1\p@}% \@bannertoken{% - \jobname\space:\space\number\year/\number\month/\number\day - (\number\hour:\number\minute)} + \jobname\space(\number\year-\two@digits\month-\two@digits\day + \space\two@digits\hour:\two@digits\minute)}% \maketombowbox} \DeclareOption{tombo}{% \tombowtrue \tombowdatefalse @@ -107,8 +108,9 @@ \if@compatibility \@openrighttrue \else -\DeclareOption{openright}{\@openrighttrue} -\DeclareOption{openany}{\@openrightfalse} +\DeclareOption{openright}{\@openrighttrue\@openleftfalse} +\DeclareOption{openleft}{\@openlefttrue\@openrightfalse} +\DeclareOption{openany}{\@openrightfalse\@openleftfalse} \fi \DeclareOption{leqno}{\input{leqno.clo}} \DeclareOption{fleqn}{\input{fleqn.clo}} @@ -157,6 +159,45 @@ \renewcommand{\floatpagefraction}{.5} \renewcommand{\dbltopfraction}{.7} \renewcommand{\dblfloatpagefraction}{.5} +\def\pltx@cleartorightpage{\clearpage\if@twoside + \ifodd\c@page + \iftdir + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi + \else + \ifydir + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi + \fi\fi} +\def\pltx@cleartoleftpage{\clearpage\if@twoside + \ifodd\c@page + \ifydir + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi + \else + \iftdir + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi + \fi\fi} +\def\pltx@cleartooddpage{\clearpage\if@twoside + \ifodd\c@page\else + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi\fi} +\def\pltx@cleartoevenpage{\clearpage\if@twoside + \ifodd\c@page + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi\fi} +\if@openleft + \let\cleardoublepage\pltx@cleartoleftpage +\else\if@openright + \let\cleardoublepage\pltx@cleartorightpage +\fi\fi \def\ps@plain{\let\@mkboth\@gobbletwo \let\ps@jpl@in\ps@plain \let\@oddhead\@empty @@ -182,9 +223,9 @@ \let\@mkboth\markboth \def\chaptermark##1{\markboth{% \ifnum \c@secnumdepth >\m@ne - \if@mainmatter + \if@mainmatter \@chapapp\thechapter\@chappos\hskip1zw - \fi + \fi \fi ##1}{}}% \def\sectionmark##1{\markright{% @@ -198,9 +239,9 @@ \let\@mkboth\markboth \def\chaptermark##1{\markright{% \ifnum \c@secnumdepth >\m@ne - \if@mainmatter + \if@mainmatter \@chapapp\thechapter\@chappos\hskip1zw - \fi + \fi \fi ##1}}% } @@ -214,9 +255,9 @@ \let\@mkboth\markboth \def\chaptermark##1{\markboth{% \ifnum \c@secnumdepth >\m@ne - \if@mainmatter + \if@mainmatter \@chapapp\thechapter\@chappos\hskip1zw - \fi + \fi \fi ##1}{}}% \def\sectionmark##1{\markright{% @@ -230,9 +271,9 @@ \let\@mkboth\markboth \def\chaptermark##1{\markright{% \ifnum \c@secnumdepth >\m@ne - \if@mainmatter + \if@mainmatter \@chapapp\thechapter\@chappos\hskip1zw - \fi + \fi \fi ##1}}% } @@ -248,7 +289,7 @@ \if@compatibility \newenvironment{titlepage} {% - \cleardoublepage + \cleardoublepage \if@twocolumn\@restonecoltrue\onecolumn \else\@restonecolfalse\newpage\fi \thispagestyle{empty}% @@ -259,14 +300,14 @@ \else \newenvironment{titlepage} {% - \cleardoublepage + \pltx@cleartooddpage %% 2017/02/15 \if@twocolumn \@restonecoltrue\onecolumn \else \@restonecolfalse\newpage \fi \thispagestyle{empty}% - \setcounter{page}\@ne + \ifodd\c@page\setcounter{page}\@ne\else\setcounter{page}\z@\fi %% 2017/02/15 }% {\if@restonecol\twocolumn \else \newpage \fi \if@twoside\else @@ -276,7 +317,7 @@ \fi \def\p@thanks#1{\footnotemark \protected@xdef\@thanks{\@thanks - \protect{\noindent$\m@th^\thefootnote$~#1\protect\par}}} + \protect{\noindent\hbox{\yoko$\m@th^\thefootnote$}#1\protect\par}}} \if@titlepage \newcommand{\maketitle}{\begin{titlepage}% \let\footnotesize\small @@ -385,16 +426,18 @@ \newcommand{\@chapapp}{\prechaptername} \newcommand{\@chappos}{\postchaptername} \newcommand{\frontmatter}{% - \if@openright \cleardoublepage \else \clearpage \fi + \pltx@cleartooddpage \@mainmatterfalse\pagenumbering{roman}} \newcommand{\mainmatter}{% - \if@openright \cleardoublepage \else \clearpage \fi + \pltx@cleartooddpage \@mainmattertrue\pagenumbering{arabic}} \newcommand{\backmatter}{% - \if@openright \cleardoublepage \else \clearpage \fi + \if@openleft \cleardoublepage \else + \if@openright \cleardoublepage \else \clearpage \fi \fi \@mainmatterfalse} \newcommand{\part}{% - \if@openright \cleardoublepage \else \clearpage \fi + \if@openleft \cleardoublepage \else + \if@openright \cleardoublepage \else \clearpage \fi \fi \thispagestyle{empty}% \if@twocolumn\onecolumn\@tempswatrue\else\@tempswafalse\fi \null\vfil @@ -422,10 +465,17 @@ \Huge\bfseries#1\par}% \@endpart} \def\@endpart{\vfil\newpage - \if@twoside\null\thispagestyle{empty}\newpage\fi + \if@twoside + \if@openleft %% \if@openleft added (2017/02/15) + \null\thispagestyle{empty}\newpage + \else\if@openright %% \if@openright added (2016/12/18) + \null\thispagestyle{empty}\newpage + \fi\fi %% added (2016/12/18, 2017/02/15) + \fi \if@tempswa\twocolumn\fi} \newcommand{\chapter}{% - \if@openright\cleardoublepage\else\clearpage\fi + \if@openleft \cleardoublepage \else + \if@openright \cleardoublepage \else \clearpage \fi \fi \thispagestyle{jpl@in}% \global\@topnum\z@ \@afterindenttrue diff --git a/Master/texmf-dist/tex/uplatex/base/utreport.cls b/Master/texmf-dist/tex/uplatex/base/utreport.cls index c64a787b7dd..dccaa068c03 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} - [2016/11/22 v1.7b-u00 + [2017/03/05 v1.7e-u00 Standard upLaTeX class] \newcounter{@paper} \newif\if@landscape \@landscapefalse @@ -25,6 +25,7 @@ \newif\if@titlepage \@titlepagetrue \newif\if@openright +\newif\if@openleft \hour\time \divide\hour by 60\relax \@tempcnta\hour \multiply\@tempcnta 60\relax \minute\time \advance\minute-\@tempcnta @@ -82,8 +83,8 @@ \tombowtrue \tombowdatetrue \setlength{\@tombowwidth}{.1\p@}% \@bannertoken{% - \jobname\space:\space\number\year/\number\month/\number\day - (\number\hour:\number\minute)} + \jobname\space(\number\year-\two@digits\month-\two@digits\day + \space\two@digits\hour:\two@digits\minute)}% \maketombowbox} \DeclareOption{tombo}{% \tombowtrue \tombowdatefalse @@ -105,8 +106,9 @@ \DeclareOption{notitlepage}{\@titlepagefalse} \if@compatibility \else -\DeclareOption{openright}{\@openrighttrue} -\DeclareOption{openany}{\@openrightfalse} +\DeclareOption{openright}{\@openrighttrue\@openleftfalse} +\DeclareOption{openleft}{\@openlefttrue\@openrightfalse} +\DeclareOption{openany}{\@openrightfalse\@openleftfalse} \fi \DeclareOption{leqno}{\input{leqno.clo}} \DeclareOption{fleqn}{\input{fleqn.clo}} @@ -155,6 +157,45 @@ \renewcommand{\floatpagefraction}{.5} \renewcommand{\dbltopfraction}{.7} \renewcommand{\dblfloatpagefraction}{.5} +\def\pltx@cleartorightpage{\clearpage\if@twoside + \ifodd\c@page + \iftdir + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi + \else + \ifydir + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi + \fi\fi} +\def\pltx@cleartoleftpage{\clearpage\if@twoside + \ifodd\c@page + \ifydir + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi + \else + \iftdir + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi + \fi\fi} +\def\pltx@cleartooddpage{\clearpage\if@twoside + \ifodd\c@page\else + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi\fi} +\def\pltx@cleartoevenpage{\clearpage\if@twoside + \ifodd\c@page + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi\fi} +\if@openleft + \let\cleardoublepage\pltx@cleartoleftpage +\else\if@openright + \let\cleardoublepage\pltx@cleartorightpage +\fi\fi \def\ps@plain{\let\@mkboth\@gobbletwo \let\ps@jpl@in\ps@plain \let\@oddhead\@empty @@ -254,7 +295,7 @@ \@restonecolfalse\newpage \fi \thispagestyle{empty}% - \setcounter{page}\@ne + \ifodd\c@page\setcounter{page}\@ne\else\setcounter{page}\z@\fi %% 2017/02/15 }% {\if@restonecol\twocolumn \else \newpage \fi \if@twoside\else @@ -264,7 +305,7 @@ \fi \def\p@thanks#1{\footnotemark \protected@xdef\@thanks{\@thanks - \protect{\noindent$\m@th^\thefootnote$~#1\protect\par}}} + \protect{\noindent\hbox{\yoko$\m@th^\thefootnote$}#1\protect\par}}} \if@titlepage \newcommand{\maketitle}{\begin{titlepage}% \let\footnotesize\small @@ -395,7 +436,8 @@ \newcommand{\@chapapp}{\prechaptername} \newcommand{\@chappos}{\postchaptername} \newcommand{\part}{% - \if@openright \cleardoublepage \else \clearpage \fi + \if@openleft \cleardoublepage \else + \if@openright \cleardoublepage \else \clearpage \fi \fi \thispagestyle{empty}% \if@twocolumn\onecolumn\@tempswatrue\else\@tempswafalse\fi \null\vfil @@ -423,10 +465,17 @@ \Huge\bfseries#1\par}% \@endpart} \def\@endpart{\vfil\newpage - \if@twoside\null\thispagestyle{empty}\newpage\fi + \if@twoside + \if@openleft %% \if@openleft added (2017/02/15) + \null\thispagestyle{empty}\newpage + \else\if@openright %% \if@openright added (2016/12/18) + \null\thispagestyle{empty}\newpage + \fi\fi %% added (2016/12/18, 2017/02/15) + \fi \if@tempswa\twocolumn\fi} \newcommand{\chapter}{% - \if@openright\cleardoublepage\else\clearpage\fi + \if@openleft \cleardoublepage \else + \if@openright \cleardoublepage \else \clearpage \fi \fi \thispagestyle{jpl@in}% \global\@topnum\z@ \@afterindenttrue diff --git a/Master/texmf-dist/tex/uplatex/base/utsize10.clo b/Master/texmf-dist/tex/uplatex/base/utsize10.clo index 6a29ab24d78..5f6b46556b7 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} - [2016/11/22 v1.7b-u00 + [2017/03/05 v1.7e-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 5f1c3abe1e2..8b74e6584fc 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} - [2016/11/22 v1.7b-u00 + [2017/03/05 v1.7e-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 8e237fd339a..33ae8a0e51c 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} - [2016/11/22 v1.7b-u00 + [2017/03/05 v1.7e-u00 Standard upLaTeX file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xiipt{18}% -- cgit v1.2.3