diff options
Diffstat (limited to 'Master')
68 files changed, 811 insertions, 3064 deletions
diff --git a/Master/texmf-dist/doc/platex/base/README.md b/Master/texmf-dist/doc/platex/base/README.md index 1c3936d7041..49daab3fb2b 100644 --- a/Master/texmf-dist/doc/platex/base/README.md +++ b/Master/texmf-dist/doc/platex/base/README.md @@ -19,7 +19,7 @@ See the documents (platex.pdf, pldoc.pdf, platexrelease.pdf) for more informatio - Fix macros which are inconsistent with the latest e-pTeX (e.g. \footnote, tabular, \parbox, \underline). -- Fix several bugs in pLaTeX2e and ascmac.sty. +- Fix several bugs in pLaTeX2e format and packages. - Add platexrelease.sty. As with the latexrelease package, this package enables us to use the old versions of pLaTeX2e (from 2006/11/10 the ASCII edition). @@ -61,6 +61,6 @@ the 3-clause BSD license (see [LICENSE](./LICENSE)). ## Release Date -2018-01-27 +2018-03-09 Japanese TeX Development Community diff --git a/Master/texmf-dist/doc/platex/base/ascmac.pdf b/Master/texmf-dist/doc/platex/base/ascmac.pdf Binary files differdeleted file mode 100644 index 93ff816e7d3..00000000000 --- a/Master/texmf-dist/doc/platex/base/ascmac.pdf +++ /dev/null diff --git a/Master/texmf-dist/doc/platex/base/exppl2e.pdf b/Master/texmf-dist/doc/platex/base/exppl2e.pdf Binary files differindex bbf690ebf16..afc156db405 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/nidanfloat.pdf b/Master/texmf-dist/doc/platex/base/nidanfloat.pdf Binary files differdeleted file mode 100644 index c25d9fda39f..00000000000 --- a/Master/texmf-dist/doc/platex/base/nidanfloat.pdf +++ /dev/null diff --git a/Master/texmf-dist/doc/platex/base/platex-en.pdf b/Master/texmf-dist/doc/platex/base/platex-en.pdf Binary files differindex 230ea9c31f3..028e4108d5a 100644 --- a/Master/texmf-dist/doc/platex/base/platex-en.pdf +++ b/Master/texmf-dist/doc/platex/base/platex-en.pdf diff --git a/Master/texmf-dist/doc/platex/base/platex.pdf b/Master/texmf-dist/doc/platex/base/platex.pdf Binary files differindex 5180aefc1bf..1c09c427610 100644 --- a/Master/texmf-dist/doc/platex/base/platex.pdf +++ b/Master/texmf-dist/doc/platex/base/platex.pdf diff --git a/Master/texmf-dist/doc/platex/base/platexrelease.pdf b/Master/texmf-dist/doc/platex/base/platexrelease.pdf Binary files differindex ee587172dd9..7e331901248 100644 --- a/Master/texmf-dist/doc/platex/base/platexrelease.pdf +++ b/Master/texmf-dist/doc/platex/base/platexrelease.pdf diff --git a/Master/texmf-dist/doc/platex/base/pldoc.pdf b/Master/texmf-dist/doc/platex/base/pldoc.pdf Binary files differindex 01f282647a2..6d7eda7ff80 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/Makefile b/Master/texmf-dist/source/platex/base/Makefile index b2e570e058d..40c8fe035c2 100644 --- a/Master/texmf-dist/source/platex/base/Makefile +++ b/Master/texmf-dist/source/platex/base/Makefile @@ -1,6 +1,6 @@ STRIPTARGET = platex.ltx jarticle.cls pl209.def platexrelease.sty \ - nidanfloat.sty tascmac.sty jltxdoc.cls -DOCTARGET = platex platexrelease pldoc nidanfloat ascmac exppl2e \ + jltxdoc.cls +DOCTARGET = platex platexrelease pldoc exppl2e \ platex-en PDFTARGET = $(addsuffix .pdf,$(DOCTARGET)) DVITARGET = $(addsuffix .dvi,$(DOCTARGET)) @@ -35,14 +35,6 @@ PLREL = platexrelease.sty PLREL_SRC = platexrelease.dtx $(PLFMT_SRC) -NIDAN = nidanfloat.sty - -NIDAN_SRC = nidanfloat.dtx - -ASCMAC = tascmac.sty ascmac.sty - -ASCMAC_SRC = ascmac.dtx - INTRODOC_SRC = platex.dtx PLRELDOC_SRC = platexrelease.dtx @@ -70,16 +62,6 @@ platexrelease.sty: $(PLREL_SRC) platex $(KANJI) platexrelease.ins rm platexrelease.log -nidanfloat.sty: $(NIDAN_SRC) - rm -f $(NIDAN) - platex $(KANJI) nidanfloat.ins - rm nidanfloat.log - -tascmac.sty: $(ASCMAC_SRC) - rm -f $(ASCMAC) - platex $(KANJI) ascmac.ins - rm ascmac.log - jltxdoc.cls: jltxdoc.dtx rm -f jltxdoc.cls pldoc.tex Xins.ins platex $(KANJI) pldocs.ins @@ -110,18 +92,6 @@ pldoc.dvi: $(PLDOC_SRC) rm pldoc.glo pldoc.gls pldoc.tex Xins.ins rm ltxdoc.cfg pldoc.dic mkpldoc.sh dstcheck.pl -nidanfloat.dvi: $(NIDAN_SRC) - rm -f platex.cfg - platex $(KANJI) nidanfloat.dtx - platex $(KANJI) nidanfloat.dtx - rm nidanfloat.aux nidanfloat.log - -ascmac.dvi: $(ASCMAC_SRC) - rm -f platex.cfg - platex $(KANJI) ascmac.dtx - platex $(KANJI) ascmac.dtx - rm ascmac.aux ascmac.log ascmac.toc - exppl2e.dvi: exppl2e.sty rm -f platex.cfg platex $(KANJI) exppl2e.sty @@ -144,10 +114,6 @@ platexrelease.pdf: platexrelease.dvi dvipdfmx $(FONTMAP) $< pldoc.pdf: pldoc.dvi dvipdfmx $(FONTMAP) $< -nidanfloat.pdf: nidanfloat.dvi - dvipdfmx $(FONTMAP) $< -ascmac.pdf: ascmac.dvi - dvipdfmx $(FONTMAP) $< exppl2e.pdf: exppl2e.dvi dvipdfmx $(FONTMAP) $< platex-en.pdf: platex-en.dvi @@ -162,13 +128,13 @@ install: cp ./*.txt ${TEXMF}/doc/platex/base/ mkdir -p ${TEXMF}/source/platex/base cp ./Makefile ${TEXMF}/source/platex/base/ - cp ./plnews* ${TEXMF}/source/platex/base/ + cp ./plnews*.tex ${TEXMF}/source/platex/base/ cp ./*.dtx ${TEXMF}/source/platex/base/ cp ./*.ins ${TEXMF}/source/platex/base/ mkdir -p ${TEXMF}/tex/platex/base cp ./kinsoku.tex ${TEXMF}/tex/platex/base/ cp ./*.clo ${TEXMF}/tex/platex/base/ - ls ./*.cls | grep -v plnews.cls | xargs -I % cp % ${TEXMF}/tex/platex/base + cp ./*.cls ${TEXMF}/tex/platex/base/ cp ./*.def ${TEXMF}/tex/platex/base/ cp ./*.fd ${TEXMF}/tex/platex/base/ cp ./*.ltx ${TEXMF}/tex/platex/base/ @@ -177,16 +143,13 @@ install: cp ./platex.ini ${TEXMF}/tex/platex/config/ clean: rm -f $(PLFMT) $(PLCLS) $(PL209) $(PLREL) \ - $(NIDAN) $(ASCMAC) \ $(DVITARGET) \ jltxdoc.cls pldoc.tex Xins.ins cleanstrip: rm -f $(PLFMT) $(PLCLS) $(PL209) $(PLREL) \ - $(NIDAN) $(ASCMAC) \ jltxdoc.cls pldoc.tex Xins.ins cleanall: rm -f $(PLFMT) $(PLCLS) $(PL209) $(PLREL) \ - $(NIDAN) $(ASCMAC) \ $(DVITARGET) $(PDFTARGET) \ jltxdoc.cls pldoc.tex Xins.ins cleandoc: diff --git a/Master/texmf-dist/source/platex/base/ascmac.dtx b/Master/texmf-dist/source/platex/base/ascmac.dtx deleted file mode 100644 index f9895e6e146..00000000000 --- a/Master/texmf-dist/source/platex/base/ascmac.dtx +++ /dev/null @@ -1,712 +0,0 @@ -% \iffalse meta-comment -% -% Copyright (c) 2010 ASCII MEDIA WORKS -% Copyright (c) 2016-2017 Japanese TeX Development Community -% -% This file is part of the pLaTeX2e system (community edition). -% ------------------------------------------------------------- -% -% \fi -% -% -% \iffalse -% -% 2017/12/17 v2.0f -% - Fix a bug. -% 2017/12/06 v2.0e -% - Again works with non-e-TeX engines. -% 2017/07/22 v2.0d -% - Check existing \Return definition and throw an error -% if it is not compatible with ascmac. -% 2016/08/21 v2.0c -% - Support pdfLaTeX, XeLaTeX and LuaLaTeX. -% 2016/04/15 v2.0b -% - Simplify \@keytop. -% 2016/03/13 v2.0a -% - Avoid arithmetic overflow in \mask/\maskbox. -% 2016/03/12 v2.0 -% - Converted to DTX file. -% - Remove extra spaces before/after \keytop[c]{...}. -% - Adjust parameters for \keytop. -% 2016/03/06 -% - Set \tbaselineshift in itembox str and shadebox env. -% - Delete \tbaselineshift\z@ in \mask and \Maskbox. -% - Save \ybaselineshift. -% 2016/03/04 -% - boxnote, shadebox begin with \par\vspace{.3\baselineskip}. -% - Adjust the width of shadebox environment. -% 2016/02/21 (many thanks to ZR for suggestions in bxascmac) -% - Made compatible with pict2e (tate-gumi not supported yet). -% - Adjust parameters for drawing rounded rectangles. -% - Fix bugs in \maskbox and \Maskbox. -% 2006/07/14 (ST): itembox, screen environment bug fix. -% 2002/04/01 (KN): ASCII logo macros -% 1998/11/27 (KN and FTEXers): itembox -% 1998/02/27 (KN): set \tbaselineshift in minipage environment. -% -% \fi -% -% \iffalse -%<*ascmac> -%% wrapper for tascmac.sty -%% -%</ascmac> -%<*tascmac> -%% "tascmac" document style option for tate gumi. -%% -%% Original version: -%% Copyright (C) by 1993, ASCII Corporation & Impress Corporation. -%% (Last update: 2006/07/14) -%% Modified by Japanese TeX Development Community, since 2016. -%% -%% (ChangeLog has moved to the source file ``ascmac.dtx'') -%% -%</tascmac> -%<ascmac|tascmac>\NeedsTeXFormat{LaTeX2e} -%<*driver> -\NeedsTeXFormat{pLaTeX2e} -\ProvidesFile{ascmac.dtx} -%</driver> -%<tascmac>\ProvidesPackage{tascmac} -%<ascmac>\ProvidesPackage{ascmac} - [2017/12/17 v2.0f -%<driver|tascmac> ascmac package (community edition) -%<ascmac> ascmac wrapper (community edition) - ] -%<*driver> -\documentclass{jltxdoc} -\usepackage{ascmac} -\GetFileInfo{ascmac.dtx} -\title{The \textsf{ascmac} package \fileversion} -\author{Japanese \TeX\ Development Community} -\date{$B:n@.F|!'(B\filedate} -\begin{document} - \maketitle - \DocInput{\filename} -\end{document} -%</driver> -% \fi -% -% \tableofcontents -% -% \section{$B$O$8$a$K(B} -% -% \textsf{ascmac}$B%Q%C%1!<%8$O!"(B\LaTeXe{}$B$NI8=`5!G=$NHO0O$G!"?^$d7S@~$G(B -% $B0O$s$@%\%C%/%9$r=PNO$9$kL?Na$J$I$rDs6!$7$^$9!#(B\textsf{ascmac}$B%Q%C%1!<%8(B -% $B$N<BBN$O(B\textsf{tascmac}$B%Q%C%1!<%8$G$9$,!"$3$l$O$b$H$b$H8E$$(Bp\LaTeX{}$B$G(B -% $BG[I[$5$l$F$$$?2#AH@lMQ(B\textsf{ascmac}$B%Q%C%1!<%8$H!"$=$l$r=DAH$KBP1~$5$;(B -% $B$?(B\textsf{tascmac}$B%Q%C%1!<%8$rE}9g$7$?L>;D$G$9!#(B -% -% $B$3$N%I%-%e%a%s%H$O!"%"%9%-!<$K$h$C$FG[I[$5$l$F$$$k(B 2006/07/14 $B%P!<%8%g%s(B -% $B$+$iGI@8$7$F!"F|K\8l(B\TeX{}$B3+H/%3%_%e%K%F%#$K$h$C$F3+H/$5$l$F$$$k%P!<%8%g%s(B -% $B$N$?$a$K?7$?$K=q$+$l$^$7$?!#%3%_%e%K%F%#HG$G$O!"%*%j%8%J%k$N%"%9%-!<HG$N(B -% $B%3!<%I$r85$K!"$$$/$D$+$N%P%0=$@5$HB>$N%Q%C%1!<%8$H$N8_49@-$r2~A1$7$^$7$?!#(B -% $B$^$?!"(Bv2.0c$B0J9_$G$O(Bpdf\LaTeX{}$B$J$I$N%(%s%8%s$b%5%]!<%H$7$^$7$?!#(B -% -% \section{$B;H$$$+$?(B} -% -% \subsection{$B4D6-7?$NL?Na(B} -% -% \textsf{ascmac}$B%Q%C%1!<%8$,Ds6!$9$k4D6-7?$NL?Na$O(B4$B<oN`$"$j$^$9!#$=$l$>$l(B -% $B%F%-%9%H$J$I$r7S@~OH$G0O$s$G=PNO$7$^$9!#(B -% -% $B$3$l$i$N4D6-$O!"$9$Y$F2#I}$,$=$N;~E@$G$N(B |\linewidth| $B$NCM$K$J$j$^$9$N(B -% $B$G!"%\%C%/%9$NI}$rJQ99$7$?$$>l9g$O(B |minipage| $B4D6-$J$I$G0O$s$G$/$@$5$$!#(B -% $B=D$ND9$5$O!"<+F0E*$KFbMF$K9g$o$;$FD4@0$5$l$^$9!#(B \medskip -% -% \DescribeEnv{boxnote} -% |boxnote| $B4D6-$O!"GK$C$?%a%bMQ;f$N$h$&$JJ70O5$$N%\%C%/%9$r:n$j$^$9!#(B -% $BGK$C$?$h$&$J7A$N7S@~$O!"(Bascgrp$B%U%)%s%H$r;H$C$F<B8=$5$l$F$$$^$9!#(B -% -% \begin{boxnote} -% $B%\%C%/%9%N!<%H4D6-$G$9!#(B -% \end{boxnote} -% $B$O!"0J2<$NF~NO$+$iF@$i$l$^$9!#(B -%\begin{verbatim} -% \begin{boxnote} -% $B%\%C%/%9%N!<%H4D6-$G$9!#(B -% \end{boxnote} -%\end{verbatim} -% -% \DescribeEnv{screen} -% |screen| $B4D6-$O!";M6y$,4]$$0O$_OH$NCf$K%F%-%9%H$rF~$l$^$9!#(B -% $B%*%W%7%g%s0z?t$H$7$F(B |0| $B$+$i(B |8| $B$N@0?tCM$r;XDj$9$l$P!";M6y$N4]$_$N(B -% $B6q9g$rJQ99$9$k$3$H$,$G$-$^$9!#@0?tCM$rBg$-$/$9$k$K$D$l$F4]$_$O>.$5$/(B -% $B$J$C$F$$$-$^$9!#>JN,$7$?>l9g$O(B |0| $B$H$_$J$5$l$^$9!#(B -% -% \begin{screen} -% $B;M6y$,4]$$0O$_OH$G$9!#(B -% \end{screen} -% \begin{screen}[4] -% $B;M6y$,4]$$0O$_OH$G$9!#(B -% \end{screen} -% $B$O!"0J2<$NF~NO$+$iF@$i$l$^$9!#(B -%\begin{verbatim} -% \begin{screen} -% $B;M6y$,4]$$0O$_OH$G$9!#(B -% \end{screen} -% \begin{screen}[4] -% $B;M6y$,4]$$0O$_OH$G$9!#(B -% \end{screen} -%\end{verbatim} -% -% \DescribeEnv{itembox} -% |itembox| $B4D6-$O(B |screen| $B4D6-$K;w$F$$$^$9$,!">eC<$N7S@~$N$H$3$m$K%?%$%H%k(B -% $B$r=PNO$9$k$3$H$,$G$-$^$9!#$^$?!"%*%W%7%g%s0z?t(B |l|, |c|, |r| $B$G%?%$%H%k(B -% $B$N=PNO0LCV$r:8!"Cf1{!"1&$H;XDj$G$-$^$9!#>JN,$7$?>l9g$OCf1{$K$J$j$^$9!#(B -% -% \begin{itembox}[l]{$B%?%$%H%k(B} -% $B9`L\%\%C%/%9$G$9!#(B -% \end{itembox} -% $B$O!"0J2<$NF~NO$+$iF@$i$l$^$9!#(B -%\begin{verbatim} -% \begin{itembox}[l]{$B%?%$%H%k(B} -% $B9`L\%\%C%/%9$G$9!#(B -% \end{itembox} -%\end{verbatim} -% -% \DescribeEnv{shadebox} -% |shadebox| $B4D6-$O!"1FIU$-%\%C%/%9$NCf$K%F%-%9%H$rF~$l$^$9!#(B -% $B1F$NI}$O(B |\shaderule| $B%Q%i%a!<%?$G5,Dj$5$l!"%G%U%)%k%H$O(B5pt$B$G$9!#(B -% -% \begin{shadebox} -% $B1FIU$-$N%\%C%/%9$G$9!#(B -% \end{shadebox} -% $B$O!"0J2<$NF~NO$+$iF@$i$l$^$9!#(B -%\begin{verbatim} -% \begin{shadebox} -% $B1FIU$-$N%\%C%/%9$G$9!#(B -% \end{shadebox} -%\end{verbatim} -% -% \subsection{$BLV3]$1L?Na(B} -% -% $BLV3]$1$r$9$kL?Na$,(B3$B<oN`MQ0U$5$l$F$$$^$9!#(B|\mask| $BL?Na$O!"0z?t$NFbMF$NItJ,(B -% $B$KLV$r3]$1$^$9!#(B|\maskbox| $BL?Na$H(B |\Maskbox| $BL?Na$O!"I}$H9b$5$r;XDj$7$F(B -% $BLV3]$1$9$k$3$H$,$G$-$^$9!#$=$7$F!"(B|\maskbox| $BL?Na$H(B |\Maskbox| $BL?Na$N0c$$(B -% $B$O!"8e<T$N$_%\%C%/%9$N<~$j$K7S@~$r0z$/$H$$$&E@$G$9!#(B -% -% $B$3$l$i$NL?Na$O!"$$$:$l$b(Bascgrp$B%U%)%s%H$K<}O?$5$l$F$$$kLV3]$1%Q%?!<%s$N(B -% $BJ8;z$rJB$Y$k$3$H$GLV3]$1$r<B8=$7$F$$$^$9!#(B -% -% \makeatletter -% \begin{table}[htbp] -% \centering -% \begin{tabular}{llll} -% A = {\@ascgrp A} & B = {\@ascgrp B} & C = {\@ascgrp C} & D = {\@ascgrp D} \\ -% E = {\@ascgrp E} & F = {\@ascgrp F} & G = {\@ascgrp G} & H = {\@ascgrp H} \\ -% I = {\@ascgrp I} & J = {\@ascgrp J} & K = {\@ascgrp K} & -% \end{tabular} -% \end{table} -% \makeatother -% -% \DescribeMacro{\mask} -% |\mask| $BL?Na$O!"Bh(B1$B0z?t$,LV3]$1$r$9$kFbMF$G!"Bh(B2$B0z?t$,LV3]$1%Q%?!<%s$r(B -% $B<($95-9f!J(BA$B$+$i(BK$B!K$G$9!#(B -% -% \begin{center} -% \mask{$BLV3]$1Nc(B1}{A} \hfil \mask{$BLV3]$1Nc(B2}{C} -% \end{center} -% $B$O!"0J2<$NF~NO$+$iF@$i$l$^$9!#(B -%\begin{verbatim} -% \mask{$BLV3]$1Nc(B1}{A} \hfil \mask{$BLV3]$1Nc(B2}{C} -%\end{verbatim} -% -% \DescribeMacro{\maskbox} -% |\maskbox| $BL?Na$O(B5$B$D$N0z?t$r;}$A!"$=$l$>$l%\%C%/%9$NI}!"9b$5!"(B -% $BLV3]$1%Q%?!<%s!"=PNO0LCV!"LV3]$1$r$9$kFbMF$G$9!#=PNO0LCV$O(B |l|, |c|, |r| $B$N(B -% $B$$$:$l$+$G!"$=$l$>$l:8!"Cf1{!"1&$K=PNO$7$^$9!#(B -% -% \begin{center} -% \maskbox{25em}{4em}{E}{c}{$BI}$r;XDj$7$?LV3]$1%\%C%/%9(B} -% \end{center} -% $B$O!"0J2<$NF~NO$+$iF@$i$l$^$9!#(B -%\begin{verbatim} -% \maskbox{25em}{4em}{E}{c}{$BI}$r;XDj$7$?LV3]$1%\%C%/%9(B} -%\end{verbatim} -% -% \DescribeMacro{\Maskbox} -% |\Maskbox| $BL?Na$O(B |\maskbox| $BL?Na$HF1MM$N0z?t$r;}$A$^$9$,!"LV3]$1$r$9$kFbMF$N(B -% $B;XDj$NA0!"$9$J$o$A(B5$BHVL\$N0z?t$H$7$F!"%\%C%/%9$r0O$`7S@~$NB@$5$b;XDj$7$^$9!#(B -% $B$7$?$,$C$F!"A4It$G(B6$B$D$N0z?t$r;}$A$^$9!#(B -% -% \begin{center} -% \Maskbox{30em}{4em}{A}{c}{1pt}{$BI}$r;XDj$7$?7S@~IU$-LV3]$1%\%C%/%9(B} -% \end{center} -% $B$O!"0J2<$NF~NO$+$iF@$i$l$^$9!#(B -%\begin{verbatim} -% \Maskbox{30em}{4em}{A}{c}{1pt}{$BI}$r;XDj$7$?7S@~IU$-LV3]$1%\%C%/%9(B} -%\end{verbatim} -% -% \subsection{$B$=$NB>$NL?Na(B} -% -% \DescribeMacro{\keytop} -% |\keytop| $B%3%^%s%I$O!"%-!<%\!<%I>e$NJ8;z$r<($9$H$-$J$I$KJXMx$G$9!#(B -% -% \begin{table}[htbp] -% \centering -% \begin{tabular}{cc} -% $BF~NO(B & $B=PNO(B \\ -% |\keytop{A}| & \keytop{A} \\ -% |\keytop{$B$"(B}| & \keytop{$B$"(B} -% \end{tabular} -% \end{table} -% -% \DescribeMacro{\yen} -% \DescribeMacro{\return} -% \DescribeMacro{\Return} -% $B1_5-9f$r=PNO$9$k(B |\yen| $BL?Na$O!"(BY$B$H(B=$B$r=E$M9g$o$;$F=PNO$7$F$$$^$9!#(B -% $B2~9T5-9f$O(B |\return| $B$H(B |\Return| $B$G$9!#2~9T5-9f$O(Bascgrp$B%U%)%s%H(B -% $B$rMQ$$$F$$$^$9!#(B -% -% \begin{table}[htbp] -% \centering -% \begin{tabular}{cc} -% $BF~NO(B & $B=PNO(B \\ -% |\yen| & \yen \\ -% |\return| & \return \\ -% |\Return| & \Return -% \end{tabular} -% \end{table} -% -% \DescribeMacro{\ascii} -% \DescribeMacro{\Ascii} -% \DescribeMacro{\ASCII} -% $B%"%9%-!<%3!<%]%l!<%7%g%s$N%m%4$r=PNO$9$kL?Na$G$9!#(B -% $B%5%$%:$O(B3$B<oN`MQ0U$5$l$F$$$^$9!#(B -% -% \ascii \hfil \Ascii \hfil \ASCII -% -% -% \StopEventually{} -% -% \section{$B%3!<%I(B} -% -% \textsf{ascmac}$B%Q%C%1!<%8$O(B\textsf{tascmac}$B%Q%C%1!<%8$N%i%C%Q!<$G$9!#(B -% \begin{macrocode} -%<*ascmac> -\RequirePackage{tascmac} -%</ascmac> -% \end{macrocode} -% -% $B=>Mh!"(B\textsf{tascmac}$B%Q%C%1!<%8$NF0:n>r7o$O!"(Bp\LaTeXe{}$B$G$7$?!#(B -% $B$7$+$7!"(Bcommunity edition$B$G$O!"%P!<%8%g%s(Bv2.0c$B0J9_$G$[$+$N%(%s%8%s$b(B -% $B%5%]!<%H$9$k$3$H$K$7$^$7$?!#(B -% \begin{macrocode} -%<*tascmac> -%% -%% Originally `ascmac' and `tascmac' can be used only in -%% pLaTeX, upLaTeX or LuaLaTeX with LuaTeX-ja support. -%% We (texjporg) started to support other engines, such as -%% pdfLaTeX, XeLaTeX and LuaLaTeX (even without LuaTeX-ja). -%% -\newif\ifascmac@ptex \ascmac@ptextrue -\ifx\kanjiskip\@undefined - \@ifpackageloaded{luatexja}{% - \PackageInfo{tascmac}{% - Patch from LuaTeX-ja will be applied}% - }{% - \PackageInfo{tascmac}{% - Assuming pdfLaTeX, XeLaTeX or LuaLaTeX}% - \ascmac@ptexfalse - }% -\fi -% \end{macrocode} -% -% (u)p\LaTeXe{}$B$H(BLua\TeX-ja$B0J30$r%5%]!<%H$9$k$?$a$N%H%j%C%/$G$9!#(B -% $B!V(BQ$B!W$H$$$&J8;z$N%+%F%4%j!<%3!<%I$r$3$N%Q%C%1!<%8$rFI$s$G$$$k4V$@$1(B -% $BJQ99$7!"(B(u)p\LaTeXe{}$B$^$?$O(BLua\TeX-ja$B$G$OL5;k$9$kJ8;z$K!"$=$l0J30$G$O(B -% $B%3%a%s%HJ8;z!J(B|%|$B$HF1$8!K$K$7$^$9!#(B -% \changes{2016/08/21}{v2.0c}{pdf\LaTeX{}$B$J$I$r%5%]!<%H(B} -% \begin{macrocode} -\chardef\ascmac@q@catcode=\catcode`\Q\relax -\ifascmac@ptex - \catcode`\Q=9\relax -\else - \catcode`\Q=14\relax -\fi -% \end{macrocode} -% -% pdf\LaTeX{}$B$d(BLua\LaTeX{}$B$N%W%j%_%F%#%V$r;H$C$F!"(Bascgrp$B$N(BType1$B%U%)%s%H$r(B -% $B;HMQ$G$-$k$h$&$K@_Dj$7$^$9!#(B -% \changes{2016/08/21}{v2.0c}{pdf\LaTeX{}$B$G(Bascgrp$B$N(BType1$B%U%)%s%H$r;HMQ(B} -% \changes{2017/12/06}{v2.0e}{$BG0$N$?$a(Be-$B3HD%$J$7$N%(%s%8%s$G$N%(%i!<$rKI;_(B} -% \changes{2017/12/17}{v2.0f}{$BH=Dj$,5U$K$J$C$F$$$?$N$r=$@5(B} -% \begin{macrocode} -%% -%% Use Type1 font for ascgrp (pdfLaTeX, LuaLaTeX) -\ifascmac@ptex\else - \ifx\pdfextension\@undefined - \ifx\pdfmapline\@undefined\else - % pdfTeX, LuaTeX (<=0.81) - \pdfmapline{+ascgrp <ascgrp.pfb} - \pdfmapline{+ascii10 <ascii10.pfb} - \pdfmapline{+ascii36 <ascii36.pfb} - \fi - \else - % LuaTeX (>=0.85) - \pdfextension mapline{+ascgrp <ascgrp.pfb} - \pdfextension mapline{+ascii10 <ascii10.pfb} - \pdfextension mapline{+ascii36 <ascii36.pfb} - \fi -\fi -% \end{macrocode} -% -% \begin{macro}{\@savetbaselineshift} -% \begin{macro}{\@saveybaselineshift} -% |\tbaselineshift| $B$H(B |\ybaselineshift| $B$r0l;~B`Hr$9$k$?$a$N=`Hw$G$9!#(B -% \changes{2016/08/21}{v2.0c}{$BDj5A:Q$_$N>l9g$O$"$($FDj5A$7$J$$$h$&$K$7$?(B} -% \begin{macrocode} -%% -%% ascmac.sty 10/28 '88 -%% ASCII special macros -Q \ifx\@savetbaselineshift\@undefined \newdimen\@savetbaselineshift \fi -Q \ifx\@saveybaselineshift\@undefined \newdimen\@saveybaselineshift \fi -%% -% \end{macrocode} -% \end{macro} -% \end{macro} -% -% \begin{macro}{\@@ASCII} -% \begin{macro}{\ascii} -% \begin{macro}{\Ascii} -% \begin{macro}{\ASCII} -% $B%"%9%-!<%3!<%]%l!<%7%g%s$N%m%4$G$9!#(B -% \begin{macrocode} -%% ASCII logo -\def\@@ASCII#1#2#3{\shortstack{#1 ASCII \\[#3] - \fontsize{#2}{\z@}\usefont{OT1}{cmss}{m}{n}ASCII CORPORATION}} -\def\ascii{\@ifundefined{@ascii}{\font\@ascii=ascii10 scaled \magstep4}{}% - \@@ASCII\@ascii{5pt}{-6pt}} -\def\Ascii{\@ifundefined{@Ascii}{\font\@Ascii=ascii10 scaled \magstep5}{}% - \@@ASCII\@Ascii{6pt}{-7pt}} -\def\ASCII{\@ifundefined{@ASCII}{\font\@ASCII=ascii36}{}% - \@@ASCII\@ASCII{9pt}{-9pt}} -%% -% \end{macrocode} -% \end{macro} -% \end{macro} -% \end{macro} -% \end{macro} -% -% |boxnote| $B4D6-$J$I$G;H$&L?Na$N=`Hw$G$9!#(B -% \begin{macrocode} -%% boxnote environment -\font\@ascgrp=ascgrp -\newbox\scb@x \newbox\scscb@x -\newdimen\@bw\newbox\@nbox\newbox\@nbody -% \end{macrocode} -% -% \begin{environment}{boxnote} -% |boxnote| $B4D6-$rDj5A$7$^$9!#(B -% \begin{macrocode} -\def\boxnote{\par\vspace{.3\baselineskip}% -Q \@saveybaselineshift\ybaselineshift\ybaselineshift\z@ -Q \@savetbaselineshift\tbaselineshift\tbaselineshift\z@ - \setbox\@nbox=\hbox{\@ascgrp\vrule width1.08pt depth35pt b\hss a\hss b} - \@whiledim \wd\@nbox<\hsize \do{ - \setbox\@nbox=\hbox{\@ascgrp\unhbox\@nbox \hss a\hss b}} - \setbox\@nbox=\hbox to\hsize{\@ascgrp\unhbox\@nbox \hss a\hss b% - \vrule width1.08pt depth35pt} - \@bw=\wd\@nbox\advance\@bw -40pt - \begin{lrbox}{\@nbody}\begin{minipage}{\@bw}% (KN:1998/02/27) -Q \ybaselineshift\@saveybaselineshift \tbaselineshift\@savetbaselineshift -}% -% \end{macrocode} -% -% \begin{macrocode} -\def\endboxnote{\end{minipage}\end{lrbox}% - \vbox{\parindent=0pt\offinterlineskip\copy\@nbox - \hbox to\wd\@nbox{\vrule width1.08pt\hfil\box\@nbody\hfil\vrule width1.08pt} - \hbox to\wd\@nbox{\vrule width1.08pt height15pt\hfil - \vrule width1.08pt height15pt}\hrule height1.08pt}} -%% -% \end{macrocode} -% \end{environment} -% -% |screen| $B4D6-$J$I$G;H$&L?Na$N=`Hw$G$9!#(B -% \begin{macrocode} -%% screen environment -\newdimen\@scw -\def\@hobox#1#2#3{\hbox to\@scw{\oval(#3,#3)[#1]\hfil\oval(#3,#3)[#2]% - \dimen\z@=#3\unitlength\advance\dimen\z@\@wholewidth - \vrule\@width\z@\@height\z@\@depth.5\dimen\z@}} -% \end{macrocode} -% -% \begin{macrocode} -\def\@vrf@#1#2{\vskip#1\leaders\vrule width#2\vfil\vskip#1} -% \end{macrocode} -% -% \begin{environment}{screen} -% |screen| $B4D6-$rDj5A$7$^$9!#(B -% \begin{macrocode} -\def\screen{% -Q \@saveybaselineshift\ybaselineshift \ybaselineshift\z@ -Q \@savetbaselineshift\tbaselineshift \tbaselineshift\z@ - \@ifnextchar[{\@screen}{\@screen[0]}} -% \end{macrocode} -% -% \begin{macrocode} -\def\@screen[#1]{\ifcase#1\def\@r{20}\def\@s{9.8pt}\def\@sx{10pt}\or - \def\@r{18}\def\@s{8.8pt}\def\@sx{9pt}\or - \def\@r{16}\def\@s{7.8pt}\def\@sx{8pt}\or - \def\@r{14}\def\@s{6.8pt}\def\@sx{7pt}\or - \def\@r{12}\def\@s{5.8pt}\def\@sx{6pt}\or - \def\@r{10}\def\@s{4.8pt}\def\@sx{5pt}\or - \def\@r{8}\def\@s{3.8pt}\def\@sx{4pt}\or - \def\@r{6}\def\@s{2.8pt}\def\@sx{3pt}\else - \def\@r{4}\def\@s{1.8pt}\def\@sx{2pt}\fi - \par\vspace{.3\baselineskip}\@scw\linewidth \advance\@scw -\@r pt - \setbox\scb@x=\hbox to\@scw\bgroup\begin{minipage}{\@scw}% (KN:1998/02/27) -Q \ybaselineshift\@saveybaselineshift \tbaselineshift\@savetbaselineshift -}% -% \end{macrocode} -% -% \begin{macrocode} -\def\endscreen{\end{minipage}\egroup% - \setbox\scscb@x=\hbox to\linewidth{\hfil\vbox{\offinterlineskip% - \thinlines\setlength{\unitlength}{1pt}\hrule\kern\@s% - \@hobox{tl}{tr}{\@r}\kern-\@sx\box\scb@x\@hobox{bl}{br}{\@r}% - \kern-.4pt\hrule}\hfil}\dimen0=\ht\scscb@x% - \dimen2=\@sx\advance\dimen2 .2pt - \noindent\hbox to\linewidth{\hbox to.2pt{\vbox to\dimen0{\@vrf@{\dimen2}{.4pt}}% - \hss}\box\scscb@x\hbox to.2pt{\hss\vbox to\dimen0{\@vrf@{\dimen2}{.4pt}}}\hss}}% -%% -% \end{macrocode} -% \end{environment} -% -% |itembox| $B4D6-$J$I$G;H$&L?Na$N=`Hw$G$9!#(B -% \begin{macrocode} -%% itembox environment -%% replace \box0 with \@iboxstr; thanks FTEXers (1998/11/27) -\newdimen\@itemh\newtoks\@iboxpos\newbox\@iboxstr -% \end{macrocode} -% -% \begin{macrocode} -\def\@hleader{\leaders\hrule height .8pt\hfil} -% \end{macrocode} -% -% \begin{environment}{itembox} -% |itembox| $B4D6-$rDj5A$7$^$9!#(B -% \begin{macrocode} -\def\itembox{\@ifnextchar[{\@itembox}{\@itembox[c]}} -\def\@itembox[#1]#2{% -Q \@saveybaselineshift\ybaselineshift\ybaselineshift\z@ -Q \@savetbaselineshift\tbaselineshift\tbaselineshift\z@ - \par\vspace{.3\baselineskip}% - \setbox\@iboxstr=\hbox{% -Q \ybaselineshift\@saveybaselineshift \tbaselineshift\@savetbaselineshift - #2}% - \@itemh\ht\@iboxstr\advance\@itemh\dp\@iboxstr - \vspace{.5\@itemh}\bgroup\@scw\linewidth - \advance\@scw-20pt\@iboxpos={#1}% - \setbox\scb@x=\hbox to\@scw\bgroup\begin{minipage}{\@scw}% -Q \ybaselineshift\@saveybaselineshift -Q \tbaselineshift\@savetbaselineshift% (KN:1998/02/27) - \vspace*{.5\@itemh}}% -% \end{macrocode} -% -% \begin{macrocode} -\def\enditembox{\end{minipage}\egroup% - \setbox\scscb@x=\hbox to\linewidth{\hfil\vbox{\offinterlineskip% - \thicklines\setlength{\unitlength}{1pt}% - \hbox to\@scw{\if l\the\@iboxpos\else\@hleader\fi - \space\vbox to.8pt{\vss\hbox{\box\@iboxstr}\vss}% - \space\if r\the\@iboxpos\else \@hleader\fi}\kern9.6pt - \@hobox{tl}{tr}{20}\kern-10pt\box\scb@x\@hobox{bl}{br}{20}% - \kern-.8pt\hrule height.8pt}\hfil}\dimen0=\ht\scscb@x% - \noindent\hbox to\linewidth{\hbox to.4pt{\vbox to\dimen0{\@vrf@{10.4pt}{.8pt}}% - \hss}\box\scscb@x\hbox to.4pt{\hss\vbox to\dimen0{\@vrf@{10.4pt}{.8pt}}}% - \hss}\egroup} -%% -% \end{macrocode} -% \end{environment} -% -% \begin{macro}{\keytop} -% \begin{macro}{\@keytop} -% |\keytop| $BL?Na$G$9!#(B -% \begin{macrocode} -%% \keytop -\def\keytop{\@ifnextchar[{\@keytop}{\@keytop[d]}} -\def\@keytop[#1]#2{% - {\setbox0=\hbox{\shortstack{#2}}% -Q \ybaselineshift\z@ \tbaselineshift\z@ - \dimen0=\wd0\advance\dimen0 5pt\dimen1=\dp0\advance\dimen1 2.5pt% - \setbox\scscb@x=\hbox to\dimen0{% -Q \iftdir\tate\else\yoko\fi - \@scw\wd0\hfil\vtop{\offinterlineskip - \thinlines\setlength{\unitlength}{1pt}\hrule\kern2.3pt\@hobox{tl}{tr}5% - \kern-2.4pt\box0\@hobox{bl}{br}5\kern-.4pt\hrule}\hfil}% - \dimen0=\dp\scscb@x\advance\dimen0 -.4pt - \setbox0=\vbox{\hbox{\hbox to.2pt{\vtop to\dimen0{\@vrf@{2.3pt}{.4pt}}\hss}% - \box\scscb@x\hbox to.2pt{\hss\vtop to\dimen0{\@vrf@{2.3pt}{.4pt}}}}}% - \if #1c\mbox{}$\vcenter{\box0}$\mbox{}\else - \if #1t\else\if #1b\boxmaxdepth=0pt\else - \boxmaxdepth=\dimen1\fi\fi \mbox{}\vbox{\box0}\fi}} -%% -% \end{macrocode} -% \end{macro} -% \end{macro} -% -% -% \begin{macro}{\yen} -% \changes{1996/03/13}{v1.1}{Append \cs{leavevmode} in -% \cs{yen}, \cs{return}, \cs{Return} command.} -% $B1_5-9f$G$9!#(B -% \begin{macrocode} -%% \yen -\def\yen{\leavevmode\hbox{% -Q \iftdir\yoko\fi - \setbox0=\hbox{Y}Y\kern-.97\wd0\vbox{\hrule height.1ex width.98\wd0 - \kern.33ex\hrule height.1ex width.98\wd0\kern.45ex}}} -% \end{macrocode} -%% -% \end{macro} -% -% \begin{macro}{\return} -% \begin{macro}{\Return} -% $B2~9T5-9f$G$9!#(B|\return|$B$d(B|\Return|$B$H$$$&L>>N$O$"$j$U$l$F$$$k$N$G!"(B -% ascmac$B%Q%C%1!<%8$NDj5A$,JL$N%Q%C%1!<%8$H>WFM$9$k>l9g$,$"$j$^$9(B -% $B!JNc!'(Balgorithm2e$B%Q%C%1!<%8!K!#(B -% $B$=$3$G!"(B|\Return|$B$H$$$&L?Na$,4{$KDj5A$5$l$F$$$F!"$+$D(Bascgrp$B%U%)%s%H$,(B -% $BIT;HMQ$HH=CG$5$l$k>l9g$O%(%i!<$r=P$7$^$9!#K\Mh$J$i$P(B|\return|$B$bF1MM$K(B -% $B%A%'%C%/$7$?$$$N$G$9$,!"!V(Bokumacro$B%Q%C%1!<%8$N8e$K(Bascmac$B%Q%C%1!<%8$r(B -% $BFI$_9~$`$H!"%(%i!<$J$7$K(Bascmac$B%Q%C%1!<%8$NDj5A$,>!$D!W$H$$$&=>Mh$N5sF0(B -% $B$r0];}$9$k$?$a!"8=;~E@$G$O%A%'%C%/$7$^$;$s!#(B -% \begin{macrocode} -%% return-key -\begingroup -\def\ascmac@definable{\PackageInfo{ascmac}{Command - \@backslashchar\reserved@a\space already defined, but - compatible with\MessageBreak ascmac package, overwriting}} -\def\ascmac@check#1{\ifx#1\@undefined\else\ascmac@parse{#1}\fi} -\def\ascmac@parse#1{\edef\reserved@a{\expandafter\@gobble\string #1}% - \edef\ascmac@parse@tmp{\meaning#1 \string\@ascgrp}% - \expandafter\ascmac@parse@i\ascmac@parse@tmp\@nil} -\expandafter\def\expandafter\ascmac@parse@i - \expandafter#\expandafter1\string\@ascgrp#2\@nil{\ifx\relax#2\relax - \@notdefinable\else\ascmac@definable\fi} -%\ascmac@check{\return}% conflict with okumacro, no check -\ascmac@check{\Return} -\endgroup -% \end{macrocode} -% -% $B2~9T5-9f$NDj5A$NK\BN$G$9!#(B -% \begin{macrocode} -\def\return{\leavevmode\hbox{% -Q \iftdir\yoko\fi - \@ascgrp\char"20}} -\def\Return{\leavevmode\hbox{% -Q \iftdir\yoko\fi - \@ascgrp @}} -%% -% \end{macrocode} -% \end{macro} -% \end{macro} -% -% |\mask| $BL?Na$N=`Hw$G$9!#(B -% \begin{macrocode} -%% \mask -\newbox\@bwsp \newbox\@@bwsp\newcount\@bcal -% \end{macrocode} -% -% \begin{macrocode} -\def\setdim@#1#2{\@bcal=#2\divide#1\@bcal\multiply#1\@bcal\advance#1 1.001#2} -% \end{macrocode} -% -% \begin{macro}{\mask} -% |\mask| $BL?Na$rDj5A$7$^$9!#(B -% \begin{macrocode} -\def\mask#1#2{{\setbox\@bwsp=\hbox{#1}% - \setbox0=\hbox{% -Q \ybaselineshift\z@\tbaselineshift\z@ - \@ascgrp#2}% - \dimen0=\wd\@bwsp\dimen1=\ht\@bwsp\advance\dimen1\dp\@bwsp\dimen2=-\dimen1 - \setdim@{\dimen0}{\wd0}\setdim@{\dimen1}{\ht0}% - \setbox\@@bwsp=\hbox to\dimen0{\leaders - \vtop to\dimen1{\leaders\box0\vfil}\hfil}% - \advance\dimen2\dp\@@bwsp\divide\dimen2 2 - \advance\dimen2\dp\@bwsp\boxmaxdepth=\dimen2 - \setbox\@@bwsp=\vbox{\box\@@bwsp}% - \mbox{}\hbox to\wd\@@bwsp{\hbox to0pt{\box\@@bwsp\hss}\hss\unhbox\@bwsp\hss}}} -%% -% \end{macrocode} -% \end{macro} -% -% |\maskbox| $BL?Na$N=`Hw$G$9!#(B -% \begin{macrocode} -%% \Maskbox{width}{height}{mask_char}{pos}{rule_wid}{body} -%% \maskbox{width}{height}{mask_char}{pos}{body} -\def\@setdim#1#2{\@bcal=#2\divide#1\@bcal\multiply#1\@bcal\advance#1 .001#2} -% \end{macrocode} -% -% \begin{macro}{\Maskbox} -% \begin{macro}{\maskbox} -% |\maskbox| $BL?Na$H(B |\Maskbox| $BL?Na$rDj5A$7$^$9!#(B -% \begin{macrocode} -\def\Maskbox#1#2#3#4#5#6{{% - \setbox0=\hbox{% -Q \ybaselineshift\z@\tbaselineshift\z@ - \@ascgrp#3}% - \dimen0=#1\@setdim{\dimen0}{\wd0}\dimen1=#2\@setdim{\dimen1}{\ht0}% - \ifx#4c\skip0=0pt plus1fil\skip1=\skip0\fi - \ifx#4r\skip0=0pt plus1fil\skip1=0pt\fi - \ifx#4l\skip1=0pt plus1fil\skip0=0pt\fi - \leavevmode - \hbox{\hbox to0pt{\hbox to\dimen0{\leaders\vbox to\dimen1{\leaders - \box0\vfil}\hfil}\hss}% - \vrule width#5\vbox to\dimen1{\hrule height#5\vfil - \dimen3=#5\advance\dimen0-2\dimen3\advance\dimen0 .15pt - \hbox to\dimen0{\hskip\skip0\relax#6\hskip\skip1}% - \vfil\hrule height#5}\vrule width#5}}} -\def\maskbox#1#2#3#4#5{\Maskbox{#1}{#2}{#3}{#4}{0pt}{#5}} -%% -% \end{macrocode} -% \end{macro} -% \end{macro} -% -% |shadebox| $B4D6-$G;H$&L?Na$N=`Hw$G$9!#(B -% \begin{macrocode} -%% shadebox environment -\newdimen\shaderule\shaderule 5pt -% \end{macrocode} -% -% \begin{environment}{shadebox} -% |shadebox| $B4D6-$rDj5A$7$^$9!#(B -% \begin{macrocode} -\def\shadebox{\par\vspace{.3\baselineskip}% -Q \@saveybaselineshift\ybaselineshift\ybaselineshift\z@ -Q \@savetbaselineshift\tbaselineshift\tbaselineshift\z@ - \dimen0\linewidth \advance\dimen0-20pt - \advance\dimen0-2\fboxrule \advance\dimen0-\shaderule - \setbox\@tempboxa=\hbox\bgroup\minipage{\dimen0}% -Q \ybaselineshift\@saveybaselineshift \tbaselineshift\@savetbaselineshift -} -% \end{macrocode} -% -% \begin{macrocode} -\def\endshadebox{\endminipage\egroup\dimen0=10pt - \setbox\@tempboxa=\hbox{\kern\dimen0\unhbox\@tempboxa\kern\dimen0}% - \setbox0=\vbox{\hrule \@height \fboxrule - \hbox{\vrule \@width \fboxrule - \vbox{\vskip\fboxsep \box\@tempboxa\vskip\fboxsep}% - \vrule \@width \fboxrule}\hrule \@height \fboxrule}% - \dimen0=\ht0 \advance\dimen0-\shaderule - \hbox{\hbox to \shaderule{\copy0\hss}\kern 0pt - \vrule width\wd0 height0pt depth\shaderule\hskip-\shaderule - \vrule width\shaderule height\dimen0}} -%% -% \end{macrocode} -% \end{environment} -% -% $B%H%j%C%/$K;HMQ$7$?!V(BQ$B!W$H$$$&J8;z$N%+%F%4%j!<%3!<%I$r85$KLa$7$^$9!#(B -% \changes{2016/08/21}{v2.0c}{pdf\LaTeX{}$B$J$I$r%5%]!<%H(B} -% \begin{macrocode} -\catcode`\Q=\ascmac@q@catcode\relax -%% -%</tascmac> -% \end{macrocode} -% -% \Finale -% -\endinput diff --git a/Master/texmf-dist/source/platex/base/ascmac.ins b/Master/texmf-dist/source/platex/base/ascmac.ins deleted file mode 100644 index 92093ae199d..00000000000 --- a/Master/texmf-dist/source/platex/base/ascmac.ins +++ /dev/null @@ -1,23 +0,0 @@ -\input docstrip -\keepsilent -\usedir{tex/platex/base} -\ifToplevel{\askonceonly} - -\Msg{*** Generating ascmac package ***} - -\preamble - -Copyright (c) 2010 ASCII MEDIA WORKS -Copyright (c) 2016 Japanese TeX Development Community - -This file is part of the pLaTeX2e system (community edition). -------------------------------------------------------------- - -\endpreamble - -\generate{ - \file{ascmac.sty}{\from{ascmac.dtx}{ascmac}} - \file{tascmac.sty}{\from{ascmac.dtx}{tascmac}} -} - -\endbatchfile diff --git a/Master/texmf-dist/source/platex/base/jclasses.dtx b/Master/texmf-dist/source/platex/base/jclasses.dtx index 739c334d3ef..1c05126c938 100644 --- a/Master/texmf-dist/source/platex/base/jclasses.dtx +++ b/Master/texmf-dist/source/platex/base/jclasses.dtx @@ -3,7 +3,7 @@ % % Copyright 1995-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). % ------------------------------------------------------------- @@ -93,6 +93,7 @@ % $B4q?t%Z!<%8$KAw$k$h$&$KJQ99(B} % \changes{v1.7f}{2017/08/31}{$BOBJ8=qBN$N4p=`$rA43Q6uGr$+$i!V4A!W$KJQ99(B} % \changes{v1.7g}{2017/09/19}{$BFbIt=hM}$G;H$C$?%\%C%/%9(B0$B$r6u$K$7$?(B} +% \changes{v1.7h}{2018/02/04}{$BOBJ8%9%1!<%kCM(B\cs{Cjascale}$B$rDj5A(B} % \fi % % \iffalse @@ -122,7 +123,7 @@ %<11pt&bk>\ProvidesFile{tbk11.clo} %<12pt&bk>\ProvidesFile{tbk12.clo} %</tate> - [2017/09/19 v1.7g + [2018/02/04 v1.7h %<article|report|book> Standard pLaTeX class] %<10pt|11pt|12pt> Standard pLaTeX file (size option)] %<*driver> @@ -755,6 +756,22 @@ % \end{macro} % \end{macro} % +% \begin{macro}{\Cjascale} +% $B$3$N%/%i%9%U%!%$%k$,0U?^$9$kOBJ8%9%1!<%kCM(B +% $B!J(B$1\,\mathrm{zw} \div \textmc{$BMW5a%5%$%:(B}$$B!K$r(B +% $BI=$9<B?tCM%^%/%m(B|\Cjascale|$B$rDj5A$7$^$9!#(B +% $B$3$N(Bp\LaTeXe{}$B$NI8=`%/%i%9$G$O!"%U%)!<%^%C%H:n@.;~$KFI$_9~$^$l$?(B +% $B%U%)%s%HDj5A%U%!%$%k!J(B\file{jy1mc.fd} / \file{jy1gt.fd} / +% \file{jt1mc.fd} / \file{jt1gt.fd}$B!K$G$NOBJ8%9%1!<%kCM$,$=$N$^$^(B +% $BM-8z$G$9$N$G!"$3$l$O(B0.962216$B$G$9!#(B +% \changes{v1.7h}{2018/02/04}{$BOBJ8%9%1!<%kCM(B\cs{Cjascale}$B$rDj5A(B} +% \begin{macrocode} +%<*article|report|book> +\def\Cjascale{0.962216} +%</article|report|book> +% \end{macrocode} +% \end{macro} +% % % % \section{$B%l%$%"%&%H(B} diff --git a/Master/texmf-dist/source/platex/base/nidanfloat.dtx b/Master/texmf-dist/source/platex/base/nidanfloat.dtx deleted file mode 100644 index 87546cfca9b..00000000000 --- a/Master/texmf-dist/source/platex/base/nidanfloat.dtx +++ /dev/null @@ -1,1122 +0,0 @@ -% \iffalse -%% File: nidanfloat.dtx -% -% Copyright 1994 ASCII Co. -% Copyright (c) 2010 ASCII MEDIA WORKS -% Copyright (c) 2016-2017 Japanese TeX Development Community -% -% This file is part of the pLaTeX2e system (community edition). -% ------------------------------------------------------------- -% -% \fi -% -% -% \setcounter{StandardModuleDepth}{1} -% -% \StopEventually{} -% -% \iffalse -% \changes{v1.10}{1994/04/07}{platex2.09$BMQ(B} -% \changes{v2.2}{1997/10/22}{platex2e$BMQ$K=$@5(B} -% \changes{v2.3}{2000/12/20}{$B0lCJH4$-$N%U%m!<%H$r:.$<$k$H%(%i!<$K(B -% $B$J$k$N$r=$@5!J$"$j$,$H$&!"ARBt!w(BQUIPU$B$5$s!K(B} -% \changes{v2.4}{2001/02/19}{$B:G=*%Z!<%8$G:81&$N9T4V$,B7$o$J$$ItJ,$r=$@5(B} -% \changes{v2.4}{2001/02/19}{$BCl$,=P$J$$$N$r=$@5(B} -% \changes{v2.4}{2001/07/23}{$B%Z!<%8$NBg$-$5$,>.$5$/$J$k$N$r=$@5(B} -% \changes{v2.5}{2001/09/14}{$B%Q%C%1!<%8%*%W%7%g%s(B(balance,nobalance)$B$rDI2C(B} -% \changes{v2.6}{2003/05/15}{\cs{@fstype}$B$r(B\cs{@fstyle}$B$H%?%$%W%_%9$7$F$$$?(B -% $B$N$r=$@5!J$"$j$,$H$&!"@n>e!w9R6u1'Ch8&5f=j$5$s!K(B} -% \changes{v2.7}{2005/12/09}{$BI,?\%U%)!<%^%C%H%U%!%$%k$r(BpLaTeX2e$B$+$i(BLaTeX2e$B$XJQ99(B} -% \changes{v2.8}{2017/05/01}{\cs{@rightfixht}$B$rDI2C(B} -% \changes{v2.8}{2017/05/01}{\cs{@outputbox}$B$r:n$k$H$-$N(B -% \texttt{to \cs{@fixht}}$B$N9b$5;XDj$r$d$a$?(B} -% \changes{v2.8}{2017/05/01}{\cs{vss}$B$N0LCV$r0\F0(B} -% \changes{v2.8}{2017/05/01}{$B1&%+%i%`MQ$N=hM}$r4]$4$HDI2C(B} -% \changes{v2.8}{2017/05/01}{$B1&%+%i%`$G$O(B\cs{@rightfixht}$B$N9b$5$G(B -% $BAH$_N)$F!"(B\cs{@colht}$B$b99?7$9$k$h$&$K$7$?(B} -% \fi -% -% \iffalse -\NeedsTeXFormat{LaTeX2e} -%<*driver> -\ProvidesFile{nidanfloat.dtx} -%</driver> -%<core>\ProvidesPackage{nidanfloat}% - [2017/05/01 v2.8 Put double-floats at top/bottom within twocolumn mode] -% -%<*driver> -\documentclass{jltxdoc} -\GetFileInfo{nidanfloat.dtx} -\title{TOP, BOTTOM$B;XDj$,2DG=$J#2CJH4$-%U%m!<%H(B\\ - $B%P!<%8%g%s(B \space\fileversion} -\date{$B:n@.F|!'(B\filedate} -\author{$BCfLn(B $B8-(B\footnote{$B3t<02q<R(B $B%"%9%-!<(B $B=PHG5;=QIt(B - $B!J%a!<%k%"%I%l%9!'(Bken-na at ascii.co.jp$B!K(B}} -\begin{document} - \maketitle - \DocInput{\filename} -\end{document} -%</driver> -% \fi -% -% \begin{abstract} -% \file{nidanfloat}$B%Q%C%1!<%8$O!"FsCJAH;~$KCJH4$-$N%U%m!<%H$r%Z!<%82<It$K$b(B -% $BG[CV2DG=$K$9$k!#(B -% \end{abstract} -% -% \section{$B%3!<%I(B} -% -% \subsection{$B%Q%C%1!<%8%*%W%7%g%s(B} -% \changes{v2.5}{2001/09/14}{$B%Q%C%1!<%8%*%W%7%g%s$rDI2C(B} -% \file{nidanfloat}$B%Q%C%1!<%8$G$O!":G=*%Z!<%8$N:81&%+%i%`$N9b$5$r(B -% $B6Q0l$K?6$jJ,$1$k$h$&$K$7$F$$$k!#$7$+$7!"$3$N5!G=$N1F6A$K$h$j!"(B -% $B:G=*%Z!<%8$G$N(B|\newpage|$B$H(B|\clearpage|$B%3%^%s%I$,@5$7$/F0:n$7$J$$!#(B -% $B$=$3$G!"$3$N5!G=$r;H$&$+$I$&$+$r;XDj$9$k%*%W%7%g%s$rF3F~$7$?!#(B -% $B%Q%C%1!<%8;XDj;~$K%*%W%7%g%s(B``balance''$B$r;XDj$9$k$H!"(B -% $B:G=*%Z!<%8$N<+F0D4@0$r9T$J$&$h$&$K$J$k!#%G%U%)%k%H$G$O9T$J$o$J$$!#(B -% \begin{macrocode} -%<*core> -\DeclareOption{balance}{\AtEndDocument{\let\clearpage\balanceclearpage}} -\DeclareOption{nobalance}{\relax} -\ExecuteOptions{nobalance} -\ProcessOptions -% \end{macrocode} -% -% \subsection{$B%U%m!<%H%Q%i%a!<%?(B} -% $B$3$3$G$O!"CJH4$-$N%U%m!<%H$r%Z!<%82<It$KCV$/$?$a$K:n@.$7$?%Q%i%a!<%?$K(B -% $B$D$$$F@bL@$r$9$k!#(B -% -% \begin{macro}{\dblbotfraction} -% $B#2CJAH;~$K%Z!<%82<It$K@j$a$k$3$H$N$G$-$k!"FsCJH4$-%U%m!<%H$N3d9g!#(B -% $B%G%U%)%k%H$O(B0.5$B!"$9$J$o$A%Z!<%8H>J,$r@j$a$k$3$H$,$G$-$k$h$&$K$7$F$$$k!#(B -% \begin{macrocode} -\newcommand\dblbotfraction{0.5} -% \end{macrocode} -% \end{macro} -% -% \begin{macro}{\c@dblbotnumber} -% $B%Z!<%82<It$KF~$l$k$3$H$N$G$-$k!"FsCJH4$-%U%m!<%H$N?t!#(B -% $B%G%U%)%k%H$G$O!"Fs$D$N?^$rCV$/$3$H$,$G$-$k$h$&$K$7$F$$$k!#(B -% |\c@dblbotnumber|$B$O%+%&%s%?(B|dblnumber|$B$NFbIt7A<0!#(B -% \begin{macrocode} -\newcount\c@dblbotnumber -\setcounter{dblbotnumber}{2} -% \end{macrocode} -% \end{macro} -% -% \begin{macro}{\@dblbotroom} -% \begin{macro}{\@dblbotnum} -% |\@dblbotroom|$B$O!"%Z!<%82<It$K@j$a$k$3$H$N$G$-$k!"(B -% $BFsCJH4$-%U%m!<%H$N3d9g$r<($9D9$5JQ?t!#(B -% |\@dblbotnum|$B$O!"%Z!<%82<It$KF~$l$k$3$H$N$G$-$k!"(B -% $BFsCJH4$-%U%m!<%H$N?t$rJ];}$9$k%+%&%s%?!#(B -% \begin{macrocode} -\newdimen\@dblbotroom -\newcount\@dblbotnum -% \end{macrocode} -% \end{macro} -% \end{macro} -% -% \begin{macro}{\@dblfloatplacement} -% $BFsCJAHMQ$N%U%m!<%H%Q%i%a!<%?$r@_Dj$9$k%^%/%m$r!"?7$?$KDI2C$7$?%Q%i%a!<%?(B -% $B$b@_Dj$9$k$h$&$K:FDj5A$9$k!#(B -% \begin{macrocode} -\def\@dblfloatplacement{% - \global\@dbltopnum\c@dbltopnumber - \global\@dblbotnum\c@dblbotnumber % added - \global\@dbltoproom\dbltopfraction\@colht - \global\@dblbotroom\dblbotfraction\@colht % added - \@textmin\@colht - \advance\@textmin-\@dbltoproom - \advance\@textmin-\@dblbotroom % added - \@fpmin\dblfloatpagefraction\textheight - \@fptop\@dblfptop - \@fpsep\@dblfpsep - \@fpbot\@dblfpbot -} -% \end{macrocode} -% \end{macro} -% -% \subsection{$B%U%m!<%H%j%9%H$X$NEPO?(B} -% $BFsCJH4$-%U%m!<%H$NDj5A$O!"%/%i%9%U%!%$%k$G!"$D$.$N$h$&$K$7$F9T$J$o$l$k!#(B -%\begin{verbatim} -% \newenvironment{figure*} -% {\@dblfloat{figure}} -% {\end@dblfloat} -%\end{verbatim} -% $BJ8>OCf$G(B|figure*|$B4D6-$G0O$^$l$?ItJ,$O!"%U%m!<%HJ];}MQ$N%j%9%H$KEPO?$5$l$k!#(B -% $B$3$N@a$G$O!"CJH4$-%U%m!<%H$r%Z!<%82<It$K$bCV$1$k$h$&$K$9$k$?$a$K3HD%$7$?(B -% $B%^%/%m$K$D$$$F@bL@$r$9$k!#(B -% -% \begin{macro}{\@dblbotlist} -% \begin{macro}{\L@toplist} -% \begin{macro}{\R@toplist} -% \begin{macro}{\L@botlist} -% \begin{macro}{\R@botlist} -% $BFsCJAH$N%Z!<%82<It$KCV$/%U%m!<%H$rJ];}$9$k$?$a$K(B|\@dblbotlist|$B$rDI2C$9$k!#(B -% $B$^$?!"%+%i%`$N>e2<$KCV$/%U%m!<%HMQ$K$O!":8B&$H1&B&$G6hJL$r$9$k$?$a!"(B -% |\L@toplist|, |\R@toplist|, |\L@botlist|, |\R@botlist|$B$rDI2C$9$k!#(B -% \begin{macrocode} -\gdef\@dblbotlist{} -\gdef\L@toplist{} -\gdef\R@toplist{} -\gdef\L@botlist{} -\gdef\R@botlist{} -% \end{macrocode} -% \end{macro} -% \end{macro} -% \end{macro} -% \end{macro} -% \end{macro} -% -% \begin{macro}{\@dblfloat} -% \begin{macro}{\@dbflt} -% \begin{macro}{\end@dblfloat} -% |\@dblfloat|$B$+$i8F$S=P$5$l$k!"(B|\@dbflt|$B$r:FDj5A$7!"0LCV;XDj$,>JN,$5$l$?(B -% $B$H$-$N%Q%i%a!<%?$r(B``tb''$B$H$9$k!#$^$?!"(B|\end@dblfloat|$B$r(B|\end@float|$B$K$7$F!"(B -% $B8=:_%Z!<%8$N2<It$K%U%m!<%H$rCV$1$k$h$&$K$9$k!#(B -% \begin{macrocode} -\def\@dblfloat{% - \if@twocolumn\let\reserved@a\@dbflt\else\let\reserved@a\@float\fi - \reserved@a} -\def\@dbflt#1{\@ifnextchar[{\@xdblfloat{#1}}{\@xdblfloat{#1}[tb]}} -\def\@xdblfloat#1[#2]{% - \@xfloat{#1}[#2]\hsize\textwidth\linewidth\textwidth} -\let\end@dblfloat\end@float -% \end{macrocode} -% \end{macro} -% \end{macro} -% \end{macro} -% -% \begin{macro}{\addtocurcol} -% |\@xdblfloat|$B$+$i8F$S=P$5$l$?!"(B|\@xfloat|$B$O0LCV;XDj%*%W%7%g%s$NI>2A$r9T$J$$!"(B -% $B%U%m!<%H%*%V%8%'%/%H$NAH$_N)$F$r3+;O$9$k!#(B -% $B%U%m!<%H%*%V%8%'%/%H$NAH$_N)$F$O(B|\end@float|$B$G=*N;$9$k!#(B -% |\end@float|$B$O!"%Z%J%k%F%#CM$r(B$-10004$$B$K$7$F(B|\output|$B%k!<%A%s$r5/F0$9$k!#(B -% $B$3$NCM$G$N(B|\output|$B%k!<%A%s$O(B|\@specialoutput|$B$r5/F0$9$k!#(B -% |\@specialoutput|$B$O(B|\@addtocurcol|$B$r8F$S=P$7!"%U%m!<%H$NFbMF$r8=:_%Z!<%8$K(B -% $B=PNO$G$-$k$N$J$i$P=PNO$r$9$k!#$=$&$G$J$1$l$P!"JL$N2DG=@-$rC5$k!#(B -% \begin{macrocode} -\def\@addtocurcol{% -% \end{macrocode} -% $B$3$N%Q%C%1!<%8$N>l9g!"CJH4$-$N%U%m!<%H$,EO$5$l$k2DG=@-$,$"$k$N$G!"$^$:!"(B -% $B$=$l$r%A%'%C%/$9$k!#%U%m!<%H$NI}$,%+%i%`I}$h$j$bBg$-$$>l9g$O!"6/@)E*$K(B -% $BCJH4$-%U%m!<%H$H$7$F07$&!#(B -% \begin{macrocode} - \ifdim\wd\@currbox>\columnwidth - \@addtodblcol - \else -% \end{macrocode} -% $B$=$l0J30$N>l9g$O!"85$NF0:n$H$[$H$s$IF1$8$G$"$k!#(B -% \begin{macrocode} - \@insertfalse - \@setfloattypecounts - \ifnum\@fpstype=8 % is only `!p' - \else - \ifnum\@fpstype=24 % is only `p' - \else - \@flsettextmin - \advance\@textmin\@textfloatsheight - \@reqcolroom\@pageht - \ifdim\@textmin>\@reqcolroom \@reqcolroom\@textmin\fi - \advance\@reqcolroom\ht\@currbox - \ifdim\@colroom>\@reqcolroom - \@flsetnum\@colnum - \ifnum\@colnum>\z@ - \@bitor\@currtype\@deferlist - \if@test - \else -% \end{macrocode} -% $B%Z!<%82<It$N%U%m!<%H$rJ];}$7$F$$$k%U%m!<%H%j%9%H$NL>A0$,0[$J$k!#(B -% \begin{macrocode} - \@bitor\@currtype{\L@botlist\R@botlist}% - \if@test - \@addtobot - \else - \ifodd\count\@currbox - \advance\@reqcolroom\intextsep - \ifdim\@colroom>\@reqcolroom - \global\advance\@colnum\m@ne - \global\advance\@textfloatsheight\ht\@currbox - \global\advance\@textfloatsheight 2\intextsep - \@cons\@midlist\@currbox - \if@nobreak - \nobreak - \@nobreakfalse - \everypar{}% - \else - \addpenalty \interlinepenalty - \fi - \vskip\intextsep - \box\@currbox - \penalty\interlinepenalty - \vskip\intextsep - \ifnum\outputpenalty<-\@Mii \vskip-\parskip \fi - \outputpenalty\z@ - \@inserttrue - \fi - \fi - \if@insert\else\@addtotoporbot\fi - \fi - \fi - \fi - \fi - \fi - \fi - \if@insert\else\@resethfps\@cons\@deferlist\@currbox\fi - \fi -} -% \end{macrocode} -% \end{macro} -% -% \begin{macro}{\@addtotoporbot} -% $B%U%m!<%H$rJ];}$7$F$$$k%j%9%HJQ?t$N=$@5!#(B -% \changes{v2.3}{2000/12/20}{% -% $B%?%$%W%_%9$N=$@5$H(B\cs{@flcheckspace}$B$N8F$S=P$7$rJQ99(B} -% \begin{macrocode} -\def\@addtotoporbot{% - \@getfpsbit \tw@ - \ifodd\@tempcnta - \@flsetnum\@topnum - \ifnum\@topnum>\z@ - \@tempswafalse - \@flcheckspace\@toproom\@toplist\L@toplist\R@toplist - \if@tempswa - \@bitor\@currtype{\@midlist\L@botlist\R@botlist}% - \if@test\else - \if@firstcolumn - \@flupdates \@topnum \@toproom \L@toplist - \else - \@flupdates \@topnum \@toproom \R@toplist - \fi - \@inserttrue - \fi - \fi - \fi - \fi - \if@insert\else\@addtobot\fi -} -% \end{macrocode} -% \end{macro} -% -% \begin{macro}{\@addtobot} -% $B%U%m!<%H$rJ];}$7$F$$$k%j%9%HJQ?t$N=$@5!#(B -% \changes{v2.3}{2000/12/20}{\cs{@flcheckspace}$B$N8F$S=P$7$rJQ99(B} -% \begin{macrocode} -\def\@addtobot{% - \@getfpsbit 4\relax - \ifodd\@tempcnta - \@flsetnum\@botnum - \ifnum\@botnum>\z@ - \@tempswafalse - \@flcheckspace\@botroom\@botlist\L@botlist\R@botlist - \if@tempswa - \global\maxdepth\z@ - \if@firstcolumn - \@flupdates \@botnum \@botroom \L@botlist - \else - \@flupdates \@botnum \@botroom \R@botlist - \fi - \@inserttrue - \fi - \fi - \fi -} -% \end{macrocode} -% \end{macro} -% -% \begin{macro}{\org@addtonextcol} -% \begin{macro}{\@addtonextcol} -% $BA^F~$K<:GT$7$?%U%m!<%H$d(B`p'$B;XDj$N%U%m!<%H$r=PNO$9$k$N$K!"(B -% |\@startcolumn|$B$GMQ$$$i$l$k!#$3$N%Q%C%1!<%8$G$O!"%+%i%`I}$h$j$bBg$-$$I}$r(B -% $B;}$D%U%m!<%H$KBP$7$F$O!"CJH4$-%U%m!<%H%j%9%H$H$7$F=PNO$9$k$h$&$K$7$F$$$k!#(B -% \begin{macrocode} -\let\org@addtonextcol\@addtonextcol -\def\@addtonextcol{% - \ifdim\wd\@currbox>\columnwidth - \@addtodblcol - \else - \org@addtonextcol - \fi -} -% \end{macrocode} -% \end{macro} -% \end{macro} -% -% \begin{macro}{\@addtodblcol} -% |\@addtodblcol|$B%^%/%m$O!"%U%m!<%H%*%V%8%'%/%H$,8=:_%Z!<%8$KF~$k$+$I$&$+(B -% $B$r3NG'$7!"F~$k$N$G$"$l$P(B|\@addtodbltoporbot|$B$r8F$S=P$9!#$=$&$G$J$1$l$P!"(B -% |\@dbldeferlist|$B$KEPO?$9$k!#(B -% -% $B$^$:(B|@insert|$B%U%i%0$r56$K$9$k!#$=$7$F!"%U%m!<%H%?%$%W$r(B|\@fpstype|$B$KF@$k!#(B -% $B%U%m!<%H%?%$%W$,(B8$B$^$?$O(B24$B$N>l9g!"0LCV%*%W%7%g%s$O(B`!p'$B$+(B`p'$B$@$1$G$"$k$N$G!"(B -% $BL5>r7o$K(B|\@dbldeferlist|$B$K2C$($k!#(B -% \begin{macrocode} -\def\@addtodblcol{% - \begingroup - \@insertfalse - \@setfloattypecounts - \ifnum\@fpstype=8 % is only `!p' - \else - \ifnum\@fpstype=24 % is only `p' - \else -% \end{macrocode} -% $B$=$&$G$J$1$l$P!"F1%?%$%W$N%U%m!<%H$GL$=PNO$N$b$N$,$"$k$+$I$&$+$r3NG'$9$k!#(B -% $BF1%?%$%W$N%U%m!<%H$G$^$@=PNO$7$F$$$J$$$b$N$,$"$k>l9g$O!"8=:_$N%U%m!<%H$r(B -% $B=PNO$7$J$$!#$?$@$7!"F1%?%$%W$G$"$C$F$b%+%i%`I}$N%U%m!<%H$K$D$$$F$O9MN8(B -% $B$7$J$$!#=PNO$9$k$3$H$,$G$-$k$N$J$i$P!"(B|\@addtodblbotortop|$B$r8F$S=P$9!#(B -% \begin{macrocode} - \@bitor\@currtype{\@dbldeferlist} - %\@bitor\@currtype{\@deferlist\@dbldeferlist} - \if@test - \else - \@tempswafalse - \@checkdblspace - \if@tempswa - \@addtodbltoporbot - \fi - \fi - \fi - \fi - \if@insert\else\@cons\@dbldeferlist\@currbox\fi - \endgroup -} -% \end{macrocode} -% \end{macro} -% -% \begin{macro}{\@addtodbltoporbot} -% $B$^$:!"(B`t'$B$N;XDj$,$"$k$+$H!"%Z!<%8>eIt$KF~$l$k?t$r1[$($F$$$J$$$+$r3NG'$9$k!#(B -% \begin{macrocode} -\def\@addtodbltoporbot{% - \@getfpsbit \tw@ - \ifodd\@tempcnta - \@flsetnum\@dbltopnum - \ifnum\@dbltopnum>\z@ -% \end{macrocode} -% $B$=$7$F!"%Z!<%8>eIt$"$k$$$O2<It$KF1%?%$%W$N%U%m!<%H$,=PNO$5$l$k2DG=@-$,(B -% $B$"$k$N$+$rD4$Y$k!#FsCJAH%U%m!<%H$O0lCJAH%U%m!<%H$N>eIt$KCV$+$l$k$3$H$KCm0U!#(B -% \begin{macrocode} - \@bitor\@currtype{% - \L@toplist\R@toplist\L@botlist\R@botlist\@dblbotlist} - \if@test - \else -% \end{macrocode} -% $BG[CV2DG=$J$i$P!"=PNO$9$k$@$1$N%9%Z!<%9$,$"$k$N$+$r3NG'$9$k!#(B -% \begin{macrocode} - \@tempswafalse - \@dblflcheckspace \@dbltoproom \@dbltoplist -% \end{macrocode} -% $B%9%Z!<%9$,$"$l$P!"CJH4$-%U%m!<%H$,>eIt$K@j$a$k$3$H$N$G$-$k9b$5$+$i!"(B -% $B$=$NJ,$r0z$/!#$^$?!">eIt$KF~$l$kCJH4$-%U%m!<%H$N?t$r8:$i$7!"(B -% $B>eItCJH4$-MQ$N%U%m!<%H%j%9%H$KEPO?$r$9$k!#(B -% \begin{macrocode} - \if@tempswa - \@tempdima-\ht\@currbox - \advance\@tempdima - -\ifx\@dbltoplist\@empty \dbltextfloatsep\else\dblfloatsep\fi - \global\advance\@dbltoproom\@tempdima - \global\advance\@dbltopnum\m@ne - \@cons\@dbltoplist\@currbox -% \end{macrocode} -% $B:8%+%i%`$N$H$-$O!"%+%i%`$N9b$5(B|\@colroom|$B$+$i%U%m!<%HJ,$r0z$/!#(B -% \begin{macrocode} - \if@firstcolumn - \advance\@colroom\@tempdima - \global\advance\@colroom\maxdepth -% \end{macrocode} -% $B1&%+%i%`$N$H$-$O!"?75,$NCJH4$-%U%m!<%HJ,$@$1$G$J$/!"$3$l$rA^F~$9$k$3$H(B -% $B$K$h$C$F!":8%+%i%`$+$i0\F0$7$F$/$k%F%-%9%H$N9b$5$b0z$/!#(B -% \begin{macrocode} - \else - \@tempdima\textheight - \@chkdblfloatht\advance\@tempdima-\@floatht - \L@chkfloatht\advance\@tempdima-\@floatht - \vbadness=\@M \splittopskip=\topskip \splitmaxdepth=\maxdepth - \setbox\z@=\vbox{\unvcopy\@leftcolumn}% - \setbox\@ne=\vsplit\z@ to\@tempdima - \advance\@colroom-\ht\z@ - \global\advance\@colroom-\dp\z@ - \fi -% \end{macrocode} -% $B:G8e$K!"(B|@insert|$B%U%i%0$r??$K$9$k!#(B -% \begin{macrocode} - \@inserttrue - \fi - \fi - \fi - \fi - \if@insert\else\@addtodblbot\fi -} -% \end{macrocode} -% \end{macro} -% -% \begin{macro}{\@addtodblbot} -% $B%Z!<%82<It$KCJH4$-%U%m!<%H$rCV$/$H$-$b!">eIt$HF1$8$G$"$k!#(B -% $B$?$@$7!"FsCJAH%U%m!<%H$O:G2<It$KCV$+$l$k$N$G!"B>$N=PNOMQ%j%9%H$rD4$Y$k(B -% $BI,MW$O$J$$$3$H$,0[$J$k!#(B -% \begin{macrocode} -\def\@addtodblbot{% - \@getfpsbit 4\relax - \ifodd\@tempcnta - \@flsetnum\@botnum - \ifnum\@botnum>\z@ - \@tempswafalse - \@dblflcheckspace \@dbltoproom \@dbltoplist - \if@tempswa - \@tempdima-\ht\@currbox \advance\@tempdima - -\ifx\@dblbotlist\@empty \dbltextfloatsep\else\dblfloatsep\fi - \global\advance\@dblbotroom\@tempdima - \global\advance\@dblbotnum\m@ne - \@cons\@dblbotlist\@currbox - \if@firstcolumn - \advance\@colroom\@tempdima - \global\advance\@colroom\maxdepth - \else - \@tempdima\textheight - \@chkdblfloatht\advance\@tempdima-\@floatht - \L@chkfloatht\advance\@tempdima-\@floatht - \vbadness=\@M \splittopskip=\topskip \splitmaxdepth=\maxdepth - \setbox\z@=\vbox{\unvcopy\@leftcolumn}% - \setbox\@ne=\vsplit\z@ to\@tempdima - \advance\@colroom-\ht\z@ - \global\advance\@colroom-\dp\z@ - \fi - \@inserttrue - \fi - \fi - \fi -} -% \end{macrocode} -% \end{macro} -% -% \subsection{$B%U%m!<%H$N9b$5$r7W;;$9$k%^%/%m(B} -% -% \begin{macro}{\@floatht} -% |\@floatht|$B$O!"=PNO%j%9%H$K3JG<$5$l$F$$$k%U%m!<%H$N9b$5$r3JG<$9$k$N$KMQ$$$k!#(B -% \begin{macrocode} -\global\newdimen\@floatht \@floatht\z@ -% \end{macrocode} -% \end{macro} -% -% \begin{macro}{\@flcheckspace} -% \changes{v2.3}{2000/12/20}{$B>u67JL$K>l9g$o$1$9$k$h$&$K$7$?(B} -% \begin{macrocode} -\def \@flcheckspace #1#2#3#4{% - \advance \@reqcolroom - \if@twocolumn - \if@firstcolumn - \ifx #3\@empty \textfloatsep \else \floatsep \fi - \else - \ifx #4\@empty \textfloatsep \else \floatsep \fi - \fi - \else - \ifx #2\@empty \textfloatsep \else \floatsep \fi - \fi - \ifdim \@colroom>\@reqcolroom - \ifdim #1>\ht\@currbox - \@tempswatrue - \else - \ifnum \@fpstype<\sixt@@n - \@tempswatrue - \fi - \fi - \fi -} -% \end{macrocode} -% \end{macro} -% -% \begin{macro}{\@dblflcheckspace} -% $BCJH4$-%U%m!<%H$,%Z!<%8>eIt$"$k$$$O2<It$K@j$a$k$3$H$N$G$-$k3d9g$r1[$($F(B -% $B$$$J$$$+$r%A%'%C%/$9$k!#1[$($F$$$J$1$l$P(B|\@tempswa|$B$r??$K$9$k!#(B -% \changes{v2.6}{2003/05/15}{\cs{@fstype}$B$r(B\cs{@fstyle}$B$H%?%$%W%_%9$7$F$$$?(B} -% \begin{macrocode} -\def\@dblflcheckspace#1#2{% - \@tempdima=#1\relax - \advance\@tempdima - -\ifx #2\@empty \dbltextfloatsep\else\dblfloatsep\fi - \ifdim\@tempdima>\ht\@currbox - \@tempswatrue - \else - \ifnum\@fpstype<\sixt@@n - \advance\@tempdima\@textmin - \if \@tempdima>\ht\@currbox - \@tempswatrue - \fi - \fi - \fi -} -% \end{macrocode} -% \end{macro} -% -% \begin{macro}{\@checkdblspace} -% $BCJH4$-%U%m!<%H$HCJH4$-%U%m!<%H4V%9%Z!<%9!J$"$k$$$OCJH4$-%U%m!<%H$H%F%-%9%H$H(B -% $B$N4V$N%9%Z!<%9!K$rF~$l$kM>M5$,$"$k$+$rD4$Y$k!#(B -% -% $B$^$:!"8=:_!"AH$_N)$F$F$"$k%F%-%9%H$N9b$5$H!":G>.8BF~$i$J$/$F$O$J$i$J$$(B -% $B%F%-%9%H$NNL$H$rHf3S$7!"Bg$-$$$[$&$r(B|\@tempdima|$B$K3JG<$9$k!#(B -% $B1&%+%i%`$K$$$k$H$-$O!":8%+%i%`$N%F%-%9%H$N9b$5$b2C$($k!#(B -% \begin{macrocode} -\def\@checkdblspace{% - \@tempdima\@pageht\advance\@tempdima\@pagedp - \@tempdimb\textfraction\@colht - \ifdim\@tempdima<\@tempdimb \@tempdima\@tempdimb\fi - \if@firstcolumn\else - \advance\@tempdima\ht\@leftcolumn - \advance\@tempdima\dp\@leftcolumn - \fi -% \end{macrocode} -% $B$=$7$F!"=PNO$9$kM=Dj$N%+%i%`I}%U%m!<%H$HCJH4$-%U%m!<%H$N9b$5$r2C$($k!#(B -% $B$3$N$H$-!"CJH4$-MQ$N%U%m!<%H$N9b$5$OFsG\$9$k!#(B -% \begin{macrocode} - \L@chkfloatht\advance\@tempdima\@floatht - \R@chkfloatht\advance\@tempdima\@floatht - \@chkdblfloatht\advance\@tempdima\tw@\@floatht -% \end{macrocode} -% $B$=$l$+$i!"8=:_$N%U%m!<%H$N9b$5$HI,MW$J%9%Z!<%9$r2C$($k!#(B -% $B$3$N$H$-$b!"$=$l$i$N9b$5$rFsG\$9$k!#(B -% \begin{macrocode} - \@tempdimb\ht\@currbox\advance\@tempdimb\dp\@currbox - \advance\@tempdimb - \ifdim\@floatht>\z@ \dbltextfloatsep\else\dblfloatsep\fi - \multiply\@tempdimb\tw@ \advance\@tempdima\@tempdimb -% \end{macrocode} -% $B$3$l$i$9$Y$F$NMWAGJ,$N9b$5$,(B|\textheight|$B$N#2G\$h$j$b>.$5$1$l$P!"(B -% $B8=:_$N%U%m!<%H$rCV$/$3$H$,$G$-$k$HH=CG$9$k!#(B -% \begin{macrocode} - \ifdim\@tempdima>\tw@\textheight - \@tempswafalse - \else - \@tempswatrue - \fi -} -% \end{macrocode} -% \end{macro} -% -% \begin{macro}{\tmp@comflelt} -% \begin{macro}{\tmp@comdblflelt} -% $B=PNO%j%9%H$K3JG<$5$l$F$$$k%U%m!<%H$N9b$5$r7W$k$?$a$KMQ$$$k!#(B -% $B$=$l$>$l!"(B|\@comfelt|, |\@comdblflelt|$B$HF1$8$@$,!"%U%m!<%H$NFbMF$,(B -% $B<:$o$l$J$$$h$&$K(B|\copy|$B$r$7$F$$$k$N$,0[$J$k!#(B -% \begin{macrocode} -\def\tmp@comflelt#1{% - \setbox\@tempboxa - \vbox{\unvbox\@tempboxa\copy #1\vskip\floatsep}% -} -\def\tmp@comdblflelt#1{% - \setbox\@tempboxa - \vbox{\unvbox\@tempboxa\copy #1\vskip\dblfloatsep}% -} -% \end{macrocode} -% \end{macro} -% \end{macro} -% -% \begin{macro}{\L@chkfloatht} -% \begin{macro}{\R@chkfloatht} -% $B$=$l$>$l!":8%+%i%`$H1&%+%i%`$K=PNO$9$k%U%m!<%H$N9b$5$r7W;;$9$k$N$KMQ$$$k!#(B -% $B7W;;7k2L$O(B|\@floatht|$B$K3JG<$9$k!#(B -% \begin{macrocode} -\def\L@chkfloatht{\@floatht\z@ - \ifx\L@toplist\@empty\else - \let\@elt\tmp@comflelt\setbox\@tempboxa\vbox{}\L@toplist - \setbox\@ne\vbox{\boxmaxdepth\maxdepth - \unvbox\@tempboxa\vskip-\floatsep\topfigrule\vskip\textfloatsep - }% - \let\@elt\relax \advance\@floatht\ht\@ne \advance\@floatht\dp\@ne - \fi - \ifx\L@botlist\@empty\else - \let\@elt\tmp@comflelt\setbox\@tempboxa\vbox{}\L@botlist - \setbox\@ne\vbox{\boxmaxdepth\maxdepth - \vskip\textfloatsep\botfigrule\unvbox\@tempboxa\vskip-\floatsep - }% - \let\@elt\relax \advance\@floatht\ht\@ne \advance\@floatht\dp\@ne - \fi - \global\@floatht\@floatht -} -\def\R@chkfloatht{\@floatht\z@ - \ifx\R@toplist\@empty\else - \let\@elt\tmp@comflelt\setbox\@tempboxa\vbox{}\R@toplist - \setbox\@ne\vbox{\boxmaxdepth\maxdepth - \unvbox\@tempboxa\vskip-\floatsep\topfigrule\vskip\textfloatsep - }% - \let\@elt\relax \advance\@floatht\ht\@ne \advance\@floatht\dp\@ne - \fi - \ifx\R@botlist\@empty\else - \let\@elt\tmp@comflelt\setbox\@tempboxa\vbox{}\R@botlist - \setbox\@ne\vbox{\boxmaxdepth\maxdepth - \vskip\textfloatsep\botfigrule\unvbox\@tempboxa\vskip-\floatsep - }% - \let\@elt\relax \advance\@floatht\ht\@ne \advance\@floatht\dp\@ne - \fi - \global\@floatht\@floatht -} -% \end{macrocode} -% \end{macro} -% \end{macro} -% -% \begin{macro}{\@chkdblfloatht} -% $B%Z!<%8>eIt$H2<It$K=PNO$9$kCJH4$-%U%m!<%H$N9b$5$r7W;;$7!"(B -% $B7k2L$r(B|\@floatht|$B$K3JG<$9$k!#(B -% \begin{macrocode} -\def\@chkdblfloatht{\@floatht\z@ - \ifx\@dbltoplist\@empty\else - \let\@elt\tmp@comdblflelt\setbox\@tempboxa\vbox{}\@dbltoplist - \setbox\@ne\vbox{\boxmaxdepth\maxdepth - \unvbox\@tempboxa - \vskip-\dblfloatsep - \dblfigrule - \vskip\dbltextfloatsep - }% - \let\@elt\relax \advance\@floatht\ht\@ne \advance\@floatht\dp\@ne - \fi - \ifx\@dblbotlist\@empty\else - \let\@elt\tmp@comdblflelt\setbox\@tempboxa\vbox{}\@dblbotlist - \setbox\@ne\vbox{\boxmaxdepth\maxdepth - \vskip\dbltextfloatsep - \dblfigrule - \unvbox\@tempboxa - \vskip-\dblfloatsep - }% - \let\@elt\relax \advance\@floatht\ht\@ne \advance\@floatht\dp\@ne - \fi - \global\@floatht\@floatht -} -% \end{macrocode} -% \end{macro} -% -% \subsection{$B%U%m!<%H$H%F%-%9%H$N%^!<%8(B} -% -% \begin{macro}{\@fixht} -% |\@fixht|$B$O!":8%+%i%`$N9b$5$r3JG<$9$k$N$KMQ$$$k!#(B -% \begin{macrocode} -\global\newdimen\@fixht -% \end{macrocode} -% \end{macro} -% -% \begin{macro}{\@rightfixht} -% \emph{$BF|K\8l(B\TeX{}$B3+H/%3%_%e%K%F%#$K$h$kDI2C(B}$B!'(B -% |\@rightfixht|$B$O!"1&%+%i%`$N9b$5$r3JG<$9$k$N$KMQ$$$k!#(B -% \changes{v2.8}{2017/05/01}{\cs{@rightfixht}$B$rDI2C(B} -% \begin{macrocode} -\global\newdimen\@rightfixht -% \end{macrocode} -% \end{macro} -% -% \begin{macro}{\@combinefloats} -% \changes{v2.4}{2001/07/23}{\cs{boxmaxdepth}$B$r(B\cs{maxdepth}$B$K$7$J$$$h$&$K$7$?(B} -% |\@combinefloats|$B$O!"%+%i%`C10L$G!"%F%-%9%H$H%U%m!<%H$r%^!<%8$9$k!#(B -% $B$3$N%^%/%m$O1&%+%i%`$N$H$-$K<B9T$9$k!#(B -% \begin{macrocode} -\def\@combinefloats{% - %%\boxmaxdepth\maxdepth - \if@twocolumn - \if@firstcolumn - \else -% \end{macrocode} -% $B:8%+%i%`$N%F%-%9%H!">e2<$N%+%i%`I}%U%m!<%H!">e2<$NCJH4$-%U%m!<%H$N9b$5$N(B -% $B9g7W$r(B|\@fixht|$B$K3JG<$9$k!#(B -% \begin{macrocode} - \@fixht\ht\@leftcolumn \advance\@fixht\dp\@leftcolumn - \@chkdblfloatht \@tempdima\@floatht - \L@chkfloatht \advance\@tempdima\@floatht - \advance\@fixht\@tempdima -% \end{macrocode} -% |\@fixht|$B$N9b$5$,(B|\textheight|$B$h$j$bBg$-$$>l9g!"%F%-%9%H$rJ,3d$7!"F~$i$J$$(B -% $BItJ,$r1&%+%i%`$K0\$9!#(B -% \begin{macrocode} - \ifdim\@fixht>\textheight -% \end{macrocode} -% $B:8%+%i%`$K;D$9ItJ,$N9b$5$r(B|\@fixht|$B$K3JG<$9$k!#(B -% \begin{macrocode} - \@fixht\textheight - \advance\@fixht-\@tempdima - \advance\@fixht\maxdepth -% \end{macrocode} -% |\@fixht|$BJ,$N%F%-%9%H$r%\%C%/%9#0$K3JG<$9$k!#(B -% \begin{macrocode} - \vbadness=\@M \splittopskip=\topskip \splitmaxdepth=\maxdepth - \setbox\z@=\vsplit\@leftcolumn to\@fixht -% \end{macrocode} -% $B0\F0$9$kItJ,$O(B|\@leftcolumn|$B$K;D$C$F$$$k$N$G!"(B -% $B$=$l$r1&%+%i%`!J(B|\@outputbox|$B!K$KF~$l$k!#(B -% $B$^$?!"%\%C%/%9#0$NFbMF$r:8%+%i%`$KLa$9!#(B -% \changes{v2.4}{2001/02/19}{$B9T4V$,B7$o$J$$ItJ,$r=$@5(B} -% \changes{v2.4}{2001/02/19}{$BCl$,=P$J$$$N$r=$@5(B} -% \changes{v2.8}{2017/05/01}{\cs{@outputbox}$B$r:n$k$H$-$N(B -% \texttt{to \cs{@fixht}}$B$N9b$5;XDj$r$d$a$?(B} -% \begin{macrocode} - \advance\@fixht-\maxdepth - \@tempdima\baselineskip \advance\@tempdima-\topskip - \setbox\@outputbox=\vbox{% - \ifvoid\@leftcolumn - \else - \unvbox\@leftcolumn\vskip\@tempdima - \fi\relax - \unvbox\@outputbox}% \vss moved from here -% \end{macrocode} -% \changes{v2.5}{2001/09/14}{\cs{vsplit}$B;~!"(Binfinite$B%(%i!<$K$J$k$N$r=$@5(B} -% |\@leftcolumn|$B$r:n@.$9$k$H$-$KMQ$$$F$$$?(B|\vss|$B$,(B -%\begin{verbatim} -% ! Infinite glue shrinkage found in box being split. -%\end{verbatim} -% $B$N%(%i!<$r5/$3$9$3$H$,$"$k$N$G:o=|$7$?!#(B -% -% \emph{$BF|K\8l(B\TeX{}$B3+H/%3%_%e%K%F%#$K$h$k=$@5(B}$B!'(B -% $B$3$N>l=j$N$9$0>e$K$"$k%3!<%I$N(B|\unvbox\@outputbox|$B$ND>8e$K$"$C$?(B|vss|$B$r(B -% $B$3$A$i$K;}$C$F$-$^$7$?!#(B -% \changes{v2.8}{2017/05/01}{\cs{vss}$B$N0LCV$r0\F0(B} -% \begin{macrocode} - \setbox\@leftcolumn=\vbox to\@fixht{\unvbox\z@\vss}% to here (2017/05/01) - \fi -% \end{macrocode} -% $B:8%+%i%`$N%F%-%9%H%5%$%:$K:8%+%i%`$KF~$k%U%m!<%H$N9b$5$r2C$($k$3$H$G!"(B -% $B:8%+%i%`$N9b$5$r(B|\@fixht|$B$K3JG<$7$^$9!#(B -% \begin{macrocode} - \@fixht\ht\@leftcolumn - \advance\@fixht\dp\@leftcolumn \advance\@fixht\@floatht -% \end{macrocode} -% \emph{$BF|K\8l(B\TeX{}$B3+H/%3%_%e%K%F%#$K$h$kDI2C(B}$B!'(B -% $B1&%+%i%`$K$D$$$F$bF1MM$K=hM}$7$^$9!#$3$l$G!"8E$/$+$i$"$C$?(B -% $B1&%+%i%`$H%U%m!<%H$,=E$J$k%P%0$r2r>C$7$^$7$?!#(B -% \changes{v2.8}{2017/05/01}{$B1&%+%i%`MQ$N=hM}$r4]$4$HDI2C(B} -% \begin{macrocode} - \@rightfixht\ht\@outputbox \advance\@rightfixht\dp\@outputbox - \@chkdblfloatht \@tempdima\@floatht - \R@chkfloatht \advance\@tempdima\@floatht - \advance\@rightfixht\@tempdima - \ifdim\@rightfixht>\textheight - \@rightfixht\textheight - \advance\@rightfixht-\@tempdima - \advance\@rightfixht\maxdepth - \vbadness=\@M \splittopskip=\topskip \splitmaxdepth=\maxdepth - \setbox\z@=\vsplit\@outputbox to\@rightfixht - \advance\@rightfixht-\maxdepth - \unvbox\@outputbox - \setbox\@outputbox=\vbox to\@rightfixht{\unvbox\z@\vss}% - \fi - \@rightfixht\ht\@outputbox - \advance\@rightfixht\dp\@outputbox \advance\@rightfixht\@floatht -% \end{macrocode} -% $B:81&!"$=$l$>$l%F%-%9%H$H%+%i%`I}%U%m!<%H$rAH$_N)$F$k!#(B -% \begin{macrocode} - \ifx\L@toplist\@empty\else\L@cflt\fi - \ifx\L@botlist\@empty\else\L@cflb\fi - \ifx\R@toplist\@empty\else\R@cflt\fi - \ifx\R@botlist\@empty\else\R@cflb\fi - \fi -% \end{macrocode} -% $BFsCJAH$G$J$$$H$-$O=>Mh$I$*$j$NF0:n$r$9$k!#(B -% \begin{macrocode} - \else - \ifx\@toplist\@empty\else\@cflt\fi - \ifx\@botlist\@empty\else\@cflb\fi - \fi -} -% \end{macrocode} -% \end{macro} -% -% \begin{macro}{\L@cflt} -% \begin{macro}{\L@cflb} -% \begin{macro}{\R@cflt} -% \begin{macro}{\R@cflb} -% $B:8%+%i%`$H1&%+%i%`$rAH$_N)$F$k$N$KMQ$$$k!#(B -% -% \emph{$BF|K\8l(B\TeX{}$B3+H/%3%_%e%K%F%#$K$h$kDI2C(B}$B!'(B -% $B:8%+%i%`$G$O(B|\@fixht|$B!"1&%+%i%`$G$O(B|\@rightfixht|$B$N9b$5$K$J$k$h$&$K(B -% $B$7$^$9!#$^$?!"(B|\@colht|$B$r$3$l$i$N9b$5$K99?7$7$^$9!#(B -% \changes{v2.3}{2000/12/20}{\cs{gdef}$B$r(B\cs{global}\cs{let}$B$KJQ99(B} -% \changes{v2.8}{2017/05/01}{$B1&%+%i%`$G$O(B\cs{@rightfixht}$B$N9b$5$G(B -% $BAH$_N)$F!"(B\cs{@colht}$B$b99?7$9$k$h$&$K$7$?(B} -% \begin{macrocode} -\def\L@cflt{% - \let\@elt\@comflelt\setbox\@tempboxa\vbox{}\L@toplist - \setbox\@leftcolumn\vbox to\@fixht{\boxmaxdepth\maxdepth - \unvbox\@tempboxa - \vskip-\floatsep\topfigrule\vskip\textfloatsep\unvbox\@leftcolumn - \vss}% - \let\@elt\relax - \xdef\@freelist{\@freelist\L@toplist}\global\let\L@toplist\@empty - \@colht\@fixht -} -\def\L@cflb{% - \let\@elt\@comflelt\setbox\@tempboxa\vbox{}\L@botlist - \setbox\@leftcolumn\vbox to\@fixht{\boxmaxdepth\maxdepth - \unvbox\@leftcolumn - \vskip\textfloatsep\botfigrule\unvbox\@tempboxa\vskip-\floatsep - \vss}% - \let\@elt\relax - \xdef\@freelist{\@freelist\L@botlist}\global\let\L@botlist\@empty - \@colht\@fixht -} -\def\R@cflt{% - \let\@elt\@comflelt\setbox\@tempboxa\vbox{}\R@toplist - \setbox\@outputbox\vbox to\@rightfixht{\boxmaxdepth\maxdepth - \unvbox\@tempboxa - \vskip-\floatsep\topfigrule\vskip\textfloatsep\unvbox\@outputbox - \vss}% - \let\@elt\relax - \xdef\@freelist{\@freelist\R@toplist}\global\let\R@toplist\@empty - \@colht\@rightfixht -} -\def\R@cflb{% - \let\@elt\@comflelt\setbox\@tempboxa\vbox{}\R@botlist - \setbox\@outputbox\vbox to\@rightfixht{\boxmaxdepth\maxdepth - \unvbox\@outputbox - \vskip\textfloatsep\botfigrule\unvbox\@tempboxa\vskip-\floatsep - \vss}% - \let\@elt\relax - \xdef\@freelist{\@freelist\R@botlist}\global\let\R@botlist\@empty - \@colht\@rightfixht -} -% \end{macrocode} -% \end{macro} -% \end{macro} -% \end{macro} -% \end{macro} -% -% \begin{macro}{\@combinedblfloats} -% $B%F%-%9%H$HCJH4$-%U%m!<%H$r%^!<%8$9$k!#$3$N%Q%C%1!<%8$G$O!"%Z!<%82<It$N(B -% $BCJH4$-%U%m!<%H$b%^!<%8$9$k$h$&$K3HD%$7$F$$$k!#(B -% \begin{macrocode} -%\def\@comdblflelt#1{\setbox\@tempboxa -% \vbox{\unvbox\@tempboxa\box#1\vskip\dblfloatsep}} -% -\def\@combinedblfloats{% - \ifx\@dbltoplist\@empty - \else - \let\@elt\@comdblflelt\setbox\@tempboxa\vbox{}\@dbltoplist - \setbox\@outputbox\vbox{\boxmaxdepth\maxdepth - \unvbox\@tempboxa - \vskip-\dblfloatsep - \dblfigrule - \vskip\dbltextfloatsep - \box\@outputbox}% - \let\@elt\relax\xdef\@freelist{\@freelist\@dbltoplist}% - \global\let\@dbltoplist\@empty - \fi - \ifx\@dblbotlist\@empty - \else - \let\@elt\@comdblflelt\setbox\@tempboxa\vbox{}\@dblbotlist - \setbox\@outputbox\vbox{\boxmaxdepth\maxdepth - \box\@outputbox - \vskip\dbltextfloatsep - \dblfigrule - \unvbox\@tempboxa - \vskip-\dblfloatsep - }% - \let\@elt\relax\xdef\@freelist{\@freelist\@dblbotlist}% - \global\let\@dblbotlist\@empty - \fi - \global\setbox\@outputbox\vbox to\textheight{\unvbox\@outputbox}% -} -% \end{macrocode} -% \end{macro} -% -% \subsection{$BFsCJAH$N=PNO(B} -% -% \begin{macro}{\if@balance} -% $B:81&$N%+%i%`$r6QEy$K$7$F=PNO$9$k$+$I$&$+$r<($9%U%i%0!#(B -% \begin{macrocode} -\newif\if@balance \@balancefalse -% \end{macrocode} -% \end{macro} -% -% \begin{macro}{\@outputdblcol} -% $B:81&$N%+%i%`$rO"7k$7!"=PNO$9$k$N$O(B|\@outputdblcol|$B$,9T$J$&!#(B -% $B$3$N%Q%C%1!<%8$G$O!":81&$N%+%i%`$r6QEy$KJ,3d$9$k$?$a$N%k!<%A%s$r2C$($F$"$k!#(B -% \begin{macrocode} -\newbox\@combinebox -% \end{macrocode} -% $B:8%+%i%`$rAH$_N)$F$?$@$1$N;~E@$G$O!"$=$l$r(B|\@leftcolumn|$B$K3JG<$9$k$@$1$G(B -% $B=PNO$O$7$J$$!#(B -% \changes{v2.4}{2001/02/19}{$B:G=*%Z!<%8$G:81&$N9T4V$,B7$o$J$$ItJ,$r=$@5(B} -% \changes{v2.4}{2001/02/19}{$BCl$,=P$J$$$N$r=$@5(B} -% \begin{macrocode} -\def\@outputdblcol{% - \if@firstcolumn - \global\@firstcolumnfalse - \global\setbox\@leftcolumn\box\@outputbox - \@colht\textheight - \@chkdblfloatht\global\advance\@colht-\@floatht - \else - \global\@firstcolumntrue - \if@balance % $B:81&%+%i%`$r6QEy$KJ,3d(B - \@tempdima\baselineskip - \advance\@tempdima-\topskip - % $BO"7k(B - \setbox\@combinebox=\vbox{% - \unvbox\@leftcolumn\vskip\@tempdima\unvbox\@outputbox}% - \@tempdima\ht\@combinebox - \advance\@tempdima\dp\@combinebox - \divide\@tempdima\tw@ - % $BJ,3d(B - \vbadness=\@M \splittopskip=\topskip \splitmaxdepth=\maxdepth - \setbox\@leftcolumn=\vsplit\@combinebox to\@tempdima - \setbox\@outputbox=\vtop{\unvbox\@combinebox} - \setbox\@leftcolumn=\vtop{\unvbox\@leftcolumn} - \fi - % $B@07A(B - \@tempdima\ht\@leftcolumn - \setbox\@outputbox\vbox to\@tempdima{% - \hb@xt@\textwidth{% - \hb@xt@\columnwidth{% - \vbox to\@tempdima{\box\@leftcolumn\vss}\hss}% - \hfil - \vrule width\columnseprule - \hfil - \hb@xt@\columnwidth{% - \vbox to\@tempdima{\box\@outputbox\vss}\hss}% - }% - \vss - }% - \@combinedblfloats - \@outputpage - \begingroup - \@dblfloatplacement - \@startdblcolumn - \@whilesw\if@fcolmade \fi{\@outputpage\@startdblcolumn}% - \endgroup - \fi - \global\@balancefalse -} -% \end{macrocode} -% \end{macro} -% -% \begin{macro}{\@startdblcolumn} -% $BFsCJAH$r3+;O$9$k$H$-!"$^$@=PNO$r$7$F$$$J$$%U%m!<%H$r=PNO$9$k!#(B -% $B$=$l$i$O(B|\sdblcolelt|$B$rDL$8$F!"(B|\@addtonextcol|$B$G=PNO$5$l$k!#(B -% $B$3$N%Q%C%1!<%8$G$O!"%+%i%`$N9b$5$r(B|\textheight|$B$+$i%U%m!<%H$N9b$5$r(B -% $B0z$$$?$b$N$K@_Dj$9$k$h$&$K:FDj5A$9$k!#(B -% \begin{macrocode} -\def\@startdblcolumn{% - \global\@colht\textheight - \@tryfcolumn\@dbldeferlist - \if@fcolmade - \else - \begingroup - \let\reserved@b\@dbldeferlist - \global\let\@dbldeferlist\@empty - \let\@elt\@sdblcolelt - \reserved@b - \endgroup - \fi - \@chkdblfloatht - \global\advance\@colht-\@floatht -} -% \end{macrocode} -% \end{macro} -% -% \begin{macro}{\@doclearpage} -% $B=PNO%U%m!<%HMQ%j%9%H$N=i4|2=$r$9$k$?$a$K!"(B|\@doclearpage|$B$r:FDj5A$9$k!#(B -% \begin{macrocode} -\def\@doclearpage{% - \ifvoid\footins - \setbox\@tempboxa\vsplit\@cclv to\z@ \unvbox\@tempboxa - \setbox\@tempboxa\box\@cclv - \xdef\@deferlist{% - \L@toplist\R@toplist\L@botlist\R@botlist\@deferlist}% - \global\let\L@toplist\@empty % changed from \@toplist - \global\let\R@toplist\@empty % added - \global\let\L@botlist\@empty % changed from \@botlist - \global\let\R@botlist\@empty % added - \global\@colroom\@colht - \ifx\@currlist\@empty - \else - \@latexerr{Float(s) lost}\@ehb - \global\let\@currlist\@empty - \fi - \@makefcolumn\@deferlist - \@whilesw\if@fcolmade \fi{\@opcol\@makefcolumn\@deferlist}% - \if@twocolumn - \if@firstcolumn - % added \@dblbotlist - \xdef\@dbldeferlist{\@dbltoplist\@dblbotlist\@dbldeferlist}% - \global\let\@dbltoplist\@empty - \global\let\@dblbotlist\@empty % added - \global\@colht\textheight - \begingroup - \@dblfloatplacement - \@makefcolumn\@dbldeferlist - \@whilesw\if@fcolmade \fi{\@outputpage - \@makefcolumn\@dbldeferlist}% - \endgroup - \else - \vbox{}\clearpage - \fi - \fi - \else - \setbox\@cclv\vbox{\box\@cclv\vfil}% - \@makecol\@opcol - \clearpage - \fi -} -% \end{macrocode} -% \end{macro} -% -% \begin{macro}{\@topnewpage} -% |\@dblbotroom|$B$H(B|dblbotnumber|$B$r=i4|2=$9$k$?$a$K(B|\@topnewpage|$B$r:FDj5A$9$k!#(B -% \begin{macrocode} -\long\def\@topnewpage[#1]{% - %\@nodocument - \@next\@currbox\@freelist{}{}% - \global\setbox\@currbox - \color@vbox - \normalcolor - \vbox{\hsize\textwidth - \@parboxrestore - \col@number\@ne - #1% - \vskip-\dbltextfloatsep}% - \color@endbox - \ifdim\ht\@currbox>\textheight - \ht\@currbox\textheight - \fi - \global\count\@currbox\tw@ - \@tempdima-\ht\@currbox - \advance\@tempdima-\dbltextfloatsep - \global\advance\@colht\@tempdima - \ifx\@dbltoplist\@empty - \else - \@latexerr{Float(s) lost}\@ehb - \let\@dbltoplist\@empty - \fi - \@cons\@dbltoplist\@currbox - \global\@dbltopnum\m@ne - \global\@dblbotnum\m@ne % added - \ifdim\@colht<2.5\baselineskip - \@latex@warning@no@line {Optional argument of \noexpand\twocolumn - too tall on page \thepage}% - \@emptycol - \if@firstcolumn - \else - \@emptycol - \fi - \else - \global\vsize\@colht - \global\@colroom\@colht - \@floatplacement - \fi - %\global\@dbltoproom\maxdimen - %\global\@dblbotroom\maxdimen - %\@addtodblcol -} -% \end{macrocode} -% \end{macro} -% -% \begin{macro}{\balancenewpage} -% \begin{macro}{\balanceclearpage} -% $B%F%-%9%H$r6QEy$KJ,3d$7$F=PNO$9$k$?$a$N%^%/%m!#(B -% $B$?$@$7!"$3$N%^%/%m$rMQ$$$?>l9g!"$=$N%Z!<%8Fb$G$N(B|\newpage|$B$d(B -% |\clearpage|$B%3%^%s%I$,L58z$K$J$k$3$H$KCm0U!#(B -% \begin{macrocode} -\def\balancenewpage{\par\vfil\global\@balancetrue\penalty-\@M} -\def\balanceclearpage{\balancenewpage - \write\m@ne{}\vbox{}\global\@balancetrue\penalty-\@Mi} -\endinput -%</core> -% \end{macrocode} -% \end{macro} -% \end{macro} -% -% \Finale -% -% \endinput diff --git a/Master/texmf-dist/source/platex/base/nidanfloat.ins b/Master/texmf-dist/source/platex/base/nidanfloat.ins deleted file mode 100644 index 938c2214c2b..00000000000 --- a/Master/texmf-dist/source/platex/base/nidanfloat.ins +++ /dev/null @@ -1,18 +0,0 @@ -\input docstrip -\keepsilent -\ifToplevel{\askonceonly} -\usedir{tex/platex/base} -\Msg{*** nidangumi double float package ***} - -\preamble - -Copyright (c) 2010 ASCII MEDIA WORKS -Copyright (c) 2016 Japanese TeX Development Community - -This file is part of the pLaTeX2e system (community edition). -------------------------------------------------------------- - -\endpreamble - -\generate{\file{nidanfloat.sty}{\from{nidanfloat.dtx}{core}}} -\endbatchfile diff --git a/Master/texmf-dist/source/platex/base/pl209.ins b/Master/texmf-dist/source/platex/base/pl209.ins index a4171a6e80b..c4ba0d8393c 100644 --- a/Master/texmf-dist/source/platex/base/pl209.ins +++ b/Master/texmf-dist/source/platex/base/pl209.ins @@ -8,7 +8,7 @@ \preamble Copyright (c) 2010 ASCII MEDIA WORKS -Copyright (c) 2016 Japanese TeX Development Community +Copyright (c) 2016-2018 Japanese TeX Development Community This file is part of the pLaTeX2e system (community edition). ------------------------------------------------------------- diff --git a/Master/texmf-dist/source/platex/base/platex.dtx b/Master/texmf-dist/source/platex/base/platex.dtx index b709a5daf72..994136cbb0d 100644 --- a/Master/texmf-dist/source/platex/base/platex.dtx +++ b/Master/texmf-dist/source/platex/base/platex.dtx @@ -3,7 +3,7 @@ % % Copyright 1995,1996 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). % ------------------------------------------------------------- @@ -73,6 +73,10 @@ % \file{platex.ltx}$B$+$i(B\file{plcore.ltx}$B$X0\F0(B} % \changes{v1.0q}{2017/11/29}{$B1Q8lHG%I%-%e%a%s%H$rDI2C(B} % \changes{v1.0r}{2017/12/02}{$B1Q8l$N;29MJ88%$bDI2C(B} +% \changes{v1.0s}{2017/12/05}{$B%G%U%)%k%H@_Dj%U%!%$%k$NFI$_9~$_$r(B +% \file{plcore.ltx}$B$+$i(B\file{platex.ltx}$B$X0\F0(B} +% \changes{v1.0t}{2018/02/07}{ascmac$B%Q%C%1!<%8$rFHN)$5$;$?(B} +% \changes{v1.0u}{2018/02/18}{nidanfloat$B%Q%C%1!<%8$rFHN)$5$;$?(B} %\else % \changes{v1.0}{1995/05/08}{first edition} % \changes{v1.0a}{1995/08/25}{Added 'Compatibility', `Usage of \dst{}' @@ -104,6 +108,10 @@ % \file{platex.ltx} to \file{plcore.ltx}} % \changes{v1.0q}{2017/11/29}{New English documentation added!} % \changes{v1.0r}{2017/12/02}{English references added} +% \changes{v1.0s}{2017/12/05}{Moved loading default settings +% from \file{plcore.ltx} to \file{platex.ltx}} +% \changes{v1.0t}{2018/02/07}{Moved ascmac package to separate bundle} +% \changes{v1.0u}{2018/02/18}{Moved nidanfloat package to separate bundle} %\fi % \fi % @@ -111,7 +119,7 @@ %<*driver> \NeedsTeXFormat{pLaTeX2e} % \fi -\ProvidesFile{platex.dtx}[2017/12/02 v1.0r pLaTeX document file] +\ProvidesFile{platex.dtx}[2018/02/18 v1.0u pLaTeX document file] % \iffalse \documentclass{jltxdoc} \usepackage{plext} @@ -480,6 +488,29 @@ % \end{macrocode} % %\ifJAPANESE +% $B%U%)%s%H4XO"$N%G%U%)%k%H@_Dj%U%!%$%k$G$"$k!"(B +% \file{pldefs.ltx}$B$rFI$_9~$_$^$9!#(B +% \TeX{}$B$NF~NO%U%!%$%k8!:w%Q%9$K@_Dj$5$l$F$$$k(B +% $B%G%#%l%/%H%j$K(B\file{pldefs.cfg}$B%U%!%$%k$,$"$k>l9g$O!"(B +% $B$=$N%U%!%$%k$r;H$$$^$9!#(B +% \changes{v1.0s}{2017/12/05}{$B%G%U%)%k%H@_Dj%U%!%$%k$NFI$_9~$_$r(B +% \file{plcore.ltx}$B$+$i(B\file{platex.ltx}$B$X0\F0(B} +%\else +% Load font-related default settings, \file{pldefs.ltx}. +% If a file \file{pldefs.cfg} is found, then that file will be +% used instead. +% \changes{v1.0s}{2017/12/05}{Moved loading default settings +% from \file{plcore.ltx} to \file{platex.ltx}} +%\fi +% \begin{macrocode} +\InputIfFileExists{pldefs.cfg} + {\typeout{*************************************^^J% + * Local config file pldefs.cfg used^^J% + *************************************}}% + {\input{pldefs.ltx}} +% \end{macrocode} +% +%\ifJAPANESE % $B%U%)!<%^%C%H:n@.;~$K(B\pLaTeX{}$B$N%P!<%8%g%s$,$o$+$k$h$&$K!"(B % $BC<Kv$KI=<($7$^$9!#(B %\else @@ -546,7 +577,10 @@ % \end{itemize} % % $B$^$?!"%W%j%m!<%I%U%)%s%H$dAHHG%Q%i%a!<%?$J$I$N%G%U%)%k%H@_Dj$O!"(B -% \file{plcore.ltx}$B$NCf$G(B\file{pldefs.ltx}$B$r%m!<%I$9$k$3$H$K$h$j9T$$$^$9!#(B +% \file{platex.ltx}$B$NCf$G(B\file{pldefs.ltx}$B$r%m!<%I$9$k$3$H$K$h$j9T$$$^$9(B +% \footnote{$B%"%9%-!<HG$G$O(B\file{plcore.ltx}$B$NCf$G%m!<%I$7$F$$$^$7$?$,!"(B +% 2018$BG/0J9_$N?7$7$$%3%_%e%K%F%#HG(B\pLaTeX{}$B$G$O(B +% \file{platex.ltx}$B$+$iFI$_9~$`$3$H$K$7$^$7$?!#(B}$B!#(B % $B$3$N%U%!%$%k(B\file{pldefs.ltx}$B$b(B\file{plfonts.dtx}$B$+$i@8@.$5$l$^$9!#(B % \begin{chuui} % $B$3$N%U%!%$%k$K5-=R$5$l$F$$$k@_Dj$rJQ99$9$l$P(B @@ -568,7 +602,10 @@ % \end{itemize} % % Moreover, default settings of pre-loaded fonts and typesetting parameters -% are done by loading \file{pldefs.ltx} inside \file{plcore.ltx}. +% are done by loading \file{pldefs.ltx} inside +% \file{platex.ltx}.\footnote{ASCII \pLaTeX\ loaded \file{pldefs.ltx} +% inside \file{plcore.ltx}; however, \pLaTeX\ community edition newer than +% 2018 loads \file{pldefs.ltx} inside \file{platex.ltx}.} % This file \file{pldefs.ltx} is also stripped from \file{plfonts.dtx}. % \begin{chuui} % You can customize \pLaTeXe\ by tuning these settings. @@ -727,15 +764,12 @@ % \item oldpfont.sty\par % \pLaTeX~2.09$B$N%U%)%s%H%3%^%s%I$rDs6!$9$k%Q%C%1!<%8!#(B % \file{pl209.dtx}$B$+$i:n@.$5$l$k!#(B -% -% \item ascmac.sty, tascmac.sty\par -% \LaTeX{}$B$NI8=`5!G=$NHO0O$G!"?^$d7S@~$G0O$s$@%\%C%/%9$r=PNO$9$kL?Na(B -% $B$J$I$rDs6!$9$k%Q%C%1!<%8!#5l%P!<%8%g%s$N(B\pLaTeX{}$B$G$bG[I[$5$l$F$$$?!#(B -% -% \item nidanfloat.sty\par -% $BFsCJAH;~$KCJH4$-$N%U%m!<%H$r%Z!<%82<It$K$bG[CV2DG=$K$9$k(B -% $B%Q%C%1!<%8!#(B % \end{itemize} +% +% $B$J$*!"0JA0$N%P!<%8%g%s$KF1:-$7$F$$$?(Bascmac$B%Q%C%1!<%8$H(B +% nidanfloat$B%Q%C%1!<%8$O!"JL$N%P%s%I%k$H$7$FFHN)$5$;$^$7$?!#(B +% \changes{v1.0t}{2018/02/07}{ascmac$B%Q%C%1!<%8$rFHN)$5$;$?(B} +% \changes{v1.0u}{2018/02/18}{nidanfloat$B%Q%C%1!<%8$rFHN)$5$;$?(B} %\else % \pLaTeXe\ packages: % \changes{v1.0d}{2016/01/27}{Updated descriptions of \pLaTeXe\ files} @@ -761,15 +795,13 @@ % \item oldpfont.sty\par % Provides \pLaTeX~2.09 font commands; % stripped from \file{pl209.dtx}. -% -% \item ascmac.sty, tascmac.sty\par -% Create fancy boxes etc., within the scope of native -% \LaTeXe\ picture commands (thus driver-independent). -% -% \item nidanfloat.sty\par -% Enable bottom (|b|) placement option for double float in -% two column mode (\emph{nidan-kumi}). % \end{itemize} +% +% The packages ``ascmac.sty'' and ``nidanfloat.sty'', +% which had been included in previous versions of \pLaTeX, +% is now distributed as a separate bundle. +% \changes{v1.0t}{2018/02/07}{Moved ascmac package to separate bundle} +% \changes{v1.0u}{2018/02/18}{Moved nidanfloat package to separate bundle} %\fi % % @@ -1121,16 +1153,6 @@ all others indicate the places where it is used.} \title{The \pLaTeXe\ Sources} \author{Ken Nakano \& Japanese \TeX\ Development Community} -% This command will be used to input the patch file -% if that file exists. -\newcommand{\includeltpatch}{% - \def\currentfile{plpatch.ltx} - \part{plpatch} - {\let\ttfamily\relax - \xdef\filekey{\filekey, \thepart={\ttfamily\currentfile}}}% - Things we did wrong\ldots - \IndexInput{plpatch.ltx}} - % Get the date and patch level from plvers.dtx \makeatletter \let\patchdate=\@empty @@ -1138,30 +1160,17 @@ all others indicate the places where it is used.} \def\ProvidesFile#1\pfmtversion#2#3\ppatch@level#4{% \date{#2}\xdef\patchdate{#4}\endinput} \input{plvers.dtx} -\global\let\X@date=\@date - -% Add the patch version if available. - \long\def\Xdef#1#2#3\def#4#5{% - \xdef\X@date{#2}% - \xdef\patchdate{#5}% - \endinput}% - \InputIfFileExists{plpatch.ltx} - {\let\def\Xdef}{\global\let\includeltpatch\relax} \endgroup -\ifx\@date\X@date - \def\Xpatch{0} - \ifx\patchdate\Xpatch\else - % number is assumed - \ifnum\patchdate>0 - \edef\@date{\@date\space Patch level\space\patchdate} - \else - \edef\@date{\@date\space Pre-Release\patchdate} - \fi\fi +% Add the patch version if available. +\def\Xpatch{0} +\ifx\patchdate\Xpatch\else +% number is assumed +\ifnum\patchdate>0 + \edef\@date{\@date\space Patch level\space\patchdate} \else - \@warning{plpatch.ltx does not match plvers.dtx!} - \let\includeltpatch\relax -\fi + \edef\@date{\@date\space Pre-Release\patchdate} +\fi\fi \makeatother \pagenumbering{roman} @@ -1187,14 +1196,12 @@ all others indicate the places where it is used.} \DocInclude{jltxdoc} % dtx documents class -%\includeltpatch % patch file (comment out May 8, 2016) - % \end{macrocode} %\ifJAPANESE % \file{ltxdoc.cfg}$B$K(B|\AtEndOfClass{\OnlyDescription}|$B$,;XDj$5$l$F$$$k>l9g$O!"(B % $B$3$3$G=*N;$7$^$9!#(B %\else -% Stop here if ltxdoc.cfg says |\AtEndOfClass{\OnlyDescription}|. +% Stop here if \file{ltxdoc.cfg} says |\AtEndOfClass{\OnlyDescription}|. %\fi % \begin{macrocode} \StopEventually{\end{document}} diff --git a/Master/texmf-dist/source/platex/base/platexrelease.dtx b/Master/texmf-dist/source/platex/base/platexrelease.dtx index 792685fe724..ebfd5305369 100644 --- a/Master/texmf-dist/source/platex/base/platexrelease.dtx +++ b/Master/texmf-dist/source/platex/base/platexrelease.dtx @@ -23,15 +23,19 @@ % \changes{v1.0h}{2017/09/26}{p\LaTeX\ \texttt{!<2017/07/29!>}$BHG$K7Y9p(B} % \changes{v1.0i}{2017/12/06}{$B%?%$%]=$@5(B} % \changes{v1.0j}{2018/01/27}{p\LaTeX\ \texttt{!<2017/09/26!>}$BHG$K7Y9p(B} +% \changes{v1.0k}{2018/01/27}{Add \cs{platexreleaseversion} info +% to \cs{ProvidesPackage} output (sync with latexrelease.dtx v1.0i)} % \fi % % \iffalse \NeedsTeXFormat{pLaTeX2e} %<*driver> +\def\platexreleaseversion{<date only known in .sty file>} \ProvidesFile{platexrelease.dtx} %</driver> %<platexrelease>\ProvidesPackage{platexrelease} - [2018/01/27 v1.0j latexrelease support for pLaTeX Kernel] + [2018/01/27 v1.0k latexrelease support for pLaTeX Kernel + (including releases up to \platexreleaseversion)] %<*driver> \documentclass{jltxdoc} \GetFileInfo{platexrelease.dtx} diff --git a/Master/texmf-dist/source/platex/base/platexrelease.ins b/Master/texmf-dist/source/platex/base/platexrelease.ins index fccdc2ae146..d7b49dc39bd 100644 --- a/Master/texmf-dist/source/platex/base/platexrelease.ins +++ b/Master/texmf-dist/source/platex/base/platexrelease.ins @@ -1,13 +1,13 @@ \input docstrip \keepsilent -\usedir{tex/platex/base} \ifToplevel{\askonceonly} +\usedir{tex/platex/base} \Msg{*** Generating the pLaTeX files for supporting latexrelease ***} \preamble -Copyright (c) 2016 Japanese TeX Development Community +Copyright (c) 2016-2018 Japanese TeX Development Community This file is part of the pLaTeX2e system (community edition). ------------------------------------------------------------- diff --git a/Master/texmf-dist/source/platex/base/plcls.ins b/Master/texmf-dist/source/platex/base/plcls.ins index 600b914c7b9..9a19b77d302 100644 --- a/Master/texmf-dist/source/platex/base/plcls.ins +++ b/Master/texmf-dist/source/platex/base/plcls.ins @@ -8,7 +8,7 @@ \preamble Copyright (c) 2010 ASCII MEDIA WORKS -Copyright (c) 2016 Japanese TeX Development Community +Copyright (c) 2016-2018 Japanese TeX Development Community This file is part of the pLaTeX2e system (community edition). ------------------------------------------------------------- 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 diff --git a/Master/texmf-dist/source/platex/base/pldocs.ins b/Master/texmf-dist/source/platex/base/pldocs.ins index d1151a76314..f5ad788c1fc 100644 --- a/Master/texmf-dist/source/platex/base/pldocs.ins +++ b/Master/texmf-dist/source/platex/base/pldocs.ins @@ -8,7 +8,7 @@ \preamble Copyright (c) 2010 ASCII MEDIA WORKS -Copyright (c) 2016 Japanese TeX Development Community +Copyright (c) 2016-2018 Japanese TeX Development Community This file is part of the pLaTeX2e system (community edition). ------------------------------------------------------------- diff --git a/Master/texmf-dist/source/platex/base/plfmt.ins b/Master/texmf-dist/source/platex/base/plfmt.ins index 3d5689c16b6..bd64099ef5b 100644 --- a/Master/texmf-dist/source/platex/base/plfmt.ins +++ b/Master/texmf-dist/source/platex/base/plfmt.ins @@ -1,14 +1,14 @@ \input docstrip \keepsilent -\usedir{tex/platex/base} \ifToplevel{\askonceonly} +\usedir{tex/platex/base} \Msg{*** Generating the pLaTeX files for making the documents ***} \preamble Copyright (c) 2010 ASCII MEDIA WORKS -Copyright (c) 2016 Japanese TeX Development Community +Copyright (c) 2016-2018 Japanese TeX Development Community This file is part of the pLaTeX2e system (community edition). ------------------------------------------------------------- diff --git a/Master/texmf-dist/source/platex/base/plfonts.dtx b/Master/texmf-dist/source/platex/base/plfonts.dtx index b603356b19c..08d4ac126ff 100644 --- a/Master/texmf-dist/source/platex/base/plfonts.dtx +++ b/Master/texmf-dist/source/platex/base/plfonts.dtx @@ -3,7 +3,7 @@ % % Copyright 1994-2006 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). % ------------------------------------------------------------- @@ -73,13 +73,16 @@ % $B6qBNE*$JCM$G$O$J$/!V6u!W$G=i4|2=(B} % \changes{v1.6j}{2017/11/06}{$B=D2#$N%(%s%3!<%G%#%s%0$N%;%C%H2=$r(B % plcore$B$+$i(Bpldefs$B$X0\F0(B} +% \changes{v1.6k}{2017/12/05}{$B%G%U%)%k%H@_Dj%U%!%$%k$NFI$_9~$_$r(B +% \file{plcore.ltx}$B$+$i(B\file{platex.ltx}$B$X0\F0(B} +% \changes{v1.6l}{2018/02/04}{$BOBJ8%9%1!<%kCM$rL@J82=(B} % \fi % % \iffalse %<*driver> \NeedsTeXFormat{pLaTeX2e} % \fi -\ProvidesFile{plfonts.dtx}[2017/11/06 v1.6j pLaTeX New Font Selection Scheme] +\ProvidesFile{plfonts.dtx}[2018/02/04 v1.6l pLaTeX New Font Selection Scheme] % \iffalse \documentclass{jltxdoc} \GetFileInfo{plfonts.dtx} @@ -119,7 +122,7 @@ % \begin{center} % \begin{tabular}{l|p{0.7\linewidth}} % \emph{$B%*%W%7%g%s(B} & \emph{$B0UL#(B}\\\hline -% plcore & \file{plfonts.ltx}$B$r@8@.$7$^$9!#(B\\ +% plcore & \file{plcore.ltx}$B$NCGJR$r@8@.$7$^$9!#(B\\ % trace & \file{ptrace.sty}$B$r@8@.$7$^$9!#(B\\ % JY1mc & $B2#AHMQ!"L@D+BN$N%U%)%s%HDj5A%U%!%$%k$r@8@.$7$^$9!#(B\\ % JY1gt & $B2#AHMQ!"%4%7%C%/BN$N%U%)%s%HDj5A%U%!%$%k$r@8@.$7$^$9!#(B\\ @@ -2086,19 +2089,12 @@ % % % \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} -%<*plcore> -\InputIfFileExists{pldefs.cfg} - {\typeout{*************************************^^J% - * Local config file pldefs.cfg used^^J% - *************************************}}% - {\input{pldefs.ltx}} -%</plcore> -% \end{macrocode} +% $B%G%U%)%k%H@_Dj%U%!%$%k(B\file{pldefs.ltx}$B$O!"$b$H$b$H(B\file{plcore.ltx}$B$NESCf$G(B +% $BFI$_9~$s$G$$$^$7$?$,!"(B2018$BG/0J9_$N?7$7$$%3%_%e%K%F%#HG(B\pLaTeX{}$B$G$O(B +% \file{platex.ltx}$B$+$iFI$_9~$`$3$H$K$7$^$7$?!#(B +% $B<B:]$NCf?H$K$D$$$F$O!"Bh(B\ref{plfonts:pldefs}$B@a$r;2>H$7$F$/$@$5$$!#(B +% \changes{v1.6k}{2017/12/05}{$B%G%U%)%k%H@_Dj%U%!%$%k$NFI$_9~$_$r(B +% \file{plcore.ltx}$B$+$i(B\file{platex.ltx}$B$X0\F0(B} % % % @@ -2108,7 +2104,6 @@ % $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 @@ -2117,13 +2112,13 @@ % \begin{macrocode} %<*pldefs> \ProvidesFile{pldefs.ltx} - [2017/11/06 v1.6j pLaTeX Kernel (Default settings)] + [2018/02/04 v1.6l pLaTeX Kernel (Default settings)] %</pldefs> % \end{macrocode} % % \subsection{$B%F%-%9%H%U%)%s%H(B} % $B%F%-%9%H%U%)%s%H$N$?$a$NB0@-$d%(%i!<=qBN$J$I$N@k8@$G$9!#(B -% +% p\LaTeX{}$B$N%G%U%)%k%H$N2#AH%(%s%3!<%I$O(BJY1$B!"=DAH%(%s%3!<%I$O(BJT1$B$H$7$^$9!#(B % \noindent % $B=D2#%(%s%3!<%I6&DL!'(B % \begin{macrocode} @@ -2169,7 +2164,7 @@ \input{jt1mc.fd} \input{jt1gt.fd} % \end{macrocode} -% $B%U%)%s%H$rM-8z$K$9$k(B +% $B%U%)%s%H$rM-8z$K$7$^$9!#(B % \begin{macrocode} \fontencoding{JT1}\selectfont \fontencoding{JY1}\selectfont @@ -2232,7 +2227,7 @@ % \subsection{$B%W%j%m!<%I%U%)%s%H(B} % $B$"$i$+$8$a%U%)!<%^%C%H%U%!%$%k$K%m!<%I$5$l$k%U%)%s%H$N@k8@$G$9!#(B % \dst{}$B%W%m%0%i%`$N%*%W%7%g%s$G%m!<%I$5$l$k%U%)%s%H$N%5%$%:$r(B -% $BJQ99$9$k$3$H$,$G$-$^$9!#(B\file{platex.ins}$B$G$O(B|xpt|$B$r;XDj$7$F$$$^$9!#(B +% $BJQ99$9$k$3$H$,$G$-$^$9!#(B\file{plfmt.ins}$B$G$O(B|xpt|$B$r;XDj$7$F$$$^$9!#(B % \begin{macrocode} %<*xpt> \DeclarePreloadSizes{JY1}{mc}{m}{n}{5,7,10,12} @@ -2358,13 +2353,22 @@ %<JY1gt>\ProvidesFile{jy1gt.fd} %<JT1mc>\ProvidesFile{jt1mc.fd} %<JT1gt>\ProvidesFile{jt1gt.fd} -%<JY1mc,JY1gt,JT1mc,JT1gt> [1997/01/24 v1.3 KANJI font defines] +%<JY1mc,JY1gt,JT1mc,JT1gt> [2018/02/04 v1.6l KANJI font defines] % \end{macrocode} % $B2#AHMQ!"=DAHMQ$H$b$K!"(B % $BL@D+BN$N%7%j!<%:(B|bx|$B$,%4%7%C%/BN$H$J$k$h$&$K@k8@$7$F$$$^$9!#(B % \changes{v1.2}{1995/11/24}{it, sl, sc $B$N@k8@$r30$7$?(B} % \changes{v1.3b}{1997/01/29}{$B%U%)%s%HDj5A%U%!%$%k$N%5%$%:;XDj$ND4@0(B} % \changes{v1.3b}{1997/03/11}{$B$9$Y$F$N%5%$%:$r%m!<%I2DG=$K$7$?(B} +% +% p\LaTeX{}$B$G$O=>B0=qBN$K(BOT1$B%(%s%3!<%G%#%s%0$r;XDj$7$F$$$^$9!#(B +% $B$^$?!"MW5a%5%$%:!J;XDj$5$l$?%U%)%s%H%5%$%:!K$,(B10pt$B$N$H$-!"(B +% $BA43QI}$N<B@#$,(B9.62216pt$B$H$J$k$h$&$K$7$^$9$N$G!"(B +% $BOBJ8%9%1!<%kCM!J(B$1\,\mathrm{zw} \div \textmc{$BMW5a%5%$%:(B}$$B!K$O(B +% $9.62216\,\mathrm{pt}/10\,\mathrm{pt}=0.962216$$B$G$9!#(B +% min10$B7O$N%a%H%j%C%/$OA43QI}$,(B9.62216pt$B$G%G%6%$%s$5$l$F$$$k$N$G!"(B +% $B$3$l$r(B1$BG\$GFI9~$_$^$9!#(B +% \changes{v1.6l}{2018/02/04}{$BOBJ8%9%1!<%kCM$rL@J82=(B} % \begin{macrocode} %<*JY1mc> \DeclareKanjiFamily{JY1}{mc}{} diff --git a/Master/texmf-dist/source/platex/base/plvers.dtx b/Master/texmf-dist/source/platex/base/plvers.dtx index c222a47b19b..421ed0a6a93 100644 --- a/Master/texmf-dist/source/platex/base/plvers.dtx +++ b/Master/texmf-dist/source/platex/base/plvers.dtx @@ -3,7 +3,7 @@ % % Copyright 1995-2006 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). % ------------------------------------------------------------- @@ -63,12 +63,15 @@ % \file{platex.ltx}$B$+$i(B\file{plcore.ltx}$B$X0\F0(B} % \changes{v1.1g}{2017/12/04}{\pLaTeX{}$B$N%P%J!<$NDj5A;~$K(B % \cs{pfmtname}, \cs{pfmtversion}, \cs{ppatch@level}$B$rE83+$7$J$$$h$&$K(B} +% \changes{v1.1h}{2018/01/10}{Modify \cs{plIncludeInRelease} code +% to check matching \cs{plEndIncluderelease} +% (sync with ltvers 2018/01/08 v1.1a)} % \fi % % \iffalse %<*driver> % \fi -\ProvidesFile{plvers.dtx}[2017/12/04 v1.1g pLaTeX Kernel (Version Info)] +\ProvidesFile{plvers.dtx}[2018/01/10 v1.1h pLaTeX Kernel (Version Info)] % \iffalse \documentclass{jltxdoc} \GetFileInfo{plvers.dtx} @@ -133,10 +136,10 @@ %</plcore> %<platexrelease>\edef\platexreleaseversion %<*plcore|platexrelease> - {2017/10/28} + {2018/03/09} %</plcore|platexrelease> %<*plcore> -\def\ppatch@level{4} +\def\ppatch@level{0} %</plcore> % \end{macrocode} % \end{macro} @@ -336,9 +339,28 @@ % \cs{plEndIncludeInRelease}$B$r?7@_!#(B} % \changes{v1.1e}{2017/11/09}{\file{latexrelease}$B$H(B % \cs{platexrelease}$B$N%(%_%e%l!<%HFbIt=hM}$rJ,N%(B} +% \changes{v1.1h}{2018/01/10}{Modify \cs{plIncludeInRelease} code +% to check matching \cs{plEndIncluderelease} +% (sync with ltvers 2018/01/08 v1.1a)} +% +% \iffalse +% $BHwK:O?!'(B\LaTeX{}$B$G$O(B\cs{if@includeinrelease}$B$NDj5A$r(B +% \file{ltvers.dtx}$B$G$O$J$/(B\file{ltdefns.dtx}$B$KCY$i$;$F$"$k!#(B +% $B$7$+$7!"$3$l$O(B\cs{newif}$B$,$=$N;~E@$GDj5A$5$l$F$$$J$$$+$i$K$9$.$:!"(B +% \pLaTeX{}$B$G$OCY$i$;$kI,MW$,$J$$!#(B +% \fi +% % \begin{macrocode} %<*plcore|platexrelease> -\def\plIncludeInRelease#1{\kernel@ifnextchar[% +\newif\if@plincludeinrelease +\@plincludeinreleasefalse +\def\plIncludeInRelease#1{% + \if@plincludeinrelease + \PackageError{platexrelease} + {mis-matched \string\plIncludeInRelease}{}% + \@plincludeinreleasefalse + \fi + \kernel@ifnextchar[% {\@plIncludeInRelease{#1}} {\@plIncludeInRelease{#1}[#1]}} % \end{macrocode} @@ -357,6 +379,7 @@ \expandafter\expandafter\expandafter\@gobble@plIncludeInRelease \else \GenericInfo{}{Applying: \the\toks@}% + \@plincludeinreleasetrue \expandafter\let\csname\string#2+\@currname+plIIR\endcsname\@empty \fi \else @@ -367,8 +390,28 @@ % \end{macrocode} % % \begin{macrocode} -\long\def\@gobble@plIncludeInRelease#1\plEndIncludeInRelease{} -\let\plEndIncludeInRelease\relax +\def\plEndIncludeInRelease{% + \if@plincludeinrelease + \@plincludeinreleasefalse + \else + \PackageError{platexrelease} + {mis-matched \string\plEndIncludeInRelease}{}% + \fi} +% \end{macrocode} +% +% \begin{macrocode} +\long\def\@gobble@plIncludeInRelease#1\plEndIncludeInRelease{% + \@plincludeinreleasefalse + \@check@plIncludeInRelease#1\plIncludeInRelease + \@check@plIncludeInRelease\@end@check@plIncludeInRelease} +% \end{macrocode} +% \begin{macrocode} +\long\def\@check@plIncludeInRelease#1\plIncludeInRelease + #2#3\@end@check@plIncludeInRelease{% + \ifx\@check@plIncludeInRelease#2\else + \PackageError{platexrelease} + {skipped \string\plIncludeInRelease}{}% + \fi} %</plcore|platexrelease> % \end{macrocode} % \end{macro} diff --git a/Master/texmf-dist/tex/platex/base/ascmac.sty b/Master/texmf-dist/tex/platex/base/ascmac.sty deleted file mode 100644 index f2ab32cc2a6..00000000000 --- a/Master/texmf-dist/tex/platex/base/ascmac.sty +++ /dev/null @@ -1,25 +0,0 @@ -%% -%% This is file `ascmac.sty', -%% generated with the docstrip utility. -%% -%% The original source files were: -%% -%% ascmac.dtx (with options: `ascmac') -%% -%% Copyright (c) 2010 ASCII MEDIA WORKS -%% Copyright (c) 2016 Japanese TeX Development Community -%% -%% This file is part of the pLaTeX2e system (community edition). -%% ------------------------------------------------------------- -%% -%% wrapper for tascmac.sty -%% -\NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{ascmac} - [2017/12/17 v2.0f - ascmac wrapper (community edition) - ] -\RequirePackage{tascmac} -\endinput -%% -%% End of file `ascmac.sty'. diff --git a/Master/texmf-dist/tex/platex/base/exppl2e.sty b/Master/texmf-dist/tex/platex/base/exppl2e.sty index 3365ad72fc3..eaaf3bc6538 100644 --- a/Master/texmf-dist/tex/platex/base/exppl2e.sty +++ b/Master/texmf-dist/tex/platex/base/exppl2e.sty @@ -385,9 +385,183 @@ % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % +% \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} +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% % \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 +% \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 +% 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} +%<platexrelease>\plIncludeInRelease{2018/03/09}{\@tabclassz} +%<platexrelease> {Inhibit JFM glue in tabular cells}% +%<*plcore|platexrelease> +\ifx\removejfmglue\@undefined +\def\@tabclassz{% + \ifcase\@lastchclass + \@acolampacol + \or + \@ampacol + \or + \or + \or + \@addamp + \or + \@acolampacol + \or + \@firstampfalse\@acol + \fi + \edef\@preamble{% + \@preamble{% + \ifcase\@chnum + \hfil\mbox{\inhibitglue\ignorespaces\@sharp\unskip}\hfil % c + \or + \hskip1sp\mbox{\inhibitglue\ignorespaces\@sharp\unskip}\hfil % l + \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 +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\@classv} +% $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{2018/03/09}{\@classv} +%<platexrelease> {Inhibit JFM glue in tabular cells}% +%<*plcore|platexrelease> +\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 +%<platexrelease>\@sharp\@endpbox}} +%<platexrelease>\plEndIncludeInRelease +% \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} +% +% % p\LaTeXe{}$B%+!<%M%k(B(2017/07/29)$B$KF3F~$7$?$?$a:o=|!#(B % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % diff --git a/Master/texmf-dist/tex/platex/base/jarticle.cls b/Master/texmf-dist/tex/platex/base/jarticle.cls index 54dee29d31c..ad7dda0cd24 100644 --- a/Master/texmf-dist/tex/platex/base/jarticle.cls +++ b/Master/texmf-dist/tex/platex/base/jarticle.cls @@ -7,7 +7,7 @@ %% jclasses.dtx (with options: `article,yoko') %% %% Copyright (c) 2010 ASCII MEDIA WORKS -%% Copyright (c) 2016 Japanese TeX Development Community +%% Copyright (c) 2016-2018 Japanese TeX Development Community %% %% This file is part of the pLaTeX2e system (community edition). %% ------------------------------------------------------------- @@ -15,7 +15,7 @@ %% File: jclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesClass{jarticle} - [2017/09/19 v1.7g + [2018/02/04 v1.7h Standard pLaTeX class] \newcounter{@paper} \newif\if@landscape \@landscapefalse @@ -123,6 +123,7 @@ \ExecuteOptions{a4paper,10pt,oneside,onecolumn,final} \ProcessOptions\relax \input{jsize1\@ptsize.clo} +\def\Cjascale{0.962216} \if@stysize \setlength\columnsep{2\Cwd} \else diff --git a/Master/texmf-dist/tex/platex/base/jarticle.sty b/Master/texmf-dist/tex/platex/base/jarticle.sty index 632cf58b3dd..7b0259aed6d 100644 --- a/Master/texmf-dist/tex/platex/base/jarticle.sty +++ b/Master/texmf-dist/tex/platex/base/jarticle.sty @@ -7,7 +7,7 @@ %% pl209.dtx (with options: `style,jarticle') %% %% Copyright (c) 2010 ASCII MEDIA WORKS -%% Copyright (c) 2016 Japanese TeX Development Community +%% Copyright (c) 2016-2018 Japanese TeX Development Community %% %% This file is part of the pLaTeX2e system (community edition). %% ------------------------------------------------------------- diff --git a/Master/texmf-dist/tex/platex/base/jbk10.clo b/Master/texmf-dist/tex/platex/base/jbk10.clo index 6a1a6680d9f..db8f59405f2 100644 --- a/Master/texmf-dist/tex/platex/base/jbk10.clo +++ b/Master/texmf-dist/tex/platex/base/jbk10.clo @@ -7,7 +7,7 @@ %% jclasses.dtx (with options: `10pt,bk,yoko') %% %% Copyright (c) 2010 ASCII MEDIA WORKS -%% Copyright (c) 2016 Japanese TeX Development Community +%% Copyright (c) 2016-2018 Japanese TeX Development Community %% %% This file is part of the pLaTeX2e system (community edition). %% ------------------------------------------------------------- @@ -15,7 +15,7 @@ %% File: jclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{jbk10.clo} - [2017/09/19 v1.7g + [2018/02/04 v1.7h Standard pLaTeX file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xpt{15}% diff --git a/Master/texmf-dist/tex/platex/base/jbk11.clo b/Master/texmf-dist/tex/platex/base/jbk11.clo index 2631554031a..e948cdc37b2 100644 --- a/Master/texmf-dist/tex/platex/base/jbk11.clo +++ b/Master/texmf-dist/tex/platex/base/jbk11.clo @@ -7,7 +7,7 @@ %% jclasses.dtx (with options: `11pt,bk,yoko') %% %% Copyright (c) 2010 ASCII MEDIA WORKS -%% Copyright (c) 2016 Japanese TeX Development Community +%% Copyright (c) 2016-2018 Japanese TeX Development Community %% %% This file is part of the pLaTeX2e system (community edition). %% ------------------------------------------------------------- @@ -15,7 +15,7 @@ %% File: jclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{jbk11.clo} - [2017/09/19 v1.7g + [2018/02/04 v1.7h Standard pLaTeX file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xipt{15.5}% diff --git a/Master/texmf-dist/tex/platex/base/jbk12.clo b/Master/texmf-dist/tex/platex/base/jbk12.clo index 0921fe9d3c7..c3d78b9d9c6 100644 --- a/Master/texmf-dist/tex/platex/base/jbk12.clo +++ b/Master/texmf-dist/tex/platex/base/jbk12.clo @@ -7,7 +7,7 @@ %% jclasses.dtx (with options: `12pt,bk,yoko') %% %% Copyright (c) 2010 ASCII MEDIA WORKS -%% Copyright (c) 2016 Japanese TeX Development Community +%% Copyright (c) 2016-2018 Japanese TeX Development Community %% %% This file is part of the pLaTeX2e system (community edition). %% ------------------------------------------------------------- @@ -15,7 +15,7 @@ %% File: jclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{jbk12.clo} - [2017/09/19 v1.7g + [2018/02/04 v1.7h Standard pLaTeX file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xiipt{16.5}% diff --git a/Master/texmf-dist/tex/platex/base/jbook.cls b/Master/texmf-dist/tex/platex/base/jbook.cls index b7b5e168996..ae4cef59e17 100644 --- a/Master/texmf-dist/tex/platex/base/jbook.cls +++ b/Master/texmf-dist/tex/platex/base/jbook.cls @@ -7,7 +7,7 @@ %% jclasses.dtx (with options: `book,yoko') %% %% Copyright (c) 2010 ASCII MEDIA WORKS -%% Copyright (c) 2016 Japanese TeX Development Community +%% Copyright (c) 2016-2018 Japanese TeX Development Community %% %% This file is part of the pLaTeX2e system (community edition). %% ------------------------------------------------------------- @@ -15,7 +15,7 @@ %% File: jclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesClass{jbook} - [2017/09/19 v1.7g + [2018/02/04 v1.7h Standard pLaTeX class] \newcounter{@paper} \newif\if@landscape \@landscapefalse @@ -133,6 +133,7 @@ \ExecuteOptions{a4paper,10pt,twoside,onecolumn,final,openright} \ProcessOptions\relax \input{jbk1\@ptsize.clo} +\def\Cjascale{0.962216} \if@stysize \setlength\columnsep{2\Cwd} \else diff --git a/Master/texmf-dist/tex/platex/base/jbook.sty b/Master/texmf-dist/tex/platex/base/jbook.sty index 56d6df93ff6..bb46725487f 100644 --- a/Master/texmf-dist/tex/platex/base/jbook.sty +++ b/Master/texmf-dist/tex/platex/base/jbook.sty @@ -7,7 +7,7 @@ %% pl209.dtx (with options: `style,jbook') %% %% Copyright (c) 2010 ASCII MEDIA WORKS -%% Copyright (c) 2016 Japanese TeX Development Community +%% Copyright (c) 2016-2018 Japanese TeX Development Community %% %% This file is part of the pLaTeX2e system (community edition). %% ------------------------------------------------------------- diff --git a/Master/texmf-dist/tex/platex/base/jltxdoc.cls b/Master/texmf-dist/tex/platex/base/jltxdoc.cls index 065d313892d..750ba659c65 100644 --- a/Master/texmf-dist/tex/platex/base/jltxdoc.cls +++ b/Master/texmf-dist/tex/platex/base/jltxdoc.cls @@ -7,7 +7,7 @@ %% jltxdoc.dtx (with options: `class') %% %% Copyright (c) 2010 ASCII MEDIA WORKS -%% Copyright (c) 2016 Japanese TeX Development Community +%% Copyright (c) 2016-2018 Japanese TeX Development Community %% %% This file is part of the pLaTeX2e system (community edition). %% ------------------------------------------------------------- diff --git a/Master/texmf-dist/tex/platex/base/jreport.cls b/Master/texmf-dist/tex/platex/base/jreport.cls index 74b7cd3a8cb..e6541e5929e 100644 --- a/Master/texmf-dist/tex/platex/base/jreport.cls +++ b/Master/texmf-dist/tex/platex/base/jreport.cls @@ -7,7 +7,7 @@ %% jclasses.dtx (with options: `report,yoko') %% %% Copyright (c) 2010 ASCII MEDIA WORKS -%% Copyright (c) 2016 Japanese TeX Development Community +%% Copyright (c) 2016-2018 Japanese TeX Development Community %% %% This file is part of the pLaTeX2e system (community edition). %% ------------------------------------------------------------- @@ -15,7 +15,7 @@ %% File: jclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesClass{jreport} - [2017/09/19 v1.7g + [2018/02/04 v1.7h Standard pLaTeX class] \newcounter{@paper} \newif\if@landscape \@landscapefalse @@ -131,6 +131,7 @@ \ExecuteOptions{a4paper,10pt,oneside,onecolumn,final,openany} \ProcessOptions\relax \input{jsize1\@ptsize.clo} +\def\Cjascale{0.962216} \if@stysize \setlength\columnsep{2\Cwd} \else diff --git a/Master/texmf-dist/tex/platex/base/jreport.sty b/Master/texmf-dist/tex/platex/base/jreport.sty index c898d43150e..6c4502171b0 100644 --- a/Master/texmf-dist/tex/platex/base/jreport.sty +++ b/Master/texmf-dist/tex/platex/base/jreport.sty @@ -7,7 +7,7 @@ %% pl209.dtx (with options: `style,jreport') %% %% Copyright (c) 2010 ASCII MEDIA WORKS -%% Copyright (c) 2016 Japanese TeX Development Community +%% Copyright (c) 2016-2018 Japanese TeX Development Community %% %% This file is part of the pLaTeX2e system (community edition). %% ------------------------------------------------------------- diff --git a/Master/texmf-dist/tex/platex/base/jsize10.clo b/Master/texmf-dist/tex/platex/base/jsize10.clo index 803d5f3a9f8..159b590f2e7 100644 --- a/Master/texmf-dist/tex/platex/base/jsize10.clo +++ b/Master/texmf-dist/tex/platex/base/jsize10.clo @@ -7,7 +7,7 @@ %% jclasses.dtx (with options: `10pt,yoko') %% %% Copyright (c) 2010 ASCII MEDIA WORKS -%% Copyright (c) 2016 Japanese TeX Development Community +%% Copyright (c) 2016-2018 Japanese TeX Development Community %% %% This file is part of the pLaTeX2e system (community edition). %% ------------------------------------------------------------- @@ -15,7 +15,7 @@ %% File: jclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{jsize10.clo} - [2017/09/19 v1.7g + [2018/02/04 v1.7h Standard pLaTeX file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xpt{15}% diff --git a/Master/texmf-dist/tex/platex/base/jsize11.clo b/Master/texmf-dist/tex/platex/base/jsize11.clo index f6bda2652a7..b3e8cdb8b43 100644 --- a/Master/texmf-dist/tex/platex/base/jsize11.clo +++ b/Master/texmf-dist/tex/platex/base/jsize11.clo @@ -7,7 +7,7 @@ %% jclasses.dtx (with options: `11pt,yoko') %% %% Copyright (c) 2010 ASCII MEDIA WORKS -%% Copyright (c) 2016 Japanese TeX Development Community +%% Copyright (c) 2016-2018 Japanese TeX Development Community %% %% This file is part of the pLaTeX2e system (community edition). %% ------------------------------------------------------------- @@ -15,7 +15,7 @@ %% File: jclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{jsize11.clo} - [2017/09/19 v1.7g + [2018/02/04 v1.7h Standard pLaTeX file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xipt{15.5}% diff --git a/Master/texmf-dist/tex/platex/base/jsize12.clo b/Master/texmf-dist/tex/platex/base/jsize12.clo index 5f101a0e017..62cb93d187a 100644 --- a/Master/texmf-dist/tex/platex/base/jsize12.clo +++ b/Master/texmf-dist/tex/platex/base/jsize12.clo @@ -7,7 +7,7 @@ %% jclasses.dtx (with options: `12pt,yoko') %% %% Copyright (c) 2010 ASCII MEDIA WORKS -%% Copyright (c) 2016 Japanese TeX Development Community +%% Copyright (c) 2016-2018 Japanese TeX Development Community %% %% This file is part of the pLaTeX2e system (community edition). %% ------------------------------------------------------------- @@ -15,7 +15,7 @@ %% File: jclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{jsize12.clo} - [2017/09/19 v1.7g + [2018/02/04 v1.7h Standard pLaTeX file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xiipt{16.5}% diff --git a/Master/texmf-dist/tex/platex/base/jt1gt.fd b/Master/texmf-dist/tex/platex/base/jt1gt.fd index 01412ea3af0..29bc547fc04 100644 --- a/Master/texmf-dist/tex/platex/base/jt1gt.fd +++ b/Master/texmf-dist/tex/platex/base/jt1gt.fd @@ -7,14 +7,14 @@ %% plfonts.dtx (with options: `JT1gt') %% %% Copyright (c) 2010 ASCII MEDIA WORKS -%% Copyright (c) 2016 Japanese TeX Development Community +%% Copyright (c) 2016-2018 Japanese TeX Development Community %% %% This file is part of the pLaTeX2e system (community edition). %% ------------------------------------------------------------- %% %% File: plfonts.dtx \ProvidesFile{jt1gt.fd} - [1997/01/24 v1.3 KANJI font defines] + [2018/02/04 v1.6l KANJI font defines] \DeclareKanjiFamily{JT1}{gt}{} \DeclareRelationFont{JT1}{gt}{m}{}{OT1}{cmr}{bx}{} \DeclareFontShape{JT1}{gt}{m}{n}{<5> <6> <7> <8> <9> <10> sgen*tgoth diff --git a/Master/texmf-dist/tex/platex/base/jt1mc.fd b/Master/texmf-dist/tex/platex/base/jt1mc.fd index ebd9ce717ee..3fba2724099 100644 --- a/Master/texmf-dist/tex/platex/base/jt1mc.fd +++ b/Master/texmf-dist/tex/platex/base/jt1mc.fd @@ -7,14 +7,14 @@ %% plfonts.dtx (with options: `JT1mc') %% %% Copyright (c) 2010 ASCII MEDIA WORKS -%% Copyright (c) 2016 Japanese TeX Development Community +%% Copyright (c) 2016-2018 Japanese TeX Development Community %% %% This file is part of the pLaTeX2e system (community edition). %% ------------------------------------------------------------- %% %% File: plfonts.dtx \ProvidesFile{jt1mc.fd} - [1997/01/24 v1.3 KANJI font defines] + [2018/02/04 v1.6l KANJI font defines] \DeclareKanjiFamily{JT1}{mc}{} \DeclareRelationFont{JT1}{mc}{m}{}{OT1}{cmr}{m}{} \DeclareRelationFont{JT1}{mc}{bx}{}{OT1}{cmr}{bx}{} diff --git a/Master/texmf-dist/tex/platex/base/jy1gt.fd b/Master/texmf-dist/tex/platex/base/jy1gt.fd index c2710d9c677..2d6943e5862 100644 --- a/Master/texmf-dist/tex/platex/base/jy1gt.fd +++ b/Master/texmf-dist/tex/platex/base/jy1gt.fd @@ -7,14 +7,14 @@ %% plfonts.dtx (with options: `JY1gt') %% %% Copyright (c) 2010 ASCII MEDIA WORKS -%% Copyright (c) 2016 Japanese TeX Development Community +%% Copyright (c) 2016-2018 Japanese TeX Development Community %% %% This file is part of the pLaTeX2e system (community edition). %% ------------------------------------------------------------- %% %% File: plfonts.dtx \ProvidesFile{jy1gt.fd} - [1997/01/24 v1.3 KANJI font defines] + [2018/02/04 v1.6l KANJI font defines] \DeclareKanjiFamily{JY1}{gt}{} \DeclareRelationFont{JY1}{gt}{m}{}{OT1}{cmr}{bx}{} \DeclareFontShape{JY1}{gt}{m}{n}{<5> <6> <7> <8> <9> <10> sgen*goth diff --git a/Master/texmf-dist/tex/platex/base/jy1mc.fd b/Master/texmf-dist/tex/platex/base/jy1mc.fd index a45f3b5a539..0fd86603a06 100644 --- a/Master/texmf-dist/tex/platex/base/jy1mc.fd +++ b/Master/texmf-dist/tex/platex/base/jy1mc.fd @@ -7,14 +7,14 @@ %% plfonts.dtx (with options: `JY1mc') %% %% Copyright (c) 2010 ASCII MEDIA WORKS -%% Copyright (c) 2016 Japanese TeX Development Community +%% Copyright (c) 2016-2018 Japanese TeX Development Community %% %% This file is part of the pLaTeX2e system (community edition). %% ------------------------------------------------------------- %% %% File: plfonts.dtx \ProvidesFile{jy1mc.fd} - [1997/01/24 v1.3 KANJI font defines] + [2018/02/04 v1.6l KANJI font defines] \DeclareKanjiFamily{JY1}{mc}{} \DeclareRelationFont{JY1}{mc}{m}{}{OT1}{cmr}{m}{} \DeclareRelationFont{JY1}{mc}{bx}{}{OT1}{cmr}{bx}{} diff --git a/Master/texmf-dist/tex/platex/base/kinsoku.tex b/Master/texmf-dist/tex/platex/base/kinsoku.tex index 5d0767aa1f1..c6ef58789c3 100644 --- a/Master/texmf-dist/tex/platex/base/kinsoku.tex +++ b/Master/texmf-dist/tex/platex/base/kinsoku.tex @@ -7,7 +7,7 @@ %% kinsoku.dtx (with options: `plcore') %% %% Copyright (c) 2010 ASCII MEDIA WORKS -%% Copyright (c) 2016 Japanese TeX Development Community +%% Copyright (c) 2016-2018 Japanese TeX Development Community %% %% This file is part of the pLaTeX2e system (community edition). %% ------------------------------------------------------------- diff --git a/Master/texmf-dist/tex/platex/base/nidanfloat.sty b/Master/texmf-dist/tex/platex/base/nidanfloat.sty deleted file mode 100644 index f7444b16137..00000000000 --- a/Master/texmf-dist/tex/platex/base/nidanfloat.sty +++ /dev/null @@ -1,652 +0,0 @@ -%% -%% This is file `nidanfloat.sty', -%% generated with the docstrip utility. -%% -%% The original source files were: -%% -%% nidanfloat.dtx (with options: `core') -%% -%% Copyright (c) 2010 ASCII MEDIA WORKS -%% Copyright (c) 2016 Japanese TeX Development Community -%% -%% This file is part of the pLaTeX2e system (community edition). -%% ------------------------------------------------------------- -%% -%% File: nidanfloat.dtx -\NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{nidanfloat}% - [2017/05/01 v2.8 Put double-floats at top/bottom within twocolumn mode] -\DeclareOption{balance}{\AtEndDocument{\let\clearpage\balanceclearpage}} -\DeclareOption{nobalance}{\relax} -\ExecuteOptions{nobalance} -\ProcessOptions -\newcommand\dblbotfraction{0.5} -\newcount\c@dblbotnumber -\setcounter{dblbotnumber}{2} -\newdimen\@dblbotroom -\newcount\@dblbotnum -\def\@dblfloatplacement{% - \global\@dbltopnum\c@dbltopnumber - \global\@dblbotnum\c@dblbotnumber % added - \global\@dbltoproom\dbltopfraction\@colht - \global\@dblbotroom\dblbotfraction\@colht % added - \@textmin\@colht - \advance\@textmin-\@dbltoproom - \advance\@textmin-\@dblbotroom % added - \@fpmin\dblfloatpagefraction\textheight - \@fptop\@dblfptop - \@fpsep\@dblfpsep - \@fpbot\@dblfpbot -} -\gdef\@dblbotlist{} -\gdef\L@toplist{} -\gdef\R@toplist{} -\gdef\L@botlist{} -\gdef\R@botlist{} -\def\@dblfloat{% - \if@twocolumn\let\reserved@a\@dbflt\else\let\reserved@a\@float\fi - \reserved@a} -\def\@dbflt#1{\@ifnextchar[{\@xdblfloat{#1}}{\@xdblfloat{#1}[tb]}} -\def\@xdblfloat#1[#2]{% - \@xfloat{#1}[#2]\hsize\textwidth\linewidth\textwidth} -\let\end@dblfloat\end@float -\def\@addtocurcol{% - \ifdim\wd\@currbox>\columnwidth - \@addtodblcol - \else - \@insertfalse - \@setfloattypecounts - \ifnum\@fpstype=8 % is only `!p' - \else - \ifnum\@fpstype=24 % is only `p' - \else - \@flsettextmin - \advance\@textmin\@textfloatsheight - \@reqcolroom\@pageht - \ifdim\@textmin>\@reqcolroom \@reqcolroom\@textmin\fi - \advance\@reqcolroom\ht\@currbox - \ifdim\@colroom>\@reqcolroom - \@flsetnum\@colnum - \ifnum\@colnum>\z@ - \@bitor\@currtype\@deferlist - \if@test - \else - \@bitor\@currtype{\L@botlist\R@botlist}% - \if@test - \@addtobot - \else - \ifodd\count\@currbox - \advance\@reqcolroom\intextsep - \ifdim\@colroom>\@reqcolroom - \global\advance\@colnum\m@ne - \global\advance\@textfloatsheight\ht\@currbox - \global\advance\@textfloatsheight 2\intextsep - \@cons\@midlist\@currbox - \if@nobreak - \nobreak - \@nobreakfalse - \everypar{}% - \else - \addpenalty \interlinepenalty - \fi - \vskip\intextsep - \box\@currbox - \penalty\interlinepenalty - \vskip\intextsep - \ifnum\outputpenalty<-\@Mii \vskip-\parskip \fi - \outputpenalty\z@ - \@inserttrue - \fi - \fi - \if@insert\else\@addtotoporbot\fi - \fi - \fi - \fi - \fi - \fi - \fi - \if@insert\else\@resethfps\@cons\@deferlist\@currbox\fi - \fi -} -\def\@addtotoporbot{% - \@getfpsbit \tw@ - \ifodd\@tempcnta - \@flsetnum\@topnum - \ifnum\@topnum>\z@ - \@tempswafalse - \@flcheckspace\@toproom\@toplist\L@toplist\R@toplist - \if@tempswa - \@bitor\@currtype{\@midlist\L@botlist\R@botlist}% - \if@test\else - \if@firstcolumn - \@flupdates \@topnum \@toproom \L@toplist - \else - \@flupdates \@topnum \@toproom \R@toplist - \fi - \@inserttrue - \fi - \fi - \fi - \fi - \if@insert\else\@addtobot\fi -} -\def\@addtobot{% - \@getfpsbit 4\relax - \ifodd\@tempcnta - \@flsetnum\@botnum - \ifnum\@botnum>\z@ - \@tempswafalse - \@flcheckspace\@botroom\@botlist\L@botlist\R@botlist - \if@tempswa - \global\maxdepth\z@ - \if@firstcolumn - \@flupdates \@botnum \@botroom \L@botlist - \else - \@flupdates \@botnum \@botroom \R@botlist - \fi - \@inserttrue - \fi - \fi - \fi -} -\let\org@addtonextcol\@addtonextcol -\def\@addtonextcol{% - \ifdim\wd\@currbox>\columnwidth - \@addtodblcol - \else - \org@addtonextcol - \fi -} -\def\@addtodblcol{% - \begingroup - \@insertfalse - \@setfloattypecounts - \ifnum\@fpstype=8 % is only `!p' - \else - \ifnum\@fpstype=24 % is only `p' - \else - \@bitor\@currtype{\@dbldeferlist} - %\@bitor\@currtype{\@deferlist\@dbldeferlist} - \if@test - \else - \@tempswafalse - \@checkdblspace - \if@tempswa - \@addtodbltoporbot - \fi - \fi - \fi - \fi - \if@insert\else\@cons\@dbldeferlist\@currbox\fi - \endgroup -} -\def\@addtodbltoporbot{% - \@getfpsbit \tw@ - \ifodd\@tempcnta - \@flsetnum\@dbltopnum - \ifnum\@dbltopnum>\z@ - \@bitor\@currtype{% - \L@toplist\R@toplist\L@botlist\R@botlist\@dblbotlist} - \if@test - \else - \@tempswafalse - \@dblflcheckspace \@dbltoproom \@dbltoplist - \if@tempswa - \@tempdima-\ht\@currbox - \advance\@tempdima - -\ifx\@dbltoplist\@empty \dbltextfloatsep\else\dblfloatsep\fi - \global\advance\@dbltoproom\@tempdima - \global\advance\@dbltopnum\m@ne - \@cons\@dbltoplist\@currbox - \if@firstcolumn - \advance\@colroom\@tempdima - \global\advance\@colroom\maxdepth - \else - \@tempdima\textheight - \@chkdblfloatht\advance\@tempdima-\@floatht - \L@chkfloatht\advance\@tempdima-\@floatht - \vbadness=\@M \splittopskip=\topskip \splitmaxdepth=\maxdepth - \setbox\z@=\vbox{\unvcopy\@leftcolumn}% - \setbox\@ne=\vsplit\z@ to\@tempdima - \advance\@colroom-\ht\z@ - \global\advance\@colroom-\dp\z@ - \fi - \@inserttrue - \fi - \fi - \fi - \fi - \if@insert\else\@addtodblbot\fi -} -\def\@addtodblbot{% - \@getfpsbit 4\relax - \ifodd\@tempcnta - \@flsetnum\@botnum - \ifnum\@botnum>\z@ - \@tempswafalse - \@dblflcheckspace \@dbltoproom \@dbltoplist - \if@tempswa - \@tempdima-\ht\@currbox \advance\@tempdima - -\ifx\@dblbotlist\@empty \dbltextfloatsep\else\dblfloatsep\fi - \global\advance\@dblbotroom\@tempdima - \global\advance\@dblbotnum\m@ne - \@cons\@dblbotlist\@currbox - \if@firstcolumn - \advance\@colroom\@tempdima - \global\advance\@colroom\maxdepth - \else - \@tempdima\textheight - \@chkdblfloatht\advance\@tempdima-\@floatht - \L@chkfloatht\advance\@tempdima-\@floatht - \vbadness=\@M \splittopskip=\topskip \splitmaxdepth=\maxdepth - \setbox\z@=\vbox{\unvcopy\@leftcolumn}% - \setbox\@ne=\vsplit\z@ to\@tempdima - \advance\@colroom-\ht\z@ - \global\advance\@colroom-\dp\z@ - \fi - \@inserttrue - \fi - \fi - \fi -} -\global\newdimen\@floatht \@floatht\z@ -\def \@flcheckspace #1#2#3#4{% - \advance \@reqcolroom - \if@twocolumn - \if@firstcolumn - \ifx #3\@empty \textfloatsep \else \floatsep \fi - \else - \ifx #4\@empty \textfloatsep \else \floatsep \fi - \fi - \else - \ifx #2\@empty \textfloatsep \else \floatsep \fi - \fi - \ifdim \@colroom>\@reqcolroom - \ifdim #1>\ht\@currbox - \@tempswatrue - \else - \ifnum \@fpstype<\sixt@@n - \@tempswatrue - \fi - \fi - \fi -} -\def\@dblflcheckspace#1#2{% - \@tempdima=#1\relax - \advance\@tempdima - -\ifx #2\@empty \dbltextfloatsep\else\dblfloatsep\fi - \ifdim\@tempdima>\ht\@currbox - \@tempswatrue - \else - \ifnum\@fpstype<\sixt@@n - \advance\@tempdima\@textmin - \if \@tempdima>\ht\@currbox - \@tempswatrue - \fi - \fi - \fi -} -\def\@checkdblspace{% - \@tempdima\@pageht\advance\@tempdima\@pagedp - \@tempdimb\textfraction\@colht - \ifdim\@tempdima<\@tempdimb \@tempdima\@tempdimb\fi - \if@firstcolumn\else - \advance\@tempdima\ht\@leftcolumn - \advance\@tempdima\dp\@leftcolumn - \fi - \L@chkfloatht\advance\@tempdima\@floatht - \R@chkfloatht\advance\@tempdima\@floatht - \@chkdblfloatht\advance\@tempdima\tw@\@floatht - \@tempdimb\ht\@currbox\advance\@tempdimb\dp\@currbox - \advance\@tempdimb - \ifdim\@floatht>\z@ \dbltextfloatsep\else\dblfloatsep\fi - \multiply\@tempdimb\tw@ \advance\@tempdima\@tempdimb - \ifdim\@tempdima>\tw@\textheight - \@tempswafalse - \else - \@tempswatrue - \fi -} -\def\tmp@comflelt#1{% - \setbox\@tempboxa - \vbox{\unvbox\@tempboxa\copy #1\vskip\floatsep}% -} -\def\tmp@comdblflelt#1{% - \setbox\@tempboxa - \vbox{\unvbox\@tempboxa\copy #1\vskip\dblfloatsep}% -} -\def\L@chkfloatht{\@floatht\z@ - \ifx\L@toplist\@empty\else - \let\@elt\tmp@comflelt\setbox\@tempboxa\vbox{}\L@toplist - \setbox\@ne\vbox{\boxmaxdepth\maxdepth - \unvbox\@tempboxa\vskip-\floatsep\topfigrule\vskip\textfloatsep - }% - \let\@elt\relax \advance\@floatht\ht\@ne \advance\@floatht\dp\@ne - \fi - \ifx\L@botlist\@empty\else - \let\@elt\tmp@comflelt\setbox\@tempboxa\vbox{}\L@botlist - \setbox\@ne\vbox{\boxmaxdepth\maxdepth - \vskip\textfloatsep\botfigrule\unvbox\@tempboxa\vskip-\floatsep - }% - \let\@elt\relax \advance\@floatht\ht\@ne \advance\@floatht\dp\@ne - \fi - \global\@floatht\@floatht -} -\def\R@chkfloatht{\@floatht\z@ - \ifx\R@toplist\@empty\else - \let\@elt\tmp@comflelt\setbox\@tempboxa\vbox{}\R@toplist - \setbox\@ne\vbox{\boxmaxdepth\maxdepth - \unvbox\@tempboxa\vskip-\floatsep\topfigrule\vskip\textfloatsep - }% - \let\@elt\relax \advance\@floatht\ht\@ne \advance\@floatht\dp\@ne - \fi - \ifx\R@botlist\@empty\else - \let\@elt\tmp@comflelt\setbox\@tempboxa\vbox{}\R@botlist - \setbox\@ne\vbox{\boxmaxdepth\maxdepth - \vskip\textfloatsep\botfigrule\unvbox\@tempboxa\vskip-\floatsep - }% - \let\@elt\relax \advance\@floatht\ht\@ne \advance\@floatht\dp\@ne - \fi - \global\@floatht\@floatht -} -\def\@chkdblfloatht{\@floatht\z@ - \ifx\@dbltoplist\@empty\else - \let\@elt\tmp@comdblflelt\setbox\@tempboxa\vbox{}\@dbltoplist - \setbox\@ne\vbox{\boxmaxdepth\maxdepth - \unvbox\@tempboxa - \vskip-\dblfloatsep - \dblfigrule - \vskip\dbltextfloatsep - }% - \let\@elt\relax \advance\@floatht\ht\@ne \advance\@floatht\dp\@ne - \fi - \ifx\@dblbotlist\@empty\else - \let\@elt\tmp@comdblflelt\setbox\@tempboxa\vbox{}\@dblbotlist - \setbox\@ne\vbox{\boxmaxdepth\maxdepth - \vskip\dbltextfloatsep - \dblfigrule - \unvbox\@tempboxa - \vskip-\dblfloatsep - }% - \let\@elt\relax \advance\@floatht\ht\@ne \advance\@floatht\dp\@ne - \fi - \global\@floatht\@floatht -} -\global\newdimen\@fixht -\global\newdimen\@rightfixht -\def\@combinefloats{% - %%\boxmaxdepth\maxdepth - \if@twocolumn - \if@firstcolumn - \else - \@fixht\ht\@leftcolumn \advance\@fixht\dp\@leftcolumn - \@chkdblfloatht \@tempdima\@floatht - \L@chkfloatht \advance\@tempdima\@floatht - \advance\@fixht\@tempdima - \ifdim\@fixht>\textheight - \@fixht\textheight - \advance\@fixht-\@tempdima - \advance\@fixht\maxdepth - \vbadness=\@M \splittopskip=\topskip \splitmaxdepth=\maxdepth - \setbox\z@=\vsplit\@leftcolumn to\@fixht - \advance\@fixht-\maxdepth - \@tempdima\baselineskip \advance\@tempdima-\topskip - \setbox\@outputbox=\vbox{% - \ifvoid\@leftcolumn - \else - \unvbox\@leftcolumn\vskip\@tempdima - \fi\relax - \unvbox\@outputbox}% \vss moved from here - \setbox\@leftcolumn=\vbox to\@fixht{\unvbox\z@\vss}% to here (2017/05/01) - \fi - \@fixht\ht\@leftcolumn - \advance\@fixht\dp\@leftcolumn \advance\@fixht\@floatht - \@rightfixht\ht\@outputbox \advance\@rightfixht\dp\@outputbox - \@chkdblfloatht \@tempdima\@floatht - \R@chkfloatht \advance\@tempdima\@floatht - \advance\@rightfixht\@tempdima - \ifdim\@rightfixht>\textheight - \@rightfixht\textheight - \advance\@rightfixht-\@tempdima - \advance\@rightfixht\maxdepth - \vbadness=\@M \splittopskip=\topskip \splitmaxdepth=\maxdepth - \setbox\z@=\vsplit\@outputbox to\@rightfixht - \advance\@rightfixht-\maxdepth - \unvbox\@outputbox - \setbox\@outputbox=\vbox to\@rightfixht{\unvbox\z@\vss}% - \fi - \@rightfixht\ht\@outputbox - \advance\@rightfixht\dp\@outputbox \advance\@rightfixht\@floatht - \ifx\L@toplist\@empty\else\L@cflt\fi - \ifx\L@botlist\@empty\else\L@cflb\fi - \ifx\R@toplist\@empty\else\R@cflt\fi - \ifx\R@botlist\@empty\else\R@cflb\fi - \fi - \else - \ifx\@toplist\@empty\else\@cflt\fi - \ifx\@botlist\@empty\else\@cflb\fi - \fi -} -\def\L@cflt{% - \let\@elt\@comflelt\setbox\@tempboxa\vbox{}\L@toplist - \setbox\@leftcolumn\vbox to\@fixht{\boxmaxdepth\maxdepth - \unvbox\@tempboxa - \vskip-\floatsep\topfigrule\vskip\textfloatsep\unvbox\@leftcolumn - \vss}% - \let\@elt\relax - \xdef\@freelist{\@freelist\L@toplist}\global\let\L@toplist\@empty - \@colht\@fixht -} -\def\L@cflb{% - \let\@elt\@comflelt\setbox\@tempboxa\vbox{}\L@botlist - \setbox\@leftcolumn\vbox to\@fixht{\boxmaxdepth\maxdepth - \unvbox\@leftcolumn - \vskip\textfloatsep\botfigrule\unvbox\@tempboxa\vskip-\floatsep - \vss}% - \let\@elt\relax - \xdef\@freelist{\@freelist\L@botlist}\global\let\L@botlist\@empty - \@colht\@fixht -} -\def\R@cflt{% - \let\@elt\@comflelt\setbox\@tempboxa\vbox{}\R@toplist - \setbox\@outputbox\vbox to\@rightfixht{\boxmaxdepth\maxdepth - \unvbox\@tempboxa - \vskip-\floatsep\topfigrule\vskip\textfloatsep\unvbox\@outputbox - \vss}% - \let\@elt\relax - \xdef\@freelist{\@freelist\R@toplist}\global\let\R@toplist\@empty - \@colht\@rightfixht -} -\def\R@cflb{% - \let\@elt\@comflelt\setbox\@tempboxa\vbox{}\R@botlist - \setbox\@outputbox\vbox to\@rightfixht{\boxmaxdepth\maxdepth - \unvbox\@outputbox - \vskip\textfloatsep\botfigrule\unvbox\@tempboxa\vskip-\floatsep - \vss}% - \let\@elt\relax - \xdef\@freelist{\@freelist\R@botlist}\global\let\R@botlist\@empty - \@colht\@rightfixht -} -\def\@combinedblfloats{% - \ifx\@dbltoplist\@empty - \else - \let\@elt\@comdblflelt\setbox\@tempboxa\vbox{}\@dbltoplist - \setbox\@outputbox\vbox{\boxmaxdepth\maxdepth - \unvbox\@tempboxa - \vskip-\dblfloatsep - \dblfigrule - \vskip\dbltextfloatsep - \box\@outputbox}% - \let\@elt\relax\xdef\@freelist{\@freelist\@dbltoplist}% - \global\let\@dbltoplist\@empty - \fi - \ifx\@dblbotlist\@empty - \else - \let\@elt\@comdblflelt\setbox\@tempboxa\vbox{}\@dblbotlist - \setbox\@outputbox\vbox{\boxmaxdepth\maxdepth - \box\@outputbox - \vskip\dbltextfloatsep - \dblfigrule - \unvbox\@tempboxa - \vskip-\dblfloatsep - }% - \let\@elt\relax\xdef\@freelist{\@freelist\@dblbotlist}% - \global\let\@dblbotlist\@empty - \fi - \global\setbox\@outputbox\vbox to\textheight{\unvbox\@outputbox}% -} -\newif\if@balance \@balancefalse -\newbox\@combinebox -\def\@outputdblcol{% - \if@firstcolumn - \global\@firstcolumnfalse - \global\setbox\@leftcolumn\box\@outputbox - \@colht\textheight - \@chkdblfloatht\global\advance\@colht-\@floatht - \else - \global\@firstcolumntrue - \if@balance % $B:81&%+%i%`$r6QEy$KJ,3d(B - \@tempdima\baselineskip - \advance\@tempdima-\topskip - % $BO"7k(B - \setbox\@combinebox=\vbox{% - \unvbox\@leftcolumn\vskip\@tempdima\unvbox\@outputbox}% - \@tempdima\ht\@combinebox - \advance\@tempdima\dp\@combinebox - \divide\@tempdima\tw@ - % $BJ,3d(B - \vbadness=\@M \splittopskip=\topskip \splitmaxdepth=\maxdepth - \setbox\@leftcolumn=\vsplit\@combinebox to\@tempdima - \setbox\@outputbox=\vtop{\unvbox\@combinebox} - \setbox\@leftcolumn=\vtop{\unvbox\@leftcolumn} - \fi - % $B@07A(B - \@tempdima\ht\@leftcolumn - \setbox\@outputbox\vbox to\@tempdima{% - \hb@xt@\textwidth{% - \hb@xt@\columnwidth{% - \vbox to\@tempdima{\box\@leftcolumn\vss}\hss}% - \hfil - \vrule width\columnseprule - \hfil - \hb@xt@\columnwidth{% - \vbox to\@tempdima{\box\@outputbox\vss}\hss}% - }% - \vss - }% - \@combinedblfloats - \@outputpage - \begingroup - \@dblfloatplacement - \@startdblcolumn - \@whilesw\if@fcolmade \fi{\@outputpage\@startdblcolumn}% - \endgroup - \fi - \global\@balancefalse -} -\def\@startdblcolumn{% - \global\@colht\textheight - \@tryfcolumn\@dbldeferlist - \if@fcolmade - \else - \begingroup - \let\reserved@b\@dbldeferlist - \global\let\@dbldeferlist\@empty - \let\@elt\@sdblcolelt - \reserved@b - \endgroup - \fi - \@chkdblfloatht - \global\advance\@colht-\@floatht -} -\def\@doclearpage{% - \ifvoid\footins - \setbox\@tempboxa\vsplit\@cclv to\z@ \unvbox\@tempboxa - \setbox\@tempboxa\box\@cclv - \xdef\@deferlist{% - \L@toplist\R@toplist\L@botlist\R@botlist\@deferlist}% - \global\let\L@toplist\@empty % changed from \@toplist - \global\let\R@toplist\@empty % added - \global\let\L@botlist\@empty % changed from \@botlist - \global\let\R@botlist\@empty % added - \global\@colroom\@colht - \ifx\@currlist\@empty - \else - \@latexerr{Float(s) lost}\@ehb - \global\let\@currlist\@empty - \fi - \@makefcolumn\@deferlist - \@whilesw\if@fcolmade \fi{\@opcol\@makefcolumn\@deferlist}% - \if@twocolumn - \if@firstcolumn - % added \@dblbotlist - \xdef\@dbldeferlist{\@dbltoplist\@dblbotlist\@dbldeferlist}% - \global\let\@dbltoplist\@empty - \global\let\@dblbotlist\@empty % added - \global\@colht\textheight - \begingroup - \@dblfloatplacement - \@makefcolumn\@dbldeferlist - \@whilesw\if@fcolmade \fi{\@outputpage - \@makefcolumn\@dbldeferlist}% - \endgroup - \else - \vbox{}\clearpage - \fi - \fi - \else - \setbox\@cclv\vbox{\box\@cclv\vfil}% - \@makecol\@opcol - \clearpage - \fi -} -\long\def\@topnewpage[#1]{% - %\@nodocument - \@next\@currbox\@freelist{}{}% - \global\setbox\@currbox - \color@vbox - \normalcolor - \vbox{\hsize\textwidth - \@parboxrestore - \col@number\@ne - #1% - \vskip-\dbltextfloatsep}% - \color@endbox - \ifdim\ht\@currbox>\textheight - \ht\@currbox\textheight - \fi - \global\count\@currbox\tw@ - \@tempdima-\ht\@currbox - \advance\@tempdima-\dbltextfloatsep - \global\advance\@colht\@tempdima - \ifx\@dbltoplist\@empty - \else - \@latexerr{Float(s) lost}\@ehb - \let\@dbltoplist\@empty - \fi - \@cons\@dbltoplist\@currbox - \global\@dbltopnum\m@ne - \global\@dblbotnum\m@ne % added - \ifdim\@colht<2.5\baselineskip - \@latex@warning@no@line {Optional argument of \noexpand\twocolumn - too tall on page \thepage}% - \@emptycol - \if@firstcolumn - \else - \@emptycol - \fi - \else - \global\vsize\@colht - \global\@colroom\@colht - \@floatplacement - \fi - %\global\@dbltoproom\maxdimen - %\global\@dblbotroom\maxdimen - %\@addtodblcol -} -\def\balancenewpage{\par\vfil\global\@balancetrue\penalty-\@M} -\def\balanceclearpage{\balancenewpage - \write\m@ne{}\vbox{}\global\@balancetrue\penalty-\@Mi} -\endinput -%% -%% End of file `nidanfloat.sty'. diff --git a/Master/texmf-dist/tex/platex/base/oldpfont.sty b/Master/texmf-dist/tex/platex/base/oldpfont.sty index 62959a461ba..268814fa58b 100644 --- a/Master/texmf-dist/tex/platex/base/oldpfont.sty +++ b/Master/texmf-dist/tex/platex/base/oldpfont.sty @@ -7,7 +7,7 @@ %% pl209.dtx (with options: `oldfonts') %% %% Copyright (c) 2010 ASCII MEDIA WORKS -%% Copyright (c) 2016 Japanese TeX Development Community +%% Copyright (c) 2016-2018 Japanese TeX Development Community %% %% This file is part of the pLaTeX2e system (community edition). %% ------------------------------------------------------------- diff --git a/Master/texmf-dist/tex/platex/base/pfltrace.sty b/Master/texmf-dist/tex/platex/base/pfltrace.sty index 06459d11a23..a415580d4c8 100644 --- a/Master/texmf-dist/tex/platex/base/pfltrace.sty +++ b/Master/texmf-dist/tex/platex/base/pfltrace.sty @@ -7,7 +7,7 @@ %% plcore.dtx (with options: `fltrace,trace') %% %% Copyright (c) 2010 ASCII MEDIA WORKS -%% Copyright (c) 2016 Japanese TeX Development Community +%% Copyright (c) 2016-2018 Japanese TeX Development Community %% %% This file is part of the pLaTeX2e system (community edition). %% ------------------------------------------------------------- diff --git a/Master/texmf-dist/tex/platex/base/pl209.def b/Master/texmf-dist/tex/platex/base/pl209.def index 68376e34600..d80c2cfe120 100644 --- a/Master/texmf-dist/tex/platex/base/pl209.def +++ b/Master/texmf-dist/tex/platex/base/pl209.def @@ -7,7 +7,7 @@ %% pl209.dtx (with options: `pl209') %% %% Copyright (c) 2010 ASCII MEDIA WORKS -%% Copyright (c) 2016 Japanese TeX Development Community +%% Copyright (c) 2016-2018 Japanese TeX Development Community %% %% This file is part of the pLaTeX2e system (community edition). %% ------------------------------------------------------------- diff --git a/Master/texmf-dist/tex/platex/base/platex.ltx b/Master/texmf-dist/tex/platex/base/platex.ltx index 37c4e0d7eb4..b36a4958e81 100644 --- a/Master/texmf-dist/tex/platex/base/platex.ltx +++ b/Master/texmf-dist/tex/platex/base/platex.ltx @@ -7,7 +7,7 @@ %% platex.dtx (with options: `plcore') %% %% Copyright (c) 2010 ASCII MEDIA WORKS -%% Copyright (c) 2016 Japanese TeX Development Community +%% Copyright (c) 2016-2018 Japanese TeX Development Community %% %% This file is part of the pLaTeX2e system (community edition). %% ------------------------------------------------------------- @@ -23,6 +23,11 @@ **************************} \makeatletter \input plcore.ltx +\InputIfFileExists{pldefs.cfg} + {\typeout{*************************************^^J% + * Local config file pldefs.cfg used^^J% + *************************************}}% + {\input{pldefs.ltx}} \the\everyjob \everyjob\expandafter{% \the\everyjob diff --git a/Master/texmf-dist/tex/platex/base/platexrelease.sty b/Master/texmf-dist/tex/platex/base/platexrelease.sty index 7f81f324a97..9ff963103b1 100644 --- a/Master/texmf-dist/tex/platex/base/platexrelease.sty +++ b/Master/texmf-dist/tex/platex/base/platexrelease.sty @@ -9,7 +9,7 @@ %% plfonts.dtx (with options: `platexrelease') %% plcore.dtx (with options: `platexrelease') %% -%% Copyright (c) 2016 Japanese TeX Development Community +%% Copyright (c) 2016-2018 Japanese TeX Development Community %% %% This file is part of the pLaTeX2e system (community edition). %% ------------------------------------------------------------- @@ -18,8 +18,16 @@ \edef\p@known@latexreleaseversion {2017/04/15} \edef\platexreleaseversion - {2017/10/28} -\def\plIncludeInRelease#1{\kernel@ifnextchar[% + {2018/03/09} +\newif\if@plincludeinrelease +\@plincludeinreleasefalse +\def\plIncludeInRelease#1{% + \if@plincludeinrelease + \PackageError{platexrelease} + {mis-matched \string\plIncludeInRelease}{}% + \@plincludeinreleasefalse + \fi + \kernel@ifnextchar[% {\@plIncludeInRelease{#1}} {\@plIncludeInRelease{#1}[#1]}} \def\@plIncludeInRelease#1[#2]{\@plIncludeInRele@se{#2}} @@ -32,6 +40,7 @@ \expandafter\expandafter\expandafter\@gobble@plIncludeInRelease \else \GenericInfo{}{Applying: \the\toks@}% + \@plincludeinreleasetrue \expandafter\let\csname\string#2+\@currname+plIIR\endcsname\@empty \fi \else @@ -39,12 +48,28 @@ \expandafter\@gobble@plIncludeInRelease \fi } -\long\def\@gobble@plIncludeInRelease#1\plEndIncludeInRelease{} -\let\plEndIncludeInRelease\relax +\def\plEndIncludeInRelease{% + \if@plincludeinrelease + \@plincludeinreleasefalse + \else + \PackageError{platexrelease} + {mis-matched \string\plEndIncludeInRelease}{}% + \fi} +\long\def\@gobble@plIncludeInRelease#1\plEndIncludeInRelease{% + \@plincludeinreleasefalse + \@check@plIncludeInRelease#1\plIncludeInRelease + \@check@plIncludeInRelease\@end@check@plIncludeInRelease} +\long\def\@check@plIncludeInRelease#1\plIncludeInRelease + #2#3\@end@check@plIncludeInRelease{% + \ifx\@check@plIncludeInRelease#2\else + \PackageError{platexrelease} + {skipped \string\plIncludeInRelease}{}% + \fi} %% File: platexrelease.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesPackage{platexrelease} - [2018/01/27 v1.0j latexrelease support for pLaTeX Kernel] + [2018/01/27 v1.0k latexrelease support for pLaTeX Kernel + (including releases up to \platexreleaseversion)] \RequirePackageWithOptions{latexrelease} \ifnum\expandafter\@parse@version\latexreleaseversion//00\@nil >\expandafter\@parse@version\p@known@latexreleaseversion//00\@nil @@ -522,6 +547,25 @@ of this package available from CTAN} \def\<{\inhibitglue} \plEndIncludeInRelease %% File: plcore.dtx +\plIncludeInRelease{2018/03/09}% + {\removejfmglue}{Macro added}% +\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 +\plEndIncludeInRelease +\plIncludeInRelease{0000/00/00}% + {\removejfmglue}{Macro added}% +\let\removejfmglue\@undefined +\plEndIncludeInRelease \plIncludeInRelease{2017/10/28}{\@no@lnbk} {Break before prebreakpenalty}% \def\@no@lnbk #1[#2]{% @@ -1126,6 +1170,58 @@ of this package available from CTAN} \@startfield \strut} \plEndIncludeInRelease +\plIncludeInRelease{2018/03/09}{\@tabclassz} + {Inhibit JFM glue in tabular cells}% +\ifx\removejfmglue\@undefined +\def\@tabclassz{% + \ifcase\@lastchclass + \@acolampacol + \or + \@ampacol + \or + \or + \or + \@addamp + \or + \@acolampacol + \or + \@firstampfalse\@acol + \fi + \edef\@preamble{% + \@preamble{% + \ifcase\@chnum + \hfil\mbox{\inhibitglue\ignorespaces\@sharp\unskip}\hfil % c + \or + \hskip1sp\mbox{\inhibitglue\ignorespaces\@sharp\unskip}\hfil % l + \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 +\plEndIncludeInRelease \plIncludeInRelease{2017/09/26}{\@tabclassz} {Inhibit JFM glue in tabular cells}% \def\@tabclassz{% @@ -1204,6 +1300,11 @@ of this package available from CTAN} \hfil\hskip1sp\ignorespaces\@sharp\unskip \fi}}} \plEndIncludeInRelease +\plIncludeInRelease{2018/03/09}{\@classv} + {Inhibit JFM glue in tabular cells}% +\def\@classv{\@addtopreamble{\@startpbox{\@nextchar}\pltx@next@inhibitglue\ignorespaces +\@sharp\unskip\@endpbox}} +\plEndIncludeInRelease \plIncludeInRelease{2017/07/29}{\@classv} {Inhibit JFM glue in tabular cells}% \def\@classv{\@addtopreamble{\@startpbox{\@nextchar}\mbox{}\inhibitglue\ignorespaces @@ -1214,6 +1315,19 @@ of this package available from CTAN} \def\@classv{\@addtopreamble{\@startpbox{\@nextchar}\ignorespaces \@sharp\@endpbox}} \plEndIncludeInRelease +\plIncludeInRelease{2018/03/09}{\pltx@next@inhibitglue} + {Add \pltx@next@inhibitglue}% +\protected\def\pltx@next@inhibitglue{% + \ifhmode\inhibitglue\else + \edef\@tempa{\everypar{\inhibitglue + \everypar{\unexpanded\expandafter{\the\everypar}}% + \unexpanded\expandafter{\the\everypar}}}% + \@tempa\fi} +\plEndIncludeInRelease +\plIncludeInRelease{0000/00/00}{\pltx@next@inhibitglue} + {Add \pltx@next@inhibitglue}% +\let\pltx@next@inhibitglue\@undefined +\plEndIncludeInRelease \plIncludeInRelease{2016/04/17}{\@tabular} {Remove extra \xkanjiskip}% \def\@tabular{\leavevmode \null\hbox \bgroup $\let\@acol\@tabacol @@ -1294,6 +1408,21 @@ of this package available from CTAN} \ifmmode\@@underline{#1}% \else $\@@underline{\hbox{#1}}\m@th$\relax\fi} \plEndIncludeInRelease +\plIncludeInRelease{2018/03/09}% + {\e@alloc@chardef}{Extended Allocation (FAM256)}% +\ifx\omathchar\@undefined + \ifx\widowpenalties\@undefined + \mathchardef\e@alloc@top=255 + \let\e@alloc@chardef\chardef + \else + \mathchardef\e@alloc@top=32767 + \let\e@alloc@chardef\mathchardef + \fi +\else + \omathchardef\e@alloc@top=65535 + \let\e@alloc@chardef\omathchardef +\fi +\plEndIncludeInRelease \plIncludeInRelease{2016/11/29}% {\e@alloc@chardef}{Extended Allocation (FAM256)}% \ifx\omathchar\@undefined diff --git a/Master/texmf-dist/tex/platex/base/plcore.ltx b/Master/texmf-dist/tex/platex/base/plcore.ltx index 000ae2fb325..288406422f2 100644 --- a/Master/texmf-dist/tex/platex/base/plcore.ltx +++ b/Master/texmf-dist/tex/platex/base/plcore.ltx @@ -10,7 +10,7 @@ %% plvers.dtx (with options: `plfinal') %% %% Copyright (c) 2010 ASCII MEDIA WORKS -%% Copyright (c) 2016 Japanese TeX Development Community +%% Copyright (c) 2016-2018 Japanese TeX Development Community %% %% This file is part of the pLaTeX2e system (community edition). %% ------------------------------------------------------------- @@ -18,10 +18,18 @@ %% File: plvers.dtx \def\pfmtname{pLaTeX2e} \def\pfmtversion - {2017/10/28} -\def\ppatch@level{4} + {2018/03/09} +\def\ppatch@level{0} \edef\platexBANNER{\the\everyjob\noexpand\typeout{}\relax}% save LaTeX banner -\def\plIncludeInRelease#1{\kernel@ifnextchar[% +\newif\if@plincludeinrelease +\@plincludeinreleasefalse +\def\plIncludeInRelease#1{% + \if@plincludeinrelease + \PackageError{platexrelease} + {mis-matched \string\plIncludeInRelease}{}% + \@plincludeinreleasefalse + \fi + \kernel@ifnextchar[% {\@plIncludeInRelease{#1}} {\@plIncludeInRelease{#1}[#1]}} \def\@plIncludeInRelease#1[#2]{\@plIncludeInRele@se{#2}} @@ -34,6 +42,7 @@ \expandafter\expandafter\expandafter\@gobble@plIncludeInRelease \else \GenericInfo{}{Applying: \the\toks@}% + \@plincludeinreleasetrue \expandafter\let\csname\string#2+\@currname+plIIR\endcsname\@empty \fi \else @@ -41,8 +50,23 @@ \expandafter\@gobble@plIncludeInRelease \fi } -\long\def\@gobble@plIncludeInRelease#1\plEndIncludeInRelease{} -\let\plEndIncludeInRelease\relax +\def\plEndIncludeInRelease{% + \if@plincludeinrelease + \@plincludeinreleasefalse + \else + \PackageError{platexrelease} + {mis-matched \string\plEndIncludeInRelease}{}% + \fi} +\long\def\@gobble@plIncludeInRelease#1\plEndIncludeInRelease{% + \@plincludeinreleasefalse + \@check@plIncludeInRelease#1\plIncludeInRelease + \@check@plIncludeInRelease\@end@check@plIncludeInRelease} +\long\def\@check@plIncludeInRelease#1\plIncludeInRelease + #2#3\@end@check@plIncludeInRelease{% + \ifx\@check@plIncludeInRelease#2\else + \PackageError{platexrelease} + {skipped \string\plIncludeInRelease}{}% + \fi} %% File: plfonts.dtx \let\k@encoding\@empty \let\ck@encoding\@empty @@ -659,11 +683,6 @@ \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% - *************************************}}% - {\input{pldefs.ltx}} %% File: plcore.dtx \def\NeedsTeXFormat#1{% \def\reserved@a{#1}% @@ -693,6 +712,18 @@ \def\documentstyle{% \makeatletter\input{pl209.def}\makeatother \documentclass} +\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 \def\cleardoublepage{\clearpage\if@twoside \ifodd\c@page \iftdir @@ -1023,6 +1054,7 @@ \newcommand\printglossary{\@input@{\jobname.gls}} \newcount\hour \newcount\minute +\ifx\removejfmglue\@undefined \def\@tabclassz{% \ifcase\@lastchclass \@acolampacol @@ -1046,8 +1078,39 @@ \or \hfil\hskip1sp\mbox{\inhibitglue\ignorespaces\@sharp\unskip}% % r \fi}}} -\def\@classv{\@addtopreamble{\@startpbox{\@nextchar}\mbox{}\inhibitglue\ignorespaces +\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 +\def\@classv{\@addtopreamble{\@startpbox{\@nextchar}\pltx@next@inhibitglue\ignorespaces \@sharp\unskip\@endpbox}} +\protected\def\pltx@next@inhibitglue{% + \ifhmode\inhibitglue\else + \edef\@tempa{\everypar{\inhibitglue + \everypar{\unexpanded\expandafter{\the\everypar}}% + \unexpanded\expandafter{\the\everypar}}}% + \@tempa\fi} \def\@tabular{\leavevmode \null\hbox \bgroup $\let\@acol\@tabacol \let\@classz\@tabclassz \let\@classiv\@tabclassiv \let\\\@tabularcr\@tabarray} @@ -1085,13 +1148,8 @@ \let\e@alloc@chardef\mathchardef \fi \else - \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 \ifx\omathchar\@undefined \chardef\e@mathgroup@top=16 % LaTeX2e kernel standard diff --git a/Master/texmf-dist/tex/platex/base/pldefs.ltx b/Master/texmf-dist/tex/platex/base/pldefs.ltx index 147f0190c5a..8e9db2bb726 100644 --- a/Master/texmf-dist/tex/platex/base/pldefs.ltx +++ b/Master/texmf-dist/tex/platex/base/pldefs.ltx @@ -7,14 +7,14 @@ %% plfonts.dtx (with options: `pldefs,xpt') %% %% Copyright (c) 2010 ASCII MEDIA WORKS -%% Copyright (c) 2016 Japanese TeX Development Community +%% Copyright (c) 2016-2018 Japanese TeX Development Community %% %% This file is part of the pLaTeX2e system (community edition). %% ------------------------------------------------------------- %% %% File: plfonts.dtx \ProvidesFile{pldefs.ltx} - [2017/11/06 v1.6j pLaTeX Kernel (Default settings)] + [2018/02/04 v1.6l pLaTeX Kernel (Default settings)] \DeclareKanjiEncodingDefaults{}{} \DeclareErrorKanjiFont{JY1}{mc}{m}{n}{10} \DeclareYokoKanjiEncoding{JY1}{}{} diff --git a/Master/texmf-dist/tex/platex/base/plext.sty b/Master/texmf-dist/tex/platex/base/plext.sty index fc28a40f256..91b85699afd 100644 --- a/Master/texmf-dist/tex/platex/base/plext.sty +++ b/Master/texmf-dist/tex/platex/base/plext.sty @@ -7,7 +7,7 @@ %% plext.dtx (with options: `package') %% %% Copyright (c) 2010 ASCII MEDIA WORKS -%% Copyright (c) 2016 Japanese TeX Development Community +%% Copyright (c) 2016-2018 Japanese TeX Development Community %% %% This file is part of the pLaTeX2e system (community edition). %% ------------------------------------------------------------- diff --git a/Master/texmf-dist/source/platex/base/plnews.cls b/Master/texmf-dist/tex/platex/base/plnews.cls index a39b6cbb991..a39b6cbb991 100644 --- a/Master/texmf-dist/source/platex/base/plnews.cls +++ b/Master/texmf-dist/tex/platex/base/plnews.cls diff --git a/Master/texmf-dist/tex/platex/base/ptrace.sty b/Master/texmf-dist/tex/platex/base/ptrace.sty index 013b7af7976..7f7d3836922 100644 --- a/Master/texmf-dist/tex/platex/base/ptrace.sty +++ b/Master/texmf-dist/tex/platex/base/ptrace.sty @@ -7,7 +7,7 @@ %% plfonts.dtx (with options: `trace') %% %% Copyright (c) 2010 ASCII MEDIA WORKS -%% Copyright (c) 2016 Japanese TeX Development Community +%% Copyright (c) 2016-2018 Japanese TeX Development Community %% %% This file is part of the pLaTeX2e system (community edition). %% ------------------------------------------------------------- diff --git a/Master/texmf-dist/tex/platex/base/tarticle.cls b/Master/texmf-dist/tex/platex/base/tarticle.cls index 6593e6798e8..4fa11a3d2c1 100644 --- a/Master/texmf-dist/tex/platex/base/tarticle.cls +++ b/Master/texmf-dist/tex/platex/base/tarticle.cls @@ -7,7 +7,7 @@ %% jclasses.dtx (with options: `article,tate') %% %% Copyright (c) 2010 ASCII MEDIA WORKS -%% Copyright (c) 2016 Japanese TeX Development Community +%% Copyright (c) 2016-2018 Japanese TeX Development Community %% %% This file is part of the pLaTeX2e system (community edition). %% ------------------------------------------------------------- @@ -15,7 +15,7 @@ %% File: jclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesClass{tarticle} - [2017/09/19 v1.7g + [2018/02/04 v1.7h Standard pLaTeX class] \newcounter{@paper} \newif\if@landscape \@landscapefalse @@ -124,6 +124,7 @@ \ProcessOptions\relax \input{tsize1\@ptsize.clo} \RequirePackage{plext} +\def\Cjascale{0.962216} \if@stysize \setlength\columnsep{3\Cwd} \else diff --git a/Master/texmf-dist/tex/platex/base/tarticle.sty b/Master/texmf-dist/tex/platex/base/tarticle.sty index 16792d49e90..60de890cf69 100644 --- a/Master/texmf-dist/tex/platex/base/tarticle.sty +++ b/Master/texmf-dist/tex/platex/base/tarticle.sty @@ -7,7 +7,7 @@ %% pl209.dtx (with options: `style,tarticle') %% %% Copyright (c) 2010 ASCII MEDIA WORKS -%% Copyright (c) 2016 Japanese TeX Development Community +%% Copyright (c) 2016-2018 Japanese TeX Development Community %% %% This file is part of the pLaTeX2e system (community edition). %% ------------------------------------------------------------- diff --git a/Master/texmf-dist/tex/platex/base/tascmac.sty b/Master/texmf-dist/tex/platex/base/tascmac.sty deleted file mode 100644 index 207bf51bd72..00000000000 --- a/Master/texmf-dist/tex/platex/base/tascmac.sty +++ /dev/null @@ -1,276 +0,0 @@ -%% -%% This is file `tascmac.sty', -%% generated with the docstrip utility. -%% -%% The original source files were: -%% -%% ascmac.dtx (with options: `tascmac') -%% -%% Copyright (c) 2010 ASCII MEDIA WORKS -%% Copyright (c) 2016 Japanese TeX Development Community -%% -%% This file is part of the pLaTeX2e system (community edition). -%% ------------------------------------------------------------- -%% -%% "tascmac" document style option for tate gumi. -%% -%% Original version: -%% Copyright (C) by 1993, ASCII Corporation & Impress Corporation. -%% (Last update: 2006/07/14) -%% Modified by Japanese TeX Development Community, since 2016. -%% -%% (ChangeLog has moved to the source file ``ascmac.dtx'') -%% -\NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{tascmac} - [2017/12/17 v2.0f - ascmac package (community edition) - ] -%% -%% Originally `ascmac' and `tascmac' can be used only in -%% pLaTeX, upLaTeX or LuaLaTeX with LuaTeX-ja support. -%% We (texjporg) started to support other engines, such as -%% pdfLaTeX, XeLaTeX and LuaLaTeX (even without LuaTeX-ja). -%% -\newif\ifascmac@ptex \ascmac@ptextrue -\ifx\kanjiskip\@undefined - \@ifpackageloaded{luatexja}{% - \PackageInfo{tascmac}{% - Patch from LuaTeX-ja will be applied}% - }{% - \PackageInfo{tascmac}{% - Assuming pdfLaTeX, XeLaTeX or LuaLaTeX}% - \ascmac@ptexfalse - }% -\fi -\chardef\ascmac@q@catcode=\catcode`\Q\relax -\ifascmac@ptex - \catcode`\Q=9\relax -\else - \catcode`\Q=14\relax -\fi -%% -%% Use Type1 font for ascgrp (pdfLaTeX, LuaLaTeX) -\ifascmac@ptex\else - \ifx\pdfextension\@undefined - \ifx\pdfmapline\@undefined\else - % pdfTeX, LuaTeX (<=0.81) - \pdfmapline{+ascgrp <ascgrp.pfb} - \pdfmapline{+ascii10 <ascii10.pfb} - \pdfmapline{+ascii36 <ascii36.pfb} - \fi - \else - % LuaTeX (>=0.85) - \pdfextension mapline{+ascgrp <ascgrp.pfb} - \pdfextension mapline{+ascii10 <ascii10.pfb} - \pdfextension mapline{+ascii36 <ascii36.pfb} - \fi -\fi -%% -%% ascmac.sty 10/28 '88 -%% ASCII special macros -Q \ifx\@savetbaselineshift\@undefined \newdimen\@savetbaselineshift \fi -Q \ifx\@saveybaselineshift\@undefined \newdimen\@saveybaselineshift \fi -%% -%% ASCII logo -\def\@@ASCII#1#2#3{\shortstack{#1 ASCII \\[#3] - \fontsize{#2}{\z@}\usefont{OT1}{cmss}{m}{n}ASCII CORPORATION}} -\def\ascii{\@ifundefined{@ascii}{\font\@ascii=ascii10 scaled \magstep4}{}% - \@@ASCII\@ascii{5pt}{-6pt}} -\def\Ascii{\@ifundefined{@Ascii}{\font\@Ascii=ascii10 scaled \magstep5}{}% - \@@ASCII\@Ascii{6pt}{-7pt}} -\def\ASCII{\@ifundefined{@ASCII}{\font\@ASCII=ascii36}{}% - \@@ASCII\@ASCII{9pt}{-9pt}} -%% -%% boxnote environment -\font\@ascgrp=ascgrp -\newbox\scb@x \newbox\scscb@x -\newdimen\@bw\newbox\@nbox\newbox\@nbody -\def\boxnote{\par\vspace{.3\baselineskip}% -Q \@saveybaselineshift\ybaselineshift\ybaselineshift\z@ -Q \@savetbaselineshift\tbaselineshift\tbaselineshift\z@ - \setbox\@nbox=\hbox{\@ascgrp\vrule width1.08pt depth35pt b\hss a\hss b} - \@whiledim \wd\@nbox<\hsize \do{ - \setbox\@nbox=\hbox{\@ascgrp\unhbox\@nbox \hss a\hss b}} - \setbox\@nbox=\hbox to\hsize{\@ascgrp\unhbox\@nbox \hss a\hss b% - \vrule width1.08pt depth35pt} - \@bw=\wd\@nbox\advance\@bw -40pt - \begin{lrbox}{\@nbody}\begin{minipage}{\@bw}% (KN:1998/02/27) -Q \ybaselineshift\@saveybaselineshift \tbaselineshift\@savetbaselineshift -}% -\def\endboxnote{\end{minipage}\end{lrbox}% - \vbox{\parindent=0pt\offinterlineskip\copy\@nbox - \hbox to\wd\@nbox{\vrule width1.08pt\hfil\box\@nbody\hfil\vrule width1.08pt} - \hbox to\wd\@nbox{\vrule width1.08pt height15pt\hfil - \vrule width1.08pt height15pt}\hrule height1.08pt}} -%% -%% screen environment -\newdimen\@scw -\def\@hobox#1#2#3{\hbox to\@scw{\oval(#3,#3)[#1]\hfil\oval(#3,#3)[#2]% - \dimen\z@=#3\unitlength\advance\dimen\z@\@wholewidth - \vrule\@width\z@\@height\z@\@depth.5\dimen\z@}} -\def\@vrf@#1#2{\vskip#1\leaders\vrule width#2\vfil\vskip#1} -\def\screen{% -Q \@saveybaselineshift\ybaselineshift \ybaselineshift\z@ -Q \@savetbaselineshift\tbaselineshift \tbaselineshift\z@ - \@ifnextchar[{\@screen}{\@screen[0]}} -\def\@screen[#1]{\ifcase#1\def\@r{20}\def\@s{9.8pt}\def\@sx{10pt}\or - \def\@r{18}\def\@s{8.8pt}\def\@sx{9pt}\or - \def\@r{16}\def\@s{7.8pt}\def\@sx{8pt}\or - \def\@r{14}\def\@s{6.8pt}\def\@sx{7pt}\or - \def\@r{12}\def\@s{5.8pt}\def\@sx{6pt}\or - \def\@r{10}\def\@s{4.8pt}\def\@sx{5pt}\or - \def\@r{8}\def\@s{3.8pt}\def\@sx{4pt}\or - \def\@r{6}\def\@s{2.8pt}\def\@sx{3pt}\else - \def\@r{4}\def\@s{1.8pt}\def\@sx{2pt}\fi - \par\vspace{.3\baselineskip}\@scw\linewidth \advance\@scw -\@r pt - \setbox\scb@x=\hbox to\@scw\bgroup\begin{minipage}{\@scw}% (KN:1998/02/27) -Q \ybaselineshift\@saveybaselineshift \tbaselineshift\@savetbaselineshift -}% -\def\endscreen{\end{minipage}\egroup% - \setbox\scscb@x=\hbox to\linewidth{\hfil\vbox{\offinterlineskip% - \thinlines\setlength{\unitlength}{1pt}\hrule\kern\@s% - \@hobox{tl}{tr}{\@r}\kern-\@sx\box\scb@x\@hobox{bl}{br}{\@r}% - \kern-.4pt\hrule}\hfil}\dimen0=\ht\scscb@x% - \dimen2=\@sx\advance\dimen2 .2pt - \noindent\hbox to\linewidth{\hbox to.2pt{\vbox to\dimen0{\@vrf@{\dimen2}{.4pt}}% - \hss}\box\scscb@x\hbox to.2pt{\hss\vbox to\dimen0{\@vrf@{\dimen2}{.4pt}}}\hss}}% -%% -%% itembox environment -%% replace \box0 with \@iboxstr; thanks FTEXers (1998/11/27) -\newdimen\@itemh\newtoks\@iboxpos\newbox\@iboxstr -\def\@hleader{\leaders\hrule height .8pt\hfil} -\def\itembox{\@ifnextchar[{\@itembox}{\@itembox[c]}} -\def\@itembox[#1]#2{% -Q \@saveybaselineshift\ybaselineshift\ybaselineshift\z@ -Q \@savetbaselineshift\tbaselineshift\tbaselineshift\z@ - \par\vspace{.3\baselineskip}% - \setbox\@iboxstr=\hbox{% -Q \ybaselineshift\@saveybaselineshift \tbaselineshift\@savetbaselineshift - #2}% - \@itemh\ht\@iboxstr\advance\@itemh\dp\@iboxstr - \vspace{.5\@itemh}\bgroup\@scw\linewidth - \advance\@scw-20pt\@iboxpos={#1}% - \setbox\scb@x=\hbox to\@scw\bgroup\begin{minipage}{\@scw}% -Q \ybaselineshift\@saveybaselineshift -Q \tbaselineshift\@savetbaselineshift% (KN:1998/02/27) - \vspace*{.5\@itemh}}% -\def\enditembox{\end{minipage}\egroup% - \setbox\scscb@x=\hbox to\linewidth{\hfil\vbox{\offinterlineskip% - \thicklines\setlength{\unitlength}{1pt}% - \hbox to\@scw{\if l\the\@iboxpos\else\@hleader\fi - \space\vbox to.8pt{\vss\hbox{\box\@iboxstr}\vss}% - \space\if r\the\@iboxpos\else \@hleader\fi}\kern9.6pt - \@hobox{tl}{tr}{20}\kern-10pt\box\scb@x\@hobox{bl}{br}{20}% - \kern-.8pt\hrule height.8pt}\hfil}\dimen0=\ht\scscb@x% - \noindent\hbox to\linewidth{\hbox to.4pt{\vbox to\dimen0{\@vrf@{10.4pt}{.8pt}}% - \hss}\box\scscb@x\hbox to.4pt{\hss\vbox to\dimen0{\@vrf@{10.4pt}{.8pt}}}% - \hss}\egroup} -%% -%% \keytop -\def\keytop{\@ifnextchar[{\@keytop}{\@keytop[d]}} -\def\@keytop[#1]#2{% - {\setbox0=\hbox{\shortstack{#2}}% -Q \ybaselineshift\z@ \tbaselineshift\z@ - \dimen0=\wd0\advance\dimen0 5pt\dimen1=\dp0\advance\dimen1 2.5pt% - \setbox\scscb@x=\hbox to\dimen0{% -Q \iftdir\tate\else\yoko\fi - \@scw\wd0\hfil\vtop{\offinterlineskip - \thinlines\setlength{\unitlength}{1pt}\hrule\kern2.3pt\@hobox{tl}{tr}5% - \kern-2.4pt\box0\@hobox{bl}{br}5\kern-.4pt\hrule}\hfil}% - \dimen0=\dp\scscb@x\advance\dimen0 -.4pt - \setbox0=\vbox{\hbox{\hbox to.2pt{\vtop to\dimen0{\@vrf@{2.3pt}{.4pt}}\hss}% - \box\scscb@x\hbox to.2pt{\hss\vtop to\dimen0{\@vrf@{2.3pt}{.4pt}}}}}% - \if #1c\mbox{}$\vcenter{\box0}$\mbox{}\else - \if #1t\else\if #1b\boxmaxdepth=0pt\else - \boxmaxdepth=\dimen1\fi\fi \mbox{}\vbox{\box0}\fi}} -%% -%% \yen -\def\yen{\leavevmode\hbox{% -Q \iftdir\yoko\fi - \setbox0=\hbox{Y}Y\kern-.97\wd0\vbox{\hrule height.1ex width.98\wd0 - \kern.33ex\hrule height.1ex width.98\wd0\kern.45ex}}} -%% -%% return-key -\begingroup -\def\ascmac@definable{\PackageInfo{ascmac}{Command - \@backslashchar\reserved@a\space already defined, but - compatible with\MessageBreak ascmac package, overwriting}} -\def\ascmac@check#1{\ifx#1\@undefined\else\ascmac@parse{#1}\fi} -\def\ascmac@parse#1{\edef\reserved@a{\expandafter\@gobble\string #1}% - \edef\ascmac@parse@tmp{\meaning#1 \string\@ascgrp}% - \expandafter\ascmac@parse@i\ascmac@parse@tmp\@nil} -\expandafter\def\expandafter\ascmac@parse@i - \expandafter#\expandafter1\string\@ascgrp#2\@nil{\ifx\relax#2\relax - \@notdefinable\else\ascmac@definable\fi} -\ascmac@check{\Return} -\endgroup -\def\return{\leavevmode\hbox{% -Q \iftdir\yoko\fi - \@ascgrp\char"20}} -\def\Return{\leavevmode\hbox{% -Q \iftdir\yoko\fi - \@ascgrp @}} -%% -%% \mask -\newbox\@bwsp \newbox\@@bwsp\newcount\@bcal -\def\setdim@#1#2{\@bcal=#2\divide#1\@bcal\multiply#1\@bcal\advance#1 1.001#2} -\def\mask#1#2{{\setbox\@bwsp=\hbox{#1}% - \setbox0=\hbox{% -Q \ybaselineshift\z@\tbaselineshift\z@ - \@ascgrp#2}% - \dimen0=\wd\@bwsp\dimen1=\ht\@bwsp\advance\dimen1\dp\@bwsp\dimen2=-\dimen1 - \setdim@{\dimen0}{\wd0}\setdim@{\dimen1}{\ht0}% - \setbox\@@bwsp=\hbox to\dimen0{\leaders - \vtop to\dimen1{\leaders\box0\vfil}\hfil}% - \advance\dimen2\dp\@@bwsp\divide\dimen2 2 - \advance\dimen2\dp\@bwsp\boxmaxdepth=\dimen2 - \setbox\@@bwsp=\vbox{\box\@@bwsp}% - \mbox{}\hbox to\wd\@@bwsp{\hbox to0pt{\box\@@bwsp\hss}\hss\unhbox\@bwsp\hss}}} -%% -%% \Maskbox{width}{height}{mask_char}{pos}{rule_wid}{body} -%% \maskbox{width}{height}{mask_char}{pos}{body} -\def\@setdim#1#2{\@bcal=#2\divide#1\@bcal\multiply#1\@bcal\advance#1 .001#2} -\def\Maskbox#1#2#3#4#5#6{{% - \setbox0=\hbox{% -Q \ybaselineshift\z@\tbaselineshift\z@ - \@ascgrp#3}% - \dimen0=#1\@setdim{\dimen0}{\wd0}\dimen1=#2\@setdim{\dimen1}{\ht0}% - \ifx#4c\skip0=0pt plus1fil\skip1=\skip0\fi - \ifx#4r\skip0=0pt plus1fil\skip1=0pt\fi - \ifx#4l\skip1=0pt plus1fil\skip0=0pt\fi - \leavevmode - \hbox{\hbox to0pt{\hbox to\dimen0{\leaders\vbox to\dimen1{\leaders - \box0\vfil}\hfil}\hss}% - \vrule width#5\vbox to\dimen1{\hrule height#5\vfil - \dimen3=#5\advance\dimen0-2\dimen3\advance\dimen0 .15pt - \hbox to\dimen0{\hskip\skip0\relax#6\hskip\skip1}% - \vfil\hrule height#5}\vrule width#5}}} -\def\maskbox#1#2#3#4#5{\Maskbox{#1}{#2}{#3}{#4}{0pt}{#5}} -%% -%% shadebox environment -\newdimen\shaderule\shaderule 5pt -\def\shadebox{\par\vspace{.3\baselineskip}% -Q \@saveybaselineshift\ybaselineshift\ybaselineshift\z@ -Q \@savetbaselineshift\tbaselineshift\tbaselineshift\z@ - \dimen0\linewidth \advance\dimen0-20pt - \advance\dimen0-2\fboxrule \advance\dimen0-\shaderule - \setbox\@tempboxa=\hbox\bgroup\minipage{\dimen0}% -Q \ybaselineshift\@saveybaselineshift \tbaselineshift\@savetbaselineshift -} -\def\endshadebox{\endminipage\egroup\dimen0=10pt - \setbox\@tempboxa=\hbox{\kern\dimen0\unhbox\@tempboxa\kern\dimen0}% - \setbox0=\vbox{\hrule \@height \fboxrule - \hbox{\vrule \@width \fboxrule - \vbox{\vskip\fboxsep \box\@tempboxa\vskip\fboxsep}% - \vrule \@width \fboxrule}\hrule \@height \fboxrule}% - \dimen0=\ht0 \advance\dimen0-\shaderule - \hbox{\hbox to \shaderule{\copy0\hss}\kern 0pt - \vrule width\wd0 height0pt depth\shaderule\hskip-\shaderule - \vrule width\shaderule height\dimen0}} -%% -\catcode`\Q=\ascmac@q@catcode\relax -%% -\endinput -%% -%% End of file `tascmac.sty'. diff --git a/Master/texmf-dist/tex/platex/base/tbk10.clo b/Master/texmf-dist/tex/platex/base/tbk10.clo index 63abc5d77ba..90bb23e8cad 100644 --- a/Master/texmf-dist/tex/platex/base/tbk10.clo +++ b/Master/texmf-dist/tex/platex/base/tbk10.clo @@ -7,7 +7,7 @@ %% jclasses.dtx (with options: `10pt,bk,tate') %% %% Copyright (c) 2010 ASCII MEDIA WORKS -%% Copyright (c) 2016 Japanese TeX Development Community +%% Copyright (c) 2016-2018 Japanese TeX Development Community %% %% This file is part of the pLaTeX2e system (community edition). %% ------------------------------------------------------------- @@ -15,7 +15,7 @@ %% File: jclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{tbk10.clo} - [2017/09/19 v1.7g + [2018/02/04 v1.7h Standard pLaTeX file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xpt{17}% diff --git a/Master/texmf-dist/tex/platex/base/tbk11.clo b/Master/texmf-dist/tex/platex/base/tbk11.clo index 5ee9207b0cd..e6acf9c2fb1 100644 --- a/Master/texmf-dist/tex/platex/base/tbk11.clo +++ b/Master/texmf-dist/tex/platex/base/tbk11.clo @@ -7,7 +7,7 @@ %% jclasses.dtx (with options: `11pt,bk,tate') %% %% Copyright (c) 2010 ASCII MEDIA WORKS -%% Copyright (c) 2016 Japanese TeX Development Community +%% Copyright (c) 2016-2018 Japanese TeX Development Community %% %% This file is part of the pLaTeX2e system (community edition). %% ------------------------------------------------------------- @@ -15,7 +15,7 @@ %% File: jclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{tbk11.clo} - [2017/09/19 v1.7g + [2018/02/04 v1.7h Standard pLaTeX file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xipt{17}% diff --git a/Master/texmf-dist/tex/platex/base/tbk12.clo b/Master/texmf-dist/tex/platex/base/tbk12.clo index 4beae15759e..ca99d207471 100644 --- a/Master/texmf-dist/tex/platex/base/tbk12.clo +++ b/Master/texmf-dist/tex/platex/base/tbk12.clo @@ -7,7 +7,7 @@ %% jclasses.dtx (with options: `12pt,bk,tate') %% %% Copyright (c) 2010 ASCII MEDIA WORKS -%% Copyright (c) 2016 Japanese TeX Development Community +%% Copyright (c) 2016-2018 Japanese TeX Development Community %% %% This file is part of the pLaTeX2e system (community edition). %% ------------------------------------------------------------- @@ -15,7 +15,7 @@ %% File: jclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{tbk12.clo} - [2017/09/19 v1.7g + [2018/02/04 v1.7h Standard pLaTeX file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xiipt{18}% diff --git a/Master/texmf-dist/tex/platex/base/tbook.cls b/Master/texmf-dist/tex/platex/base/tbook.cls index 97be3c3a64e..a2555dacbbf 100644 --- a/Master/texmf-dist/tex/platex/base/tbook.cls +++ b/Master/texmf-dist/tex/platex/base/tbook.cls @@ -7,7 +7,7 @@ %% jclasses.dtx (with options: `book,tate') %% %% Copyright (c) 2010 ASCII MEDIA WORKS -%% Copyright (c) 2016 Japanese TeX Development Community +%% Copyright (c) 2016-2018 Japanese TeX Development Community %% %% This file is part of the pLaTeX2e system (community edition). %% ------------------------------------------------------------- @@ -15,7 +15,7 @@ %% File: jclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesClass{tbook} - [2017/09/19 v1.7g + [2018/02/04 v1.7h Standard pLaTeX class] \newcounter{@paper} \newif\if@landscape \@landscapefalse @@ -134,6 +134,7 @@ \ProcessOptions\relax \input{tbk1\@ptsize.clo} \RequirePackage{plext} +\def\Cjascale{0.962216} \if@stysize \setlength\columnsep{3\Cwd} \else diff --git a/Master/texmf-dist/tex/platex/base/tbook.sty b/Master/texmf-dist/tex/platex/base/tbook.sty index 32cb5c4d80c..c3c463b5e61 100644 --- a/Master/texmf-dist/tex/platex/base/tbook.sty +++ b/Master/texmf-dist/tex/platex/base/tbook.sty @@ -7,7 +7,7 @@ %% pl209.dtx (with options: `style,tbook') %% %% Copyright (c) 2010 ASCII MEDIA WORKS -%% Copyright (c) 2016 Japanese TeX Development Community +%% Copyright (c) 2016-2018 Japanese TeX Development Community %% %% This file is part of the pLaTeX2e system (community edition). %% ------------------------------------------------------------- diff --git a/Master/texmf-dist/tex/platex/base/treport.cls b/Master/texmf-dist/tex/platex/base/treport.cls index a658d82c974..f1d9f0f1a63 100644 --- a/Master/texmf-dist/tex/platex/base/treport.cls +++ b/Master/texmf-dist/tex/platex/base/treport.cls @@ -7,7 +7,7 @@ %% jclasses.dtx (with options: `report,tate') %% %% Copyright (c) 2010 ASCII MEDIA WORKS -%% Copyright (c) 2016 Japanese TeX Development Community +%% Copyright (c) 2016-2018 Japanese TeX Development Community %% %% This file is part of the pLaTeX2e system (community edition). %% ------------------------------------------------------------- @@ -15,7 +15,7 @@ %% File: jclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesClass{treport} - [2017/09/19 v1.7g + [2018/02/04 v1.7h Standard pLaTeX class] \newcounter{@paper} \newif\if@landscape \@landscapefalse @@ -132,6 +132,7 @@ \ProcessOptions\relax \input{tsize1\@ptsize.clo} \RequirePackage{plext} +\def\Cjascale{0.962216} \if@stysize \setlength\columnsep{3\Cwd} \else diff --git a/Master/texmf-dist/tex/platex/base/treport.sty b/Master/texmf-dist/tex/platex/base/treport.sty index 0d4d2c141f8..2496da513f5 100644 --- a/Master/texmf-dist/tex/platex/base/treport.sty +++ b/Master/texmf-dist/tex/platex/base/treport.sty @@ -7,7 +7,7 @@ %% pl209.dtx (with options: `style,treport') %% %% Copyright (c) 2010 ASCII MEDIA WORKS -%% Copyright (c) 2016 Japanese TeX Development Community +%% Copyright (c) 2016-2018 Japanese TeX Development Community %% %% This file is part of the pLaTeX2e system (community edition). %% ------------------------------------------------------------- diff --git a/Master/texmf-dist/tex/platex/base/tsize10.clo b/Master/texmf-dist/tex/platex/base/tsize10.clo index 0e9eb115ed0..986f4a10d9d 100644 --- a/Master/texmf-dist/tex/platex/base/tsize10.clo +++ b/Master/texmf-dist/tex/platex/base/tsize10.clo @@ -7,7 +7,7 @@ %% jclasses.dtx (with options: `10pt,tate') %% %% Copyright (c) 2010 ASCII MEDIA WORKS -%% Copyright (c) 2016 Japanese TeX Development Community +%% Copyright (c) 2016-2018 Japanese TeX Development Community %% %% This file is part of the pLaTeX2e system (community edition). %% ------------------------------------------------------------- @@ -15,7 +15,7 @@ %% File: jclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{tsize10.clo} - [2017/09/19 v1.7g + [2018/02/04 v1.7h Standard pLaTeX file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xpt{17}% diff --git a/Master/texmf-dist/tex/platex/base/tsize11.clo b/Master/texmf-dist/tex/platex/base/tsize11.clo index cc790c8e81d..aaea97795be 100644 --- a/Master/texmf-dist/tex/platex/base/tsize11.clo +++ b/Master/texmf-dist/tex/platex/base/tsize11.clo @@ -7,7 +7,7 @@ %% jclasses.dtx (with options: `11pt,tate') %% %% Copyright (c) 2010 ASCII MEDIA WORKS -%% Copyright (c) 2016 Japanese TeX Development Community +%% Copyright (c) 2016-2018 Japanese TeX Development Community %% %% This file is part of the pLaTeX2e system (community edition). %% ------------------------------------------------------------- @@ -15,7 +15,7 @@ %% File: jclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{tsize11.clo} - [2017/09/19 v1.7g + [2018/02/04 v1.7h Standard pLaTeX file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xipt{17}% diff --git a/Master/texmf-dist/tex/platex/base/tsize12.clo b/Master/texmf-dist/tex/platex/base/tsize12.clo index ce85b7e1d18..33d26eea759 100644 --- a/Master/texmf-dist/tex/platex/base/tsize12.clo +++ b/Master/texmf-dist/tex/platex/base/tsize12.clo @@ -7,7 +7,7 @@ %% jclasses.dtx (with options: `12pt,tate') %% %% Copyright (c) 2010 ASCII MEDIA WORKS -%% Copyright (c) 2016 Japanese TeX Development Community +%% Copyright (c) 2016-2018 Japanese TeX Development Community %% %% This file is part of the pLaTeX2e system (community edition). %% ------------------------------------------------------------- @@ -15,7 +15,7 @@ %% File: jclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{tsize12.clo} - [2017/09/19 v1.7g + [2018/02/04 v1.7h Standard pLaTeX file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xiipt{18}% |