diff options
Diffstat (limited to 'Master/texmf-dist/source/platex/base/plcore.dtx')
-rw-r--r-- | Master/texmf-dist/source/platex/base/plcore.dtx | 197 |
1 files changed, 181 insertions, 16 deletions
diff --git a/Master/texmf-dist/source/platex/base/plcore.dtx b/Master/texmf-dist/source/platex/base/plcore.dtx index 156d9319100..f15de60e8e7 100644 --- a/Master/texmf-dist/source/platex/base/plcore.dtx +++ b/Master/texmf-dist/source/platex/base/plcore.dtx @@ -80,13 +80,18 @@ % \changes{v1.2u}{2017/11/04}{emath$B$N(B\cs{marusuuref}$BBP:v(B} % \changes{v1.2v}{2018/01/27}{v1.2o$B$H(Bv1.2q$B$N=$@5$G(B\cs{nolinebreak}$B$,(B % $B8z$+$J$$>l9g$,$"$C$?$N$G!"85$KLa$7$?(B} +% \changes{v1.2w}{2018/02/24}{e-up\TeX{}$B$G$b(B\cs{omathchardef}$B$r;HMQ(B} +% \changes{v1.2x}{2018/03/01}{JFM$B%0%k!<%N!<%I$r:o=|$9$k%^%/%mDI2C(B} +% \changes{v1.2x}{2018/03/01}{\cs{removejfmglue}$B$,$"$l$PMxMQ$9$k$h$&$K$7$?(B} +% \changes{v1.2x}{2018/03/01}{$B%;%k:G=i$N(B\cs{par}$B$G6u9T$,F~$i$J$$$h$&$K$7$?(B} +% \changes{v1.2x}{2018/03/01}{\cs{everypar}$B$K(B\cs{inhibitglue}$B$r;E9~$`%^%/%mDI2C(B} % \fi % % \iffalse %<*driver> \NeedsTeXFormat{pLaTeX2e} % \fi -\ProvidesFile{plcore.dtx}[2018/01/27 v1.2v pLaTeX core file] +\ProvidesFile{plcore.dtx}[2018/03/01 v1.2x pLaTeX core file] % \iffalse \documentclass{jltxdoc} \GetFileInfo{plcore.dtx} @@ -183,11 +188,51 @@ \def\documentstyle{% \makeatletter\input{pl209.def}\makeatother \documentclass} +%</plcore> % \end{macrocode} % \end{macro} % % % +% \subsection{$BD>A0$N(BJFM$BM3Mh%9%Z!<%9$N:o=|!Z%3%_%e%K%F%#HGFH<+![(B} +% $B8=>u$N(Bp\TeX{}$B!J(B\TeX\ Live 2017$B;~E@!K$G$O!"(B +% |\inhibitglue|$B%W%j%_%F%#%V$O!V(BJFM$BM3Mh$N%9%Z!<%9!J%0%k!<!&%+!<%s!KA^F~(B +% $B%k!<%A%s$rM^@)$9$k!WF/$-$r$7$^$9!#$7$+$7!"4{$KA^F~$5$l$F$7$^$C$?(B +% JFM$B%0%k!<$d%+!<%s$r:o=|$9$k$3$H$O$G$-$^$;$s!#(B +% +% \begin{macro}{\removejfmglue} +% $B$=$3$G!"!V:G8e$N%N!<%I$,(BJFM$B%0%k!<$G$"$C$?>l9g$K$=$l$r:o=|$9$k!W$H$$$&(B +% $B%f!<%68~$1L?Na$rDj5A$7$^$9!#$3$N5!G=$K$O(Be-p\TeX{} 180226$B0J9_$N(B +% |\lastnodesubtype|$B%W%j%_%F%#%V$,I,MW$G$9!#(B +% \changes{v1.2x}{2018/03/01}{JFM$B%0%k!<%N!<%I$r:o=|$9$k%^%/%mDI2C(B} +% \begin{macrocode} +%<platexrelease>\plIncludeInRelease{2018/03/09}% +%<platexrelease> {\removejfmglue}{Macro added}% +%<*plcore|platexrelease> +% \end{macrocode} +% \begin{macrocode} +\ifx\lastnodesubtype\@undefined + \let\removejfmglue\@undefined +\else + \def\pltx@gluetype{11} + \def\pltx@jfmgluesubtype{21} + \protected\def\removejfmglue{% + \ifnum\lastnodetype=\pltx@gluetype\relax + \ifnum\lastnodesubtype=\pltx@jfmgluesubtype\relax + \unskip + \fi + \fi} +\fi +%</plcore|platexrelease> +%<platexrelease>\plEndIncludeInRelease +%<platexrelease>\plIncludeInRelease{0000/00/00}% +%<platexrelease> {\removejfmglue}{Macro added}% +%<platexrelease>\let\removejfmglue\@undefined +%<platexrelease>\plEndIncludeInRelease +% \end{macrocode} +% \end{macro} +% +% % \subsection{$B2~%Z!<%8(B} % $B=DAH$N$H$-!"2~%Z!<%88e$NFbMF$,6v?t%Z!<%8!J1&%Z!<%8!K$+$i$O$8$^$k$h$&$K$7$^$9!#(B % $B2#AH$N$H$-$K$O!"4q?t%Z!<%8!J1&%Z!<%8!K$+$i$O$8$^$j$^$9!#(B @@ -197,6 +242,7 @@ % \pstyle{empty}$B$K$7!"%X%C%@$H%U%C%?$,F~$i$J$$$h$&$K$7$F$$$^$9!#(B % \file{ltoutput.dtx}$B$NDj5A$r!"=DAH!"2#AH$K9g$o$;$F!"Dj5A$7$J$*$7$?$b$N$G$9!#(B % \begin{macrocode} +%<*plcore> \def\cleardoublepage{\clearpage\if@twoside \ifodd\c@page \iftdir @@ -1624,15 +1670,21 @@ % $B$7$^$&$N$G!"(Bp\LaTeX{}$B$G$ODI2C$NBP=h$rF~$l$^$9!#(B % % $B$^$:!"(B|l|, |c|, |r|$B$N>l9g$G$9!#(B -% $B%;%k$NMWAG$r(B|\mbox|$B$KF~$l!"$=$N:G=i$G(B|\inhibitglue|$B$rH/9T$7$^$9!#(B +% 2017/09/26$B$N=$@5$G$O!V%;%k$NMWAG$r(B|\mbox|$B$KF~$l!"(B +% $B$=$N:G=i$G(B|\inhibitglue|$B$rH/9T$9$k!W$H$$$&J}?K$G$7$?$,!"(B +% 2018/03/09$B$N=$@5$G$O!V(B|\removejfmglue|$B%^%/%m$,Dj5A$5$l$F$$$k>l9g$O(B +% $B:G=i$K(B|\inhibitglue|$B$rH/9T$7!":G8e$K(B|\removejfmglue|$B$rH/9T$9$k!W$H$$$&(B +% $BJ}?K$K$7$^$9!#$3$&$9$l$P>/!9(B\LaTeX{}$B$H$N8_49@-$,8~>e$7$^$9!#(B % \changes{v1.2p}{2017/07/21}{tabular$B4D6-$N%;%kFb$N(BJFM$B%0%k!=$r:o=|(B} % \changes{v1.2r}{2017/09/26}{tabular$B4D6-$N1&B7$((B(r)$B$G7S@~$,$:$l$k$h$&$K(B % $B$J$C$F$$$?%P%0$r=$@5(B} +% \changes{v1.2x}{2018/03/01}{\cs{removejfmglue}$B$,$"$l$PMxMQ$9$k$h$&$K$7$?(B} % \begin{macrocode} %</plcore> -%<platexrelease>\plIncludeInRelease{2017/09/26}{\@tabclassz} +%<platexrelease>\plIncludeInRelease{2018/03/09}{\@tabclassz} %<platexrelease> {Inhibit JFM glue in tabular cells}% %<*plcore|platexrelease> +\ifx\removejfmglue\@undefined \def\@tabclassz{% \ifcase\@lastchclass \@acolampacol @@ -1656,8 +1708,59 @@ \or \hfil\hskip1sp\mbox{\inhibitglue\ignorespaces\@sharp\unskip}% % r \fi}}} +\else +\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\removejfmglue\hfil % c + \or + \hskip1sp\inhibitglue\ignorespaces\@sharp\unskip\removejfmglue\hfil % l + \or + \hfil\hskip1sp\inhibitglue\ignorespaces\@sharp\unskip\removejfmglue % r + \fi}}} +\fi %</plcore|platexrelease> %<platexrelease>\plEndIncludeInRelease +%<platexrelease>\plIncludeInRelease{2017/09/26}{\@tabclassz} +%<platexrelease> {Inhibit JFM glue in tabular cells}% +%<platexrelease>\def\@tabclassz{% +%<platexrelease> \ifcase\@lastchclass +%<platexrelease> \@acolampacol +%<platexrelease> \or +%<platexrelease> \@ampacol +%<platexrelease> \or +%<platexrelease> \or +%<platexrelease> \or +%<platexrelease> \@addamp +%<platexrelease> \or +%<platexrelease> \@acolampacol +%<platexrelease> \or +%<platexrelease> \@firstampfalse\@acol +%<platexrelease> \fi +%<platexrelease> \edef\@preamble{% +%<platexrelease> \@preamble{% +%<platexrelease> \ifcase\@chnum +%<platexrelease> \hfil\mbox{\inhibitglue\ignorespaces\@sharp\unskip}\hfil % c +%<platexrelease> \or +%<platexrelease> \hskip1sp\mbox{\inhibitglue\ignorespaces\@sharp\unskip}\hfil % l +%<platexrelease> \or +%<platexrelease> \hfil\hskip1sp\mbox{\inhibitglue\ignorespaces\@sharp\unskip}% % r +%<platexrelease> \fi}}} +%<platexrelease>\plEndIncludeInRelease %<platexrelease>\plIncludeInRelease{2017/07/29}{\@tabclassz} %<platexrelease> {Inhibit JFM glue in tabular cells}% %<platexrelease>\def\@tabclassz{% @@ -1714,16 +1817,34 @@ % \end{macro} % % \begin{macro}{\@classv} -% $B<!$K!"(B|p|$B$N>l9g$G$9!#(B|\mbox{}\inhibitglue|$B$H(B|\unskip|$B$rDI2C$7$F$$$^$9!#(B +% $B<!$K!"(B|p|$B$N>l9g$G$9!#(B +% 2017/07/29$B$N=$@5$G$O(B|\mbox{}\inhibitglue|$B$H(B|\unskip|$B$rDI2C$7$F$$$^$7$?$,!"(B +% $B0J2<$N$h$&$K(B|p|$B;XDj$N%;%k$N:G=i$G(B|\par|$B$H$7$F(B +% $B2~CJMn$rH/9T$9$k$H!"0l9T6u$$$F$7$^$&$H$$$&>I>u$,5/$-$F$7$^$$$^$9(B(platex/\#63)$B!#(B +%\begin{verbatim} +% \begin{tabular}{p{5cm}} +% A\\ +% \relax\par +% A +% \end{tabular} +%\end{verbatim} +% $B$3$3$G$O!"(B2017/07/29$B$N=$@5$+$iJ}?K$r2~$a!"(B|\everypar|$BFb$K(B|\inhibitglue|$B$r(B +% $B;E9~$`$H$$$&J}?K$GBP1~$7$^$9!#(B % \changes{v1.2p}{2017/07/21}{tabular$B4D6-$N%;%kFb$N(BJFM$B%0%k!=$r:o=|(B} +% \changes{v1.2x}{2018/03/01}{$B%;%k:G=i$N(B\cs{par}$B$G6u9T$,F~$i$J$$$h$&$K$7$?(B} % \begin{macrocode} -%<platexrelease>\plIncludeInRelease{2017/07/29}{\@classv} +%<platexrelease>\plIncludeInRelease{2018/03/09}{\@classv} %<platexrelease> {Inhibit JFM glue in tabular cells}% %<*plcore|platexrelease> -\def\@classv{\@addtopreamble{\@startpbox{\@nextchar}\mbox{}\inhibitglue\ignorespaces +\def\@classv{\@addtopreamble{\@startpbox{\@nextchar}\pltx@next@inhibitglue\ignorespaces \@sharp\unskip\@endpbox}} %</plcore|platexrelease> %<platexrelease>\plEndIncludeInRelease +%<platexrelease>\plIncludeInRelease{2017/07/29}{\@classv} +%<platexrelease> {Inhibit JFM glue in tabular cells}% +%<platexrelease>\def\@classv{\@addtopreamble{\@startpbox{\@nextchar}\mbox{}\inhibitglue\ignorespaces +%<platexrelease>\@sharp\unskip\@endpbox}} +%<platexrelease>\plEndIncludeInRelease %<platexrelease>\plIncludeInRelease{0000/00/00}{\@classv} %<platexrelease> {Inhibit JFM glue in tabular cells}% %<platexrelease>\def\@classv{\@addtopreamble{\@startpbox{\@nextchar}\ignorespaces @@ -1732,6 +1853,29 @@ % \end{macrocode} % \end{macro} % +% \begin{macro}{\pltx@next@inhibitglue} +% $B?eJ?%b!<%I$G$"$l$P$=$N$^$^(B|\inhibitglue|$B$rH/9T$7!"$=$l0J30$G$"$l$P(B +% |\everypar|$BFb$K(B|\inhibitglue|$B$r;E9~$_$^$9!#(B +% \changes{v1.2x}{2018/03/01}{\cs{everypar}$B$K(B\cs{inhibitglue}$B$r;E9~$`%^%/%mDI2C(B} +% \begin{macrocode} +%<platexrelease>\plIncludeInRelease{2018/03/09}{\pltx@next@inhibitglue} +%<platexrelease> {Add \pltx@next@inhibitglue}% +%<*plcore|platexrelease> +\protected\def\pltx@next@inhibitglue{% + \ifhmode\inhibitglue\else + \edef\@tempa{\everypar{\inhibitglue + \everypar{\unexpanded\expandafter{\the\everypar}}% + \unexpanded\expandafter{\the\everypar}}}% + \@tempa\fi} +%</plcore|platexrelease> +%<platexrelease>\plEndIncludeInRelease +%<platexrelease>\plIncludeInRelease{0000/00/00}{\pltx@next@inhibitglue} +%<platexrelease> {Add \pltx@next@inhibitglue}% +%<platexrelease>\let\pltx@next@inhibitglue\@undefined +%<platexrelease>\plEndIncludeInRelease +% \end{macrocode} +% \end{macro} +% % % \section{2013$BG/0J9_$N?7$7$$(Bp\TeX{}$BBP1~(B} % \LaTeXe{}$B$N%+!<%M%k$N%3!<%I$r$=$N$^$^;H$&$H!"(B2013$BG/0J9_$N(Bp\TeX{}$B$G$O(B @@ -1864,7 +2008,7 @@ % $B$N$G!"(Be-p\TeX{}$B$N3HD%%l%8%9%?$rMxMQ$G$-$k$h$&$K@_Dj$7$^$9!#(B % \changes{v1.2j}{2016/11/09}{FAM256$B%Q%C%AE,MQ(Be-p\TeX{}$B$KBP1~(B} % \begin{macrocode} -%<platexrelease>\plIncludeInRelease{2016/11/29}% +%<platexrelease>\plIncludeInRelease{2018/03/09}% %<platexrelease> {\e@alloc@chardef}{Extended Allocation (FAM256)}% %<*plcore|platexrelease> % \end{macrocode} @@ -1879,16 +2023,17 @@ \else % \end{macrocode} % e-\TeX{}$B3HD%$G(B$2^{15}$$B8D$N%l%8%9%?$,MxMQ$G$-$^$9!#(B -% ^^A $B!V(BFAM256$B$J$7$N(Be-(u)p\TeX{}$B!W$O;v<B>eB8:_$7$J$$$O$:!#(B +% ^^A $BHwK:O?!'!V(BFAM256$B$J$7$N(Be-(u)p\TeX{}$B!W$O;v<B>eB8:_$7$J$$$O$:!#(B % ^^A $B$?$@$7!"$?$H$($P(Be-(u)p\TeX{}$B$r%Y!<%9$K$7$?(B % ^^A p\TeX{}-ng (Asiatic pTeX)$B$O(Be-\TeX{}$B3HD%$r;}$C$F$$$F!"(B % ^^A FAM256$B%Q%C%A$OE,MQ$5$l$F$$$J$$$?$a!"$3$3$K3:Ev$9$k!#(B % ^^A cf: https://github.com/clerkma/ptex-ng % ^^A $B$J$*!"(Bp\TeX{}-ng$B$O(Be-p\TeX{}$B$HF1MM$K(Bpdf\TeX{}$B3HD%$N(B % ^^A $B0lIt!J(Be-p\TeX{}$B$HHO0O$,0lCW$7$J$$!K$r;}$C$F$$$k$3$H!"(B -% ^^A $B$^$?(B|\lastnodechar|$B$J$I$N(Be-p\TeX{}$BFH<+$N%W%j%_%F%#%V$r(B -% ^^A $B;}$C$F$$$J$$$3$H$K$bCm0U!D$@$C$?$,!"(B2017/09/06$BIU$G(B -% ^^A p\TeX{}-ng$B$K$b(B|\lastnodechar|$B$,DI2C$5$l$?!#(B +% ^^A $B$^$?(B|\epTeXinputencoding|$B$J$I$N(Be-p\TeX{}$BFH<+$N%W%j%_%F%#%V$r(B +% ^^A $B;}$C$F$$$J$$$3$H$K$bCm0U!#(B +% ^^A $B!J(B|\lastnodechar|$B$b(Be-p\TeX{}$BFH<+$@$C$?$,!"(B2017/09/06$BIU$G(B +% ^^A p\TeX{}-ng$B$K$bDI2C$5$l$F$$$k!#!K(B % \begin{macrocode} \mathchardef\e@alloc@top=32767 \let\e@alloc@chardef\mathchardef @@ -1896,19 +2041,39 @@ \else % \end{macrocode} % FAM256$B%Q%C%A$,E,MQ$5$l$?(Be-p\TeX{}$B$N>l9g$O!"(B$2^{16}$$B8D$N%l%8%9%?$,MxMQ$G$-$^$9!#(B +% \changes{v1.2w}{2018/02/24}{e-up\TeX{}$B$G$b(B\cs{omathchardef}$B$r;HMQ(B} +% ^^A $BHwK:O?!'(Bup\TeX{}$B$G$O(B|\omathchardef|$B$G$J$/(B|\chardef|$B$b2D$@$,!"(B +% ^^A $B%U%)!<%^%C%H:n@.;~$K(B|-kanji-internal=euc|$B$,;XDj$5$l$k2DG=@-$,(B +% ^^A $B$J$$$H$O8@$$@Z$l$J$$$N$G!"(BFAM256$B%Q%C%AE,MQ:Q(Be-(u)p\TeX{}$B$J$i$P(B +% ^^A $B>o$K(B|\omathchardef|$B$rMQ$$$k$3$H$K$9$k!#(B % \begin{macrocode} - \ifx\enablecjktoken\@undefined % pTeX \omathchardef\e@alloc@top=65535 \let\e@alloc@chardef\omathchardef - \else % upTeX - \chardef\e@alloc@top=65535 - \let\e@alloc@chardef\chardef - \fi \fi % \end{macrocode} % \begin{macrocode} %</plcore|platexrelease> %<platexrelease>\plEndIncludeInRelease +%<platexrelease>\plIncludeInRelease{2016/11/29}% +%<platexrelease> {\e@alloc@chardef}{Extended Allocation (FAM256)}% +%<platexrelease>\ifx\omathchar\@undefined +%<platexrelease> \ifx\widowpenalties\@undefined +%<platexrelease> \mathchardef\e@alloc@top=255 +%<platexrelease> \let\e@alloc@chardef\chardef +%<platexrelease> \else +%<platexrelease> \mathchardef\e@alloc@top=32767 +%<platexrelease> \let\e@alloc@chardef\mathchardef +%<platexrelease> \fi +%<platexrelease>\else +%<platexrelease> \ifx\enablecjktoken\@undefined % pTeX +%<platexrelease> \omathchardef\e@alloc@top=65535 +%<platexrelease> \let\e@alloc@chardef\omathchardef +%<platexrelease> \else % upTeX +%<platexrelease> \chardef\e@alloc@top=65535 +%<platexrelease> \let\e@alloc@chardef\chardef +%<platexrelease> \fi +%<platexrelease>\fi +%<platexrelease>\plEndIncludeInRelease %<platexrelease>\plIncludeInRelease{2015/01/01}% %<platexrelease> {\e@alloc@chardef}{Extended Allocation (FAM256)}% %<platexrelease>\ifx\widowpenalties\@undefined |