From 511d12ce71d7023f76adc3e05490d24638bd0d69 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 1 Jul 2016 22:02:58 +0000 Subject: uplatex (1jul16) git-svn-id: svn://tug.org/texlive/trunk@41594 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/uplatex/base/README.md | 2 +- Master/texmf-dist/doc/uplatex/base/upldoc.pdf | Bin 571196 -> 573572 bytes Master/texmf-dist/source/uplatex/base/Makefile | 2 +- Master/texmf-dist/source/uplatex/base/plcore.dtx | 40 ++++- Master/texmf-dist/source/uplatex/base/uplfonts.dtx | 190 ++++++++++++--------- Master/texmf-dist/source/uplatex/base/uplvers.dtx | 24 ++- Master/texmf-dist/tex/uplatex/base/uplcore.ltx | 16 +- Master/texmf-dist/tex/uplatex/base/upldefs.ltx | 46 +---- 8 files changed, 189 insertions(+), 131 deletions(-) diff --git a/Master/texmf-dist/doc/uplatex/base/README.md b/Master/texmf-dist/doc/uplatex/base/README.md index 23135a6b5e2..b6f8dfc0a4e 100644 --- a/Master/texmf-dist/doc/uplatex/base/README.md +++ b/Master/texmf-dist/doc/uplatex/base/README.md @@ -17,6 +17,6 @@ the 3-clause BSD license (see [LICENSE](./LICENSE)). ## Release Date -2016-06-19 +2016-07-01 Japanese TeX Development Community diff --git a/Master/texmf-dist/doc/uplatex/base/upldoc.pdf b/Master/texmf-dist/doc/uplatex/base/upldoc.pdf index fa99fef638b..1a9093744d6 100644 Binary files a/Master/texmf-dist/doc/uplatex/base/upldoc.pdf and b/Master/texmf-dist/doc/uplatex/base/upldoc.pdf differ diff --git a/Master/texmf-dist/source/uplatex/base/Makefile b/Master/texmf-dist/source/uplatex/base/Makefile index ee912165186..ea26c0dbc4d 100644 --- a/Master/texmf-dist/source/uplatex/base/Makefile +++ b/Master/texmf-dist/source/uplatex/base/Makefile @@ -49,7 +49,7 @@ upldoc.pdf: $(PLDOC_SRC) dvipdfmx $(FONTMAP) upldoc.dvi rm *.aux *.log upldoc.toc upldoc.idx upldoc.ind upldoc.ilg rm upldoc.glo upldoc.gls *.dvi upldoc.tex Xins.ins - rm *.cfg upldoc.dic mkpldoc.sh dstcheck.pl + rm ltxdoc.cfg upldoc.dic mkpldoc.sh dstcheck.pl .PHONY: clean clean: diff --git a/Master/texmf-dist/source/uplatex/base/plcore.dtx b/Master/texmf-dist/source/uplatex/base/plcore.dtx index b0cb34d7e46..19db1ed8592 100644 --- a/Master/texmf-dist/source/uplatex/base/plcore.dtx +++ b/Master/texmf-dist/source/uplatex/base/plcore.dtx @@ -10,7 +10,7 @@ % % \fi % -% \CheckSum{1269} +% \CheckSum{1292} %% \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 @@ -59,13 +59,14 @@ % \changes{v1.2d}{2016/04/01}{multicol$B%Q%C%1!<%8$r;H$&$H%H%s%\$N2o$K2#AH$K(B} % \fi % % \iffalse %<*driver> \NeedsTeXFormat{pLaTeX2e} % \fi -\ProvidesFile{plcore.dtx}[2016/05/20 v1.2e pLaTeX core file] +\ProvidesFile{plcore.dtx}[2016/06/30 v1.2f pLaTeX core file] % \iffalse \documentclass{jltxdoc} \GetFileInfo{plcore.dtx} @@ -763,6 +764,41 @@ % \end{macrocode} % \end{macro} % +% \begin{macro}{\AtBeginDvi} +% p\LaTeX{}$B$N=PNO%k!<%A%s$N(B|\@outputpage|$B$G$O!"(B|\shipout|$B$9$k(Bvbox$B$NCf?H$K(B +% |\yoko|$B$r;XDj$7$F$$$^$9!#$3$N$?$a!"(B|\AtBeginDocument{\AtBeginDvi{}}|$B$H$$$&(B +% $B%3!<%I$r=q$/$H(B\texttt{Incompatible direction list can't be unboxed.}$B$H$$$&(B +% $B%(%i!<$,=P$F$7$^$$$^$9!#(B +% +% $B$=$3$G!"%3%_%e%K%F%#HG(Bp\LaTeX{}$B$G$O!V(B|\shipout|$B$G(B|\yoko|$B$,;XDj$5$l$F$$$k!W(B +% $B$3$H$r:,5r$H$7$F(B +% \begin{center} +% |\@begindvibox|$B$O!J6u$G$J$$8B$j!K>o$K2#AH$G$J$1$l$P$J$i$J$$(B +% \end{center} +% $B$H2>Dj$7$^$9!#$3$N2>Dj$K=>$$!"(B|\AtBeginDvi|$B$r:FDj5A$7$^$9!#(B +% \changes{v1.2f}{2016/06/30}{\cs{@begindvibox}$B$r>o$K2#AH$K(B} +% \begin{macrocode} +% +%\plIncludeInRelease{2016/07/01}{\AtBeginDvi} +% {Fix for incompatible direction}% +%<*plcore|platexrelease> +\def \AtBeginDvi #1{% + \global \setbox \@begindvibox + \vbox{\yoko \unvbox \@begindvibox #1}% +} +% +%\plEndIncludeInRelease +%\plIncludeInRelease{0000/00/00}{\AtBeginDvi} +% {Fix for incompatible direction}% +%\def \AtBeginDvi #1{% +% \global \setbox \@begindvibox +% \vbox{\unvbox \@begindvibox #1}% +%} +%\plEndIncludeInRelease +%<*plcore> +% \end{macrocode} +% \end{macro} +% % % \subsection{$B5SCm%^%/%m(B} % $B5SCm$rAH$_N)$F$kItJ,$N%^%/%m$r:FDj5A$7$^$9!#(B diff --git a/Master/texmf-dist/source/uplatex/base/uplfonts.dtx b/Master/texmf-dist/source/uplatex/base/uplfonts.dtx index 61aeaf62327..016758a51c6 100644 --- a/Master/texmf-dist/source/uplatex/base/uplfonts.dtx +++ b/Master/texmf-dist/source/uplatex/base/uplfonts.dtx @@ -14,7 +14,7 @@ % % \fi % -% \CheckSum{2029} +% \CheckSum{2061} %% \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 @@ -79,13 +79,17 @@ % 周囲に\cs{xkanjiskip}が入らなくなっていたのを修正。} % \changes{v1.6c-u00}{2016/06/06}{p\LaTeX{}の変更に追随。} % \changes{v1.6d}{2016/06/19}{アクセント付き文字をさらに修正(forum:1951)} +% \changes{v1.6d-u00}{2016/06/19}{p\LaTeX{}の変更に追随。} +% \changes{v1.6e}{2016/06/26}{v1.6a以降の修正で全てのアクセント付き文字で +% トラブルが相次いだため、いったんパッチを除去。} +% \changes{v1.6e-u00}{2016/06/29}{p\LaTeX{}の変更に追随。} % \fi % % \iffalse %<*driver> \NeedsTeXFormat{pLaTeX2e} % \fi -\ProvidesFile{uplfonts.dtx}[2016/06/19 v1.6d-u00 upLaTeX New Font Selection Scheme] +\ProvidesFile{uplfonts.dtx}[2016/06/29 v1.6e-u00 upLaTeX New Font Selection Scheme] % \iffalse \documentclass{jltxdoc} \GetFileInfo{uplfonts.dtx} @@ -1647,33 +1651,42 @@ % \begin{macrocode} %<*pldefs> \ProvidesFile{upldefs.ltx} - [2016/06/19 v1.6d-u00 upLaTeX Kernel (Default settings)] + [2016/06/29 v1.6e-u00 upLaTeX Kernel (Default settings)] % % \end{macrocode} % % \subsection{合成文字} % \LaTeXe{}のカーネルのコードをそのまま使うと、p\TeX{}のベースライン % 補正量がゼロでないときに合成文字がおかしくなっていたため、対策します。 -% \begin{macrocode} -%\plIncludeInRelease{2016/06/10}{\@text@composite} -% {Fix for non-zero baselineshift}% -%<*pldefs|platexrelease> -% \end{macrocode} +% % \begin{macro}{\g@tlastchart@} % \TeX\ Live 2015で追加された\cs{lastnodechar}を利用して、 % 「直前の文字」の符号位置を得るコードです。\cs{lastnodechar}が未定義の場合は % $-1$が返ります。 % \changes{v1.6c}{2016/06/06}{マクロ追加} % \begin{macrocode} +%\plIncludeInRelease{2016/06/10}{\g@tlastchart@} +% {Added \g@tlastchart@}% +%<*pldefs|platexrelease> \def\g@tlastchart@#1{#1\ifx\lastnodechar\@undefined\m@ne\else\lastnodechar\fi} +% +%\plEndIncludeInRelease +%\plIncludeInRelease{0000/00/00}{\g@tlastchart@} +% {Added \g@tlastchart@}% +%\let\g@tlastchart@\@undefined +%\plEndIncludeInRelease % \end{macrocode} % \end{macro} +% % \begin{macro}{\pltx@isletter} % 第一引数のマクロ(|#1|)の置換テキストが、カテゴリコード11か12の文字トークン1文字であった % 場合に第二引数の内容に展開され、そうでない場合は第三引数の内容に展開されます。 % \changes{v1.6c}{2016/06/06}{マクロ追加} % \changes{v1.6d}{2016/06/19}{アクセント付き文字をさらに修正(forum:1951)} % \begin{macrocode} +%\plIncludeInRelease{2016/06/10}{\pltx@isletter} +% {Added \pltx@isletter}% +%<*pldefs|platexrelease> \def\pltx@mark{\pltx@mark@} \let\pltx@scanstop\relax \long\def\pltx@cond#1\fi{% @@ -1692,83 +1705,114 @@ \pltx@cond{\ifnum0\ifcat A\noexpand#21\fi\ifcat=\noexpand#21\fi>\z@}\fi {\@firstoftwo}{\@secondoftwo}% }{\@secondoftwo}} +% +%\plEndIncludeInRelease +%\plIncludeInRelease{0000/00/00}{\pltx@isletter} +% {Added \pltx@isletter}% +%\let\pltx@isletter\@undefined +%\plEndIncludeInRelease % \end{macrocode} % \end{macro} +% % \begin{macro}{\@text@composite} -% \begin{macro}{\@text@composite@x} +% 合成文字の内部命令です。v1.6aで誤って\LaTeX{}の定義を上書きしてしまいました +% が、v1.6cで外しました。 % \changes{v1.6a}{2016/04/01}{ベースライン補正量が0でないときに -% \cs{AA}など一部の合成文字がおかしくなることへの対応。} -% \changes{v1.6c}{2016/06/06}{v1.6aでの修正で\'e など全てのアクセント付き文字で -% 周囲に\cs{xkanjiskip}が入らなくなっていたのを修正。} +% \cs{AA}など一部の合成文字がおかしくなることに対応するため再定義} +% \changes{v1.6c}{2016/06/06}{v1.6aでの誤った再定義を削除(forum:1941)} % \begin{macrocode} +%\plIncludeInRelease{2016/06/10}{\@text@composite} +% {Wrong fix for non-zero baselineshift}% %\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 -% \end{macrocode} -% \begin{macrocode} - \ifnum\@tempcntb<\z@ - \@tempdima=\iftdir - \ifmdir - \ifmmode\tbaselineshift\else\ybaselineshift\fi - \else - \tbaselineshift - \fi - \else - \ybaselineshift - \fi - \@tempcntb=\@cclvi - \else\@tempdima=\z@ - \fi -% \end{macrocode} -% アクセントが付く「本体の文字」が欧文文字と推測される場合には、 -% 一旦数式モードに入ることによって\cs{xkanjiskip}が前後に入るようにします。 -% 必要なら、数式モードの前後に\cs{null}を補って\cs{xkanjiskip}の挿入を抑制します。 -% \begin{macrocode} - \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 -% \end{macrocode} -% \begin{macrocode} - \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 +% {Wrong fix for non-zero baselineshift}% %\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} +%\plEndIncludeInRelease +%\plIncludeInRelease{0000/00/00}{\@text@composite} +% {Wrong fix for non-zero baselineshift}% +%\def\@text@composite#1#2#3\@text@composite{% +% \expandafter\@text@composite@x +% \csname\string#1-\string#2\endcsname} +%\plEndIncludeInRelease +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\@text@composite@x} +% 合成文字の内部命令です。|\g@tlastchart@|と|\pltx@isletter|を使います。 +% \changes{v1.6a}{2016/04/01}{ベースライン補正量が0でないときに +% \cs{AA}など一部の合成文字がおかしくなることへの対応。} +% \changes{v1.6c}{2016/06/06}{v1.6aでの修正で\'e など全てのアクセント付き文字で +% 周囲に\cs{xkanjiskip}が入らなくなっていたのを修正。} +% \changes{v1.6e}{2016/06/26}{v1.6a以降の修正で全てのアクセント付き文字で +% トラブルが相次いだため、いったんパッチを除去。} +% \begin{macrocode} +%\plIncludeInRelease{2016/07/01}{\@text@composite@x} +% {Fix for non-zero baselineshift}% +%\def\@text@composite@x#1{% +% \ifx#1\relax +% \expandafter\@secondoftwo +% \else +% \expandafter\@firstoftwo +% \fi +% #1} +%\plEndIncludeInRelease +%\plIncludeInRelease{2016/06/10}{\@text@composite@x} +% {Fix for non-zero baselineshift}% +%\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@x} +% {Fix for non-zero baselineshift}% %\def\@text@composite@x#1#2{% % \ifx#1\relax % \expandafter\@secondoftwo @@ -1790,13 +1834,8 @@ % \box\z@ % \endgroup} %\plEndIncludeInRelease -%\plIncludeInRelease{0000/00/00}{\@text@composite} +%\plIncludeInRelease{0000/00/00}{\@text@composite@x} % {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} %\def\@text@composite@x#1{% % \ifx#1\relax % \expandafter\@secondoftwo @@ -1808,7 +1847,6 @@ %<*pldefs> % \end{macrocode} % \end{macro} -% \end{macro} % % \subsection{イタリック補正} % \changes{v1.3i}{2000/07/13}{\cs{text..}コマンドの左側に\cs{xkanjiskip}が diff --git a/Master/texmf-dist/source/uplatex/base/uplvers.dtx b/Master/texmf-dist/source/uplatex/base/uplvers.dtx index 3f8afb6a4f5..a9aa5afde48 100644 --- a/Master/texmf-dist/source/uplatex/base/uplvers.dtx +++ b/Master/texmf-dist/source/uplatex/base/uplvers.dtx @@ -14,7 +14,7 @@ % % \fi % -% \CheckSum{194} +% \CheckSum{201} %% \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 @@ -72,12 +72,13 @@ % 使われた場合に明確なエラーを出すようにした。} % \changes{v1.0x}{2016/06/19}{パッチレベルを\file{plvers.dtx}で設定} % \changes{v1.0x-u01}{2016/06/19}{p\LaTeX{}の変更に追随。} +% \changes{v1.0y-u01}{2016/06/27}{uplatex.cfgの読み込みを追加} % \fi % % \iffalse %<*driver> % \fi -\ProvidesFile{uplvers.dtx}[2016/06/19 v1.0x-u01 upLaTeX Kernel (Version Info)] +\ProvidesFile{uplvers.dtx}[2016/06/29 v1.0y-u01 upLaTeX Kernel (Version Info)] % \iffalse \documentclass{jltxdoc} \GetFileInfo{uplvers.dtx} @@ -141,10 +142,10 @@ % %\edef\platexreleaseversion %<*plcore|platexrelease> - {2016/06/10u01} + {2016/07/01u01} % %<*plcore> -\def\ppatch@level{1} +\def\ppatch@level{0} % % \end{macrocode} % \end{macro} @@ -303,6 +304,21 @@ % \end{macrocode} % \end{macro} % +% 起動時にuplatex.cfgがある場合、それを読み込むようにします。 +% \changes{v1.0y-u01}{2016/06/29}{uplatex.cfgの読み込みを追加} +% \begin{macrocode} +%<*plfinal> +\everyjob\expandafter{% + \the\everyjob + \IfFileExists{uplatex.cfg}{% + \typeout{*************************^^J% + * Loading uplatex.cfg.^^J% + *************************}% + \input{uplatex.cfg}}{}% +} +% +% \end{macrocode} +% % \LaTeXe{}が提供するlatexreleaseパッケージが読み込まれていて、 % かつp\LaTeXe{}が提供するplatexreleaseパッケージが読み込まれていない % 場合は、警告を出します。 diff --git a/Master/texmf-dist/tex/uplatex/base/uplcore.ltx b/Master/texmf-dist/tex/uplatex/base/uplcore.ltx index 4b874fbff61..6425216d4b3 100644 --- a/Master/texmf-dist/tex/uplatex/base/uplcore.ltx +++ b/Master/texmf-dist/tex/uplatex/base/uplcore.ltx @@ -35,8 +35,8 @@ %% \def\pfmtname{pLaTeX2e} \def\pfmtversion - {2016/06/10u01} -\def\ppatch@level{1} + {2016/07/01u01} +\def\ppatch@level{0} \def\plIncludeInRelease#1{\kernel@ifnextchar[% {\@plIncludeInRelease{#1}} {\@plIncludeInRelease{#1}[#1]}} @@ -958,6 +958,10 @@ \stepcounter{page}% \let\firstmark\botmark } +\def \AtBeginDvi #1{% + \global \setbox \@begindvibox + \vbox{\yoko \unvbox \@begindvibox #1}% +} \renewcommand\@makefnmark{% \ifydir \hbox{}\hbox{\@textsuperscript{\normalfont\@thefnmark}}\hbox{}% \else\hbox{\yoko\@textsuperscript{\normalfont\@thefnmark}}\fi} @@ -1082,6 +1086,14 @@ } \expandafter \endgroup \platexTMP +\everyjob\expandafter{% + \the\everyjob + \IfFileExists{uplatex.cfg}{% + \typeout{*************************^^J% + * Loading uplatex.cfg.^^J% + *************************}% + \input{uplatex.cfg}}{}% +} \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 f8b22882d96..a8c379761d9 100644 --- a/Master/texmf-dist/tex/uplatex/base/upldefs.ltx +++ b/Master/texmf-dist/tex/uplatex/base/upldefs.ltx @@ -31,7 +31,7 @@ %% Right brace \} Tilde \~} %% \ProvidesFile{upldefs.ltx} - [2016/06/19 v1.6d-u00 upLaTeX Kernel (Default settings)] + [2016/06/29 v1.6e-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 @@ -51,50 +51,6 @@ \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 - #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 -} \def \check@nocorr@ #1#2\nocorr#3\@nil {% \let \check@icl \relax% \maybe@ic から変更 \def \check@icr {\ifvmode \else \aftergroup \maybe@ic \fi}% -- cgit v1.2.3