From 374414f65a92b39427b6ae8e3fb08e9f042f8b83 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 29 Jul 2017 21:39:00 +0000 Subject: platex (29jul17) git-svn-id: svn://tug.org/texlive/trunk@44913 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/platex/base/README.md | 2 +- Master/texmf-dist/doc/platex/base/ascmac.pdf | Bin 141254 -> 148502 bytes Master/texmf-dist/doc/platex/base/exppl2e.pdf | Bin 137446 -> 138932 bytes Master/texmf-dist/doc/platex/base/pldoc.pdf | Bin 758339 -> 763703 bytes Master/texmf-dist/source/platex/base/ascmac.dtx | 34 +++++- Master/texmf-dist/source/platex/base/plcore.dtx | 115 +++++++++++++++++++-- Master/texmf-dist/source/platex/base/plext.dtx | 29 ++++-- Master/texmf-dist/source/platex/base/plvers.dtx | 2 +- Master/texmf-dist/tex/platex/base/ascmac.sty | 2 +- Master/texmf-dist/tex/platex/base/exppl2e.sty | 8 +- .../texmf-dist/tex/platex/base/platexrelease.sty | 64 +++++++++++- Master/texmf-dist/tex/platex/base/plcore.ltx | 27 ++++- Master/texmf-dist/tex/platex/base/plext.sty | 16 ++- Master/texmf-dist/tex/platex/base/tascmac.sty | 15 ++- 14 files changed, 281 insertions(+), 33 deletions(-) (limited to 'Master') diff --git a/Master/texmf-dist/doc/platex/base/README.md b/Master/texmf-dist/doc/platex/base/README.md index 90255d7b828..9595b3c3a27 100644 --- a/Master/texmf-dist/doc/platex/base/README.md +++ b/Master/texmf-dist/doc/platex/base/README.md @@ -61,6 +61,6 @@ the 3-clause BSD license (see [LICENSE](./LICENSE)). ## Release Date -2017-05-05 +2017-07-29 Japanese TeX Development Community diff --git a/Master/texmf-dist/doc/platex/base/ascmac.pdf b/Master/texmf-dist/doc/platex/base/ascmac.pdf index 028dfda908d..47b2abba1d9 100644 Binary files a/Master/texmf-dist/doc/platex/base/ascmac.pdf and b/Master/texmf-dist/doc/platex/base/ascmac.pdf differ diff --git a/Master/texmf-dist/doc/platex/base/exppl2e.pdf b/Master/texmf-dist/doc/platex/base/exppl2e.pdf index c8a14a05149..e7423afcf1a 100644 Binary files a/Master/texmf-dist/doc/platex/base/exppl2e.pdf and b/Master/texmf-dist/doc/platex/base/exppl2e.pdf differ diff --git a/Master/texmf-dist/doc/platex/base/pldoc.pdf b/Master/texmf-dist/doc/platex/base/pldoc.pdf index 47d7452c06c..ece1207e3d7 100644 Binary files a/Master/texmf-dist/doc/platex/base/pldoc.pdf and b/Master/texmf-dist/doc/platex/base/pldoc.pdf differ diff --git a/Master/texmf-dist/source/platex/base/ascmac.dtx b/Master/texmf-dist/source/platex/base/ascmac.dtx index b9f06627127..84f2197343f 100644 --- a/Master/texmf-dist/source/platex/base/ascmac.dtx +++ b/Master/texmf-dist/source/platex/base/ascmac.dtx @@ -1,7 +1,7 @@ % \iffalse meta-comment % % Copyright (c) 2010 ASCII MEDIA WORKS -% Copyright (c) 2016 Japanese TeX Development Community +% Copyright (c) 2016-2017 Japanese TeX Development Community % % This file is part of the pLaTeX2e system (community edition). % ------------------------------------------------------------- @@ -11,6 +11,9 @@ % % \iffalse % +% 2017/07/22 v2.0d +% - Check existing \Return definition and throw an error +% if it is not compatible with ascmac. % 2016/08/21 v2.0c % - Support pdfLaTeX, XeLaTeX and LuaLaTeX. % 2016/04/15 v2.0b @@ -62,7 +65,7 @@ % %\ProvidesPackage{tascmac} %\ProvidesPackage{ascmac} - [2016/08/21 v2.0c + [2017/07/22 v2.0d % ascmac package (community edition) % ascmac wrapper (community edition) ] @@ -554,9 +557,34 @@ Q \iftdir\yoko\fi % % \begin{macro}{\return} % \begin{macro}{\Return} -% 改行記号です。 +% 改行記号です。|\return|や|\Return|という名称はありふれているので、 +% ascmacパッケージの定義が別のパッケージと衝突する場合があります +% (例:algorithm2eパッケージ)。 +% そこで、|\Return|という命令が既に定義されていて、かつascgrpフォントが +% 不使用と判断される場合はエラーを出します。本来ならば|\return|も同様に +% チェックしたいのですが、「okumacroパッケージの後にascmacパッケージを +% 読み込むと、エラーなしにascmacパッケージの定義が勝つ」という従来の挙動 +% を維持するため、現時点ではチェックしません。 % \begin{macrocode} %% return-key +\begingroup +\def\ascmac@definable{\PackageInfo{ascmac}{Command + \@backslashchar\reserved@a\space already defined, but + compatible with\MessageBreak ascmac package, overwriting}} +\def\ascmac@check#1{\ifx#1\@undefined\else\ascmac@parse{#1}\fi} +\def\ascmac@parse#1{\edef\reserved@a{\expandafter\@gobble\string #1}% + \edef\ascmac@parse@tmp{\meaning#1 \string\@ascgrp}% + \expandafter\ascmac@parse@i\ascmac@parse@tmp\@nil} +\expandafter\def\expandafter\ascmac@parse@i + \expandafter#\expandafter1\string\@ascgrp#2\@nil{\ifx\relax#2\relax + \@notdefinable\else\ascmac@definable\fi} +%\ascmac@check{\return}% conflict with okumacro, no check +\ascmac@check{\Return} +\endgroup +% \end{macrocode} +% +% 改行記号の定義の本体です。 +% \begin{macrocode} \def\return{\leavevmode\hbox{% Q \iftdir\yoko\fi \@ascgrp\char"20}} diff --git a/Master/texmf-dist/source/platex/base/plcore.dtx b/Master/texmf-dist/source/platex/base/plcore.dtx index 5f04e22a119..5cdc2337634 100644 --- a/Master/texmf-dist/source/platex/base/plcore.dtx +++ b/Master/texmf-dist/source/platex/base/plcore.dtx @@ -37,8 +37,9 @@ % との間にxkanjiskipが入ってしまう問題に対応。 % \cs{@outputbox}の深さが他のものの位置に影響を与えない % ようにする\texttt{\cs{vskip}~-\cs{dimen@}}が縦組モードでは無効になっていたので修正} -% \changes{v1.2c}{2016/02/28}{1.2bと同様の修正を -% tabular環境、\cs{parbox}命令、\cs{underline}命令にも行った} +% \changes{v1.2c}{2016/02/28}{1.2bと同様の修正をtabular環境にも行った} +% \changes{v1.2c}{2016/02/28}{1.2bと同様の修正を\cs{parbox}命令にも行った} +% \changes{v1.2c}{2016/02/28}{1.2bと同様の修正を\cs{underline}命令にも行った} % \changes{v1.2d}{2016/04/01}{multicolパッケージを使うとトンボの下端が縮む問題を修正} % \changes{v1.2e}{2016/05/20}{\file{fltrace}パッケージのp\LaTeX{}版 % として\file{pfltrace}パッケージを新設} @@ -66,13 +67,14 @@ % ように\cs{language}を設定(sync with ltmiscen.dtx 2017/03/09 v1.1m)} % \changes{v1.2n}{2017/04/23}{ドキュメントの追加} % \changes{v1.2o}{2017/05/03}{行頭禁則文字の直前でも改行するようにした} +% \changes{v1.2p}{2017/07/21}{tabular環境のセル内のJFMグル―を削除} % \fi % % \iffalse %<*driver> \NeedsTeXFormat{pLaTeX2e} % \fi -\ProvidesFile{plcore.dtx}[2017/05/03 v1.2o pLaTeX core file] +\ProvidesFile{plcore.dtx}[2017/07/21 v1.2p pLaTeX core file] % \iffalse \documentclass{jltxdoc} \GetFileInfo{plcore.dtx} @@ -1474,15 +1476,108 @@ % \end{macro} % \end{macro} % -% \subsection{tabular環境など} -% \changes{v1.2c}{2016/02/28}{1.2bと同様の修正を -% tabular環境、\cs{parbox}命令、\cs{underline}命令にも行った} -% \LaTeXe{}のカーネルのコードをそのまま使うと、p\TeX{}の|\xkanjiskip|由来の -% アキが前後に入ってしまうことがありました。そうした命令にパッチをあてます。 +% \subsection{tabular環境} +% \LaTeX{}カーネル(lttab.dtx)の命令群を修正します。 +% +% \begin{macro}{\@tabclassz} +% \LaTeX{}カーネルは、アラインメント文字|&|の周囲に半角空白を書いたかどうかに +% かかわらず余分なスペースを出力しないように、|\ignorespaces|と|\unskip|を +% 発行しています(lttab.dtx)。しかし、これだけではJFMグルーが消えずに残って +% しまうので、p\LaTeX{}では追加の対処を入れます。 +% +% まず、|l|, |c|, |r|の場合です。 +% 最初に|\inhibitglue|を発行し、最後に余分な|\unskip|を発行する +% ことで、セル要素の周囲のJFMグル―を消します。 +% \changes{v1.2p}{2017/07/21}{tabular環境のセル内のJFMグル―を削除} +% \begin{macrocode} +% +%\plIncludeInRelease{2017/07/29}{\@tabclassz} +% {Inhibit JFM glue in tabular cells}% +%<*plcore|platexrelease> +\def\@tabclassz{% + \ifcase\@lastchclass + \@acolampacol + \or + \@ampacol + \or + \or + \or + \@addamp + \or + \@acolampacol + \or + \@firstampfalse\@acol + \fi + \edef\@preamble{% + \@preamble{% + \ifcase\@chnum + \hfil\inhibitglue\ignorespaces\@sharp\unskip\unskip\hfil % c + \or + \hskip1sp\inhibitglue\ignorespaces\@sharp\unskip\unskip\hfil % l + \or + \hfil\hskip1sp\inhibitglue\ignorespaces\@sharp\unskip\unskip % r + \fi}}} +% +%\plEndIncludeInRelease +%\plIncludeInRelease{0000/00/00}{\@tabclassz} +% {Inhibit JFM glue in tabular cells}% +%\def\@tabclassz{% +% \ifcase\@lastchclass +% \@acolampacol +% \or +% \@ampacol +% \or +% \or +% \or +% \@addamp +% \or +% \@acolampacol +% \or +% \@firstampfalse\@acol +% \fi +% \edef\@preamble{% +% \@preamble{% +% \ifcase\@chnum +% \hfil\ignorespaces\@sharp\unskip\hfil +% \or +% \hskip1sp\ignorespaces\@sharp\unskip\hfil +% \or +% \hfil\hskip1sp\ignorespaces\@sharp\unskip +% \fi}}} +%\plEndIncludeInRelease +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\@classv} +% 次に、|p|の場合です。|\mbox{}\inhibitglue|と|\unskip|を追加しています。 +% \changes{v1.2p}{2017/07/21}{tabular環境のセル内のJFMグル―を削除} +% \begin{macrocode} +%\plIncludeInRelease{2017/07/29}{\@classv} +% {Inhibit JFM glue in tabular cells}% +%<*plcore|platexrelease> +\def\@classv{\@addtopreamble{\@startpbox{\@nextchar}\mbox{}\inhibitglue\ignorespaces +\@sharp\unskip\@endpbox}} +% +%\plEndIncludeInRelease +%\plIncludeInRelease{0000/00/00}{\@classv} +% {Inhibit JFM glue in tabular cells}% +%\def\@classv{\@addtopreamble{\@startpbox{\@nextchar}\ignorespaces +%\@sharp\@endpbox}} +%\plEndIncludeInRelease +% \end{macrocode} +% \end{macro} +% +% +% \section{2013年以降の新しいp\TeX{}対応} +% \LaTeXe{}のカーネルのコードをそのまま使うと、2013年以降のp\TeX{}では +% |\xkanjiskip|由来のアキが前後に入ってしまうことがありました。 +% そうした命令にパッチをあてます。なお、既に出てきた|\footnote|の内部命令 +% (|\@makefnmark|)には同様のパッチがもうあててあります。 +% % \begin{macro}{\@tabular} % tabular環境の内部命令です。もとは\file{lttab.dtx}で定義されています。 +% \changes{v1.2c}{2016/02/28}{1.2bと同様の修正をtabular環境にも行った} % \begin{macrocode} -% %\plIncludeInRelease{2016/04/17}{\@tabular} % {Remove extra \xkanjiskip}% %<*plcore|platexrelease> @@ -1521,6 +1616,7 @@ % % \begin{macro}{\@iiiparbox} % |\parbox|の内部命令です。もとは\file{ltboxes.dtx}で定義されています。 +% \changes{v1.2c}{2016/02/28}{1.2bと同様の修正を\cs{parbox}命令にも行った} % \begin{macrocode} %\plIncludeInRelease{2016/04/17}{\@iiiparbox} % {Remove extra \xkanjiskip}% @@ -1573,6 +1669,7 @@ % % \begin{macro}{\underline} % 下線を引く命令です。もとは\file{ltboxes.dtx}で定義されています。 +% \changes{v1.2c}{2016/02/28}{1.2bと同様の修正を\cs{underline}命令にも行った} % \begin{macrocode} %\plIncludeInRelease{2016/04/17}{\underline} % {Remove extra \xkanjiskip}% diff --git a/Master/texmf-dist/source/platex/base/plext.dtx b/Master/texmf-dist/source/platex/base/plext.dtx index 0ea21fad485..639d28f1e9a 100644 --- a/Master/texmf-dist/source/platex/base/plext.dtx +++ b/Master/texmf-dist/source/platex/base/plext.dtx @@ -59,6 +59,7 @@ % \changes{v1.2g}{2017/05/04}{Make \cs{pbox} Robust} % \changes{v1.2g}{2017/05/04}{Use \cs{setlength}, so that % calc extensions apply} +% \changes{v1.2h}{2017/07/21}{表と周囲との揃え位置をさらに修正} % \fi % % \iffalse @@ -67,7 +68,7 @@ \ProvidesFile{plext.dtx} % %\ProvidesPackage{plext} - [2017/05/04 v1.2g pLaTeX package file (community edition)] + [2017/07/21 v1.2h pLaTeX package file (community edition)] %<*driver> \documentclass{jltxdoc} \usepackage{plext} @@ -318,14 +319,14 @@ % \item |[b]|指定のとき\\最終行のベースラインが周囲のそれと一致(罫線の場合は和文ベースラインの位置) % \end{itemize} % \item 周囲の組方向が縦組かつ組方向が||指定の場合 -% [TODO] 未定! -%^^A \begin{itemize} -%^^A \item |[t]|指定のとき\\表組の上端が周囲の和文ベースラインと一致 -%^^A \item |[c]|指定のとき\\表組の中心が周囲の数式軸を通る(欧文ベースラインシフトの影響下) -%^^A \item |[b]|指定のとき\\表組の下端が周囲の和文ベースラインと一致 -%^^A \end{itemize} +% \begin{itemize} +% \item |[t]|指定のとき\\一行目の欧文ベースラインが周囲のそれと一致 +% \item |[c]|指定のとき\\表組の中心が周囲の数式軸を通る(欧文ベースラインシフトの影響下) +% \item |[b]|指定のとき\\最終行の欧文ベースラインが周囲のそれと一致 +% \end{itemize} % \end{itemize} % \changes{v1.2f}{2017/03/28}{表と周囲との揃え位置を修正} +% \changes{v1.2h}{2017/07/21}{表と周囲との揃え位置をさらに修正} % \begin{macrocode} \def\fork@array@option<#1>[#2]{% \@rotswfalse @@ -352,10 +353,18 @@ \fi\fi \else\if #1z\relax\let\box@dir\relax\@rotswtrue \if #2t\relax - \def\@begin@alignbox{\raise\cdp\vtop\bgroup\kern\z@\vbox}% + \def\@begin@alignbox{% + \@tempdima=\tbaselineshift + \advance\@tempdima-\ybaselineshift + \advance\@tempdima\ht\tstrutbox + \raise\arraystretch\@tempdima\vtop\bgroup\kern\z@\vtop}% \let\@end@alignbox\egroup \else\if #2b\relax - \def\@begin@alignbox{\lower\cdp\vbox\bgroup\vbox}% + \def\@begin@alignbox{% + \@tempdima=\tbaselineshift + \advance\@tempdima-\ybaselineshift + \advance\@tempdima-\dp\tstrutbox + \raise\arraystretch\@tempdima\vbox\bgroup\vbox}% \def\@end@alignbox{\kern\z@\egroup}% \else \let\@begin@alignbox\vcenter @@ -946,7 +955,7 @@ \fi\fi\fi \else\if #1z\relax\@rotswtrue \let\box@dir\relax \if #2t\relax - \def\@begin@parbox{\raise\cdp\vtop\bgroup\kern\z@\vtop}% + \def\@begin@parbox{\raise\cht\vtop\bgroup\kern\z@\vtop}% \let\@end@parbox\egroup \else\if #2b\relax \def\@begin@parbox{\lower\cdp\vbox\bgroup\vbox}% diff --git a/Master/texmf-dist/source/platex/base/plvers.dtx b/Master/texmf-dist/source/platex/base/plvers.dtx index 8a9add2a2b0..2f494586ec1 100644 --- a/Master/texmf-dist/source/platex/base/plvers.dtx +++ b/Master/texmf-dist/source/platex/base/plvers.dtx @@ -127,7 +127,7 @@ % %\edef\platexreleaseversion %<*plcore|platexrelease> - {2017/05/05} + {2017/07/29} % %<*plcore> \def\ppatch@level{0} diff --git a/Master/texmf-dist/tex/platex/base/ascmac.sty b/Master/texmf-dist/tex/platex/base/ascmac.sty index ac5639a4ebc..5ee8fa6a08b 100644 --- a/Master/texmf-dist/tex/platex/base/ascmac.sty +++ b/Master/texmf-dist/tex/platex/base/ascmac.sty @@ -16,7 +16,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{ascmac} - [2016/08/21 v2.0c + [2017/07/22 v2.0d ascmac wrapper (community edition) ] \RequirePackage{tascmac} diff --git a/Master/texmf-dist/tex/platex/base/exppl2e.sty b/Master/texmf-dist/tex/platex/base/exppl2e.sty index 55ddf96abd2..d3e4a30d35d 100644 --- a/Master/texmf-dist/tex/platex/base/exppl2e.sty +++ b/Master/texmf-dist/tex/platex/base/exppl2e.sty @@ -34,7 +34,7 @@ % case 1: This file must be a normal package \NeedsTeXFormat{pLaTeX2e} \ProvidesPackage{exppl2e} - [2017/05/04 v1.0l Experimental pLaTeX2e features] + [2017/07/29 v1.0n Experimental pLaTeX2e features] \PackageWarningNoLine{exppl2e}{% This is the unstable, experimental part of pLaTeX2e.\MessageBreak This package may contain:\MessageBreak @@ -373,4 +373,10 @@ % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % +% \section{tabular環境のセル内のJFMグル―} +% +% p\LaTeXe{}カーネル(2017/07/29)に導入したため削除。 +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% \endinput diff --git a/Master/texmf-dist/tex/platex/base/platexrelease.sty b/Master/texmf-dist/tex/platex/base/platexrelease.sty index 2609700d438..4d61e65b9ed 100644 --- a/Master/texmf-dist/tex/platex/base/platexrelease.sty +++ b/Master/texmf-dist/tex/platex/base/platexrelease.sty @@ -18,7 +18,7 @@ \edef\p@known@latexreleaseversion {2017/04/15} \edef\platexreleaseversion - {2017/05/05} + {2017/07/29} \def\plIncludeInRelease#1{\kernel@ifnextchar[% {\@plIncludeInRelease{#1}} {\@plIncludeInRelease{#1}[#1]}} @@ -914,6 +914,68 @@ of this package available from CTAN} \@ifstar\@sverb\@verb} \fi \plEndIncludeInRelease +\plIncludeInRelease{2017/07/29}{\@tabclassz} + {Inhibit JFM glue in tabular cells}% +\def\@tabclassz{% + \ifcase\@lastchclass + \@acolampacol + \or + \@ampacol + \or + \or + \or + \@addamp + \or + \@acolampacol + \or + \@firstampfalse\@acol + \fi + \edef\@preamble{% + \@preamble{% + \ifcase\@chnum + \hfil\inhibitglue\ignorespaces\@sharp\unskip\unskip\hfil % c + \or + \hskip1sp\inhibitglue\ignorespaces\@sharp\unskip\unskip\hfil % l + \or + \hfil\hskip1sp\inhibitglue\ignorespaces\@sharp\unskip\unskip % r + \fi}}} +\plEndIncludeInRelease +\plIncludeInRelease{0000/00/00}{\@tabclassz} + {Inhibit JFM glue in tabular cells}% +\def\@tabclassz{% + \ifcase\@lastchclass + \@acolampacol + \or + \@ampacol + \or + \or + \or + \@addamp + \or + \@acolampacol + \or + \@firstampfalse\@acol + \fi + \edef\@preamble{% + \@preamble{% + \ifcase\@chnum + \hfil\ignorespaces\@sharp\unskip\hfil + \or + \hskip1sp\ignorespaces\@sharp\unskip\hfil + \or + \hfil\hskip1sp\ignorespaces\@sharp\unskip + \fi}}} +\plEndIncludeInRelease +\plIncludeInRelease{2017/07/29}{\@classv} + {Inhibit JFM glue in tabular cells}% +\def\@classv{\@addtopreamble{\@startpbox{\@nextchar}\mbox{}\inhibitglue\ignorespaces +\@sharp\unskip\@endpbox}} +\plEndIncludeInRelease +\plIncludeInRelease{0000/00/00}{\@classv} + {Inhibit JFM glue in tabular cells}% +\def\@classv{\@addtopreamble{\@startpbox{\@nextchar}\ignorespaces +\@sharp\@endpbox}} +\plEndIncludeInRelease \plIncludeInRelease{2016/04/17}{\@tabular} {Remove extra \xkanjiskip}% \def\@tabular{\leavevmode \null\hbox \bgroup $\let\@acol\@tabacol diff --git a/Master/texmf-dist/tex/platex/base/plcore.ltx b/Master/texmf-dist/tex/platex/base/plcore.ltx index 50ea96a1821..1c31dd0bf52 100644 --- a/Master/texmf-dist/tex/platex/base/plcore.ltx +++ b/Master/texmf-dist/tex/platex/base/plcore.ltx @@ -18,7 +18,7 @@ %% File: plvers.dtx \def\pfmtname{pLaTeX2e} \def\pfmtversion - {2017/05/05} + {2017/07/29} \def\ppatch@level{0} \def\plIncludeInRelease#1{\kernel@ifnextchar[% {\@plIncludeInRelease{#1}} @@ -1006,6 +1006,31 @@ \newcommand\printglossary{\@input@{\jobname.gls}} \newcount\hour \newcount\minute +\def\@tabclassz{% + \ifcase\@lastchclass + \@acolampacol + \or + \@ampacol + \or + \or + \or + \@addamp + \or + \@acolampacol + \or + \@firstampfalse\@acol + \fi + \edef\@preamble{% + \@preamble{% + \ifcase\@chnum + \hfil\inhibitglue\ignorespaces\@sharp\unskip\unskip\hfil % c + \or + \hskip1sp\inhibitglue\ignorespaces\@sharp\unskip\unskip\hfil % l + \or + \hfil\hskip1sp\inhibitglue\ignorespaces\@sharp\unskip\unskip % r + \fi}}} +\def\@classv{\@addtopreamble{\@startpbox{\@nextchar}\mbox{}\inhibitglue\ignorespaces +\@sharp\unskip\@endpbox}} \def\@tabular{\leavevmode \null\hbox \bgroup $\let\@acol\@tabacol \let\@classz\@tabclassz \let\@classiv\@tabclassiv \let\\\@tabularcr\@tabarray} diff --git a/Master/texmf-dist/tex/platex/base/plext.sty b/Master/texmf-dist/tex/platex/base/plext.sty index 071980ec497..fc28a40f256 100644 --- a/Master/texmf-dist/tex/platex/base/plext.sty +++ b/Master/texmf-dist/tex/platex/base/plext.sty @@ -15,7 +15,7 @@ %% File: plext.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesPackage{plext} - [2017/05/04 v1.2g pLaTeX package file (community edition)] + [2017/07/21 v1.2h pLaTeX package file (community edition)] \newif\if@rotsw \def\array{\let\@acol\@arrayacol \let\@classz\@arrayclassz \let\@classiv\@arrayclassiv @@ -90,10 +90,18 @@ \fi\fi \else\if #1z\relax\let\box@dir\relax\@rotswtrue \if #2t\relax - \def\@begin@alignbox{\raise\cdp\vtop\bgroup\kern\z@\vbox}% + \def\@begin@alignbox{% + \@tempdima=\tbaselineshift + \advance\@tempdima-\ybaselineshift + \advance\@tempdima\ht\tstrutbox + \raise\arraystretch\@tempdima\vtop\bgroup\kern\z@\vtop}% \let\@end@alignbox\egroup \else\if #2b\relax - \def\@begin@alignbox{\lower\cdp\vbox\bgroup\vbox}% + \def\@begin@alignbox{% + \@tempdima=\tbaselineshift + \advance\@tempdima-\ybaselineshift + \advance\@tempdima-\dp\tstrutbox + \raise\arraystretch\@tempdima\vbox\bgroup\vbox}% \def\@end@alignbox{\kern\z@\egroup}% \else \let\@begin@alignbox\vcenter @@ -353,7 +361,7 @@ \fi\fi\fi \else\if #1z\relax\@rotswtrue \let\box@dir\relax \if #2t\relax - \def\@begin@parbox{\raise\cdp\vtop\bgroup\kern\z@\vtop}% + \def\@begin@parbox{\raise\cht\vtop\bgroup\kern\z@\vtop}% \let\@end@parbox\egroup \else\if #2b\relax \def\@begin@parbox{\lower\cdp\vbox\bgroup\vbox}% diff --git a/Master/texmf-dist/tex/platex/base/tascmac.sty b/Master/texmf-dist/tex/platex/base/tascmac.sty index 3d5d9e1f8ee..3fcd103cc9f 100644 --- a/Master/texmf-dist/tex/platex/base/tascmac.sty +++ b/Master/texmf-dist/tex/platex/base/tascmac.sty @@ -23,7 +23,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{tascmac} - [2016/08/21 v2.0c + [2017/07/22 v2.0d ascmac package (community edition) ] %% @@ -190,6 +190,19 @@ Q \iftdir\yoko\fi \kern.33ex\hrule height.1ex width.98\wd0\kern.45ex}}} %% %% return-key +\begingroup +\def\ascmac@definable{\PackageInfo{ascmac}{Command + \@backslashchar\reserved@a\space already defined, but + compatible with\MessageBreak ascmac package, overwriting}} +\def\ascmac@check#1{\ifx#1\@undefined\else\ascmac@parse{#1}\fi} +\def\ascmac@parse#1{\edef\reserved@a{\expandafter\@gobble\string #1}% + \edef\ascmac@parse@tmp{\meaning#1 \string\@ascgrp}% + \expandafter\ascmac@parse@i\ascmac@parse@tmp\@nil} +\expandafter\def\expandafter\ascmac@parse@i + \expandafter#\expandafter1\string\@ascgrp#2\@nil{\ifx\relax#2\relax + \@notdefinable\else\ascmac@definable\fi} +\ascmac@check{\Return} +\endgroup \def\return{\leavevmode\hbox{% Q \iftdir\yoko\fi \@ascgrp\char"20}} -- cgit v1.2.3