From f2735cd0c7d339056ebced0b410c14666b2e4812 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 22 Sep 2018 20:59:59 +0000 Subject: platex (22sep18) git-svn-id: svn://tug.org/texlive/trunk@48735 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/platex/base/README.md | 2 +- Master/texmf-dist/doc/platex/base/platex-en.pdf | Bin 148790 -> 149713 bytes Master/texmf-dist/doc/platex/base/platex.pdf | Bin 287418 -> 288279 bytes Master/texmf-dist/doc/platex/base/pldoc.pdf | Bin 822760 -> 824845 bytes Master/texmf-dist/source/platex/base/platex.dtx | 44 +++++++++-- Master/texmf-dist/source/platex/base/plcore.dtx | 11 +-- Master/texmf-dist/source/platex/base/plext.dtx | 101 ++++++++++++++++++------ Master/texmf-dist/tex/platex/base/plext.sty | 55 ++++++++----- 8 files changed, 157 insertions(+), 56 deletions(-) diff --git a/Master/texmf-dist/doc/platex/base/README.md b/Master/texmf-dist/doc/platex/base/README.md index 6d4052d8d83..3f1f661f4bc 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 -2018-09-03 +2018-09-22 Japanese TeX Development Community diff --git a/Master/texmf-dist/doc/platex/base/platex-en.pdf b/Master/texmf-dist/doc/platex/base/platex-en.pdf index 609e57a241b..99c3e7200e1 100644 Binary files a/Master/texmf-dist/doc/platex/base/platex-en.pdf and b/Master/texmf-dist/doc/platex/base/platex-en.pdf differ diff --git a/Master/texmf-dist/doc/platex/base/platex.pdf b/Master/texmf-dist/doc/platex/base/platex.pdf index 3e38e778125..5cb716ebaf7 100644 Binary files a/Master/texmf-dist/doc/platex/base/platex.pdf and b/Master/texmf-dist/doc/platex/base/platex.pdf differ diff --git a/Master/texmf-dist/doc/platex/base/pldoc.pdf b/Master/texmf-dist/doc/platex/base/pldoc.pdf index 91a683bbeff..b278ab6743b 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/platex.dtx b/Master/texmf-dist/source/platex/base/platex.dtx index da62e0f18b5..e559bdc473d 100644 --- a/Master/texmf-dist/source/platex/base/platex.dtx +++ b/Master/texmf-dist/source/platex/base/platex.dtx @@ -83,6 +83,7 @@ % \changes{v1.0x}{2018/09/03}{ドキュメントを更新} % \changes{v1.0x}{2018/09/03}{platexcheatに言及} % \changes{v1.0x}{2018/09/03}{plautopatchに言及} +% \changes{v1.0y}{2018/09/22}{最終更新日を\file{pldoc.pdf}に表示} %\else % \changes{v1.0}{1995/05/08}{first edition} % \changes{v1.0a}{1995/08/25}{Added 'Compatibility', `Usage of \dst{}' @@ -124,6 +125,7 @@ % \changes{v1.0x}{2018/09/03}{Update document.} % \changes{v1.0x}{2018/09/03}{Mention platexcheat (Japanese only).} % \changes{v1.0x}{2018/09/03}{Mention plautopatch.} +% \changes{v1.0y}{2018/09/22}{Show last update info on \file{pldoc.pdf}} %\fi % \fi % @@ -131,7 +133,7 @@ %<*driver> \NeedsTeXFormat{pLaTeX2e} % \fi -\ProvidesFile{platex.dtx}[2018/09/03 v1.0x pLaTeX document file] +\ProvidesFile{platex.dtx}[2018/09/22 v1.0y pLaTeX document file] % \iffalse \documentclass{jltxdoc} \usepackage{plext} @@ -1202,20 +1204,21 @@ all others indicate the places where it is used.} \settowidth\MacroIndent{\ttfamily\scriptsize 000\ } % \end{macrocode} %\ifJAPANESE -% ここからが本文ページとなります。 +% この文書のタイトル・著者・日付を設定します。 % \changes{v1.0c}{1997/01/29}{\file{pltpatch.ltx}を\file{plpatch.ltx}に名称変更} % \changes{v1.0h}{2016/05/08}{ドキュメントから\file{plpatch.ltx}を除外} % \changes{v1.0l}{2016/06/19}{パッチレベルを\file{plvers.dtx}から取得} % \changes{v1.0o}{2017/09/24}{パッチレベルが負の数の場合をpre-release扱いへ} +% \changes{v1.0y}{2018/09/22}{最終更新日を\file{pldoc.pdf}に表示} %\else -% Here starts the document body. +% Set the title, authors and the date for this document. % \changes{v1.0c}{1997/01/29}{Rename \file{pltpatch.ltx} to \file{plpatch.ltx}.} % \changes{v1.0h}{2016/05/08}{Exclude \file{plpatch.ltx} from the document} % \changes{v1.0l}{2016/06/19}{Get the patch level from \file{plvers.dtx}} % \changes{v1.0o}{2017/09/24}{Allow negative patch level for pre-release} +% \changes{v1.0y}{2018/09/22}{Show last update info on \file{pldoc.pdf}} %\fi % \begin{macrocode} -\begin{document} \title{The \pLaTeXe\ Sources} \author{Ken Nakano \& Japanese \TeX\ Development Community} @@ -1237,8 +1240,39 @@ all others indicate the places where it is used.} \else \edef\@date{\@date\space Pre-Release\patchdate} \fi\fi -\makeatother +% Add the last update info, in case formate date unchanged +% Note: \@ifl@t@r can be used only in preamble. +\def\lastupd@te{0000/00/00} +\begingroup + \def\ProvidesFile#1[#2 #3]{% + \def\@tempd@te{#2}\endinput + \@ifl@t@r{\@tempd@te}{\lastupd@te}{% + \global\let\lastupd@te\@tempd@te + }{}} + \let\ProvidesClass\ProvidesFile + \let\ProvidesPackage\ProvidesFile + \input{plvers.dtx} + \input{plfonts.dtx} + \input{plcore.dtx} + \input{plext.dtx} + \input{pl209.dtx} + \input{kinsoku.dtx} + \input{jclasses.dtx} + \input{jltxdoc.cls} +\endgroup +\@ifl@t@r{\lastupd@te}{\pfmtversion}{% + \edef\@date{\@date\break (last updated: \lastupd@te)}% +}{} +\makeatother +% \end{macrocode} +%\ifJAPANESE +% ここからが本文ページとなります。 +%\else +% Here starts the document body. +%\fi +% \begin{macrocode} +\begin{document} \pagenumbering{roman} \maketitle \renewcommand\maketitle{} diff --git a/Master/texmf-dist/source/platex/base/plcore.dtx b/Master/texmf-dist/source/platex/base/plcore.dtx index 545206a0152..01f03994153 100644 --- a/Master/texmf-dist/source/platex/base/plcore.dtx +++ b/Master/texmf-dist/source/platex/base/plcore.dtx @@ -26,7 +26,8 @@ % \changes{v1.1e}{1996/03/12}{tabbing環境での和欧文間スペース} % \changes{v1.1f}{1996/07/10}{トンボまわりを修正} % \changes{v1.1g}{1997/01/16}{\LaTeX\ \textt{!<1996/06/01!>}に対応} -% \changes{v1.1h}{1997/06/25}{\LaTeX\ の改行マクロの変更に対応} +% \changes{v1.1h}{1997/06/25}{\LaTeX{}の改行マクロの変更に対応。 +% ありがとう、奥村さん。} % \changes{v1.1i}{1998/02/03}{\cs{@shipoutsetup}を\cs{@outputpage}内に入れた} % \changes{v1.1j}{2001/05/10}{\cs{@makecol}で組み立てられる % \cs{@outputbox}の大きさが、縦組で中身が空のボックスだけの場合も適正になる @@ -315,7 +316,7 @@ % % \changes{v1.1j}{1999/04/05}{オプションを付けた場合に、余計な空白 % が入ってしまうのを修正。ありがとう、鈴木隆志@京都大学さん。} -% \changes{v1.1h}{1997/06/25}{\LaTeX\ の改行マクロの変更に対応。 +% \changes{v1.1h}{1997/06/25}{\LaTeX{}の改行マクロの変更に対応。 % ありがとう、奥村さん。} % \LaTeX\ \texttt{<1996/12/01>}で改行マクロが変更され、|\\|が % |\newline|を呼び出さなくなったため、変更された改行マクロに対応しまし @@ -1098,9 +1099,9 @@ % \begin{macro}{\@@paperheight} % \begin{macro}{\@@paperwidth} % \begin{macro}{\@@topmargin} -% |\@@pageheight|は、用紙の縦の長さにトンボの長さを加えた長さになります。 +% |\@@paperheight|は、用紙の縦の長さにトンボの長さを加えた長さになります。 % -% |\@@pagewidth|は、用紙の横の長さにトンボの長さを加えた長さになります。 +% |\@@paperwidth|は、用紙の横の長さにトンボの長さを加えた長さになります。 % % |\@@topmargin|は、現在のトップマージンに1インチ加えた長さになります。 % \begin{macrocode} @@ -1683,7 +1684,7 @@ % % \begin{macro}{\@footnotemark} % \changes{v1.0a}{1995/04/12}{脚注記号の出力位置の調整} -% \changes{v1.1g}{1997/02/14}{縦組時の位置調整を2\cs{ch}から.9zhに変更} +% \changes{v1.1g}{1997/02/14}{縦組時の位置調整を2\cs{cht}から.9zhに変更} % 脚注記号を出力します。 % \begin{macrocode} \def\@footnotemark{\leavevmode diff --git a/Master/texmf-dist/source/platex/base/plext.dtx b/Master/texmf-dist/source/platex/base/plext.dtx index 639d28f1e9a..89c777796af 100644 --- a/Master/texmf-dist/source/platex/base/plext.dtx +++ b/Master/texmf-dist/source/platex/base/plext.dtx @@ -3,7 +3,7 @@ % % Copyright 2001 ASCII Corporation. % Copyright (c) 2010 ASCII MEDIA WORKS -% Copyright (c) 2016-2017 Japanese TeX Development Community +% Copyright (c) 2016-2018 Japanese TeX Development Community % % This file is part of the pLaTeX2e system (community edition). % ------------------------------------------------------------- @@ -60,6 +60,23 @@ % \changes{v1.2g}{2017/05/04}{Use \cs{setlength}, so that % calc extensions apply} % \changes{v1.2h}{2017/07/21}{表と周囲との揃え位置をさらに修正} +% \changes{v1.2i}{2018/09/09}{Made caption an error outside a float: latex/2815 +% (sync with ltfloat 1999/04/19 v1.1u)} +% \changes{v1.2i}{2018/09/09}{縦数式ディレクションの連数字} +% \changes{v1.2i}{2018/09/09}{Moved the code associated with +% \cs{@mkpream} into the group provided by the box, +% for robustness (latex/2183) +% (sync with lttab.dtx 1996/10/21 v1.1i)} +% \changes{v1.2i}{2018/09/09}{Use \cs{set@typeset@protect} +% (sync with lttab.dtx 1996/10/21 v1.1i)} +% \changes{v1.2i}{2018/09/09}{Check for hmode to see if something +% went wrong during parsing (pr/2884) +% (sync with lttab.dtx 1998/11/13 v1.1m)} +% \changes{v1.2i}{2018/09/09}{安全のため、\cs{DeclareLayoutCaption}で +% 定義する内部命令を\cs{...@layoutcaption}から +% \cs{...@layoutc@ption}へ変更} +% \changes{v1.2j}{2018/09/20}{Change \cs{@stabular} to \cs{p@stabular}, +% to avoid conflict with \textsf{stabular} package} % \fi % % \iffalse @@ -68,7 +85,7 @@ \ProvidesFile{plext.dtx} % %\ProvidesPackage{plext} - [2017/07/21 v1.2h pLaTeX package file (community edition)] + [2018/09/20 v1.2j pLaTeX package file (community edition)] %<*driver> \documentclass{jltxdoc} \usepackage{plext} @@ -182,7 +199,7 @@ % \def\tabular{\let\@halignto\@empty\X@tabular} \@namedef{tabular*}{\@ifnextchar<%> - {\@stabular}{\@stabular}} + {\p@stabular}{\p@stabular}} % \end{macrocode} % \end{macro} % \end{macro} @@ -203,15 +220,17 @@ % \end{macro} % \end{macro} % -% \begin{macro}{\@stabular} +% \begin{macro}{\p@stabular} % \begin{macro}{\p@tabular} % アスタリスク形式の場合は、組方向オプションの後ろに幅を指定します。 % \changes{v1.1d}{1995/11/10}{\cs{@tabular} to \cs{p@tabular}} % \changes{v1.2a}{2016/08/20}{tabular環境前の余分な\cs{xkanjiskip}を削除} % \changes{v1.2c}{2016/11/19}{Use \cs{setlength}, so that % calc extensions apply (sync with lttab.dtx v1.1j)} +% \changes{v1.2j}{2018/09/20}{Change \cs{@stabular} to \cs{p@stabular}, +% to avoid conflict with \textsf{stabular} package} % \begin{macrocode} -\def\@stabular<#1>#2{% +\def\p@stabular<#1>#2{% \setlength\dimen@{#2}% \edef\@halignto{to\the\dimen@}\p@tabular<#1>} \def\p@tabular<#1>{\leavevmode \null\hbox \bgroup $\let\@acol\@tabacol @@ -232,11 +251,19 @@ % % \begin{macro}{\p@array} % tabular環境とarray環境の内部形式です。 +% \changes{v1.1c}{1995/09/11}{Add \cs{adjustbaseline}.} % \changes{v1.1d}{1995/11/10}{\cs{@array} to \cs{p@array}} % \changes{v1.2a}{2016/08/20}{横組で\texttt{}を指定した場合に % \cs{@arstrutbox}を余計に\cs{hbox}に入れていたのを修正} -% \begin{macrocode} -\def\p@array<#1>[#2]#3{\setbox\@arstrutbox\hbox{% +% \changes{v1.2i}{2018/09/09}{Moved the code associated with +% \cs{@mkpream} into the group provided by the box, +% for robustness (latex/2183) +% (sync with lttab.dtx 1996/10/21 v1.1i)} +% \begin{macrocode} +\def\p@array<#1>[#2]#3{% + \fork@array@option<#1>[#2]\@begin@alignbox + \bgroup\box@dir\adjustbaseline + \setbox\@arstrutbox\hbox{% \iftdir \if #1y\relax\yoko \vrule\@height\arraystretch\ht\strutbox @@ -257,18 +284,25 @@ \@depth\arraystretch\dp\strutbox \@width\z@ \fi \fi}% - \fork@array@option<#1>[#2]% \@mkpream{#3}\edef\@preamble{\ialign \noexpand\@halignto \bgroup \tabskip\z@skip \@arstrut \@preamble \tabskip\z@skip \cr}% \let\@startpbox\@@startpbox \let\@endpbox\@@endpbox \let\tabularnewline\\% % \end{macrocode} -% \changes{v1.1c}{1995/09/11}{Add \cs{adjustbaseline}.} +% \changes{v1.2i}{2018/09/09}{Use \cs{set@typeset@protect} +% (sync with lttab.dtx 1996/10/21 v1.1i)} % \begin{macrocode} - \@begin@alignbox\bgroup\box@dir\adjustbaseline \let\par\@empty - \let\@sharp##\let\protect\relax - \lineskip\z@skip\baselineskip\z@skip\@preamble} + \let\@sharp##% + \set@typeset@protect + \lineskip\z@skip\baselineskip\z@skip +% \end{macrocode} +% \changes{v1.2i}{2018/09/09}{Check for hmode to see if something +% went wrong during parsing (pr/2884) +% (sync with lttab.dtx 1998/11/13 v1.1m)} +% \begin{macrocode} + \ifhmode \@preamerr\z@ \@@par\fi + \@preamble} % \end{macrocode} % \end{macro} % @@ -518,21 +552,24 @@ % `|(12zw)|'と指定をすると、漢字12文字分の長さで折り返されます。 % `|(\floatwidth)|'と指定をすると、 % キャプションの幅はフロートオブジェクトの幅となります。 -% これがデフォルトです。なお、`|(\floatheigt)|'と指定をすると、 +% これがデフォルトです。なお、`|(\floatheight)|'と指定をすると、 % キャプションの幅はフロートオブジェクトの高さとなります。 % % \meta{pos1}と\meta{pos2}には、キャプションを出力する位置を指定します。 % \meta{pos1}は、`|c|', `|t|', `|b|'のいずれかです。 % \meta{pos2}は、`|u|', `|d|', `|l|', `|r|'のいずれかです。 % デフォルトは、|figure|タイプが`|cd|'、|table|タイプは`|cu|'です。 +% \changes{v1.2i}{2018/09/09}{安全のため、\cs{DeclareLayoutCaption}で +% 定義する内部命令を\cs{...@layoutcaption}から +% \cs{...@layoutc@ption}へ変更} % \begin{macrocode} \def\DeclareLayoutCaption#1<#2>(#3)[#4#5]{% \expandafter - \ifx\csname #1@layoutcaption\endcsname\relax \else + \ifx\csname #1@layoutc@ption\endcsname\relax \else \@latex@info{Redeclaring capiton layout setting of '#1'}% \fi \expandafter - \gdef\csname #1@layoutcaption\endcsname{% + \gdef\csname #1@layoutc@ption\endcsname{% \if Z\caption@dir\def\caption@dir{#2}\fi \ifdim\captionwidth=\z@ \captionwidth=#3\relax\fi \if Z\caption@posa\def\caption@posa{#4}\fi @@ -586,14 +623,25 @@ % 指定をします。位置の指定は|\layoutcaption|コマンドで行ないます。 % |\layoutcaption|コマンドが省略された場合は、|\DeclareLayoutCaption|コマンド % で設定されているデフォルト値が使われます。 +% \changes{v1.2i}{2018/09/09}{Made caption an error outside a float: latex/2815 +% (sync with ltfloat 1999/04/19 v1.1u)} % \begin{macrocode} -\def\pcaption{\refstepcounter\@captype \@dblarg{\@pcaption\@captype}} +\def\pcaption{% + \ifx\@captype\@undefined + \@latex@error{\noexpand\pcaption outside float}\@ehd + \expandafter\@gobble + \else + \refstepcounter\@captype + \expandafter\@firstofone + \fi + {\@dblarg{\@pcaption\@captype}}% +} % \long\def\@pcaption#1[#2]#3{% \addcontentsline{\csname ext@#1\endcsname}{#1}{% \protect\numberline{\csname the#1\endcsname}{\ignorespaces#2}}% \ifvoid\@floatbox - \latex@error{Use with `\protect\layoutfloat'.}\@eha + \@latex@error{Use \noexpand\pcaption with `\string\layoutfloat'}\@eha \fi \make@pcaptionbox{#3}% \@pboxswfalse @@ -601,12 +649,13 @@ \if l\caption@posb\box\@captionbox\kern\captionfloatsep\fi \if t\caption@posa\vtop \else\if b\caption@posa\vbox - \else\ifmmode\vcenter \else\@pboxswtrue $\vcenter \fi\fi\fi + \else\@pboxswtrue $\vcenter \fi\fi {\if u\caption@posb\box\@captionbox\kern\captionfloatsep\fi \unvbox\@floatbox \if d\caption@posb\kern\captionfloatsep\box\@captionbox\fi}% + \if@pboxsw \m@th$\fi \if r\caption@posb\kern\captionfloatsep\box\@captionbox\fi - \if@pboxsw \m@th$\fi \if r\float@pos\else\hss\fi}}% + \if r\float@pos\else\hss\fi}}% \par\vskip.25\baselineskip \box\@tempboxa} % \end{macrocode} @@ -626,12 +675,12 @@ % \changes{v1.1h}{1996/03/13}{typo: \cs{@latex@warning}.} % \begin{macrocode} \expandafter - \ifx\csname\@captype @layoutcaption\endcsname\relax - \@latex@warning{Default caption layout of `\@captype' unknown.}% + \ifx\csname\@captype @layoutc@ption\endcsname\relax + \@latex@warning{Default caption layout of `\@captype' unknown}% \def\caption@dir{Z}\captionwidth\z@ \def\caption@posa{Z}\def\caption@posb{Z}% \else - \csname \@captype @layoutcaption\endcsname + \csname \@captype @layoutc@ption\endcsname \fi % \end{macrocode} % 次に、組み方向を設定します。 @@ -665,7 +714,7 @@ \if@tempswa \@tempdima\ht0 \else\@tempdima\wd0 \fi \ifdim\@tempdima>\captionwidth \@tempdima\captionwidth \fi \@pboxswfalse - \setbox0\hbox{\if@rotsw\ifmmode\@rotswfalse \else $\fi\fi + \setbox0\hbox{\if@rotsw $\fi \if u\caption@posb\vbox \else\if d\caption@posb\vbox \else\if t\caption@posa\vtop @@ -1227,13 +1276,14 @@ % |\@@rensuji|が|\rensuji|の内部形式です。 % \changes{v1.2b}{2016/11/07}{横組で段落の頭に\cs{rensuji}を使える % ように\cs{leavevmode}を追加して修正} +% \changes{v1.2i}{2018/09/09}{縦数式ディレクションの連数字} % \begin{macrocode} \DeclareRobustCommand\rensuji{% \@ifstar{\not@advancelinetrue\@rensuji}{\@rensuji}} \def\@rensuji{\@ifnextchar[{\@@rensuji}{\@@rensuji[c]}} \def\@@rensuji[#1]#2{% \ifvmode\leavevmode\fi - \ifydir\hbox{#2}\else + \iftdir\ifmdir\hbox{#2}\else \hskip\rensujiskip \ifnot@advanceline\not@advancelinefalse\else \setbox\z@\hbox{\yoko#2}% @@ -1248,7 +1298,8 @@ \else\vtop{\hbox to1zw{\yoko#2\hss}}% \fi\fi \hskip\rensujiskip -\fi} + \fi\else\hbox{#2}\fi +} % \end{macrocode} % \end{macro} % \end{macro} diff --git a/Master/texmf-dist/tex/platex/base/plext.sty b/Master/texmf-dist/tex/platex/base/plext.sty index 91b85699afd..69482194e17 100644 --- a/Master/texmf-dist/tex/platex/base/plext.sty +++ b/Master/texmf-dist/tex/platex/base/plext.sty @@ -15,19 +15,19 @@ %% File: plext.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesPackage{plext} - [2017/07/21 v1.2h pLaTeX package file (community edition)] + [2018/09/20 v1.2j pLaTeX package file (community edition)] \newif\if@rotsw \def\array{\let\@acol\@arrayacol \let\@classz\@arrayclassz \let\@classiv\@arrayclassiv \let\\\@arraycr\let\@halignto\@empty\X@tabarray} \def\tabular{\let\@halignto\@empty\X@tabular} \@namedef{tabular*}{\@ifnextchar<%> - {\@stabular}{\@stabular}} + {\p@stabular}{\p@stabular}} \def\X@tabarray{\@ifnextchar<%> {\p@tabarray}{\p@tabarray}} \def\X@tabular{\@ifnextchar<%> {\p@tabular}{\p@tabular}} -\def\@stabular<#1>#2{% +\def\p@stabular<#1>#2{% \setlength\dimen@{#2}% \edef\@halignto{to\the\dimen@}\p@tabular<#1>} \def\p@tabular<#1>{\leavevmode \null\hbox \bgroup $\let\@acol\@tabacol @@ -35,7 +35,10 @@ \let\@classiv\@tabclassiv \let\\\@tabularcr\p@tabarray<#1>} \def\p@tabarray<#1>{\m@th\@ifnextchar[%] {\p@array<#1>}{\p@array<#1>[c]}} -\def\p@array<#1>[#2]#3{\setbox\@arstrutbox\hbox{% +\def\p@array<#1>[#2]#3{% + \fork@array@option<#1>[#2]\@begin@alignbox + \bgroup\box@dir\adjustbaseline + \setbox\@arstrutbox\hbox{% \iftdir \if #1y\relax\yoko \vrule\@height\arraystretch\ht\strutbox @@ -56,15 +59,16 @@ \@depth\arraystretch\dp\strutbox \@width\z@ \fi \fi}% - \fork@array@option<#1>[#2]% \@mkpream{#3}\edef\@preamble{\ialign \noexpand\@halignto \bgroup \tabskip\z@skip \@arstrut \@preamble \tabskip\z@skip \cr}% \let\@startpbox\@@startpbox \let\@endpbox\@@endpbox \let\tabularnewline\\% - \@begin@alignbox\bgroup\box@dir\adjustbaseline \let\par\@empty - \let\@sharp##\let\protect\relax - \lineskip\z@skip\baselineskip\z@skip\@preamble} + \let\@sharp##% + \set@typeset@protect + \lineskip\z@skip\baselineskip\z@skip + \ifhmode \@preamerr\z@ \@@par\fi + \@preamble} \def\endarray{\crcr\egroup\egroup\@end@alignbox} \def\endtabular{\crcr\egroup\egroup\@end@alignbox $\egroup\null} \expandafter \let \csname endtabular*\endcsname = \endtabular @@ -178,11 +182,11 @@ }\hrule width\floatwidth height\floatruletick depth\z@}} \def\DeclareLayoutCaption#1<#2>(#3)[#4#5]{% \expandafter - \ifx\csname #1@layoutcaption\endcsname\relax \else + \ifx\csname #1@layoutc@ption\endcsname\relax \else \@latex@info{Redeclaring capiton layout setting of '#1'}% \fi \expandafter - \gdef\csname #1@layoutcaption\endcsname{% + \gdef\csname #1@layoutc@ption\endcsname{% \if Z\caption@dir\def\caption@dir{#2}\fi \ifdim\captionwidth=\z@ \captionwidth=#3\relax\fi \if Z\caption@posa\def\caption@posa{#4}\fi @@ -202,12 +206,21 @@ \@ifnextchar[{\@iilayoutcaption}{\relax}} \def\@iilayoutcaption[#1#2]{% \def\caption@posa{#1}\def\caption@posb{#2}} -\def\pcaption{\refstepcounter\@captype \@dblarg{\@pcaption\@captype}} +\def\pcaption{% + \ifx\@captype\@undefined + \@latex@error{\noexpand\pcaption outside float}\@ehd + \expandafter\@gobble + \else + \refstepcounter\@captype + \expandafter\@firstofone + \fi + {\@dblarg{\@pcaption\@captype}}% +} \long\def\@pcaption#1[#2]#3{% \addcontentsline{\csname ext@#1\endcsname}{#1}{% \protect\numberline{\csname the#1\endcsname}{\ignorespaces#2}}% \ifvoid\@floatbox - \latex@error{Use with `\protect\layoutfloat'.}\@eha + \@latex@error{Use \noexpand\pcaption with `\string\layoutfloat'}\@eha \fi \make@pcaptionbox{#3}% \@pboxswfalse @@ -215,22 +228,23 @@ \if l\caption@posb\box\@captionbox\kern\captionfloatsep\fi \if t\caption@posa\vtop \else\if b\caption@posa\vbox - \else\ifmmode\vcenter \else\@pboxswtrue $\vcenter \fi\fi\fi + \else\@pboxswtrue $\vcenter \fi\fi {\if u\caption@posb\box\@captionbox\kern\captionfloatsep\fi \unvbox\@floatbox \if d\caption@posb\kern\captionfloatsep\box\@captionbox\fi}% + \if@pboxsw \m@th$\fi \if r\caption@posb\kern\captionfloatsep\box\@captionbox\fi - \if@pboxsw \m@th$\fi \if r\float@pos\else\hss\fi}}% + \if r\float@pos\else\hss\fi}}% \par\vskip.25\baselineskip \box\@tempboxa} \def\make@pcaptionbox#1{% \expandafter - \ifx\csname\@captype @layoutcaption\endcsname\relax - \@latex@warning{Default caption layout of `\@captype' unknown.}% + \ifx\csname\@captype @layoutc@ption\endcsname\relax + \@latex@warning{Default caption layout of `\@captype' unknown}% \def\caption@dir{Z}\captionwidth\z@ \def\caption@posa{Z}\def\caption@posb{Z}% \else - \csname \@captype @layoutcaption\endcsname + \csname \@captype @layoutc@ption\endcsname \fi \@rotswfalse \@tempswafalse \iftdir\if y\caption@dir \let\captiondir\yoko \@tempswatrue @@ -246,7 +260,7 @@ \if@tempswa \@tempdima\ht0 \else\@tempdima\wd0 \fi \ifdim\@tempdima>\captionwidth \@tempdima\captionwidth \fi \@pboxswfalse - \setbox0\hbox{\if@rotsw\ifmmode\@rotswfalse \else $\fi\fi + \setbox0\hbox{\if@rotsw $\fi \if u\caption@posb\vbox \else\if d\caption@posb\vbox \else\if t\caption@posa\vtop @@ -500,7 +514,7 @@ \def\@rensuji{\@ifnextchar[{\@@rensuji}{\@@rensuji[c]}} \def\@@rensuji[#1]#2{% \ifvmode\leavevmode\fi - \ifydir\hbox{#2}\else + \iftdir\ifmdir\hbox{#2}\else \hskip\rensujiskip \ifnot@advanceline\not@advancelinefalse\else \setbox\z@\hbox{\yoko#2}% @@ -515,7 +529,8 @@ \else\vtop{\hbox to1zw{\yoko#2\hss}}% \fi\fi \hskip\rensujiskip -\fi} + \fi\else\hbox{#2}\fi +} \let\Rensuji\rensuji \let\prensuji\rensuji \def\Kanji#1{\expandafter\@Kanji\csname c@#1\endcsname} -- cgit v1.2.3