summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2016-06-11 23:06:18 +0000
committerKarl Berry <karl@freefriends.org>2016-06-11 23:06:18 +0000
commit95b471835523e634d7a1a09c433dbd827d3af0ef (patch)
tree8e1c39f3c53a06451694de32a64f14b3ed735acb /Master/texmf-dist/tex
parent9e59fe5cbd2d8d2eb3abb95254ead13c5334bad2 (diff)
platex (11jun16)
git-svn-id: svn://tug.org/texlive/trunk@41369 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r--Master/texmf-dist/tex/platex/base/kinsoku.tex128
-rw-r--r--Master/texmf-dist/tex/platex/base/pfltrace.sty92
-rw-r--r--Master/texmf-dist/tex/platex/base/platex.ltx3
-rw-r--r--Master/texmf-dist/tex/platex/base/platexrelease.sty89
-rw-r--r--Master/texmf-dist/tex/platex/base/plcore.ltx62
-rw-r--r--Master/texmf-dist/tex/platex/base/pldefs.ltx83
-rw-r--r--Master/texmf-dist/tex/platex/config/platex.ini31
7 files changed, 400 insertions, 88 deletions
diff --git a/Master/texmf-dist/tex/platex/base/kinsoku.tex b/Master/texmf-dist/tex/platex/base/kinsoku.tex
index ec0700192c6..9ebcd9a3ccf 100644
--- a/Master/texmf-dist/tex/platex/base/kinsoku.tex
+++ b/Master/texmf-dist/tex/platex/base/kinsoku.tex
@@ -129,6 +129,134 @@
\xspcode`;=2
\xspcode`,=2
\xspcode`.=2
+\xspcode"80=3
+\xspcode"81=3
+\xspcode"82=3
+\xspcode"83=3
+\xspcode"84=3
+\xspcode"85=3
+\xspcode"86=3
+\xspcode"87=3
+\xspcode"88=3
+\xspcode"89=3
+\xspcode"8A=3
+\xspcode"8B=3
+\xspcode"8C=3
+\xspcode"8D=3
+\xspcode"8E=3
+\xspcode"8F=3
+\xspcode"90=3
+\xspcode"91=3
+\xspcode"92=3
+\xspcode"93=3
+\xspcode"94=3
+\xspcode"95=3
+\xspcode"96=3
+\xspcode"97=3
+\xspcode"98=3
+\xspcode"99=3
+\xspcode"9A=3
+\xspcode"9B=3
+\xspcode"9C=3
+\xspcode"9D=3
+\xspcode"9E=3
+\xspcode"9F=3
+\xspcode"A0=3
+\xspcode"A1=3
+\xspcode"A2=3
+\xspcode"A3=3
+\xspcode"A4=3
+\xspcode"A5=3
+\xspcode"A6=3
+\xspcode"A7=3
+\xspcode"A8=3
+\xspcode"A9=3
+\xspcode"AA=3
+\xspcode"AB=3
+\xspcode"AC=3
+\xspcode"AD=3
+\xspcode"AE=3
+\xspcode"AF=3
+\xspcode"B0=3
+\xspcode"B1=3
+\xspcode"B2=3
+\xspcode"B3=3
+\xspcode"B4=3
+\xspcode"B5=3
+\xspcode"B6=3
+\xspcode"B7=3
+\xspcode"B8=3
+\xspcode"B9=3
+\xspcode"BA=3
+\xspcode"BB=3
+\xspcode"BC=3
+\xspcode"BD=3
+\xspcode"BE=3
+\xspcode"BF=3
+\xspcode"C0=3
+\xspcode"C1=3
+\xspcode"C2=3
+\xspcode"C3=3
+\xspcode"C4=3
+\xspcode"C5=3
+\xspcode"C6=3
+\xspcode"C7=3
+\xspcode"C8=3
+\xspcode"C9=3
+\xspcode"CA=3
+\xspcode"CB=3
+\xspcode"CC=3
+\xspcode"CD=3
+\xspcode"CE=3
+\xspcode"CF=3
+\xspcode"D0=3
+\xspcode"D1=3
+\xspcode"D2=3
+\xspcode"D3=3
+\xspcode"D4=3
+\xspcode"D5=3
+\xspcode"D6=3
+\xspcode"D7=3
+\xspcode"D8=3
+\xspcode"D9=3
+\xspcode"DA=3
+\xspcode"DB=3
+\xspcode"DC=3
+\xspcode"DD=3
+\xspcode"DE=3
+\xspcode"DF=3
+\xspcode"E0=3
+\xspcode"E1=3
+\xspcode"E2=3
+\xspcode"E3=3
+\xspcode"E4=3
+\xspcode"E5=3
+\xspcode"E6=3
+\xspcode"E7=3
+\xspcode"E8=3
+\xspcode"E9=3
+\xspcode"EA=3
+\xspcode"EB=3
+\xspcode"EC=3
+\xspcode"ED=3
+\xspcode"EE=3
+\xspcode"EF=3
+\xspcode"F0=3
+\xspcode"F1=3
+\xspcode"F2=3
+\xspcode"F3=3
+\xspcode"F4=3
+\xspcode"F5=3
+\xspcode"F6=3
+\xspcode"F7=3
+\xspcode"F8=3
+\xspcode"F9=3
+\xspcode"FA=3
+\xspcode"FB=3
+\xspcode"FC=3
+\xspcode"FD=3
+\xspcode"FE=3
+\xspcode"FF=3
\inhibitxspcode`、=1
\inhibitxspcode`。=1
\inhibitxspcode`,=1
diff --git a/Master/texmf-dist/tex/platex/base/pfltrace.sty b/Master/texmf-dist/tex/platex/base/pfltrace.sty
new file mode 100644
index 00000000000..a6b644a4ce7
--- /dev/null
+++ b/Master/texmf-dist/tex/platex/base/pfltrace.sty
@@ -0,0 +1,92 @@
+%%
+%% This is file `pfltrace.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% plcore.dtx (with options: `fltrace,trace')
+%%
+%% Copyright (c) 2010 ASCII MEDIA WORKS
+%% Copyright (c) 2016 Japanese TeX Development Community
+%%
+%% This file is part of the pLaTeX2e system (community edition).
+%% -------------------------------------------------------------
+%%
+%% File: plcore.dtx
+%% \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
+%% Digits \0\1\2\3\4\5\6\7\8\9
+%% Exclamation \! Double quote \" Hash (number) \#
+%% Dollar \$ Percent \% Ampersand \&
+%% Acute accent \' Left paren \( Right paren \)
+%% Asterisk \* Plus \+ Comma \,
+%% Minus \- Point \. Solidus \/
+%% Colon \: Semicolon \; Less than \<
+%% Equals \= Greater than \> Question mark \?
+%% Commercial at \@ Left bracket \[ Backslash \\
+%% Right bracket \] Circumflex \^ Underscore \_
+%% Grave accent \` Left brace \{ Vertical bar \|
+%% Right brace \} Tilde \~}
+%%
+\NeedsTeXFormat{pLaTeX2e}
+\ProvidesPackage{pfltrace}
+ [2016/05/20 v1.2e Standard pLaTeX package (float tracing)]
+\RequirePackageWithOptions{fltrace}
+\gdef\@makespecialcolbox{%
+ \fl@trace{Krudgeins ht \the\ht\@kludgeins\space
+ dp \the\dp\@kludgeins\space
+ wd \the\wd\@kludgeins}%
+ \setbox\@outputbox \vbox {%
+ \@texttop
+ \dimen@ \dp\@outputbox
+ \unvbox\@outputbox
+ \vskip-\dimen@
+ }%
+ \@tempdima \@colht
+ \ifdim \wd\@kludgeins>\z@
+ \advance \@tempdima -\ht\@outputbox
+ \advance \@tempdima \pageshrink
+ \fl@trace {Natural ht of col: \the\ht\@outputbox}%
+ \fl@trace {\string \@colht: \the\@colht}%
+ \fl@trace {Pageshrink added: \the\pageshrink}%
+ \fl@trace {Hence, space added: \the\@tempdima}%
+ \setbox\@outputbox \vbox to \@colht {%
+ \unvbox\@outputbox
+ \vskip \@tempdima
+ \@textbottom
+ \ifvoid\footins\else % for pLaTeX
+ \vskip\skip\footins
+ \color@begingroup
+ \normalcolor
+ \footnoterule
+ \unvbox \footins
+ \color@endgroup
+ \fi
+ }%
+ \else
+ \advance \@tempdima -\ht\@kludgeins
+ \fl@trace {Natural ht of col: \the\ht\@outputbox}%
+ \fl@trace {\string \@colht: \the\@colht}%
+ \fl@trace {Extra size added: -\the \ht \@kludgeins}%
+ \fl@trace {Hence, height of inner box: \the\@tempdima}%
+ \fl@trace {Max? pageshrink available: \the\pageshrink}%
+ \setbox \@outputbox \vbox to \@colht {%
+ \vbox to \@tempdima {%
+ \unvbox\@outputbox
+ \@textbottom
+ \ifvoid\footins\else % for pLaTeX
+ \vskip\skip\footins
+ \color@begingroup
+ \normalcolor
+ \footnoterule
+ \unvbox \footins
+ \color@endgroup
+ \fi
+ }\vss}%
+ \fi
+ {\setbox \@tempboxa \box \@kludgeins}%
+}
+\endinput
+%%
+%% End of file `pfltrace.sty'.
diff --git a/Master/texmf-dist/tex/platex/base/platex.ltx b/Master/texmf-dist/tex/platex/base/platex.ltx
index 719ca548ba2..8df129f5f0c 100644
--- a/Master/texmf-dist/tex/platex/base/platex.ltx
+++ b/Master/texmf-dist/tex/platex/base/platex.ltx
@@ -40,9 +40,10 @@
**************************}
\makeatletter
\input plcore.ltx
-\makeatother
\the\everyjob
\let\dump\orgdump
+\let\orgdump\@undefined
+\makeatother
\dump
\endinput
\endinput
diff --git a/Master/texmf-dist/tex/platex/base/platexrelease.sty b/Master/texmf-dist/tex/platex/base/platexrelease.sty
index 0a138ddf9c1..25d40cb26b9 100644
--- a/Master/texmf-dist/tex/platex/base/platexrelease.sty
+++ b/Master/texmf-dist/tex/platex/base/platexrelease.sty
@@ -9,7 +9,6 @@
%% plfonts.dtx (with options: `platexrelease')
%% plcore.dtx (with options: `platexrelease')
%%
-%% Copyright (c) 2010 ASCII MEDIA WORKS
%% Copyright (c) 2016 Japanese TeX Development Community
%%
%% This file is part of the pLaTeX2e system (community edition).
@@ -35,7 +34,7 @@
\edef\p@known@latexreleaseversion
{2016/03/31}
\edef\platexreleaseversion
- {2016/05/07}
+ {2016/06/10}
\def\plIncludeInRelease#1{\kernel@ifnextchar[%
{\@plIncludeInRelease{#1}}
{\@plIncludeInRelease{#1}[#1]}}
@@ -77,7 +76,7 @@
%%
\NeedsTeXFormat{pLaTeX2e}
\ProvidesPackage{platexrelease}
- [2016/04/12 v1.0c latexrelease support for pLaTeX Kernel]
+ [2016/06/08 v1.0d latexrelease support for pLaTeX Kernel]
\RequirePackageWithOptions{latexrelease}
\ifnum\expandafter\@parse@version\latexreleaseversion//00\@nil
>\expandafter\@parse@version\p@known@latexreleaseversion//00\@nil
@@ -133,6 +132,17 @@ of this package available from CTAN}
\fi
\let\pfmtversion\requestedplpatchdate
\let\currentpLaTeXdate\requestedpLaTeXdate
+\plIncludeInRelease{2016/06/10}{\PackageWarning}{pLaTeX Info}%
+\plEndIncludeInRelease
+\plIncludeInRelease{2016/04/17}{\PackageWarning}{pLaTeX Info}%
+ \PackageWarningNoLine{platexrelease}{%
+ You selected pLaTeX2e <\pfmtversion>, but\MessageBreak
+ this version of pLaTeX2e is known to have\MessageBreak
+ some critical bugs. We advise you to\MessageBreak
+ select another format date}
+\plEndIncludeInRelease
+\plIncludeInRelease{0000/00/00}{\PackageWarning}{pLaTeX Info}%
+\plEndIncludeInRelease
%% File: plfonts.dtx
%% \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
@@ -150,8 +160,79 @@ of this package available from CTAN}
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
%%
+\plIncludeInRelease{2016/06/10}{\@text@composite}
+ {Fix for non-zero baselineshift}%
+\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#1#2#3\@text@composite{%
+ \expandafter\@text@composite@x
+ \csname\string#1-\string#2\endcsname}
+\def\@text@composite@x#1#2{%
+ \ifx#1\relax
+ #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
+ \ifdim\@tempdima=\z@{\ybaselineshift\z@\tbaselineshift\z@#1}%
+ \else\lower\@tempdima\box\z@\fi
+ \fi
+ \endgroup}%
+ \fi
+}
+\plEndIncludeInRelease
\plIncludeInRelease{2016/04/17}{\@text@composite}
{Fix for non-zero baselineshift}%
+\let\g@tlastchart@\@undefined
+\let\pltx@isletter\@undefined
\def\@text@composite#1#2#3#{%
\begingroup
\setbox\z@=\hbox\bgroup%
@@ -181,6 +262,8 @@ of this package available from CTAN}
\plEndIncludeInRelease
\plIncludeInRelease{0000/00/00}{\@text@composite}
{Fix for non-zero baselineshift}%
+\let\g@tlastchart@\@undefined
+\let\pltx@isletter\@undefined
\def\@text@composite#1#2#3\@text@composite{%
\expandafter\@text@composite@x
\csname\string#1-\string#2\endcsname}
diff --git a/Master/texmf-dist/tex/platex/base/plcore.ltx b/Master/texmf-dist/tex/platex/base/plcore.ltx
index 9da789532ed..a96ce8a7da0 100644
--- a/Master/texmf-dist/tex/platex/base/plcore.ltx
+++ b/Master/texmf-dist/tex/platex/base/plcore.ltx
@@ -34,7 +34,7 @@
%%
\def\pfmtname{pLaTeX2e}
\def\pfmtversion
- {2016/05/07}
+ {2016/06/10}
\def\plIncludeInRelease#1{\kernel@ifnextchar[%
{\@plIncludeInRelease{#1}}
{\@plIncludeInRelease{#1}[#1]}}
@@ -1048,41 +1048,35 @@
\def\patch@level{0}\fi
\ifx\ppatch@level\@undefined % fallback if undefined in pLaTeX
\def\ppatch@level{0}\fi
-\ifnum\patch@level=0
- \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>)}}
- \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{%
- \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/platex/base/pldefs.ltx b/Master/texmf-dist/tex/platex/base/pldefs.ltx
index b6205eaa01e..a90f4020bda 100644
--- a/Master/texmf-dist/tex/platex/base/pldefs.ltx
+++ b/Master/texmf-dist/tex/platex/base/pldefs.ltx
@@ -30,33 +30,70 @@
%% Right brace \} Tilde \~}
%%
\ProvidesFile{pldefs.ltx}
- [2016/04/01 v1.6a pLaTeX 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 pLaTeX 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/platex/config/platex.ini b/Master/texmf-dist/tex/platex/config/platex.ini
index 2ea55904069..3ac0f71b23a 100644
--- a/Master/texmf-dist/tex/platex/config/platex.ini
+++ b/Master/texmf-dist/tex/platex/config/platex.ini
@@ -1,32 +1,9 @@
%% for pLaTeX (ASCII Nihongo LaTeX)
-%% 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 "platex with Babel" format >>>}
- \def\platexTMP{%
- \let\platexDUMP=\dump
- \let\dump=\endinput
- }
- \expandafter
-\endgroup \platexTMP
-%
-%% \scrollmode
+ \immediate\write20{<<< making "platex with Babel" format >>>}
+\endgroup
+\scrollmode
\input platex.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