diff options
| -rw-r--r-- | Master/texmf-dist/doc/uplatex/base/README.md | 2 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/uplatex/base/upldoc.pdf | bin | 615472 -> 615446 bytes | |||
| -rw-r--r-- | Master/texmf-dist/source/uplatex/base/plcore.dtx | 115 | ||||
| -rw-r--r-- | Master/texmf-dist/source/uplatex/base/uplvers.dtx | 2 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/uplatex/base/uplcore.ltx | 27 |
5 files changed, 134 insertions, 12 deletions
diff --git a/Master/texmf-dist/doc/uplatex/base/README.md b/Master/texmf-dist/doc/uplatex/base/README.md index dad7a3709eb..475342a9086 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 -2017-05-05 +2017-07-29 Japanese TeX Development Community diff --git a/Master/texmf-dist/doc/uplatex/base/upldoc.pdf b/Master/texmf-dist/doc/uplatex/base/upldoc.pdf Binary files differindex d28a65d949f..b7cf0dbdce9 100644 --- a/Master/texmf-dist/doc/uplatex/base/upldoc.pdf +++ b/Master/texmf-dist/doc/uplatex/base/upldoc.pdf diff --git a/Master/texmf-dist/source/uplatex/base/plcore.dtx b/Master/texmf-dist/source/uplatex/base/plcore.dtx index 5f04e22a119..5cdc2337634 100644 --- a/Master/texmf-dist/source/uplatex/base/plcore.dtx +++ b/Master/texmf-dist/source/uplatex/base/plcore.dtx @@ -37,8 +37,9 @@ % $B$H$N4V$K(Bxkanjiskip$B$,F~$C$F$7$^$&LdBj$KBP1~!#(B % \cs{@outputbox}$B$N?<$5$,B>$N$b$N$N0LCV$K1F6A$rM?$($J$$(B % $B$h$&$K$9$k(B\texttt{\cs{vskip}~-\cs{dimen@}}$B$,=DAH%b!<%I$G$OL58z$K$J$C$F$$$?$N$G=$@5(B} -% \changes{v1.2c}{2016/02/28}{1.2b$B$HF1MM$N=$@5$r(B -% tabular$B4D6-!"(B\cs{parbox}$BL?Na!"(B\cs{underline}$BL?Na$K$b9T$C$?(B} +% \changes{v1.2c}{2016/02/28}{1.2b$B$HF1MM$N=$@5$r(Btabular$B4D6-$K$b9T$C$?(B} +% \changes{v1.2c}{2016/02/28}{1.2b$B$HF1MM$N=$@5$r(B\cs{parbox}$BL?Na$K$b9T$C$?(B} +% \changes{v1.2c}{2016/02/28}{1.2b$B$HF1MM$N=$@5$r(B\cs{underline}$BL?Na$K$b9T$C$?(B} % \changes{v1.2d}{2016/04/01}{multicol$B%Q%C%1!<%8$r;H$&$H%H%s%\$N2<C<$,=L$`LdBj$r=$@5(B} % \changes{v1.2e}{2016/05/20}{\file{fltrace}$B%Q%C%1!<%8$N(Bp\LaTeX{}$BHG(B % $B$H$7$F(B\file{pfltrace}$B%Q%C%1!<%8$r?7@_(B} @@ -66,13 +67,14 @@ % $B$h$&$K(B\cs{language}$B$r@_Dj(B(sync with ltmiscen.dtx 2017/03/09 v1.1m)} % \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} % \fi % % \iffalse %<*driver> \NeedsTeXFormat{pLaTeX2e} % \fi -\ProvidesFile{plcore.dtx}[2017/05/03 v1.2o pLaTeX core file] +\ProvidesFile{plcore.dtx}[2017/07/21 v1.2p pLaTeX core file] % \iffalse \documentclass{jltxdoc} \GetFileInfo{plcore.dtx} @@ -1474,15 +1476,108 @@ % \end{macro} % \end{macro} % -% \subsection{tabular$B4D6-$J$I(B} -% \changes{v1.2c}{2016/02/28}{1.2b$B$HF1MM$N=$@5$r(B -% tabular$B4D6-!"(B\cs{parbox}$BL?Na!"(B\cs{underline}$BL?Na$K$b9T$C$?(B} -% \LaTeXe{}$B$N%+!<%M%k$N%3!<%I$r$=$N$^$^;H$&$H!"(Bp\TeX{}$B$N(B|\xkanjiskip|$BM3Mh$N(B -% $B%"%-$,A08e$KF~$C$F$7$^$&$3$H$,$"$j$^$7$?!#$=$&$7$?L?Na$K%Q%C%A$r$"$F$^$9!#(B +% \subsection{tabular$B4D6-(B} +% \LaTeX{}$B%+!<%M%k(B(lttab.dtx)$B$NL?Na72$r=$@5$7$^$9!#(B +% +% \begin{macro}{\@tabclassz} +% \LaTeX{}$B%+!<%M%k$O!"%"%i%$%s%a%s%HJ8;z(B|&|$B$N<~0O$KH>3Q6uGr$r=q$$$?$+$I$&$+$K(B +% $B$+$+$o$i$:M>J,$J%9%Z!<%9$r=PNO$7$J$$$h$&$K!"(B|\ignorespaces|$B$H(B|\unskip|$B$r(B +% $BH/9T$7$F$$$^$9(B(lttab.dtx)$B!#$7$+$7!"$3$l$@$1$G$O(BJFM$B%0%k!<$,>C$($:$K;D$C$F(B +% $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:G=i$K(B|\inhibitglue|$B$rH/9T$7!":G8e$KM>J,$J(B|\unskip|$B$rH/9T$9$k(B +% $B$3$H$G!"%;%kMWAG$N<~0O$N(BJFM$B%0%k!=$r>C$7$^$9!#(B +% \changes{v1.2p}{2017/07/21}{tabular$B4D6-$N%;%kFb$N(BJFM$B%0%k!=$r:o=|(B} +% \begin{macrocode} +%</plcore> +%<platexrelease>\plIncludeInRelease{2017/07/29}{\@tabclassz} +%<platexrelease> {Inhibit JFM glue in tabular cells}% +%<*plcore|platexrelease> +\def\@tabclassz{% + \ifcase\@lastchclass + \@acolampacol + \or + \@ampacol + \or + \or + \or + \@addamp + \or + \@acolampacol + \or + \@firstampfalse\@acol + \fi + \edef\@preamble{% + \@preamble{% + \ifcase\@chnum + \hfil\inhibitglue\ignorespaces\@sharp\unskip\unskip\hfil % c + \or + \hskip1sp\inhibitglue\ignorespaces\@sharp\unskip\unskip\hfil % l + \or + \hfil\hskip1sp\inhibitglue\ignorespaces\@sharp\unskip\unskip % r + \fi}}} +%</plcore|platexrelease> +%<platexrelease>\plEndIncludeInRelease +%<platexrelease>\plIncludeInRelease{0000/00/00}{\@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\ignorespaces\@sharp\unskip\hfil +%<platexrelease> \or +%<platexrelease> \hskip1sp\ignorespaces\@sharp\unskip\hfil +%<platexrelease> \or +%<platexrelease> \hfil\hskip1sp\ignorespaces\@sharp\unskip +%<platexrelease> \fi}}} +%<platexrelease>\plEndIncludeInRelease +% \end{macrocode} +% \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 +% \changes{v1.2p}{2017/07/21}{tabular$B4D6-$N%;%kFb$N(BJFM$B%0%k!=$r:o=|(B} +% \begin{macrocode} +%<platexrelease>\plIncludeInRelease{2017/07/29}{\@classv} +%<platexrelease> {Inhibit JFM glue in tabular cells}% +%<*plcore|platexrelease> +\def\@classv{\@addtopreamble{\@startpbox{\@nextchar}\mbox{}\inhibitglue\ignorespaces +\@sharp\unskip\@endpbox}} +%</plcore|platexrelease> +%<platexrelease>\plEndIncludeInRelease +%<platexrelease>\plIncludeInRelease{0000/00/00}{\@classv} +%<platexrelease> {Inhibit JFM glue in tabular cells}% +%<platexrelease>\def\@classv{\@addtopreamble{\@startpbox{\@nextchar}\ignorespaces +%<platexrelease>\@sharp\@endpbox}} +%<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 +% |\xkanjiskip|$BM3Mh$N%"%-$,A08e$KF~$C$F$7$^$&$3$H$,$"$j$^$7$?!#(B +% $B$=$&$7$?L?Na$K%Q%C%A$r$"$F$^$9!#$J$*!"4{$K=P$F$-$?(B|\footnote|$B$NFbItL?Na(B +% $B!J(B|\@makefnmark|$B!K$K$OF1MM$N%Q%C%A$,$b$&$"$F$F$"$j$^$9!#(B +% % \begin{macro}{\@tabular} % tabular$B4D6-$NFbItL?Na$G$9!#$b$H$O(B\file{lttab.dtx}$B$GDj5A$5$l$F$$$^$9!#(B +% \changes{v1.2c}{2016/02/28}{1.2b$B$HF1MM$N=$@5$r(Btabular$B4D6-$K$b9T$C$?(B} % \begin{macrocode} -%</plcore> %<platexrelease>\plIncludeInRelease{2016/04/17}{\@tabular} %<platexrelease> {Remove extra \xkanjiskip}% %<*plcore|platexrelease> @@ -1521,6 +1616,7 @@ % % \begin{macro}{\@iiiparbox} % |\parbox|$B$NFbItL?Na$G$9!#$b$H$O(B\file{ltboxes.dtx}$B$GDj5A$5$l$F$$$^$9!#(B +% \changes{v1.2c}{2016/02/28}{1.2b$B$HF1MM$N=$@5$r(B\cs{parbox}$BL?Na$K$b9T$C$?(B} % \begin{macrocode} %<platexrelease>\plIncludeInRelease{2016/04/17}{\@iiiparbox} %<platexrelease> {Remove extra \xkanjiskip}% @@ -1573,6 +1669,7 @@ % % \begin{macro}{\underline} % $B2<@~$r0z$/L?Na$G$9!#$b$H$O(B\file{ltboxes.dtx}$B$GDj5A$5$l$F$$$^$9!#(B +% \changes{v1.2c}{2016/02/28}{1.2b$B$HF1MM$N=$@5$r(B\cs{underline}$BL?Na$K$b9T$C$?(B} % \begin{macrocode} %<platexrelease>\plIncludeInRelease{2016/04/17}{\underline} %<platexrelease> {Remove extra \xkanjiskip}% diff --git a/Master/texmf-dist/source/uplatex/base/uplvers.dtx b/Master/texmf-dist/source/uplatex/base/uplvers.dtx index a533bba1d07..c22ee6aa824 100644 --- a/Master/texmf-dist/source/uplatex/base/uplvers.dtx +++ b/Master/texmf-dist/source/uplatex/base/uplvers.dtx @@ -139,7 +139,7 @@ %</plcore> %<platexrelease>\edef\platexreleaseversion %<*plcore|platexrelease> - {2017/05/05u01} + {2017/07/29u01} %</plcore|platexrelease> %<*plcore> \def\ppatch@level{0} diff --git a/Master/texmf-dist/tex/uplatex/base/uplcore.ltx b/Master/texmf-dist/tex/uplatex/base/uplcore.ltx index 503a33abf50..0d91d1583c2 100644 --- a/Master/texmf-dist/tex/uplatex/base/uplcore.ltx +++ b/Master/texmf-dist/tex/uplatex/base/uplcore.ltx @@ -19,7 +19,7 @@ %% File: uplvers.dtx \def\pfmtname{pLaTeX2e} \def\pfmtversion - {2017/05/05u01} + {2017/07/29u01} \def\ppatch@level{0} \def\plIncludeInRelease#1{\kernel@ifnextchar[% {\@plIncludeInRelease{#1}} @@ -1007,6 +1007,31 @@ \newcommand\printglossary{\@input@{\jobname.gls}} \newcount\hour \newcount\minute +\def\@tabclassz{% + \ifcase\@lastchclass + \@acolampacol + \or + \@ampacol + \or + \or + \or + \@addamp + \or + \@acolampacol + \or + \@firstampfalse\@acol + \fi + \edef\@preamble{% + \@preamble{% + \ifcase\@chnum + \hfil\inhibitglue\ignorespaces\@sharp\unskip\unskip\hfil % c + \or + \hskip1sp\inhibitglue\ignorespaces\@sharp\unskip\unskip\hfil % l + \or + \hfil\hskip1sp\inhibitglue\ignorespaces\@sharp\unskip\unskip % r + \fi}}} +\def\@classv{\@addtopreamble{\@startpbox{\@nextchar}\mbox{}\inhibitglue\ignorespaces +\@sharp\unskip\@endpbox}} \def\@tabular{\leavevmode \null\hbox \bgroup $\let\@acol\@tabacol \let\@classz\@tabclassz \let\@classiv\@tabclassiv \let\\\@tabularcr\@tabarray} |