From a880c715c123c4ecf8da826a5283895cec739b42 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 11 Jun 2016 23:06:28 +0000 Subject: uplatex (11jun16) git-svn-id: svn://tug.org/texlive/trunk@41370 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/uplatex/base/uplatex.ltx | 3 +- Master/texmf-dist/tex/uplatex/base/uplcore.ltx | 65 +++++++++---------- Master/texmf-dist/tex/uplatex/base/upldefs.ltx | 83 +++++++++++++++++------- Master/texmf-dist/tex/uplatex/config/uplatex.ini | 31 ++------- 4 files changed, 97 insertions(+), 85 deletions(-) (limited to 'Master/texmf-dist/tex/uplatex') diff --git a/Master/texmf-dist/tex/uplatex/base/uplatex.ltx b/Master/texmf-dist/tex/uplatex/base/uplatex.ltx index e06193c8be6..60287e1f6ff 100644 --- a/Master/texmf-dist/tex/uplatex/base/uplatex.ltx +++ b/Master/texmf-dist/tex/uplatex/base/uplatex.ltx @@ -41,9 +41,10 @@ **************************} \makeatletter \input uplcore.ltx -\makeatother \the\everyjob \let\dump\orgdump +\let\orgdump\@undefined +\makeatother \dump \endinput \endinput diff --git a/Master/texmf-dist/tex/uplatex/base/uplcore.ltx b/Master/texmf-dist/tex/uplatex/base/uplcore.ltx index acea93b4c38..bda26827b4e 100644 --- a/Master/texmf-dist/tex/uplatex/base/uplcore.ltx +++ b/Master/texmf-dist/tex/uplatex/base/uplcore.ltx @@ -35,7 +35,7 @@ %% \def\pfmtname{pLaTeX2e} \def\pfmtversion - {2016/05/07u00} + {2016/06/10u01} \def\plIncludeInRelease#1{\kernel@ifnextchar[% {\@plIncludeInRelease{#1}} {\@plIncludeInRelease{#1}[#1]}} @@ -1045,45 +1045,42 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} %% +\def\documentstyle{% + \@latex@error{upLaTeX does NOT support LaTeX 2.09 compatibility mode}\@ehc + \documentclass} \ifx\patch@level\@undefined % fallback if undefined in LaTeX \def\patch@level{0}\fi \ifx\ppatch@level\@undefined % fallback if undefined in upLaTeX \def\ppatch@level{0}\fi -\ifnum\patch@level=0 - \ifnum\ppatch@level=0 - \everyjob{\typeout{% - \pfmtname\space<\pfmtversion>\space - (based on \fmtname\space<\fmtversion>)}} - \else - \everyjob{\typeout{% - \pfmtname\space<\pfmtversion>+\ppatch@level\space - (based on \fmtname\space<\fmtversion>)}} - \fi -\else\ifnum\patch@level>0 - \ifnum\ppatch@level=0 - \everyjob{\typeout{% - \pfmtname\space<\pfmtversion>\space - (based on \fmtname\space<\fmtversion>\space - patch level \patch@level)}} - \else - \everyjob{\typeout{% - \pfmtname\space<\pfmtversion>+\ppatch@level\space - (based on \fmtname\space<\fmtversion>\space - patch level \patch@level)}} - \fi -\else - \ifnum\ppatch@level=0 - \everyjob{\typeout{% +\begingroup + \def\parse@BANNER#1{\expandafter\parse@@BANNER#1} + \def\parse@@BANNER#1#2#3#4{#2} + \edef\platexTMP{% + \ifnum\ppatch@level=0 + \everyjob{\noexpand\typeout{% \pfmtname\space<\pfmtversion>\space - (based on \fmtname\space<\fmtversion>\space - pre-release\patch@level)}} - \else - \everyjob{\typeout{% + (based on \parse@BANNER{\platexBANNER})}}% + \else + \everyjob{\noexpand\typeout{% \pfmtname\space<\pfmtversion>+\ppatch@level\space - (based on \fmtname\space<\fmtversion>\space - pre-release\patch@level)}} - \fi -\fi\fi + (based on \parse@BANNER{\platexBANNER})}}% + \fi + } +\expandafter +\endgroup \platexTMP +\begingroup + \def\parse@BANNER#1{\expandafter\parse@@BANNER#1} + \def\parse@@BANNER#1#2#3#4{#4} + \edef\platexTMP{% + \the\everyjob\noexpand\typeout{\parse@BANNER{\platexBANNER}}% + } + \everyjob=\expandafter{\platexTMP}% + \edef\platexTMP{% + \noexpand\let\noexpand\platexBANNER=\noexpand\@undefined + \noexpand\everyjob={\the\everyjob}% + } + \expandafter +\endgroup \platexTMP \AtBeginDocument{% \@ifpackageloaded{latexrelease}{% \@ifpackageloaded{platexrelease}{}{% diff --git a/Master/texmf-dist/tex/uplatex/base/upldefs.ltx b/Master/texmf-dist/tex/uplatex/base/upldefs.ltx index 3a5455b681b..87b0215a2a0 100644 --- a/Master/texmf-dist/tex/uplatex/base/upldefs.ltx +++ b/Master/texmf-dist/tex/uplatex/base/upldefs.ltx @@ -31,33 +31,70 @@ %% Right brace \} Tilde \~} %% \ProvidesFile{upldefs.ltx} - [2016/04/06 v1.6a-u00 upLaTeX Kernel (Default settings)] -\def\@text@composite#1#2#3#{% - \begingroup - \setbox\z@=\hbox\bgroup% - \ybaselineshift\z@\tbaselineshift\z@ - \expandafter\@text@composite@x - \csname\string#1-\string#2\endcsname} + [2016/06/06 v1.6c-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} +\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}} +\long\def\pltx@isletter@ii#1\pltx@scanstop#{% + \pltx@cond\ifx\pltx@mark#1\pltx@mark\fi% + {\pltx@isletter@iii}{\pltx@isletter@iv}} +\long\def\pltx@isletter@iii#1\pltx@mark{\@secondoftwo} +\long\def\pltx@isletter@iv#1#2#3\pltx@mark{% + \pltx@cond\ifx\pltx@mark#3\pltx@mark\fi{% + \pltx@cond{\ifnum0\ifcat A\noexpand#21\fi\ifcat=\noexpand#21\fi>\z@}\fi + {\@firstoftwo}{\@secondoftwo}% + }{\@secondoftwo}} \def\@text@composite@x#1#2{% \ifx#1\relax - \expandafter\@secondoftwo - \else - \expandafter\@firstoftwo - \fi - #1{#2}\egroup - \leavevmode - \expandafter\lower - \iftdir - \ifmdir - \ifmmode\tbaselineshift\else\ybaselineshift\fi - \else - \tbaselineshift - \fi + #2% + \else\pltx@isletter{#1}{#1}{% + \begingroup + \setbox\z@\hbox\bgroup% + \ybaselineshift\z@\tbaselineshift\z@ + #1% + \g@tlastchart@\@tempcntb + \xdef\pltx@composite@temp{\noexpand\@tempcntb=\the\@tempcntb\relax}% + \aftergroup\pltx@composite@temp + \egroup + \ifnum\@tempcntb<\z@ + \@tempdima=\iftdir + \ifmdir + \ifmmode\tbaselineshift\else\ybaselineshift\fi + \else + \tbaselineshift + \fi + \else + \ybaselineshift + \fi + \@tempcntb=\@cclvi + \else\@tempdima=\z@ + \fi + \ifnum\@tempcntb<\@cclvi + \ifnum\@tempcntb>\m@ne\ifnum\@tempcntb<\@cclvi + \ifodd\xspcode\@tempcntb\else\leavevmode\hbox{}\fi + \fi\fi + \begingroup\mathsurround\z@$% + \ifx\textbaselineshiftfactor\@undefined\else + \textbaselineshiftfactor\z@\fi + \box\z@ + $\endgroup% + \ifnum\@tempcntb>\m@ne\ifnum\@tempcntb<\@cclvi + \ifnum\xspcode\@tempcntb<2\hbox{}\fi + \fi\fi \else - \ybaselineshift + \ifdim\@tempdima=\z@{\ybaselineshift\z@\tbaselineshift\z@#1}% + \else\lower\@tempdima\box\z@\fi \fi - \box\z@ - \endgroup} + \endgroup}% + \fi +} \def \check@nocorr@ #1#2\nocorr#3\@nil {% \let \check@icl \relax% \maybe@ic から変更 \def \check@icr {\ifvmode \else \aftergroup \maybe@ic \fi}% diff --git a/Master/texmf-dist/tex/uplatex/config/uplatex.ini b/Master/texmf-dist/tex/uplatex/config/uplatex.ini index bfacea88e43..5ac594b3aa5 100644 --- a/Master/texmf-dist/tex/uplatex/config/uplatex.ini +++ b/Master/texmf-dist/tex/uplatex/config/uplatex.ini @@ -1,32 +1,9 @@ %% for upLaTeX (Unicode pLaTeX) -%% written by Tono san (modified by texjporg 2016/05/07) +%% written by Tono san (modified by texjporg 2016/05/12) %% \begingroup \catcode`\{=1 \catcode`\}=2% - \immediate\write20{<<< making "uplatex with Babel" format >>>} - \def\platexTMP{% - \let\platexDUMP=\dump - \let\dump=\endinput - } - \expandafter -\endgroup \platexTMP -% -%% \scrollmode + \immediate\write20{<<< making "uplatex with Babel" format >>>} +\endgroup +\scrollmode \input uplatex.ltx -% -\begingroup \makeatletter% - \def\parse@BANNER#1{\expandafter\parse@@BANNER#1}% - \def\parse@@BANNER#1#2#3#4{#4}% - \edef\platexTMP{% - \the\everyjob\noexpand\typeout{\parse@BANNER{\platexBANNER}}% - }% - \everyjob=\expandafter{\platexTMP}% - \edef\platexTMP{% - \noexpand\let\noexpand\platexBANNER=\noexpand\@undefined - \noexpand\let\noexpand\dump=\noexpand\platexDUMP - \noexpand\let\noexpand\platexDUMP=\noexpand\@undefined - \noexpand\everyjob={\the\everyjob}% - } - \expandafter -\endgroup \platexTMP -\dump \endinput -- cgit v1.2.3