diff options
Diffstat (limited to 'Master/texmf-dist')
-rw-r--r-- | Master/texmf-dist/doc/platex/base/README.md | 10 | ||||
-rw-r--r-- | Master/texmf-dist/doc/platex/base/exppl2e.pdf | bin | 138932 -> 182666 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/platex/base/pldoc.pdf | bin | 763703 -> 767854 bytes | |||
-rw-r--r-- | Master/texmf-dist/source/platex/base/kinsoku.dtx | 16 | ||||
-rw-r--r-- | Master/texmf-dist/source/platex/base/plcore.dtx | 31 | ||||
-rw-r--r-- | Master/texmf-dist/source/platex/base/plfonts.dtx | 165 | ||||
-rw-r--r-- | Master/texmf-dist/source/platex/base/plnewsc07.tex | 274 | ||||
-rw-r--r-- | Master/texmf-dist/source/platex/base/plvers.dtx | 2 | ||||
-rw-r--r-- | Master/texmf-dist/tex/platex/base/exppl2e.sty | 282 | ||||
-rw-r--r-- | Master/texmf-dist/tex/platex/base/kinsoku.tex | 8 | ||||
-rw-r--r-- | Master/texmf-dist/tex/platex/base/platexrelease.sty | 58 | ||||
-rw-r--r-- | Master/texmf-dist/tex/platex/base/plcore.ltx | 25 | ||||
-rw-r--r-- | Master/texmf-dist/tex/platex/base/pldefs.ltx | 21 | ||||
-rw-r--r-- | Master/texmf-dist/tex/platex/base/ptrace.sty | 39 |
14 files changed, 817 insertions, 114 deletions
diff --git a/Master/texmf-dist/doc/platex/base/README.md b/Master/texmf-dist/doc/platex/base/README.md index 9595b3c3a27..d511d06d863 100644 --- a/Master/texmf-dist/doc/platex/base/README.md +++ b/Master/texmf-dist/doc/platex/base/README.md @@ -11,7 +11,7 @@ is now maintained by [Japanese TeX Development Community](http://texjp.org). The original ASCII edition can be obtained from: -- http://ascii.asciimw.jp/pb/ptex/ +- https://ctan.org/pkg/ptex-texmf ## Changes from the original ASCII edition @@ -43,9 +43,9 @@ the following commands will be helpful: ## Character encoding -All the text files containing Japanese characters in ptex-texmf are -encoded in ISO-2022-JP. This is because ISO-2022-JP encoded texts -are most suitable for the traditional pTeX engine. +All the text files containing Japanese characters in this repository +are encoded in ISO-2022-JP. This is because ISO-2022-JP encoded +texts are most suitable for the traditional pTeX engine. ## Repository @@ -61,6 +61,6 @@ the 3-clause BSD license (see [LICENSE](./LICENSE)). ## Release Date -2017-07-29 +2017-08-27 Japanese TeX Development Community diff --git a/Master/texmf-dist/doc/platex/base/exppl2e.pdf b/Master/texmf-dist/doc/platex/base/exppl2e.pdf Binary files differindex e7423afcf1a..4cd8e644842 100644 --- a/Master/texmf-dist/doc/platex/base/exppl2e.pdf +++ b/Master/texmf-dist/doc/platex/base/exppl2e.pdf diff --git a/Master/texmf-dist/doc/platex/base/pldoc.pdf b/Master/texmf-dist/doc/platex/base/pldoc.pdf Binary files differindex ece1207e3d7..c8affe5f69f 100644 --- a/Master/texmf-dist/doc/platex/base/pldoc.pdf +++ b/Master/texmf-dist/doc/platex/base/pldoc.pdf diff --git a/Master/texmf-dist/source/platex/base/kinsoku.dtx b/Master/texmf-dist/source/platex/base/kinsoku.dtx index 0afe83fd253..e59aa35056d 100644 --- a/Master/texmf-dist/source/platex/base/kinsoku.dtx +++ b/Master/texmf-dist/source/platex/base/kinsoku.dtx @@ -3,7 +3,7 @@ % % Copyright 1995 ASCII Corporation. % 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). % ------------------------------------------------------------- @@ -15,6 +15,8 @@ % \changes{v1.0}{1995/04/01}{first edition} % \changes{v1.0a}{2016/06/08}{T1$B$J$I$N(B8$B%S%C%H%U%)%s%H%(%s%3!<%G%#%s%0(B % $B$N$?$a$K(B128--256$B$NJ8;z$r(B\texttt{\cs{xspcode}=3}$B$K@_Dj(B} +% \changes{v1.0b}{2017/08/05}{$B!s!"!u!"(B\%$B!"(B\&$B$N6XB'%Z%J%k%F%#$,(B +% $B8m$C$F$$$?$N$r=$@5!J(Bpost $\rightarrow$ pre$B!K(B} % \fi % % \setcounter{StandardModuleDepth}{1} @@ -24,7 +26,7 @@ %<*driver> \NeedsTeXFormat{pLaTeX2e} % \fi -\ProvidesFile{kinsoku.dtx}[2016/06/08 v1.0a pLaTeX Kernel (community edition)] +\ProvidesFile{kinsoku.dtx}[2017/08/05 v1.0b pLaTeX Kernel (community edition)] % \iffalse \documentclass{jltxdoc} \GetFileInfo{kinsoku.dtx} @@ -57,14 +59,16 @@ % % \subsection{$BH>3QJ8;z$KBP$9$k6XB'(B} % $B$3$3$G$O!"H>3QJ8;z$KBP$9$k6XB'$N@_Dj$r9T$J$C$F$$$^$9!#(B +% \changes{v1.0b}{2017/08/05}{$B!s!"!u!"(B\%$B!"(B\&$B$N6XB'%Z%J%k%F%#$,(B +% $B8m$C$F$$$?$N$r=$@5!J(Bpost $\rightarrow$ pre$B!K(B} % % \begin{macrocode} \prebreakpenalty`!=10000 \prebreakpenalty`"=10000 \postbreakpenalty`\#=500 \postbreakpenalty`\$=500 -\postbreakpenalty`\%=500 -\postbreakpenalty`\&=500 +\prebreakpenalty`\%=500 +\prebreakpenalty`\&=500 \postbreakpenalty`\`=10000 \prebreakpenalty`'=10000 \prebreakpenalty`)=10000 @@ -132,8 +136,8 @@ \prebreakpenalty`$B!a(B=200 \postbreakpenalty`$B!t(B=200 \postbreakpenalty`$B!p(B=200 -\postbreakpenalty`$B!s(B=200 -\postbreakpenalty`$B!u(B=200 +\prebreakpenalty`$B!s(B=200 +\prebreakpenalty`$B!u(B=200 \prebreakpenalty`$B$!(B=150 \prebreakpenalty`$B$#(B=150 \prebreakpenalty`$B$%(B=150 diff --git a/Master/texmf-dist/source/platex/base/plcore.dtx b/Master/texmf-dist/source/platex/base/plcore.dtx index 5cdc2337634..bac04240e68 100644 --- a/Master/texmf-dist/source/platex/base/plcore.dtx +++ b/Master/texmf-dist/source/platex/base/plcore.dtx @@ -68,13 +68,15 @@ % \changes{v1.2n}{2017/04/23}{$B%I%-%e%a%s%H$NDI2C(B} % \changes{v1.2o}{2017/05/03}{$B9TF,6XB'J8;z$ND>A0$G$b2~9T$9$k$h$&$K$7$?(B} % \changes{v1.2p}{2017/07/21}{tabular$B4D6-$N%;%kFb$N(BJFM$B%0%k!=$r:o=|(B} +% \changes{v1.2q}{2017/08/25}{\cs{nolinebreak}$B$N>l9g$K(B\cs{(x)kanjiskip}$B$,(B +% $BF~$i$J$/$J$C$F$$$?$N$r=$@5(B} % \fi % % \iffalse %<*driver> \NeedsTeXFormat{pLaTeX2e} % \fi -\ProvidesFile{plcore.dtx}[2017/07/21 v1.2p pLaTeX core file] +\ProvidesFile{plcore.dtx}[2017/08/25 v1.2q pLaTeX core file] % \iffalse \documentclass{jltxdoc} \GetFileInfo{plcore.dtx} @@ -269,8 +271,15 @@ % $B9TJ,3d$,5/$-$?>l9g!"?7$7$$9TF,$N(BJFM$B%0%k!=$O>C$($k$H$$$&=>Mh$N(B % p\LaTeX{}$B$N5sF0$b0];}$7$F$$$^$9!#(B % \changes{v1.2o}{2017/05/03}{$B9TF,6XB'J8;z$ND>A0$G$b2~9T$9$k$h$&$K$7$?(B} +% +% $BA02s$N(B|\hskip\z@\relax|$B$NDI2C$G$O!"(B|\nolinebreak|$B$N>l9g$K(B|\kanjiskip|$B$d(B +% |\xkanjiskip|$B$,F~$i$J$$LdBj$,5/$-$F$7$^$$$^$7$?!#$=$3$G!"(B +% |\penalty\z@\relax|$B$KJQ99$7$^$7$?!#$3$l$O!"L@<(E*$J(B|\penalty|$B%W%j%_%F%#%V(B +% $BF1;N$N9g;;$O9T$o$l$J$$$3$H$rMxMQ$7$F$$$^$9!#(B +% \changes{v1.2q}{2017/08/25}{\cs{nolinebreak}$B$N>l9g$K(B\cs{(x)kanjiskip}$B$,(B +% $BF~$i$J$/$J$C$F$$$?$N$r=$@5(B} % \begin{macrocode} -%<platexrelease>\plIncludeInRelease{2017/05/05}{\@no@lnbk} +%<platexrelease>\plIncludeInRelease{2017/07/29}{\@no@lnbk} %<platexrelease> {Break before prebreakpenalty}% %<*plcore|platexrelease> \def\@no@lnbk #1[#2]{% @@ -280,7 +289,7 @@ \@tempskipa\lastskip \unskip \penalty #1\@getpen{#2}% - \hskip\z@\relax %% added (2017/05/03) + \penalty\z@\relax %% added (2017/08/25) \ifdim\@tempskipa>\z@ \hskip\@tempskipa \ignorespaces @@ -288,6 +297,22 @@ \fi} %</plcore|platexrelease> %<platexrelease>\plEndIncludeInRelease +%<platexrelease>\plIncludeInRelease{2017/05/05}{\@no@lnbk} +%<platexrelease> {Break before prebreakpenalty}% +%<platexrelease>\def\@no@lnbk #1[#2]{% +%<platexrelease> \ifvmode +%<platexrelease> \@nolnerr +%<platexrelease> \else +%<platexrelease> \@tempskipa\lastskip +%<platexrelease> \unskip +%<platexrelease> \penalty #1\@getpen{#2}% +%<platexrelease> \hskip\z@\relax %% added (2017/05/03) +%<platexrelease> \ifdim\@tempskipa>\z@ +%<platexrelease> \hskip\@tempskipa +%<platexrelease> \ignorespaces +%<platexrelease> \fi +%<platexrelease> \fi} +%<platexrelease>\plEndIncludeInRelease %<platexrelease>\plIncludeInRelease{0000/00/00}{\@no@lnbk} %<platexrelease> {Break before prebreakpenalty}% %<platexrelease>\def\@no@lnbk #1[#2]{% diff --git a/Master/texmf-dist/source/platex/base/plfonts.dtx b/Master/texmf-dist/source/platex/base/plfonts.dtx index 7e116ebb358..66ee0ead1e7 100644 --- a/Master/texmf-dist/source/platex/base/plfonts.dtx +++ b/Master/texmf-dist/source/platex/base/plfonts.dtx @@ -34,7 +34,7 @@ % $BF~$i$J$$$N$r=$@5(B} % \changes{v1.3j}{2000/10/24}{\cs{adjustbaseline}$B$GM>J,$J%"%-$,F~$i$J$$(B % $B$h$&$K$7$?(B} -% \changes{v1.3k}{2001/05/10}{\cs{adjustbaseline}$B$ND4@0NL(B} +% \changes{v1.3k}{2001/05/10}{$B2$J8=qBN$N4p=`$r:F$S(B`/`$B$+$i(B`M'$B$KJQ99(B} % \changes{v1.3l}{2002/04/05}{\cs{adjustbaseline}$B$G%U%)%s%H$N4p=`CM$,=D=q$-(B % $B0J30$G$O@_Dj$5$l$J$$$N$r=$@5(B} % \changes{v1.3m}{2004/06/14}{\cs{fontfamily}$B%3%^%s%IFbIt%U%i%0JQ99(B} @@ -64,13 +64,15 @@ % \changes{v1.6f}{2017/02/20}{\cs{ystrut}$B$rDI2C(B} % \changes{v1.6f}{2017/02/20}{\cs{ystrutbox}$B$rAH$_N)$F$k$h$&$K(B} % \changes{v1.6g}{2017/03/07}{$B%Y!<%9%i%$%sJd@5NL$r=$@5(B} +% \changes{v1.6h}{2017/08/05}{$BOBJ8=qBN$N4p=`$rA43Q6uGr$+$i!V4A!W$KJQ99(B} +% \changes{v1.6h}{2017/08/05}{trace$B$N%3!<%I$N(B\texttt{\%}$BK:$l$r=$@5(B} % \fi % % \iffalse %<*driver> \NeedsTeXFormat{pLaTeX2e} % \fi -\ProvidesFile{plfonts.dtx}[2017/03/07 v1.6g pLaTeX New Font Selection Scheme] +\ProvidesFile{plfonts.dtx}[2017/08/05 v1.6h pLaTeX New Font Selection Scheme] % \iffalse \documentclass{jltxdoc} \GetFileInfo{plfonts.dtx} @@ -144,7 +146,7 @@ %<*trace> \NeedsTeXFormat{pLaTeX2e} \ProvidesPackage{ptrace} - [2017/02/20 v1.6f Standard pLaTeX package (font tracing)] + [2017/08/05 v1.6h Standard pLaTeX package (font tracing)] \RequirePackageWithOptions{tracefnt} %</trace> % \end{macrocode} @@ -1145,6 +1147,8 @@ \set@fontsize\baselinestretch\f@size\f@baselineskip \fi \size@update} +%</plcore|trace> +%<*plcore> % \end{macrocode} % \end{macro} % @@ -1163,7 +1167,7 @@ % |\fontsize|$B%3%^%s%I$NFbIt7A<0$G$9!#(B % $B%Y!<%9%i%$%s$N@_Dj$H!";YCl$N@_Dj$r9T$J$$$^$9!#(B % \begin{macrocode} -%</plcore|trace> +%</plcore> %<platexrelease|trace>\plIncludeInRelease{2017/04/08}{\set@fontsize} %<platexrelease|trace> {Construct \ystrutbox}% %<*plcore|platexrelease|trace> @@ -1247,7 +1251,7 @@ %</trace> %<platexrelease|trace> \let\size@update\relax}} %<platexrelease|trace>\plEndIncludeInRelease -%<*plcore|trace> +%<*plcore> % \end{macrocode} % \end{macro} % @@ -1257,30 +1261,41 @@ % $B8=:_$N2$J8%U%)%s%H$N(B``/''$B$NCf1{$,$/$k$h$&$K%Y!<%9%i%$%s%7%U%H$r@_Dj$7$^$9!#(B % \changes{v1.0c}{1995/08/31}{$B2$J8=qBN$N4p=`$r(B`M'$B$+$i(B`/'$B$KJQ99(B} % \changes{v1.2}{1995/11/21}{$B=DAH;~$N$_D4@0$9$k$h$&$K$7$?(B} -% \changes{v1.3j}{2000/10/24}{$BJ8F,$K3C3g8L$J$I$,$"$k$H$-$KM>7W$J%"%-$,$G(B -% $B$kLdBj$KBP=h(B} -% \changes{v1.3l}{2002/04/05}{\cs{adjustbaseline}$B$G%U%)%s%H$N4p=`CM$,=D=q$-(B -% $B0J30$G$O@_Dj$5$l$J$$$N$r=$@5(B} % % $BEv=i$O$^$:%Y!<%9%i%$%s%7%U%HNL$r%<%m$K$7$F$$$^$7$?$,!"(B % \cs{tbaselineshift}$B$rO"B3$7$FJQ99$7$?8e$K3C3g8LN`$r;H$&$HM>7W$J%"%-$,(B % $B$G$kLdBj$,5/$3$k$?$a!"(B\cs{tbaselineshift}$B$r%<%m%/%j%"$9$k=hM}$r:o=|$7(B % $B$^$7$?!#(B +% \changes{v1.3j}{2000/10/24}{$BJ8F,$K3C3g8L$J$I$,$"$k$H$-$KM>7W$J%"%-$,$G(B +% $B$kLdBj$KBP=h(B} % % $B$7$+$7!"$=$l$G$O%Y!<%9%i%$%s%7%U%H$rD4@0:Q$_$N2$J8%\%C%/%9$HHf3S$7$F(B % $B$7$^$&$?$a!"7W;;$7$?CM$,Bg$-$/$J$C$F$7$^$$$^$9!#$=$3$G!"$3$N%\%C%/%9(B % $B$NCf$G%<%m$K$9$k$h$&$K$7$^$7$?!#$^$?!"(B``/''$B$HHf3S$7$F$$$?$N$r(B``M''$B$K(B % $B$7$^$7$?!#(B -% \changes{v1.3k}{2001/05/10}{\cs{adjustbaseline}$B$ND4@0NL(B -% $B!J:F$S(B`M'$B$r4p=`$K$7$?!K(B} +% \changes{v1.3k}{2001/05/10}{$B2$J8=qBN$N4p=`$r:F$S(B`/`$B$+$i(B`M'$B$KJQ99(B} +% \changes{v1.3l}{2002/04/05}{\cs{adjustbaseline}$B$G%U%)%s%H$N4p=`CM$,=D=q$-(B +% $B0J30$G$O@_Dj$5$l$J$$$N$r=$@5(B} +% +% $BA43Q6uGr!J(BEUC$B%3!<%I(B\texttt{0xA1A1}$B!K$O(BJFM$B$GFC<l$J%?%$%W$KJ,N`$5$l$k2DG=@-(B +% $B$,$"$k$?$a!"OBJ8=qBN$N4p=`$r!V4A!W!J(BJIS$B%3!<%I(B\texttt{0x3441}$B!K$XJQ99$7$^$7$?!#(B +% \changes{v1.6h}{2017/08/05}{$BOBJ8=qBN$N4p=`$rA43Q6uGr$+$i!V4A!W$KJQ99(B} +% % \begin{macrocode} \newbox\adjust@box \newdimen\adjust@dimen +% \end{macrocode} +% +% \begin{macrocode} +%</plcore> +%<platexrelease|trace>\plIncludeInRelease{2017/07/29}{\adjustbaseline} +%<platexrelease|trace> {Change zenkaku reference}% +%<*plcore|platexrelease|trace> \def\adjustbaseline{% % \end{macrocode} % $BOBJ8%U%)%s%H$N4p=`CM$r@_Dj$7$^$9!#(B % \begin{macrocode} - \setbox\adjust@box\hbox{\char\euc"A1A1}%" + \setbox\adjust@box\hbox{\char\jis"3441}%" \cht\ht\adjust@box \cdp\dp\adjust@box \cwd\wd\adjust@box @@ -1294,10 +1309,11 @@ % % \begin{eqnarray*} % \textmc{$B%Y!<%9%i%$%s%7%U%HNL(B} &=& -% \{ (\textmc{$BA43Q6uGr$N?<$5(B}) - (\textmc{M$B$N?<$5(B}) \} \\ -% &&- \frac{(\textmc{$BA43Q6uGr$N9b$5(B$+$$B?<$5(B}) +% \{ (\textmc{$B4A$N?<$5(B}) - (\textmc{M$B$N?<$5(B}) \} \\ +% &&- \frac{(\textmc{$B4A$N9b$5(B$+$$B?<$5(B}) % - (\textmc{M$B$N9b$5(B$+$$B?<$5(B})}{2} % \end{eqnarray*} +% \changes{v1.6h}{2017/08/05}{trace$B$N%3!<%I$N(B\texttt{\%}$BK:$l$r=$@5(B} % % \begin{macrocode} \iftdir @@ -1309,11 +1325,38 @@ \advance\adjust@dimen\cdp \advance\adjust@dimen-\dp\adjust@box \tbaselineshift\adjust@dimen -%<trace> \ifnum \tracingfonts>\tw@ -%<trace> \typeout{baselineshift:\the\tbaselineshift} -%<trace> \fi +%<trace> \ifnum \tracingfonts>\tw@ +%<trace> \typeout{baselineshift:\the\tbaselineshift}% +%<trace> \fi \fi} -%</plcore|trace> +%</plcore|platexrelease|trace> +%<platexrelease|trace>\plEndIncludeInRelease +%<platexrelease|trace>\plIncludeInRelease{0000/00/00}{\adjustbaseline} +%<platexrelease|trace> {Change zenkaku reference}% +%<platexrelease|trace>\def\adjustbaseline{% +%<platexrelease|trace> \setbox\adjust@box\hbox{\char\euc"A1A1}%" +%<platexrelease|trace> \cht\ht\adjust@box +%<platexrelease|trace> \cdp\dp\adjust@box +%<platexrelease|trace> \cwd\wd\adjust@box +%<platexrelease|trace> \cvs\normalbaselineskip +%<platexrelease|trace> \chs\cwd +%<platexrelease|trace> \cHT\cht \advance\cHT\cdp +%<platexrelease|trace> \iftdir +%<platexrelease|trace> \setbox\adjust@box\hbox{\tbaselineshift\z@ M}% +%<platexrelease|trace> \adjust@dimen\ht\adjust@box +%<platexrelease|trace> \advance\adjust@dimen\dp\adjust@box +%<platexrelease|trace> \advance\adjust@dimen-\cHT +%<platexrelease|trace> \divide\adjust@dimen\tw@ +%<platexrelease|trace> \advance\adjust@dimen\cdp +%<platexrelease|trace> \advance\adjust@dimen-\dp\adjust@box +%<platexrelease|trace> \tbaselineshift\adjust@dimen +%<*trace> +%<platexrelease|trace> \ifnum \tracingfonts>\tw@ +%<platexrelease|trace> \typeout{baselineshift:\the\tbaselineshift} +%<platexrelease|trace> \fi +%</trace> +%<platexrelease|trace> \fi} +%<platexrelease|trace>\plEndIncludeInRelease %<*plcore> % \end{macrocode} % \end{macro} @@ -1407,7 +1450,9 @@ } \let\kenc@update\relax % \end{macrocode} +% \end{macro} % +% \begin{macro}{\@changed@kcmd} % |\@changed@cmd|$B$NOBJ8%(%s%3!<%G%#%s%0%P!<%8%g%s!#(B % \changes{v1.3n}{2004/08/10}{$BOBJ8%(%s%3!<%G%#%s%0$N@Z$jBX$($rM-8z2=(B} % \begin{macrocode} @@ -1754,42 +1799,6 @@ % \end{macro} % % -% -% \subsection{$B%G%U%)%k%H@_Dj%U%!%$%k$NFI$_9~$_(B} -% $B:G8e$K!"%G%U%)%k%H@_Dj%U%!%$%k$G$"$k!"(B\file{pldefs.ltx}$B$rFI$_9~$_$^$9!#(B -% $B$3$N%U%!%$%k$K$D$$$F$N>\:Y$O!"Bh(B\ref{plfonts:pldefs}$B@a$r;2>H$7$F$/$@$5$$!#(B -% \TeX{}$B$NF~NO%U%!%$%k8!:w%Q%9$K@_Dj$5$l$F$$$k%G%#%l%/%H%j$K(B\file{pldefs.cfg}% -% $B%U%!%$%k$,$"$k>l9g$O!"$=$N%U%!%$%k$r;H$$$^$9!#(B -% \begin{macrocode} -\InputIfFileExists{pldefs.cfg} - {\typeout{*************************************^^J% - * Local config file pldefs.cfg used^^J% - *************************************}}% - {\input{pldefs.ltx}} -%</plcore> -% \end{macrocode} -% -% -% -% -% \section{$B%G%U%)%k%H@_Dj%U%!%$%k(B}\label{plfonts:pldefs} -% $B$3$3$G$O!"%U%)!<%^%C%H%U%!%$%k$KFI$_9~$^$l$k%G%U%)%k%HCM$r@_Dj$7$F$$$^$9!#(B -% $B$3$N@a$G$NFbMF$O(B\file{pldefs.ltx}$B$K=PNO$5$l$^$9!#(B -% $B$3$N%U%!%$%k$NFbMF$r(B\file{plcore.ltx}$B$K4^$a$F$b$h$$$N$G$9$,!"(B -% $B%G%U%)%k%H$N@_Dj$r;2>H$7$d$9$$$h$&$K!"JL%U%!%$%k$K$7$F$"$j$^$9!#(B -% \file{pldefs.ltx}$B$O(B\file{plcore.ltx}$B$+$iFI$_9~$^$l$^$9!#(B -% -% $B%W%j%m!<%I%5%$%:$O!"(B\dst{}$B%W%m%0%i%`$N%*%W%7%g%s$GJQ99$9$k$3$H$,$G$-$^$9!#(B -% $B$3$l0J30$N@_Dj$rJQ99$7$?$$>l9g$O!"(B\file{pldefs.ltx}$B$r(B -% $BD>@\!"=$@5$9$k$N$G$O$J$/!"$3$N%U%!%$%k$r(B\file{pldefs.cfg}$B$H$$$&L>A0$G(B -% $B%3%T!<$r$7$F!"$=$N%U%!%$%k$KBP$7$F=$@5$r2C$($k$h$&$K$7$F$/$@$5$$!#(B -% \begin{macrocode} -%<*pldefs> -\ProvidesFile{pldefs.ltx} - [2016/06/26 v1.6e pLaTeX Kernel (Default settings)] -%</pldefs> -% \end{macrocode} -% % \subsection{$B9g@.J8;z(B} % \LaTeXe{}$B$N%+!<%M%k$N%3!<%I$r$=$N$^$^;H$&$H!"(Bp\TeX{}$B$N%Y!<%9%i%$%s(B % $BJd@5NL$,%<%m$G$J$$$H$-$K9g@.J8;z$,$*$+$7$/$J$C$F$$$?$?$a!"BP:v$7$^$9!#(B @@ -1800,11 +1809,12 @@ % $-1$$B$,JV$j$^$9!#(B % \changes{v1.6c}{2016/06/06}{$B%^%/%mDI2C(B} % \begin{macrocode} +%</plcore> %<platexrelease>\plIncludeInRelease{2016/06/10}{\g@tlastchart@} %<platexrelease> {Added \g@tlastchart@}% -%<*pldefs|platexrelease> +%<*plcore|platexrelease> \def\g@tlastchart@#1{#1\ifx\lastnodechar\@undefined\m@ne\else\lastnodechar\fi} -%</pldefs|platexrelease> +%</plcore|platexrelease> %<platexrelease>\plEndIncludeInRelease %<platexrelease>\plIncludeInRelease{0000/00/00}{\g@tlastchart@} %<platexrelease> {Added \g@tlastchart@}% @@ -1821,7 +1831,7 @@ % \begin{macrocode} %<platexrelease>\plIncludeInRelease{2016/06/10}{\pltx@isletter} %<platexrelease> {Added \pltx@isletter}% -%<*pldefs|platexrelease> +%<*plcore|platexrelease> \def\pltx@mark{\pltx@mark@} \let\pltx@scanstop\relax \long\def\pltx@cond#1\fi{% @@ -1840,7 +1850,7 @@ \pltx@cond{\ifnum0\ifcat A\noexpand#21\fi\ifcat=\noexpand#21\fi>\z@}\fi {\@firstoftwo}{\@secondoftwo}% }{\@secondoftwo}} -%</pldefs|platexrelease> +%</plcore|platexrelease> %<platexrelease>\plEndIncludeInRelease %<platexrelease>\plIncludeInRelease{0000/00/00}{\pltx@isletter} %<platexrelease> {Added \pltx@isletter}% @@ -1979,10 +1989,46 @@ %<platexrelease> \fi %<platexrelease> #1} %<platexrelease>\plEndIncludeInRelease -%<*pldefs> +%<*plcore> % \end{macrocode} % \end{macro} % +% +% \subsection{$B%G%U%)%k%H@_Dj%U%!%$%k$NFI$_9~$_(B} +% $B:G8e$K!"%G%U%)%k%H@_Dj%U%!%$%k$G$"$k!"(B\file{pldefs.ltx}$B$rFI$_9~$_$^$9!#(B +% $B$3$N%U%!%$%k$K$D$$$F$N>\:Y$O!"Bh(B\ref{plfonts:pldefs}$B@a$r;2>H$7$F$/$@$5$$!#(B +% \TeX{}$B$NF~NO%U%!%$%k8!:w%Q%9$K@_Dj$5$l$F$$$k%G%#%l%/%H%j$K(B\file{pldefs.cfg}% +% $B%U%!%$%k$,$"$k>l9g$O!"$=$N%U%!%$%k$r;H$$$^$9!#(B +% \begin{macrocode} +\InputIfFileExists{pldefs.cfg} + {\typeout{*************************************^^J% + * Local config file pldefs.cfg used^^J% + *************************************}}% + {\input{pldefs.ltx}} +%</plcore> +% \end{macrocode} +% +% +% +% +% \section{$B%G%U%)%k%H@_Dj%U%!%$%k(B}\label{plfonts:pldefs} +% $B$3$3$G$O!"%U%)!<%^%C%H%U%!%$%k$KFI$_9~$^$l$k%G%U%)%k%HCM$r@_Dj$7$F$$$^$9!#(B +% $B$3$N@a$G$NFbMF$O(B\file{pldefs.ltx}$B$K=PNO$5$l$^$9!#(B +% $B$3$N%U%!%$%k$NFbMF$r(B\file{plcore.ltx}$B$K4^$a$F$b$h$$$N$G$9$,!"(B +% $B%G%U%)%k%H$N@_Dj$r;2>H$7$d$9$$$h$&$K!"JL%U%!%$%k$K$7$F$"$j$^$9!#(B +% \file{pldefs.ltx}$B$O(B\file{plcore.ltx}$B$+$iFI$_9~$^$l$^$9!#(B +% +% $B%W%j%m!<%I%5%$%:$O!"(B\dst{}$B%W%m%0%i%`$N%*%W%7%g%s$GJQ99$9$k$3$H$,$G$-$^$9!#(B +% $B$3$l0J30$N@_Dj$rJQ99$7$?$$>l9g$O!"(B\file{pldefs.ltx}$B$r(B +% $BD>@\!"=$@5$9$k$N$G$O$J$/!"$3$N%U%!%$%k$r(B\file{pldefs.cfg}$B$H$$$&L>A0$G(B +% $B%3%T!<$r$7$F!"$=$N%U%!%$%k$KBP$7$F=$@5$r2C$($k$h$&$K$7$F$/$@$5$$!#(B +% \begin{macrocode} +%<*pldefs> +\ProvidesFile{pldefs.ltx} + [2017/08/05 v1.6h pLaTeX Kernel (Default settings)] +%</pldefs> +% \end{macrocode} +% % \subsection{$B%$%?%j%C%/Jd@5(B} % \changes{v1.3i}{2000/07/13}{\cs{text..}$B%3%^%s%I$N:8B&$K(B\cs{xkanjiskip}$B$,(B % $BF~$i$J$$$N$r=$@5!J$"$j$,$H$&!"25It!wElBg$5$s!K(B} @@ -1990,6 +2036,7 @@ % $B!V(B\verb|$B$"(B\texttt{abc}$B$$(B|$B!W$H$7$?$H$-!"=qBN$NJQ99$r;XDj$5$l$?2$J8$N:8B&$K(B % $BOB2$J84V%9%Z!<%9$,F~$i$J$$$N$r=$@5$7$^$9!#(B % \begin{macrocode} +%<*pldefs> \def \check@nocorr@ #1#2\nocorr#3\@nil {% \let \check@icl \relax% \maybe@ic $B$+$iJQ99(B \def \check@icr {\ifvmode \else \aftergroup \maybe@ic \fi}% diff --git a/Master/texmf-dist/source/platex/base/plnewsc07.tex b/Master/texmf-dist/source/platex/base/plnewsc07.tex new file mode 100644 index 00000000000..20bcefa13df --- /dev/null +++ b/Master/texmf-dist/source/platex/base/plnewsc07.tex @@ -0,0 +1,274 @@ +%% <2017/07/29> +\documentclass{plnews} + +\publicationyear{2017}% $BH/9TG/(B +\publicationmonth{07}% $BH/9T7n(B +\publicationissue{c7}% $BHV9f(B +\author{$BF|K\8l(B\TeX{}$B3+H/%3%_%e%K%F%#!J(B\texttt{https://texjp.org/}$B!K(B} + +\def\cs#1{\texttt{\char92 #1}} +\def\pTeX{p\kern-.15em\TeX} +\def\eTeX{$\varepsilon$-\TeX} +\def\epTeX{$\varepsilon$-\pTeX} +\def\pLaTeX{p\kern-.05em\LaTeX} +\def\pLaTeXe{p\kern-.05em\LaTeXe} + +% ==== specific to 2017/07/29 ==== +\usepackage{booktabs} +\let\origfootnoterule\footnoterule +\usepackage{pxftnright} +\let\footnoterule\origfootnoterule +\makeatletter +\renewcommand{\section}{% + \@startsection{section}{1}{\z@} + {1.5\Cvs \@plus.6\Cvs \@minus.2\Cvs}% + {.5\Cvs \@plus.3\Cvs}{\reset@font\large\bfseries}% \Large -> \large +} +\renewcommand{\maketitle}{% + \twocolumn[{% + \parbox[t][6\baselineskip]{\textwidth}{% + \@titlefont\@title\hspace{3mm}% + \normalsize $BBh(B{\@issue}$B9f(B\\[\medskipamount] + \normalfont{\@year}$BG/(B{\@month}$B7n(B~$BH/9T(B\\ + $B:n@.<T!'(B\begin{tabular}[t]{l} + \@author + \end{tabular}% + } + \parbox[t][3\baselineskip]{\textwidth}{% +$B$3$NJ8=q$O%3%_%e%K%F%#HG(B\pLaTeXe\ \texttt{<2017/07/29>}$B$K$D$$$F!"(B +\pLaTeXe\ \texttt{<2017/05/05>}$B$+$i$N99?72U=j$r$^$H$a$?$b$N$G$9(B\footnotemark$B!#(B + }% + }]% +} +\makeatother +% ==== end ==== + +\begin{document} + +\maketitle +\footnotetext{$B=$@5%j%j!<%9(B\texttt{<2017/07/29>+1}$B$G$N99?72U=j$r4^$_$^$9!#(B} + +\section{$BI=$N%;%kMWAG<~0O$N(BJFM$B%0%k!<$rM^@)(B} +$BI=$r:n$k(B|tabular|$B4D6-$G!"%;%k$NMWAG$,3g8LN`$J$I$G;O$^$k!"$^$?$O3g8LN`(B +$B$J$I$G=*$o$k>l9g!"M>J,$J%9%Z!<%9$,F~$k$3$H$,$"$j$^$7$?!#(B +$B$^$?!"%9%Z!<%9$,F~$k$+$I$&$+$O!"!V%=!<%9Cf$G%"%i%$%s%a%s%HJ8;z(B |&| $B$N(B +$BA08e$KH>3Q6uGr$r=q$$$?$+$I$&$+!W$GJQ2=$7$F$$$^$7$?!#$3$NM>J,$J%9%Z!<%9(B +$B$O!"(B\pTeX{}$B$N%a%H%j%C%/$+$iA^F~$5$l$k(BJFM$B%0%k!<$KM3Mh$7$^$9!#(B + +\begin{verbatim} + \begin{tabular}{|l|c|r|} + $B!J:8B7$(!K(B&$B!JCf1{B7$(!K(B&$B!J1&B7$(!K(B\\ + $B!J:8!K(B & $B!JCf!K(B & $B!J1&!K(B\\ + \end{tabular} +\end{verbatim} + +\makeatletter +\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}}} +\makeatother +\DeleteShortVerb{\|} + \begin{tabular}{|l|c|r|} + $B!J:8B7$(!K(B&$B!JCf1{B7$(!K(B&$B!J1&B7$(!K(B\\ + $B!J:8!K(B & $B!JCf!K(B & $B!J1&!K(B\\ + \end{tabular} +\MakeShortVerb{\|} +\medskip + +$B%=!<%9$r8+$d$9$/$9$k$?$a$KH>3Q6uGr$rF~$l$k$3$H$O$h$/$"$j$^$9$N$G!"(B +$BH>3Q6uGr$NM-L5$K$h$C$F7k2L$,JQ$o$k$N$O:$$j$^$9!#$=$N$?$a$+!"K\2H$N(B +\LaTeX{}$B$G$O!"%"%i%$%s%a%s%HJ8;z(B |&| $B$NA08e$KH>3Q6uGr$r=q$$$?$+$I$&$+(B +$B$K$+$+$o$i$:!"F1$8=PNO$,F@$i$l$k$h$&$JBP=h$,=>Mh$+$iF~$C$F$$$^$7$?!#(B + +\pLaTeX{}$B$N>l9g!"$3$NBP=h$,(B\pTeX{}$B$N(BJFM$B%0%k!<$K$O8z$$$F$$$^$;$s$G$7$?!#(B +$B$3$NLdBj$r=$@5$7!"Cf1{B7$((B(|c|)$B$d:8B7$((B(|l|)$B!"1&B7$((B(|r|)$B$,$:$l$F(B +$B8+$($J$$$h$&$K$J$j$^$7$?!#(B + +\medskip +\makeatletter +\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}}} +\makeatother +\DeleteShortVerb{\|} + \begin{tabular}{|l|c|r|} + $B!J:8B7$(!K(B&$B!JCf1{B7$(!K(B&$B!J1&B7$(!K(B\\ + $B!J:8!K(B & $B!JCf!K(B & $B!J1&!K(B\\ + \end{tabular} +\MakeShortVerb{\|} +\medskip + +$B$J$*!"$3$N=$@5$O(B\file{array}$B%Q%C%1!<%8!J(B\LaTeX3 Team$B$K$h$k(B +\file{latex-tools}$B%P%s%I%k$K<}O?!K$rFI$_9~$`$HL58z$K$J$C$F$7$^$$$^$9!#(B +\pLaTeX{}/u\pLaTeX{}$B$G(B\file{array}$B%Q%C%1!<%8$r;H$$$?$$>l9g$O!"(B +\file{plarray}$B%Q%C%1!<%8!J(B2017/07/29$B0J9_$N(B\file{platex-tools}$B%P%s%I%k$K(B +$B<}O?!K$rDI2C$b$7$/$OBe$o$j$KFI$_9~$s$G$/$@$5$$!#(B + + +\section{\file{plext}$B$NB7$(0LCV(B} +\file{plext}$B%Q%C%1!<%8$,3HD%$9$kI=AH!J(B|tabular|$B4D6-$H(B|array|$B4D6-!K!"(B +$B$*$h$S(B|\parbox|$BL?Na$H(B|minipage|$B4D6-$N!VAHJ}8~%*%W%7%g%s!W(B +(|<t>|, |<y>|, |<z>|)$B$r;HMQ$7$?>l9g$N!"7S@~$d%Y!<%9%i%$%s$NB7$(J}$N(B +$B;EMM$r?7$?$K:vDj$7$^$7$?!#(B + +\medskip + \begin{tabular}{lcccc} + \toprule + $B"-Cf?H!@<~0O"*(B & $B2#(B & $B=D(B & $B=D?t<0(B \\ + \midrule + $B2#(B & A & B & B \\ + $B=D(B & B & A & D \\ + $B=D?t<0(B & B & D & A \\ + \bottomrule + \end{tabular} +\bigskip + +A, B, D$B$O$=$l$>$l0J2<$N$H$*$j$G$9!J$J$*!"$3$NI=5-$O(B +Lua\TeX-ja$B%Q%C%1!<%8$N%I%-%e%a%s%H$G$NI=5-$H0lCW$5$;$F$"$j$^$9!K!#(B + +\begin{itemize} + \item[A] $B<~0O$NAHJ}8~$HCf?H$NAHJ}8~$,F1$8>l9g(B + $B!J!a2#AH$G$N(B|<y>|, |<z>|$B!"=DAH$G$N(B|<t>|$B!K(B + \begin{itemize}\itemindent-18pt + \item \texttt{[t]}$B;XDj$N$H$-!'(B + $BCf?H$N@hF,9T$N%Y!<%9%i%$%s$,<~0O$N%Y!<%9%i%$%s$H0lCW$9$k!#(B + $BI=AH$G@hF,9T$N>e$K7S@~$,$"$C$?>l9g$O!"$=$l$,OBJ8%Y!<%9%i%$%s$N0LCV$H$J$k!#(B + \item \texttt{[c]}$B;XDj$N$H$-!'(B + $BCf?H$N>e2<$NCf?4$,<~0O$N?t<0$N<4$rDL$k!#(B + \item \texttt{[b]}$B;XDj$N$H$-!'(B + $BCf?H$N:G=*9T$N%Y!<%9%i%$%s$,<~0O$N%Y!<%9%i%$%s$H0lCW$9$k!#(B + $BI=AH$G:G=*9T$N2<$K7S@~$,$"$C$?>l9g$O!"$=$l$,OBJ8%Y!<%9%i%$%s$N0LCV$H$J$k!#(B + \end{itemize} + \item[B] $B<~0O$NAHJ}8~$HCf?H$NAHJ}8~$,(B90$BEY$:$l$F$$$k>l9g(B + $B!J!a2#AH$G$N(B|<t>|$B!"=DAH$G$N(B|<y>|$B!K(B + \begin{itemize}\itemindent-18pt + \item \texttt{[t]}$B;XDj$N$H$-!'(B + $BI=AH$K$*$$$F$O!">eC<$,<~0O$NOBJ8%Y!<%9%i%$%s$H0lCW$9$k!#(B + |\parbox|$B$d(B|minipage|$B4D6-$K$*$$$F$O!">eC<$,<~0O$NOBJ8J8;z$N>eC<$H0lCW$9$k!#(B + \item \texttt{[c]}$B;XDj$N$H$-!'(B + $BCf?H$N>e2<$NCf?4$,<~0O$N?t<0$N<4$rDL$k!#(B + \item \texttt{[b]}$B;XDj$N$H$-!'(B + $BI=AH$K$*$$$F$O!"2<C<$,<~0O$NOBJ8%Y!<%9%i%$%s$H0lCW$9$k!#(B + |\parbox|$B$d(B|minipage|$B4D6-$K$*$$$F$O!"2<C<$,<~0O$NOBJ8J8;z$N2<C<$H0lCW$9$k!#(B + \end{itemize} + \item[D] $BDL>o$N=DAH$H=D?t<0%G%#%l%/%7%g%s$,Mm$s$@>l9g(B + $B!J!a=DAH$G$N(B|<z>|$B!K(B \\ + |\parbox|$B$d(B|minipage|$B4D6-$K$*$$$F$O!">e$N(BB$B$N>l9g$HF1$8!#(B + $BI=AH$K$*$$$F$O!"(B + \begin{itemize}\itemindent-18pt + \item \texttt{[t]}$B;XDj$N$H$-!'(B + $BCf?H$N@hF,9T$N2$J8%Y!<%9%i%$%s$,<~0O$N2$J8%Y!<%9%i%$%s$H0lCW$9$k!#(B + \item \texttt{[c]}$B;XDj$N$H$-!'(B + $BCf?H$N>e2<$NCf?4$,<~0O$N?t<0$N<4$rDL$k!#(B + \item \texttt{[b]}$B;XDj$N$H$-!'(B + $BCf?H$N:G=*9T$N2$J8%Y!<%9%i%$%s$,<~0O$N2$J8%Y!<%9%i%$%s$H0lCW$9$k!#(B + \end{itemize} +\end{itemize} + + +\section{\file{ascmac}$B$N%j%?!<%s5-9fL?Na$N>WFMBP:v(B} +\file{ascmac}$B%Q%C%1!<%8$,Ds6!$9$k(B|\Return|$B$H$$$&L?Na$,!"$[$+$N(B +$B%Q%C%1!<%8$H>WFM$9$k$3$H$,$"$j$^$7$?!JNc!'(B\file{algorithm2e}$B%Q%C%1!<%8!K!#(B +$B=>Mh$N(B\file{ascmac}$B%Q%C%1!<%8$G$O!"4{$K(B|\Return|$B$H$$$&L?Na$,Dj5A$5$l$F(B +$B$$$F$b4X78$J$/>e=q$-$7$F$$$^$7$?$,!"?7$7$$HG$G$O(B|\Return|$B$,Dj5A:Q$_$+(B +$B$I$&$+%A%'%C%/$9$k$h$&$K$7$^$7$?!#$=$7$F!"(B +$B!VDj5A:Q$_$G$+$D(B\file{ascmac}$B%Q%C%1!<%8$NDj5A$HHs8_49$J>l9g!W(B +$B$K%(%i!<$r=P$7$^$9!#(B + + +\section{$B6XB'%Z%J%k%F%#$N=$@5(B} +$B@N$N%"%9%-!<F|K\8l(B\TeX{}$B$N:"$+$i%Z%J%k%F%#@_Dj$,8m$C$F$$$?J8;z!J(B|%&$B!s!u(B|$B!K$r(B +$B=$@5$7$^$7$?!#(B +u\pLaTeX{}$B$G$O$5$i$K!"Cf9q8l$d4Z9q8l$G!R!&!S$N;z7A$H$7$F(B\texttt{U+30FB}$B$G$J$/(B +\texttt{U+00B7}$B$,;H$o$l$k$3$H$+$i!"?7$?$K(B|\prebreakpenalty|$B$r@_Dj$7$^$7$?(B +\footnote{u\pLaTeX{}$B$N>l9g$O=>Mh$+$i!"(B\texttt{U+00A0}--\texttt{U+00FF}$B$NHO0O(B +$B$K$"$kJ8;z$K$D$$$F!V$3$l$,LsJ*$G$"$C$F!"$+$D(BJIS X 0213$B$KDj5A$5$l$F$$$k>l9g!W$O(B +$B6XB'%Z%J%k%F%#$r@_Dj$7$F$$$^$7$?!#(B\texttt{U+00B7}$B$b$3$l$K3:Ev$9$k$N$G!"(B +$BC1$KO3$l$F$$$?2DG=@-$,$"$j$^$9!#0lJ}$G!"$3$NHO0O$NJ8;z$O(B8-bit Latin$B$H$b=EJ#(B +$B$9$k$N$G(B\textbf{$B!VOBJ8J8;z$NA08e$K!JH>3Q6uGr$r64$^$:!KO"B3$9$k(BT1$B%(%s%3!<%I$N(B +$BJ8;z!W$J$I$,M=4|$;$:6XB'BP>]$K$J$k2DG=@-$,$"$k$3$H$KCm0U$,I,MW(B}$B$G$9!#(B}$B!#(B + + +\section{$B$=$NB>$N%P%0=$@5(B} +$B5lHG$G:.F~$7$?%P%0$N=$@5!'(B +\begin{itemize} +\item $B9TF,6XB'J8;z$ND>A0$G(B|\linebreak|$B$K$h$k6/@)2~9T$,8z$+$J$$LdBj$K(B + $BBP=h$7$?(B2017/05/05$BHG$G!":#EY$O5U$K(B|\nolinebreak|$B$rA^F~$7$?$=$N2U=j$G(B + |\(x)kanjiskip|$B$,F~$i$J$/$J$C$?LdBj$KBP=h!#(B +\end{itemize} +$B$=$NB>$N(B\pLaTeXe{}$B%+!<%M%k$N=$@5E@!'(B +\begin{itemize} +\item |\adjustbaseline|$B$NA43QJ8;z4p=`$r!"A43Q6uGrJ8;z$+$i!V4A!W$H$$$&(B + $BJ8;z$KJQ99!#(B +\end{itemize} + + +\section{$B3+H/HG$N%F%9%H$N$*4j$$(B} +$B:#8e(B\pLaTeX{}$B$KF3F~$9$k$+$b$7$l$J$$=$@5%Q%C%A$d;EMMJQ99$N%F%9%H$K$46(NO$/$@(B +$B$5$$!#(B\TeX{}$B%U%!%$%k$NKAF,!J(B|\documentclass|$B$h$jA0!K$G(B +\begin{verbatim} + \RequirePackage{exppl2e} +\end{verbatim} +$B$H=q$/$3$H$G!"3+H/HG$r%F%9%H$9$k$3$H$,$G$-$^$9!#(B +$B8=:_$O0J2<$N=$@5$,4^$^$l!"FC$K:G8e$N(B3$B$D$O2$J8$N(B\LaTeX{}$B$H$N(B +$BAHHG7k2L$N8_49@-8~>e$rL\;X$7$F$$$^$9!#(B +\begin{itemize} +\item $B%"%/%;%s%H9g@.J8;z$NA08e$K(B|\xkanjiskip|$B$,F~$i$J$$LdBj$N=$@5(B +\item |\<|$B$H$$$&L?Na$rCJMnF,$G$b8z$/$h$&$K$9$k=$@5(B + \footnote{2010$BG/$N(B\pTeX{}$B$N=$@5$K$h$j(B\cs{inhibitglue}$B$,?bD>%b!<%I(B + $B$G8z$+$J$/$J$C$?$3$H$X$NBP1~!#(B} +\item tabbing$B4D6-$N9T$N:G=i$N9`L\$@$13g8LN`$N(BJFM$B%0%k!<$,F~$k8=>]$X$NBP=h(B +\item |\verb|$B$NCf?H$,H>3Q6uGr$G;O$^$k>l9g$K$=$l$,>CLG$9$kLdBj$N=$@5(B +\item |\ref|$B$N7k2L$,(B``A''$B$N$h$&$J1QBgJ8;z$N>l9g$N%9%Z!<%9%U%!%/%?!<(B + \footnote{$BJ8Kv6uGr$+C18l4V6uGr$+$r7h$a$k0x;R!#(B}$B$NJd@5(B +\item |\emph{f\textrm{a}}|$B$N$h$&$J>l9g$N(B|\text..|$BL?Na$N:8B&$G%$%?%j%C%/Jd@5(B + $B$,8z$+$J$$LdBj$N=$@5(B +\end{itemize} +$B%P%0Js9p$d$40U8+$r4?7^$7$^$9!#(B +\TeX\ Forum$B$d(BGitHub$B$N(BIssue$B%7%9%F%`$,MxMQ$G$-$^$9!#(B +\begin{itemize} +\item \texttt{https://github.com/texjporg/platex} +\item \texttt{https://github.com/texjporg/uplatex} +\end{itemize} + +\end{document} diff --git a/Master/texmf-dist/source/platex/base/plvers.dtx b/Master/texmf-dist/source/platex/base/plvers.dtx index 2f494586ec1..6143a5ee9a6 100644 --- a/Master/texmf-dist/source/platex/base/plvers.dtx +++ b/Master/texmf-dist/source/platex/base/plvers.dtx @@ -130,7 +130,7 @@ {2017/07/29} %</plcore|platexrelease> %<*plcore> -\def\ppatch@level{0} +\def\ppatch@level{1} %</plcore> % \end{macrocode} % \end{macro} diff --git a/Master/texmf-dist/tex/platex/base/exppl2e.sty b/Master/texmf-dist/tex/platex/base/exppl2e.sty index d3e4a30d35d..05887655212 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/07/29 v1.0n Experimental pLaTeX2e features] + [2017/08/26 v1.0p Experimental pLaTeX2e features] \PackageWarningNoLine{exppl2e}{% This is the unstable, experimental part of pLaTeX2e.\MessageBreak This package may contain:\MessageBreak @@ -131,7 +131,7 @@ % \begin{macrocode} %<platexrelease>\plIncludeInRelease{????/??/??}{\pltx@isletter} %<platexrelease> {Support PD1 encoding}% -%<*pldefs|platexrelease> +%<*plcore|platexrelease> \def\pltx@mark{\pltx@mark@} \let\pltx@scanstop\relax \long\def\pltx@cond#1\fi{% @@ -157,7 +157,7 @@ \pltx@cond{\ifnum0\ifcat A\noexpand#21\fi\ifcat=\noexpand#21\fi>\z@}\fi {\@firstoftwo}{\pltx@composite@chkenc}% }{\pltx@composite@chkenc}} -%</pldefs|platexrelease> +%</plcore|platexrelease> %<platexrelease>\plEndIncludeInRelease %<platexrelease>\plIncludeInRelease{2016/06/10}{\pltx@isletter} %<platexrelease> {Added \pltx@isletter}% @@ -188,7 +188,7 @@ % \begin{macrocode} %<platexrelease>\plIncludeInRelease{????/??/??}{\@text@composite@x} %<platexrelease> {Fix for non-zero baselineshift}% -%<*pldefs|platexrelease> +%<*plcore|platexrelease> \def\@text@composite@x#1#2{% \ifx#1\relax #2% @@ -242,7 +242,7 @@ \endgroup}% \fi } -%</pldefs|platexrelease> +%</plcore|platexrelease> %<platexrelease>\plEndIncludeInRelease % \end{macrocode} % \end{macro} @@ -347,12 +347,63 @@ % $B9TF,6XB'J8;z$NA0$G$N(B|\linebreak|$B$N5sF0$N=$@5$O!"(B % p\LaTeXe{}$B%+!<%M%k(B(2017/05/05)$B$KF3F~$7$?$?$a:o=|!#(B % +% $B>e5-$N=$@5$K$h$j(B|\nolinebreak|$B$G(B|\(x)kanjiskip|$B$,(B +% $BF~$i$J$/$J$C$F$$$?%P%0$N=$@5$O!"(B +% p\LaTeXe{}$B%+!<%M%k(B(2017/07/29+1)$B$KF3F~$7$?$?$a:o=|!#(B +% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % % \section{$BAj8_;2>H(B} % % p\LaTeXe{}$B%+!<%M%k(B(2017/04/08)$B$KF3F~$7$?$?$a:o=|!#(B % +% $B$5$i$K!"Nc$($P(B``see Appendix A.''$B$N$h$&$J5-=R$,J8Kv$K$"$j!"$+$D(B +% ``A''$B$rAj8_;2>H$G<hF@$7$?>l9g$N%9%Z!<%9%U%!%/%?!<$rJd@5$9$k$?$a!"(B +% |\spacefactor\@m{}|$B$K=$@5$7$^$7$?!#$3$l$G!"(B``A.''$B$N8e$N%9%Z!<%9$,(B +% $BJ8Kv$H$7$F07$o$l$^$9!#(B +% $B!J;29M!'(B\LaTeXe{}$B%^%/%m(B\&$B%/%i%9(B $B%W%m%0%i%_%s%0<BA)2r@b!K(B +% \changes{v????}{????/??/??}{$B%9%Z!<%9%U%!%/%?!<$rJd@5(B} +% \begin{macrocode} +%<platexrelease>\plIncludeInRelease{????/??/??}{\@setref} +%<platexrelease> {Spacing after \ref in moving arguments}% +%<*plcore|platexrelease> +\def\@setref#1#2#3{% + \ifx#1\relax + \protect\G@refundefinedtrue + \nfss@text{\reset@font\bfseries ??}% + \@latex@warning{Reference `#3' on page \thepage \space + undefined}% + \else + \expandafter#2#1\spacefactor\@m{}% change \null to \spacefactor\@m{} + \fi} +%</plcore|platexrelease> +%<platexrelease>\plEndIncludeInRelease +%<platexrelease>\plIncludeInRelease{2017/04/08}{\@setref} +%<platexrelease> {Spacing after \ref in moving arguments}% +%<platexrelease>\def\@setref#1#2#3{% +%<platexrelease> \ifx#1\relax +%<platexrelease> \protect\G@refundefinedtrue +%<platexrelease> \nfss@text{\reset@font\bfseries ??}% +%<platexrelease> \@latex@warning{Reference `#3' on page \thepage \space +%<platexrelease> undefined}% +%<platexrelease> \else +%<platexrelease> \expandafter#2#1\relax{}% change \null to \relax{} +%<platexrelease> \fi} +%<platexrelease>\plEndIncludeInRelease +%<platexrelease>\plIncludeInRelease{0000/00/00}{\@setref} +%<platexrelease> {Spacing after \ref in moving arguments}% +%<platexrelease>\def\@setref#1#2#3{% +%<platexrelease> \ifx#1\relax +%<platexrelease> \protect\G@refundefinedtrue +%<platexrelease> \nfss@text{\reset@font\bfseries ??}% +%<platexrelease> \@latex@warning{Reference `#3' on page \thepage \space +%<platexrelease> undefined}% +%<platexrelease> \else +%<platexrelease> \expandafter#2#1\relax% change \null to \relax +%<platexrelease> \fi} +%<platexrelease>\plEndIncludeInRelease +% \end{macrocode} +% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % % \section{$B5SCm$H%\%H%`%U%m!<%H$N=g=x$*$h$S?bD>0LCV(B} @@ -373,10 +424,231 @@ % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % +% \section{verb$B$NKAF,$N%9%Z!<%9(B} +% +% \begin{macro}{\verb} +% \changes{v1.1b}{1995/04/05}{$B8_49%b!<%I$N$H$-$O!"(Bpl209.def$B$NDj5A$r;H$&(B} +% \changes{v1.1g}{1997/01/16} +% {\cs{verb}$B%3%^%s%I$r(B\LaTeX\ \texttt{!<1996/06/01!>}$B$K9g$o$;$F=$@5(B} +% \LaTeX{}$B$N(B|\verb|$B%3%^%s%I$G$O!"?t<0%b!<%I$G$J$$$H$-$O!"(B +% |\leavevmode|$B$G?eJ?%b!<%I$KF~$C$?$"$H!"(B|\null|$B$r=PNO$7$F$$$^$9!#(B +% $B%^%/%m(B|\null|$B$O(B|\hbox{}|$B$H$7$FDj5A$5$l$F$$$^$9$N$G!"(B +% $B$3$3$K$OOB2$J84V%9%Z!<%9!J(B|\xkanjiskip|$B!K$,F~$j$^$;$s!#(B +% +% $B$7$+$7!"C1$K(B|\null|$B$r=|$$$F$7$^$&$H!":#EY$O(B|\verb+ abc+|$B$N$h$&$K(B +% |\verb|$B$NKAF,$KH>3Q6uGr$,$"$k>l9g$K$3$l$,>C$($F$7$^$$$^$9(B(TeX.SX 170245)$B!#(B +% $B$=$3$G!"(Bp\LaTeX{}$B$G$O(B|\null|$B$NBe$o$j$K(B +% \begin{enumerate} +% \item $BOB2$J84V%9%Z!<%9$NA^F~=hM}$OF)2a$9$k(B +% \item $B9TJ,3d;~$K>C$($k(B(discardable)$B%N!<%I$G$O$J$$(B +% \end{enumerate} +% $B$NN>>r7o$rK~$?$9%N!<%I$rA^F~$7$^$9!#$3$3$G$O(B|\vadjust{}|$B$H$7$^$7$?!#(B +% +% $B$3$N%^%/%m$O!"(B\file{ltmiscen.dtx}$B$GDj5A$5$l$F$$$^$9!#(B +% \changes{v????}{????/??/??}{\cs{verb}$B$NKAF,$NH>3Q6uGr$rJ];}(B} +% \begin{macrocode} +%<platexrelease>\plIncludeInRelease{????/??/??}{\verb} +%<platexrelease> {Preserve beginning space characters}% +%<*plcore|platexrelease> +\if@compatibility\else +\def\verb{\relax\ifmmode\hbox\else\leavevmode\vadjust{}\fi + \bgroup + \verb@eol@error \let\do\@makeother \dospecials + \verbatim@font\@noligs +% \end{macrocode} +% \LaTeXe\ 2017-04-15$B$KDI?o$7$F!"(B|\verb|$B$NESCf$G%O%$%U%M!<%7%g%s$,5/$-$J$$(B +% $B$h$&$K(B|\language|$B$r@_Dj$7$^$9!J;29M!'(Blatex2e svn r1405$B!K!#(B +% \changes{v1.2m}{2017/03/19}{\cs{verb}$B$NESCf$G%O%$%U%M!<%7%g%s$,5/$-$J$$(B +% $B$h$&$K(B\cs{language}$B$r@_Dj(B(sync with ltmiscen.dtx 2017/03/09 v1.1m)} +% \begin{macrocode} + \language\l@nohyphenation + \@ifstar\@sverb\@verb} +\fi +%</plcore|platexrelease> +%<platexrelease>\plEndIncludeInRelease +%<platexrelease>\plIncludeInRelease{2017/04/08}{\verb} +%<platexrelease> {Disable hyphenation in verb}% +%<platexrelease>\if@compatibility\else +%<platexrelease>\def\verb{\relax\ifmmode\hbox\else\leavevmode\fi +%<platexrelease> \bgroup +%<platexrelease> \verb@eol@error \let\do\@makeother \dospecials +%<platexrelease> \verbatim@font\@noligs +%<platexrelease> \language\l@nohyphenation +%<platexrelease> \@ifstar\@sverb\@verb} +%<platexrelease>\fi +%<platexrelease>\plEndIncludeInRelease +%<platexrelease>\plIncludeInRelease{0000/00/00}{\verb} +%<platexrelease> {Disable hyphenation in verb}% +%<platexrelease>\if@compatibility\else +%<platexrelease>\def\verb{\relax\ifmmode\hbox\else\leavevmode\fi +%<platexrelease> \bgroup +%<platexrelease> \verb@eol@error \let\do\@makeother \dospecials +%<platexrelease> \verbatim@font\@noligs +%<platexrelease> \@ifstar\@sverb\@verb} +%<platexrelease>\fi +%<platexrelease>\plEndIncludeInRelease +% \end{macrocode} +% \end{macro} +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% % \section{tabular$B4D6-$N%;%kFb$N(BJFM$B%0%k!=(B} % % p\LaTeXe{}$B%+!<%M%k(B(2017/07/29)$B$KF3F~$7$?$?$a:o=|!#(B % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % +% \section{tabbing$B4D6-$N9TKAF,$N(BJFM$B%0%k!=(B} +% +% \begin{macro}{\@startline} +% tabbing$B4D6-$N9T$G!"Cf?H$,;O$a3g8LN`$J$I$G;O$^$k>l9g!"(B +% $B:G=i$N9`L\$@$1(BJFM$B%0%k!<$,>C$($J$$8=>]$KBP=h$7$^$9!#(B +% \changes{v????}{????/??/??}{tabbing$B4D6-$N9TKAF,$N(BJFM$B%0%k!=$r:o=|(B} +% \begin{macrocode} +%<platexrelease>\plIncludeInRelease{????/??/??}{\@startline} +%<platexrelease> {Inhibit JFM glue at the beginning}% +%<*plcore|platexrelease> +\gdef\@startline{% + \ifnum \@nxttabmar >\@hightab + \@badtab + \global\@nxttabmar \@hightab + \fi + \global\@curtabmar \@nxttabmar + \global\@curtab \@curtabmar + \global\setbox\@curline \hbox {}% + \@startfield + \strut\inhibitglue} +%</plcore|platexrelease> +%<platexrelease>\plEndIncludeInRelease +%<platexrelease>\plIncludeInRelease{0000/00/00}{\@startline} +%<platexrelease> {Inhibit JFM glue at the beginning}% +%<platexrelease>\gdef\@startline{% +%<platexrelease> \ifnum \@nxttabmar >\@hightab +%<platexrelease> \@badtab +%<platexrelease> \global\@nxttabmar \@hightab +%<platexrelease> \fi +%<platexrelease> \global\@curtabmar \@nxttabmar +%<platexrelease> \global\@curtab \@curtabmar +%<platexrelease> \global\setbox\@curline \hbox {}% +%<platexrelease> \@startfield +%<platexrelease> \strut} +%<platexrelease>\plEndIncludeInRelease +% \end{macrocode} +% \end{macro} +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +% \section{\cs{inhibitglue}$B$N4JN,7A(B} +% +% \begin{macro}{\<} +% 2014$BG/$N(Bp\TeX{}$B$N(B|\inhibitglue|$B$N%P%0=$@5$KH<$$!"(B +% |\inhibitglue|$B$,?bD>%b!<%I$G$O8z$+$J$/$J$j$^$7$?!#(B +% \LaTeX{}$B$G$O?bD>%b!<%I$H?eJ?%b!<%I$N6hJL$,1#$5$l$F$$$^$9$N$G!"(B +% p\LaTeX{}$B$NDI2CL?Na$G$"$k(B|\<|$B$OCJMnF,$G$b8z$/$h$&$K=$@5$7$^$9!#(B +% +% |\DeclareRobustCommand|$B$r;H$&$H(B|\protect|$B$N1F6A$GA0J}$NJ8;z$KBP$9$k(B +% |\inhibitglue|$B$,8z$+$J$/$J$k$N$G!"(Be-\TeX{}$B$N(B|\protected|$B$,I,MW$G$9!#(B +% \changes{v????}{????/??/??}{\cs{<}$B$,CJMnF,$G$b8z$/$h$&$K$7$?(B} +% \begin{macrocode} +%<platexrelease>\plIncludeInRelease{????/??/??}{\<} +%<platexrelease> {\inhibitglue in vertical mode}% +%<*pldefs|platexrelease> +\ifx\protected\@undefined +\def\<{\inhibitglue} +\else +\protected\def\<{\ifvmode\leavevmode\fi\inhibitglue} +\fi +%</pldefs|platexrelease> +%<platexrelease>\plEndIncludeInRelease +%<platexrelease>\plIncludeInRelease{0000/00/00}{\<} +%<platexrelease> {\inhibitglue in vertical mode}% +%<platexrelease>\def\<{\inhibitglue} +%<platexrelease>\plEndIncludeInRelease +% \end{macrocode} +% \end{macro} +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +% \section{$B%$%?%j%C%/Jd@5$H(B\cs{xkanjiskip}} +% +% \begin{macro}{\check@nocorr@} +% $B!V(B\verb|$B$"(B\texttt{abc}$B$$(B|$B!W$H$7$?$H$-!"=qBN$NJQ99$r;XDj$5$l$?2$J8$N:8B&$K(B +% $BOB2$J84V%9%Z!<%9$,F~$i$J$$$N$r=$@5$7$^$9!#(B +% \changes{v1.3i}{2000/07/13}{\cs{text..}$B%3%^%s%I$N:8B&$K(B\cs{xkanjiskip}$B$,(B +% $BF~$i$J$$$N$r=$@5!J$"$j$,$H$&!"25It!wElBg$5$s!K(B} +% +% $B%3%_%e%K%F%#HG$N=$@5!'(Bp\TeX{}$B$N%P!<%8%g%s(Bp3.1.11$B0JA0$O!"%$%?%j%C%/Jd@5(B +% $B!J0J2<(B|\/|$B$H5-$9!K$H(B|\xkanjiskip|$B$NA^F~$,>WFM(B\footnote{$BOBJ8$N%$%?%j%C%/(B +% $BJd@5MQ(Bkern$B$,!"DL>o$N(Bexplicit$B$J!J(B\cs{kern}$B$K$h$k!K(Bkern$B$HF1$807$$$r<u$1$F(B +% $B$$$?$?$a!#(B}$B$7(B +% \begin{enumerate} +% \item $B!V2$J8J8;z(B $B"*(B |\/|$B!W$N>l9g$K$O(B|\/|$B$rL5;k$9$k(B +% $B!J$D$^$j8e$K(B|\xkanjiskip|$BA^F~2DG=!K(B +% \item $B!VOBJ8J8;z(B $B"*(B |\/|$B!W$N>l9g$K$O$3$N8e$K(B|\xkanjiskip|$B$OA^F~$G$-$J$$(B +% \end{enumerate} +% $B$H$$$&5sF0$K$J$C$F$$$^$7$?!#(Bp3.2$B!J(B2010$BG/!K$N=$@5$G(B +% \begin{itemize} +% \item |\xkanjiskip|$BA^F~;~$K$O$$$+$J$k>l9g$b(B|\/|$B$rL5;k$9$k(B +% \end{itemize} +% $B$H$$$&5sF0$KJQ99$5$l$^$7$?!#(Bp\LaTeX{}$B%+!<%M%k$N(B|\check@nocorr@|$B$N=$@5$O!"(B +% p3.1.11$B0JA0$N(B2.$B$X$NBP=h$G$7$?$,!"$3$l$O!V(B|\text...{}|$B$N:8$X$N(B|\/|$BA^F~!W$r(B +% $BL58z2=$7$F$$$k$N$G!"(B|\textit{f\textup{a}}|$B$GK\MhF~$k$Y$-%$%?%j%C%/Jd@5$,(B +% $BF~$j$^$;$s$G$7$?!#(Bp3.2$B0J9_$G$O(Bp\TeX{}$B$N(B|\xkanjiskip|$BBP:v$,ITMW$K$J$C$F(B +% $B$$$^$9$N$G!"%3%_%e%K%F%#HG$G$O:o=|$7$^$7$?!#(B +% \changes{v????}{????/??/??}{2010$BG/$N(Bp\TeX{}$BK\BN$N=$@5$K$h$j!"(Bv1.3i$B$GF~$l$?(B +% $BBP=h$,ITMW$K$J$C$F$$$?$N$G:o=|(B} +% \begin{macrocode} +%<platexrelease>\plIncludeInRelease{????/??/??}{\check@nocorr@} +%<platexrelease> {Italic correction before \textt...}% +%<*pldefs|platexrelease> +\def \check@nocorr@ #1#2\nocorr#3\@nil {% + \let \check@icl \maybe@ic + \def \check@icr {\ifvmode \else \aftergroup \maybe@ic \fi}% + \def \reserved@a {\nocorr}% + \def \reserved@b {#1}% + \def \reserved@c {#3}% + \ifx \reserved@a \reserved@b + \ifx \reserved@c \@empty + \let \check@icl \@empty + \else + \let \check@icl \@empty + \let \check@icr \@empty + \fi + \else + \ifx \reserved@c \@empty + \else + \let \check@icr \@empty + \fi + \fi +} +%</pldefs|platexrelease> +%<platexrelease>\plEndIncludeInRelease +%<platexrelease>\plIncludeInRelease{0000/00/00}{\check@nocorr@} +%<platexrelease> {Italic correction before \textt...}% +%<platexrelease>\def \check@nocorr@ #1#2\nocorr#3\@nil {% +%<platexrelease> \let \check@icl \relax% \maybe@ic $B$+$iJQ99(B +%<platexrelease> \def \check@icr {\ifvmode \else \aftergroup \maybe@ic \fi}% +%<platexrelease> \def \reserved@a {\nocorr}% +%<platexrelease> \def \reserved@b {#1}% +%<platexrelease> \def \reserved@c {#3}% +%<platexrelease> \ifx \reserved@a \reserved@b +%<platexrelease> \ifx \reserved@c \@empty +%<platexrelease> \let \check@icl \@empty +%<platexrelease> \else +%<platexrelease> \let \check@icl \@empty +%<platexrelease> \let \check@icr \@empty +%<platexrelease> \fi +%<platexrelease> \else +%<platexrelease> \ifx \reserved@c \@empty +%<platexrelease> \else +%<platexrelease> \let \check@icr \@empty +%<platexrelease> \fi +%<platexrelease> \fi +%<platexrelease>} +%<platexrelease>\plEndIncludeInRelease +% \end{macrocode} +% \end{macro} +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% \endinput diff --git a/Master/texmf-dist/tex/platex/base/kinsoku.tex b/Master/texmf-dist/tex/platex/base/kinsoku.tex index 6d03b0d7339..5d0767aa1f1 100644 --- a/Master/texmf-dist/tex/platex/base/kinsoku.tex +++ b/Master/texmf-dist/tex/platex/base/kinsoku.tex @@ -17,8 +17,8 @@ \prebreakpenalty`"=10000 \postbreakpenalty`\#=500 \postbreakpenalty`\$=500 -\postbreakpenalty`\%=500 -\postbreakpenalty`\&=500 +\prebreakpenalty`\%=500 +\prebreakpenalty`\&=500 \postbreakpenalty`\`=10000 \prebreakpenalty`'=10000 \prebreakpenalty`)=10000 @@ -80,8 +80,8 @@ \prebreakpenalty`$B!a(B=200 \postbreakpenalty`$B!t(B=200 \postbreakpenalty`$B!p(B=200 -\postbreakpenalty`$B!s(B=200 -\postbreakpenalty`$B!u(B=200 +\prebreakpenalty`$B!s(B=200 +\prebreakpenalty`$B!u(B=200 \prebreakpenalty`$B$!(B=150 \prebreakpenalty`$B$#(B=150 \prebreakpenalty`$B$%(B=150 diff --git a/Master/texmf-dist/tex/platex/base/platexrelease.sty b/Master/texmf-dist/tex/platex/base/platexrelease.sty index 4d61e65b9ed..a7bfdde6ed3 100644 --- a/Master/texmf-dist/tex/platex/base/platexrelease.sty +++ b/Master/texmf-dist/tex/platex/base/platexrelease.sty @@ -214,6 +214,48 @@ of this package available from CTAN} \@height.7\baselineskip \@depth.3\baselineskip}% \let\size@update\relax}} \plEndIncludeInRelease +\plIncludeInRelease{2017/07/29}{\adjustbaseline} + {Change zenkaku reference}% +\def\adjustbaseline{% + \setbox\adjust@box\hbox{\char\jis"3441}%" + \cht\ht\adjust@box + \cdp\dp\adjust@box + \cwd\wd\adjust@box + \cvs\normalbaselineskip + \chs\cwd + \cHT\cht \advance\cHT\cdp + \iftdir + \setbox\adjust@box\hbox{\tbaselineshift\z@ M}% + \adjust@dimen\ht\adjust@box + \advance\adjust@dimen\dp\adjust@box + \advance\adjust@dimen-\cHT + \divide\adjust@dimen\tw@ + \advance\adjust@dimen\cdp + \advance\adjust@dimen-\dp\adjust@box + \tbaselineshift\adjust@dimen + \fi} +\plEndIncludeInRelease +\plIncludeInRelease{0000/00/00}{\adjustbaseline} + {Change zenkaku reference}% +\def\adjustbaseline{% + \setbox\adjust@box\hbox{\char\euc"A1A1}%" + \cht\ht\adjust@box + \cdp\dp\adjust@box + \cwd\wd\adjust@box + \cvs\normalbaselineskip + \chs\cwd + \cHT\cht \advance\cHT\cdp + \iftdir + \setbox\adjust@box\hbox{\tbaselineshift\z@ M}% + \adjust@dimen\ht\adjust@box + \advance\adjust@dimen\dp\adjust@box + \advance\adjust@dimen-\cHT + \divide\adjust@dimen\tw@ + \advance\adjust@dimen\cdp + \advance\adjust@dimen-\dp\adjust@box + \tbaselineshift\adjust@dimen + \fi} +\plEndIncludeInRelease \plIncludeInRelease{2017/04/08}{\textunderscore} {Baseline shift for \textunderscore}% \DeclareTextCommandDefault{\textunderscore}{% @@ -393,6 +435,22 @@ of this package available from CTAN} \let\eminnershape\@undefined \plEndIncludeInRelease %% File: plcore.dtx +\plIncludeInRelease{2017/07/29}{\@no@lnbk} + {Break before prebreakpenalty}% +\def\@no@lnbk #1[#2]{% + \ifvmode + \@nolnerr + \else + \@tempskipa\lastskip + \unskip + \penalty #1\@getpen{#2}% + \penalty\z@\relax %% added (2017/08/25) + \ifdim\@tempskipa>\z@ + \hskip\@tempskipa + \ignorespaces + \fi + \fi} +\plEndIncludeInRelease \plIncludeInRelease{2017/05/05}{\@no@lnbk} {Break before prebreakpenalty}% \def\@no@lnbk #1[#2]{% diff --git a/Master/texmf-dist/tex/platex/base/plcore.ltx b/Master/texmf-dist/tex/platex/base/plcore.ltx index 1c31dd0bf52..ec3728105f6 100644 --- a/Master/texmf-dist/tex/platex/base/plcore.ltx +++ b/Master/texmf-dist/tex/platex/base/plcore.ltx @@ -19,7 +19,7 @@ \def\pfmtname{pLaTeX2e} \def\pfmtversion {2017/07/29} -\def\ppatch@level{0} +\def\ppatch@level{1} \def\plIncludeInRelease#1{\kernel@ifnextchar[% {\@plIncludeInRelease{#1}} {\@plIncludeInRelease{#1}[#1]}} @@ -444,7 +444,7 @@ \newbox\adjust@box \newdimen\adjust@dimen \def\adjustbaseline{% - \setbox\adjust@box\hbox{\char\euc"A1A1}%" + \setbox\adjust@box\hbox{\char\jis"3441}%" \cht\ht\adjust@box \cdp\dp\adjust@box \cwd\wd\adjust@box @@ -640,6 +640,25 @@ \else\tbaselineshift\fi \else\ybaselineshift\fi \vbox{\hrule\@width.3em}} +\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#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}} \InputIfFileExists{pldefs.cfg} {\typeout{*************************************^^J% * Local config file pldefs.cfg used^^J% @@ -700,7 +719,7 @@ \@tempskipa\lastskip \unskip \penalty #1\@getpen{#2}% - \hskip\z@\relax %% added (2017/05/03) + \penalty\z@\relax %% added (2017/08/25) \ifdim\@tempskipa>\z@ \hskip\@tempskipa \ignorespaces diff --git a/Master/texmf-dist/tex/platex/base/pldefs.ltx b/Master/texmf-dist/tex/platex/base/pldefs.ltx index 6eca8060621..4558c474e0f 100644 --- a/Master/texmf-dist/tex/platex/base/pldefs.ltx +++ b/Master/texmf-dist/tex/platex/base/pldefs.ltx @@ -14,26 +14,7 @@ %% %% File: plfonts.dtx \ProvidesFile{pldefs.ltx} - [2016/06/26 v1.6e 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#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}} + [2017/08/05 v1.6h pLaTeX Kernel (Default settings)] \def \check@nocorr@ #1#2\nocorr#3\@nil {% \let \check@icl \relax% \maybe@ic $B$+$iJQ99(B \def \check@icr {\ifvmode \else \aftergroup \maybe@ic \fi}% diff --git a/Master/texmf-dist/tex/platex/base/ptrace.sty b/Master/texmf-dist/tex/platex/base/ptrace.sty index 18fca273f86..013b7af7976 100644 --- a/Master/texmf-dist/tex/platex/base/ptrace.sty +++ b/Master/texmf-dist/tex/platex/base/ptrace.sty @@ -15,7 +15,7 @@ %% File: plfonts.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesPackage{ptrace} - [2017/02/20 v1.6f Standard pLaTeX package (font tracing)] + [2017/08/05 v1.6h Standard pLaTeX package (font tracing)] \RequirePackageWithOptions{tracefnt} \DeclareRobustCommand\selectfont{% \let\tmp@error@fontshape\error@fontshape @@ -72,8 +72,6 @@ \set@fontsize\baselinestretch\f@size\f@baselineskip \fi \size@update} -\def\KanjiEncodingPair#1#2{\@namedef{t@enc@#1}{#2}\@namedef{y@enc@#2}{#1}} -\KanjiEncodingPair{JY1}{JT1} \plIncludeInRelease{2017/04/08}{\set@fontsize} {Construct \ystrutbox}% \def\set@fontsize#1#2#3{% @@ -144,8 +142,32 @@ \fi \let\size@update\relax}} \plEndIncludeInRelease -\newbox\adjust@box -\newdimen\adjust@dimen +\plIncludeInRelease{2017/07/29}{\adjustbaseline} + {Change zenkaku reference}% +\def\adjustbaseline{% + \setbox\adjust@box\hbox{\char\jis"3441}%" + \cht\ht\adjust@box + \cdp\dp\adjust@box + \cwd\wd\adjust@box + \cvs\normalbaselineskip + \chs\cwd + \cHT\cht \advance\cHT\cdp + \iftdir + \setbox\adjust@box\hbox{\tbaselineshift\z@ M}% + \adjust@dimen\ht\adjust@box + \advance\adjust@dimen\dp\adjust@box + \advance\adjust@dimen-\cHT + \divide\adjust@dimen\tw@ + \advance\adjust@dimen\cdp + \advance\adjust@dimen-\dp\adjust@box + \tbaselineshift\adjust@dimen + \ifnum \tracingfonts>\tw@ + \typeout{baselineshift:\the\tbaselineshift}% + \fi + \fi} +\plEndIncludeInRelease +\plIncludeInRelease{0000/00/00}{\adjustbaseline} + {Change zenkaku reference}% \def\adjustbaseline{% \setbox\adjust@box\hbox{\char\euc"A1A1}%" \cht\ht\adjust@box @@ -163,10 +185,11 @@ \advance\adjust@dimen\cdp \advance\adjust@dimen-\dp\adjust@box \tbaselineshift\adjust@dimen - \ifnum \tracingfonts>\tw@ - \typeout{baselineshift:\the\tbaselineshift} - \fi + \ifnum \tracingfonts>\tw@ + \typeout{baselineshift:\the\tbaselineshift} + \fi \fi} +\plEndIncludeInRelease \endinput %% %% End of file `ptrace.sty'. |