diff options
| author | Karl Berry <karl@freefriends.org> | 2017-04-16 22:05:53 +0000 |
|---|---|---|
| committer | Karl Berry <karl@freefriends.org> | 2017-04-16 22:05:53 +0000 |
| commit | 8e7cee93b8e73580a81e4d353d4843345b2c2998 (patch) | |
| tree | 2fc7e286869016f51b0a334d7d085740cbc3576b /Master/texmf-dist/source/platex | |
| parent | d1a1a8aa97b00e8dfb3d1b8366c29591e0a65ea7 (diff) | |
platex (16apr17)
git-svn-id: svn://tug.org/texlive/trunk@43852 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/platex')
| -rw-r--r-- | Master/texmf-dist/source/platex/base/Makefile | 50 | ||||
| -rw-r--r-- | Master/texmf-dist/source/platex/base/jclasses.dtx | 339 | ||||
| -rw-r--r-- | Master/texmf-dist/source/platex/base/plcore.dtx | 253 | ||||
| -rw-r--r-- | Master/texmf-dist/source/platex/base/plext.dtx | 121 | ||||
| -rw-r--r-- | Master/texmf-dist/source/platex/base/plfonts.dtx | 215 | ||||
| -rw-r--r-- | Master/texmf-dist/source/platex/base/plnewsc06.tex | 114 | ||||
| -rw-r--r-- | Master/texmf-dist/source/platex/base/plvers.dtx | 52 |
7 files changed, 1025 insertions, 119 deletions
diff --git a/Master/texmf-dist/source/platex/base/Makefile b/Master/texmf-dist/source/platex/base/Makefile index e15431380d9..6a19d0e89d5 100644 --- a/Master/texmf-dist/source/platex/base/Makefile +++ b/Master/texmf-dist/source/platex/base/Makefile @@ -1,15 +1,16 @@ -TARGET1 = platex.ltx jarticle.cls pl209.def platexrelease.sty \ +STRIPTARGET = platex.ltx jarticle.cls pl209.def platexrelease.sty \ nidanfloat.sty tascmac.sty jltxdoc.cls -TARGET2 = platex.pdf platexrelease.pdf pldoc.pdf \ +PDFTARGET = platex.pdf platexrelease.pdf pldoc.pdf \ nidanfloat.pdf ascmac.pdf exppl2e.pdf -TARGET3 = platex.dvi platexrelease.dvi pldoc.dvi \ +DVITARGET = platex.dvi platexrelease.dvi pldoc.dvi \ nidanfloat.dvi ascmac.dvi exppl2e.dvi KANJI = -kanji=jis FONTMAP = -f ipaex.map -f ptex-ipaex.map +TEXMF = $(shell kpsewhich -var-value=TEXMFHOME) -default: $(TARGET1) $(TARGET3) -strip: $(TARGET1) -all: $(TARGET1) $(TARGET2) +default: $(STRIPTARGET) $(DVITARGET) +strip: $(STRIPTARGET) +all: $(STRIPTARGET) $(PDFTARGET) PLFMT = platex.ltx plcore.ltx kinsoku.tex pldefs.ltx \ jy1mc.fd jy1gt.fd jt1mc.fd jt1gt.fd plext.sty \ @@ -134,12 +135,32 @@ ascmac.pdf: ascmac.dvi exppl2e.pdf: exppl2e.dvi dvipdfmx $(FONTMAP) exppl2e.dvi -.PHONY: clean cleanstrip cleanall cleandoc +.PHONY: install clean cleanstrip cleanall cleandoc +install: + mkdir -p ${TEXMF}/doc/platex/base + cp ./LICENSE ${TEXMF}/doc/platex/base/ + cp ./README.md ${TEXMF}/doc/platex/base/ + cp ./*.pdf ${TEXMF}/doc/platex/base/ + 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 ./*.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 ./*.def ${TEXMF}/tex/platex/base/ + cp ./*.fd ${TEXMF}/tex/platex/base/ + cp ./*.ltx ${TEXMF}/tex/platex/base/ + cp ./*.sty ${TEXMF}/tex/platex/base/ + mkdir -p ${TEXMF}/tex/platex/config + cp ./platex.ini ${TEXMF}/tex/platex/config/ clean: rm -f $(PLFMT) $(PLCLS) $(PL209) $(PLREL) \ $(NIDAN) $(ASCMAC) \ - platex.dvi platexrelease.dvi pldoc.dvi \ - nidanfloat.dvi ascmac.dvi exppl2e.dvi \ + $(DVITARGET) \ jltxdoc.cls pldoc.tex Xins.ins cleanstrip: rm -f $(PLFMT) $(PLCLS) $(PL209) $(PLREL) \ @@ -148,14 +169,7 @@ cleanstrip: cleanall: rm -f $(PLFMT) $(PLCLS) $(PL209) $(PLREL) \ $(NIDAN) $(ASCMAC) \ - platex.dvi platexrelease.dvi pldoc.dvi \ - nidanfloat.dvi ascmac.dvi exppl2e.dvi \ - platex.pdf platexrelease.pdf pldoc.pdf \ - nidanfloat.pdf ascmac.pdf exppl2e.pdf \ + $(DVITARGET) $(PDFTARGET) \ jltxdoc.cls pldoc.tex Xins.ins cleandoc: - rm -f \ - platex.dvi platexrelease.dvi pldoc.dvi \ - nidanfloat.dvi ascmac.dvi exppl2e.dvi \ - platex.pdf platexrelease.pdf pldoc.pdf \ - nidanfloat.pdf ascmac.pdf exppl2e.pdf + rm -f $(DVITARGET) $(PDFTARGET) diff --git a/Master/texmf-dist/source/platex/base/jclasses.dtx b/Master/texmf-dist/source/platex/base/jclasses.dtx index 94281509de7..390cf78695c 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 Japanese TeX Development Community +% Copyright (c) 2016-2017 Japanese TeX Development Community % % This file is part of the pLaTeX2e system (community edition). % ------------------------------------------------------------- @@ -76,6 +76,21 @@ % \changes{v1.7a}{2016/11/16}{Use \cs{expandafter} % (sync with ltlists.dtx v1.0j)} % \changes{v1.7b}{2016/11/22}{$BJdB-%I%-%e%a%s%H$rDI2C(B} +% \changes{v1.7c}{2016/12/18}{Only add empty page after part if +% twoside and openright (sync with classes.dtx v1.4b)} +% \changes{v1.7c}{2016/12/18}{$B4qL/$J(Barticle$B%,!<%I$H%3!<%I$r:o=|$7$F(B +% $B%I%-%e%a%s%H$rDI2C(B} +% \changes{v1.7d}{2017/02/15}{\cs{if@openleft}$B%9%$%C%ADI2C(B} +% \changes{v1.7d}{2017/02/15}{openleft$B%*%W%7%g%sDI2C(B} +% \changes{v1.7d}{2017/02/15}{\cs{cleardoublepage}$B$NBeMQ$H$J$kL?Na72$rDI2C(B} +% \changes{v1.7d}{2017/02/15}{book$B%/%i%9$G(Btitlepage$B$rI,$:4q?t%Z!<%8(B +% $B$KAw$k$h$&$KJQ99(B} +% \changes{v1.7d}{2017/02/15}{titlepage$B$N%Z!<%8HV9f$r4q?t$J$i$P(B1$B$K!"(B +% $B6v?t$J$i$P(B0$B$K%j%;%C%H$9$k$h$&$KJQ99(B} +% \changes{v1.7d}{2017/02/15}{$B=DAH%/%i%9$N=jB0I=<($NHV9f$rD>N)$K$7$?(B} +% \changes{v1.7e}{2017/03/05}{$B%H%s%\$KI=<($9$k%8%g%V>pJs$N=q<0$rJQ99(B} +% \changes{v1.7e}{2017/03/05}{\cs{frontmatter}$B$H(B\cs{mainmatter}$B$r(B +% $B4q?t%Z!<%8$KAw$k$h$&$KJQ99(B} % \fi % % \iffalse @@ -105,7 +120,7 @@ %<11pt&bk>\ProvidesFile{tbk11.clo} %<12pt&bk>\ProvidesFile{tbk12.clo} %</tate> - [2016/11/22 v1.7b + [2017/03/05 v1.7e %<article|report|book> Standard pLaTeX class] %<10pt|11pt|12pt> Standard pLaTeX file (size option)] %<*driver> @@ -152,7 +167,7 @@ % % \begin{macro}{\c@@paper} % $BMQ;f%5%$%:$r<($9$?$a$K;H$$$^$9!#(B -% A4, A5, B4, B5 $BMQ;f$O$=$l$>$l!"(B1, 2, 3, 4 $B$H$7$FI=$5$l$^$9!#(B +% A4, A5, B4, B5$BMQ;f$O$=$l$>$l!"(B1, 2, 3, 4$B$H$7$FI=$5$l$^$9!#(B % \begin{macrocode} %<*article|report|book> \newcounter{@paper} @@ -168,7 +183,7 @@ % % \begin{macro}{\@ptsize} % $BAHHG$r$9$k%]%$%s%H?t$N0l$N0L$rJ]B8$9$k$?$a$K;H$$$^$9!#(B -% 0, 1, 2 $B$N$$$:$l$+$G$9!#(B +% 0, 1, 2$B$N$$$:$l$+$G$9!#(B % \begin{macrocode} \newcommand{\@ptsize}{} % \end{macrocode} @@ -193,7 +208,8 @@ % \end{macro} % % \begin{macro}{\if@openright} -% chapter$B%l%Y%k$r4q?t%Z!<%8$+$i$O$8$a$k$+$I$&$+$N%9%$%C%A$G$9!#(B +% chapter$B%l%Y%k$r1&%Z!<%8$+$i$O$8$a$k$+$I$&$+$N%9%$%C%A$G$9!#(B +% $B2#AH$G$O4q?t%Z!<%8!"=DAH$G$O6v?t%Z!<%8$+$i;O$^$k$3$H$K$J$j$^$9!#(B % report$B%/%i%9$N%G%U%)%k%H$O!"(B``no''$B$G$9!#(B % book$B%/%i%9$N%G%U%)%k%H$O!"(B``yes''$B$G$9!#(B % \begin{macrocode} @@ -201,6 +217,17 @@ % \end{macrocode} % \end{macro} % +% \begin{macro}{\if@openleft} +% chapter$B%l%Y%k$r:8%Z!<%8$+$i$O$8$a$k$+$I$&$+$N%9%$%C%A$G$9!#(B +% $BF|K\8l(B\TeX{}$B3+H/%3%_%e%K%F%#HG$G?7$?$KDI2C$5$l$^$7$?!#(B +% $B2#AH$G$O6v?t%Z!<%8!"=DAH$G$O4q?t%Z!<%8$+$i;O$^$k$3$H$K$J$j$^$9!#(B +% report$B%/%i%9$H(Bbook$B%/%i%9$NN>J}$G!"%G%U%)%k%H$O(B``no''$B$G$9!#(B +% \changes{v1.7d}{2017/02/15}{\cs{if@openleft}$B%9%$%C%ADI2C(B} +% \begin{macrocode} +%<!article>\newif\if@openleft +% \end{macrocode} +% \end{macro} +% % \changes{v1.0c}{1995/12/25}{Macro \cs{if@openbib} removed} % % \begin{macro}{\if@mainmatter} @@ -323,15 +350,19 @@ % |tombow|$B%*%W%7%g%s$,;XDj$5$l$k$H!"MQ;f%5%$%:$K9g$o$;$F%H%s%\$r=PNO$7$^$9!#(B % $B$3$N$H$-!"%H%s%\$NOF$K(BDVI$B$r:n@.$7$?F|IU$,=PNO$5$l$^$9!#(B % $B:n@.F|IU$N=PNO$rM^@)$9$k$K$O!"(B|tombow|$B$G$O$J$/!"(B|tombo|$B$H;XDj$r$7$^$9!#(B +% +% $B%8%g%V>pJs$N=q<0$O85!9(B|filename : 2017/3/5(13:3)|$B$N$h$&$J=q<0$G$7$?$,!"(B +% jsclasses$B$K$"$o$;$F7e?t8GDj$N(B|filename (2017-03-05 13:03)|$B$KD>$7$^$7$?!#(B % \changes{v1.0g}{1996/09/03}{Add to \cs{@bannertoken}.} % \changes{v1.1a}{1997/01/23}{$BF|IU=PNO%*%W%7%g%s(B} +% \changes{v1.7e}{2017/03/05}{$B%H%s%\$KI=<($9$k%8%g%V>pJs$N=q<0$rJQ99(B} % \begin{macrocode} \DeclareOption{tombow}{% \tombowtrue \tombowdatetrue \setlength{\@tombowwidth}{.1\p@}% \@bannertoken{% - \jobname\space:\space\number\year/\number\month/\number\day - (\number\hour:\number\minute)} + \jobname\space(\number\year-\two@digits\month-\two@digits\day + \space\two@digits\hour:\two@digits\minute)}% \maketombowbox} \DeclareOption{tombo}{% \tombowtrue \tombowdatefalse @@ -389,12 +420,15 @@ % \subsection{$B1&:85/$3$7%*%W%7%g%s(B} % chapter$B$r1&%Z!<%8$"$k$$$O:8%Z!<%8$+$i(B % $B$O$8$a$k$+$I$&$+$r;XDj$9$k%*%W%7%g%s$G$9!#(B +% |openleft|$B%*%W%7%g%s$OF|K\8l(B\TeX{}$B3+H/%3%_%e%K%F%#$K$h$C$FDI2C$5$l$^$7$?!#(B +% \changes{v1.7d}{2017/02/15}{openleft$B%*%W%7%g%sDI2C(B} % \begin{macrocode} %<!article>\if@compatibility %<book>\@openrighttrue %<!article>\else -%<!article>\DeclareOption{openright}{\@openrighttrue} -%<!article>\DeclareOption{openany}{\@openrightfalse} +%<!article>\DeclareOption{openright}{\@openrighttrue\@openleftfalse} +%<!article>\DeclareOption{openleft}{\@openlefttrue\@openrightfalse} +%<!article>\DeclareOption{openany}{\@openrightfalse\@openleftfalse} %<!article>\fi % \end{macrocode} % @@ -441,6 +475,13 @@ % |disablejfam|$B%*%W%7%g%s$r;XDj$7$F$b(B|\textmc|$B$d(B|\textgt|$B$J$I$rMQ$$$F!"(B % $B?t<0Fb$KF|K\8l$r5-=R$9$k$3$H$O2DG=$G$9!#(B % +% \noindent\emph{$BF|K\8l(B\TeX{}$B3+H/%3%_%e%K%F%#$K$h$kJdB-(B}$B!'(B +% $B%3%_%e%K%F%#HG(Bp\LaTeX{}$B$N(B2016/11/29$B0J9_$NHG$G$O!"(Be-p\TeX{}$B$N3HD%5!G=(B +% $B!JDL>N!V5l(BFAM256$B%Q%C%A!W!K$,MxMQ2DG=$J>l9g$K!"(B\LaTeX{}$B$N5!G=$G@k8@(B +% $B$G$-$k?t<0%U%!%_%j!J?t<0%"%k%U%!%Y%C%H!K$N>e8B$r(B256$B8D$KA}$d$7$F$$$^$9!#(B +% $B$7$?$,$C$F!"?7$7$$4D6-$G$O(B|disablejfam|$B$r;XDj$7$J$/$F$b>e8B$rD6$($k(B +% $B$3$H$,5/$-$K$/$/$J$C$F$$$^$9!#(B +% % |mathrmmc|$B%*%W%7%g%s$O!"(B % |\mathrm|$B$H(B|\mathbf|$B$rOB2$J8N>BP1~$K$9$k$?$a$N%/%i%9%*%W%7%g%s$G$9!#(B % \changes{v1.1d}{1992/02/04}{disablejfam$B$NH=CG$r4V0c$($F$?$N$r=$@5(B} @@ -1605,6 +1646,92 @@ % \end{macro} % % +% \section{$B2~%Z!<%8!JF|K\8l(B\TeX{}$B3+H/%3%_%e%K%F%#HG$N$_!K(B}\label{sec:cleardoublepage} +% +% \begin{macro}{\pltx@cleartorightpage} +% \begin{macro}{\pltx@cleartoleftpage} +% \begin{macro}{\pltx@cleartooddpage} +% \begin{macro}{\pltx@cleartoevenpage} +% |\cleardoublepage|$BL?Na$O!"(B\LaTeX{}$B%+!<%M%k$G$O!V4q?t%Z!<%8$K$J$k$^$G%Z!<%8$r(B +% $B7+$kL?Na!W$H$7$FDj5A$5$l$F$$$^$9!#$7$+$7(Bp\LaTeX{}$B%+!<%M%k$G$O!"%"%9%-!<$NJ}?K(B +% $B$K$h$j!V2#AH$G$O4q?t%Z!<%8$K$J$k$^$G!"=DAH$G$O6v?t%Z!<%8$K$J$k$^$G%Z!<%8$r(B +% $B7+$kL?Na!W$K:FDj5A$5$l$F$$$^$9!#$9$J$o$A!"(Bp\LaTeX{}$B$G$O=DAH$G$b2#AH$G$b(B +% $B1&%Z!<%8$K$J$k$^$G%Z!<%8$r7+$k$3$H$K$J$j$^$9!#(B +% +% p\LaTeX{}$BI8=`%/%i%9$N(Bbook$B$O!"2#AH$b=DAH$b(B|openright|$B$,%G%U%)%k%H$K$J$C$F$$$F!"(B +% $B$3$l$O=>Mh(Bp\LaTeX{}$B%+!<%M%k$GDj5A$5$l$?(B|\cleardoublepage|$B$rMxMQ$7$F$$$^$7$?!#(B +% $B$7$+$7!"=DAH$G4q?t%Z!<%8;O$^$j$NJ8=q$r:n$j$?$$>l9g$b$"$k$G$7$g$&$+$i!"(B +% $B%3%_%e%K%F%#HG%/%i%9$G$O0J2<$N!JHs%f!<%68~$1!KL?Na$rDI2C$7$^$9!#(B +% \begin{enumerate} +% \item|\pltx@cleartorightpage|$B!'1&%Z!<%8$K$J$k$^$G%Z!<%8$r7+$kL?Na(B +% \item|\pltx@cleartoleftpage|$B!':8%Z!<%8$K$J$k$^$G%Z!<%8$r7+$kL?Na(B +% \item|\pltx@cleartooddpage|$B!'4q?t%Z!<%8$K$J$k$^$G%Z!<%8$r7+$kL?Na(B +% \item|\pltx@cleartoevenpage|$B!'6v?t%Z!<%8$K$J$k$^$G%Z!<%8$r7+$kL?Na(B +% \end{enumerate} +% \changes{v1.7d}{2017/02/15}{\cs{cleardoublepage}$B$NBeMQ$H$J$kL?Na72$rDI2C(B} +% \begin{macrocode} +\def\pltx@cleartorightpage{\clearpage\if@twoside + \ifodd\c@page + \iftdir + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi + \else + \ifydir + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi + \fi\fi} +\def\pltx@cleartoleftpage{\clearpage\if@twoside + \ifodd\c@page + \ifydir + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi + \else + \iftdir + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi + \fi\fi} +% \end{macrocode} +% +% |\pltx@cleartooddpage|$B$O(B\LaTeX{}$B$N(B|\cleardoublepage|$B$K;w$F$$$^$9$,!"(B +% $B>e$N(B2$B$D$K9g$o$;$k$?$a(B|\thispagestyle{empty}|$B$rDI2C$7$F$"$j$^$9!#(B +% \begin{macrocode} +\def\pltx@cleartooddpage{\clearpage\if@twoside + \ifodd\c@page\else + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi\fi} +\def\pltx@cleartoevenpage{\clearpage\if@twoside + \ifodd\c@page + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi\fi} +% \end{macrocode} +% \end{macro} +% \end{macro} +% \end{macro} +% \end{macro} +% +% \begin{macro}{\cleardoublepage} +% $B$=$7$F(Breport$B$H(Bbook$B%/%i%9$N>l9g$O!"%f!<%68~$1L?Na$G$"$k(B|\cleardoublepage|$B$r!"(B +% |openright|$B%*%W%7%g%s$,;XDj$5$l$F$$$k>l9g$O(B|\pltx@cleartorightpage|$B$K!"(B +% |openleft|$B%*%W%7%g%s$,;XDj$5$l$F$$$k>l9g$O(B|\pltx@cleartoleftpage|$B$K!"(B +% $B$=$l$>$l(B|\let|$B$7$^$9!#(B|openany|$B$N>l9g$O(Bp\LaTeX{}$B%+!<%M%k$NDj5A$N$^$^$G$9!#(B +% \begin{macrocode} +%<*!article> +\if@openleft + \let\cleardoublepage\pltx@cleartoleftpage +\else\if@openright + \let\cleardoublepage\pltx@cleartorightpage +\fi\fi +%</!article> +% \end{macrocode} +% \end{macro} +% +% % % \section{$B%Z!<%8%9%?%$%k(B}\label{sec:pagestyle} % p\LaTeXe{}$B$G$O!"$D$.$N(B6$B<oN`$N%Z!<%8%9%?%$%k$r;HMQ$G$-$^$9!#(B @@ -1774,9 +1901,9 @@ %<*report|book> \def\chaptermark##1{\markboth{% \ifnum \c@secnumdepth >\m@ne -%<book> \if@mainmatter +%<book> \if@mainmatter \@chapapp\thechapter\@chappos\hskip1zw -%<book> \fi +%<book> \fi \fi ##1}{}}% \def\sectionmark##1{\markright{% @@ -1803,9 +1930,9 @@ %<*report|book> \def\chaptermark##1{\markright{% \ifnum \c@secnumdepth >\m@ne -%<book> \if@mainmatter +%<book> \if@mainmatter \@chapapp\thechapter\@chappos\hskip1zw -%<book> \fi +%<book> \fi \fi ##1}}% %</report|book> @@ -1821,7 +1948,7 @@ % $B%X%C%@$K8+=P$7$r!"%U%C%?$K%Z!<%8HV9f$r=PNO$7$^$9!#(B % % $B$3$N%9%?%$%k$O!"N>LL0u:~$HJRLL0u:~$H$G7A<0$,0[$J$j$^$9!#(B -% \changes{v1.0d}{1995/08/23}{$B2#AH$N(B evenfoot $B$,Cf1{B7$($K$J$C$F$$$?$N$r=$@5(B} +% \changes{v1.0d}{1995/08/23}{$B2#AH$N(Bevenfoot$B$,Cf1{B7$($K$J$C$F$$$?$N$r=$@5(B} % \changes{v1.0d}{1996/03/05}{$B2#AH$G6v?t%Z!<%8$H4q?t%Z!<%8$N@_Dj$,5U$J$N$r=$@5(B} % \begin{macrocode} \if@twoside @@ -1850,9 +1977,9 @@ %<*report|book> \def\chaptermark##1{\markboth{% \ifnum \c@secnumdepth >\m@ne -%<book> \if@mainmatter +%<book> \if@mainmatter \@chapapp\thechapter\@chappos\hskip1zw -%<book> \fi +%<book> \fi \fi ##1}{}}% \def\sectionmark##1{\markright{% @@ -1881,9 +2008,9 @@ %<*report|book> \def\chaptermark##1{\markright{% \ifnum \c@secnumdepth >\m@ne -%<book> \if@mainmatter +%<book> \if@mainmatter \@chapapp\thechapter\@chappos\hskip1zw -%<book> \fi +%<book> \fi \fi ##1}}% %</report|book> @@ -1916,7 +2043,7 @@ % % \section{$BJ8=q%3%^%s%I(B} % -% \subsubsection{$BI=Bj(B} +% \subsection{$BI=Bj(B} % % \begin{macro}{\title} % \begin{macro}{\author} @@ -1945,12 +2072,90 @@ % $B1&5/$3$7%Z!<%8MQ$N%Z!<%8%Q%i%a!<%?$G$O8m$C$?7k2L$K$J$j$^$9!#(B % $BFsCJAH%9%?%$%k$G$b0lCJAH$N%Z!<%8$,:n$i$l$^$9!#(B % +% \noindent\emph{$BF|K\8l(B\TeX{}$B3+H/%3%_%e%K%F%#$K$h$kJQ99(B}$B!'(B +% $B>e$K$"$k$N$O%"%9%-!<HG$N@bL@$G$9!#2~$a$F%"%9%-!<HG$N5sF0$r@0M}$9$k$H!"(B +% $B0J2<$N$h$&$K$J$j$^$9!#(B +% \begin{enumerate} +% \item $B%"%9%-!<HG$G$O!"%?%$%H%k%Z!<%8$NHV9f$rI,$:(B1$B$K%j%;%C%H$7$F$$$^$7$?$,!"(B +% $B$3$l$O@5$7$/$"$j$^$;$s!#$3$l$O!"%?%$%H%k%Z!<%8$,4q?t%Z!<%8L\$+6v?t%Z!<%8L\(B +% $B$+$K$+$+$o$i$:!"%l%$%"%&%H$@$14q?t%Z!<%8MQ$,E,MQ$5$l$F$7$^$&$+$i$G$9!#(B +% $B$5$i$K!"%?%$%H%k$N<!$N%Z!<%8$b6v?t$N%Z!<%8HV9f$r;}$C$F$7$^$&$?$a!"N>LL0u:~(B +% $B$G4q?t%Z!<%8$H6v?t%Z!<%8$,8r8_$K=P$J$/$J$k$H$$$&LdBj$b$"$j$^$9!#(B +% \item $B%"%9%-!<HG(Bbook$B%/%i%9$O!"%?%$%H%k%Z!<%8$rI,$:(B|\cleardoublepage|$B$G;O$a$F(B +% $B$$$^$7$?!#(Bp\LaTeX{}$B%+!<%M%k$G$N(B|\cleardoublepage|$B$NDj5A$+$i!"=DAH$N4{Dj$G$O(B +% $B%?%$%H%k$,6v?t%Z!<%8L\$K=P$k$3$H$K$J$j$^$9!#$3$l<+BN$,@5$7$/$J$$$HCGDj$9$k(B +% $B$3$H$O$G$-$^$;$s$,!"%?%$%H%k$N%Z!<%8HV9f$r(B1$B$K%j%;%C%H$9$k$3$H$H9g$o$5$C$F!"(B +% $B6v?t%Z!<%8$KAw$C$?%?%$%H%k$K4q?t%Z!<%8MQ%l%$%"%&%H$,E,MQ$5$l$F$7$^$&$H$$$&(B +% $B7k2L$O@5$7$/$"$j$^$;$s!#(B +% \end{enumerate} +% $B$=$3$G!"%3%_%e%K%F%#HG$G$O%?%$%H%k$N%l%$%"%&%H$,I,$:4q?t%Z!<%8MQ$K$J$k$H$$$&(B +% $B5sF0$r;Y;}$7!"(Bbook$B%/%i%9$G$O%?%$%H%k%Z!<%8$r4q?t%Z!<%8L\$KAw$k$3$H$K$7$^$7$?!#(B +% $B$3$l$G%?%$%H%k%Z!<%8$,I=;f$i$7$/8+$($k$h$&$K$J$j$^$9!#$^$?!"(Breport$B%/%i%9$N(B +% $B$h$&$J%?%$%H%k$,@.$j9T$-$K=>$C$F=P$k>l9g$K$O(B +% \begin{itemize} +% \item $B4q?t%Z!<%8L\$K=P$k>l9g!"%Z!<%8HV9f$r(B1$B!J4q?t!K$K%j%;%C%H(B +% \item $B6v?t%Z!<%8L\$K=P$k>l9g!"%Z!<%8HV9f$r(B0$B!J6v?t!K$K%j%;%C%H(B +% \end{itemize} +% $B$H$7$^$7$?!#(B +% +% $B0l$D$a$NNc$r9M$($^$9!#(B +%\begin{verbatim} +% \documentclass{tbook} +% \title{$B%?%$%H%k(B}\author{$BCx<T(B} +% \begin{document} +% \maketitle +% \chapter{$B%A%c%W%?!<(B} +% \end{document} +%\end{verbatim} +% $B%"%9%-!<HG(Btbook$B%/%i%9$G$N7k2L$O(B +%\begin{verbatim} +% 1$B%Z!<%8L\!'6uGr!J%Z!<%8HV9f(B1$B$OHsI=<(!K(B +% 2$B%Z!<%8L\!'%?%$%H%k!J4q?t%l%$%"%&%H!"%Z!<%8HV9f(B1$B$OHsI=<(!K(B +% 3$B%Z!<%8L\!'%A%c%W%?!<!J6v?t%l%$%"%&%H!"%Z!<%8HV9f(B2$B!K(B +%\end{verbatim} +% $B$G$9$,!"2>$K:G=i$N6uGr%Z!<%8$5$($J$1$l$P(B +%\begin{verbatim} +% 1$B%Z!<%8L\!'%?%$%H%k$9$J$o$AI=;f!J4q?t%l%$%"%&%H!"%Z!<%8HV9f(B1$B$OHsI=<(!K(B +% 2$B%Z!<%8L\!'%A%c%W%?!<!J6v?t%l%$%"%&%H!"%Z!<%8HV9f(B2$B!K(B +%\end{verbatim} +% $B$H$_$J$;$k$?$a!"%3%_%e%K%F%#HG$G$O6uGr%Z!<%8$rH/@8$5$;$J$$$h$&$K$7$^$7$?!#(B +% +% $BFs$D$a$NNc$r9M$($^$9!#(B +%\begin{verbatim} +% \documentclass{tbook} +% \title{$B%?%$%H%k(B}\author{$BCx<T(B} +% \begin{document} +% $B%F%9%HJ8>O(B +% \maketitle +% \chapter{$B%A%c%W%?!<(B} +% \end{document} +%\end{verbatim} +% $B%"%9%-!<HG(Btbook$B%/%i%9$G$N7k2L$O(B +%\begin{verbatim} +% 1$B%Z!<%8L\!'%F%9%HJ8>O!J4q?t%l%$%"%&%H!"%Z!<%8HV9f(B1$B!K(B +% 2$B%Z!<%8L\!'%?%$%H%k!J4q?t%l%$%"%&%H!"%Z!<%8HV9f(B1$B$OHsI=<(!K(B +% 3$B%Z!<%8L\!'%A%c%W%?!<!J6v?t%l%$%"%&%H!"%Z!<%8HV9f(B2$B!K(B +%\end{verbatim} +% $B$G$9$,!"$3$l$G$O4q?t$H6v?t$N%Z!<%8HV9f$,8r8_$K$J$C$F$$$J$$$N$G@5$7$/(B +% $B$"$j$^$;$s!#$=$3$G!"%3%_%e%K%F%#HG$G$O(B +%\begin{verbatim} +% 1$B%Z!<%8L\!'%F%9%HJ8>O!J4q?t%l%$%"%&%H!"%Z!<%8HV9f(B1$B!K(B +% 2$B%Z!<%8L\!'6uGr%Z!<%8!J%Z!<%8HV9f(B2$B$OHsI=<(!K(B +% 3$B%Z!<%8L\!'%?%$%H%k!J4q?t%l%$%"%&%H!"%Z!<%8HV9f(B1$B$OHsI=<(!K(B +% 4$B%Z!<%8L\!'%A%c%W%?!<!J6v?t%l%$%"%&%H!"%Z!<%8HV9f(B2$B!K(B +%\end{verbatim} +% $B$HD>$7$^$7$?!#(B +% +% $B$J$*!"(Bp\LaTeX~2.09$B8_49%b!<%I$O%"%9%-!<HG$N$^$^!"$9$J$o$A!V%Z!<%8HV9f$r%<%m$K(B +% $B@_Dj!W$H$7$F$"$j$^$9!#$3$l$O!"2#AH$N1&5/$3$7$N5sF0$H$7$F$O8m$j$G$9$,!"=DAH$N(B +% $B1&5/$3$7$N5sF0$H$7$F$O0l1~@5$7$/$J$C$F$$$k$H$$$($^$9!#(B +% % $B:G=i$K8_49%b!<%I$NDj5A$r:n$j$^$9!#(B % \begin{macrocode} \if@compatibility \newenvironment{titlepage} {% -%<book> \cleardoublepage +%<book> \cleardoublepage \if@twocolumn\@restonecoltrue\onecolumn \else\@restonecolfalse\newpage\fi \thispagestyle{empty}% @@ -1961,22 +2166,26 @@ % \end{macrocode} % % $B$=$7$F!"(B\LaTeX{}$B%M%$%F%#%V$N$?$a$NDj5A$G$9!#(B +% \changes{v1.7d}{2017/02/15}{book$B%/%i%9$G(Btitlepage$B$rI,$:4q?t%Z!<%8(B +% $B$KAw$k$h$&$KJQ99(B} +% \changes{v1.7d}{2017/02/15}{titlepage$B$N%Z!<%8HV9f$r4q?t$J$i$P(B1$B$K!"(B +% $B6v?t$J$i$P(B0$B$K%j%;%C%H$9$k$h$&$KJQ99(B} % \begin{macrocode} \else \newenvironment{titlepage} {% -%<book> \cleardoublepage +%<book> \pltx@cleartooddpage %% 2017/02/15 \if@twocolumn \@restonecoltrue\onecolumn \else \@restonecolfalse\newpage \fi \thispagestyle{empty}% - \setcounter{page}\@ne + \ifodd\c@page\setcounter{page}\@ne\else\setcounter{page}\z@\fi %% 2017/02/15 }% {\if@restonecol\twocolumn \else \newpage \fi % \end{macrocode} -% $BFsCJAH%b!<%I$G$J$1$l$P!"%?%$%H%k%Z!<%8$ND>8e$N%Z!<%8$N%Z!<%8HV9f$b(B1$B$K(B +% $BN>LL%b!<%I$G$J$1$l$P!"%?%$%H%k%Z!<%8$ND>8e$N%Z!<%8$N%Z!<%8HV9f$b(B1$B$K(B % $B$7$^$9!#(B % \begin{macrocode} \if@twoside\else @@ -1997,10 +2206,14 @@ % $B=DAH$N$H$-$O!"(B|\thanks|$B%3%^%s%I$r(B|\p@thanks|$B$K(B|\let|$B$7$^$9!#(B % $B$3$N%3%^%s%I$O(B|\footnotetext|$B$r;H$o$:!"D>@\!"J8;z$r(B|\@thanks|$B$K3JG<(B % $B$7$F$$$-$^$9!#(B +% +% $BCx<TL>$NOF$KI=<($5$l$k9g0u$OD>N)$7$??t;z!"Cm<aB&$O2#$K?2$??t;z$H$J$C$F$$$^$7(B +% $B$?$,!"IT<+A3$J$N$G(B|\hbox{\yoko ...}|$B$rDI2C$7!"N>J}$H$bD>N)$9$k$h$&$K$7$^$7$?!#(B +% \changes{v1.7d}{2017/02/15}{$B=DAH%/%i%9$N=jB0I=<($NHV9f$rD>N)$K$7$?(B} % \begin{macrocode} \def\p@thanks#1{\footnotemark \protected@xdef\@thanks{\@thanks - \protect{\noindent$\m@th^\thefootnote$~#1\protect\par}}} + \protect{\noindent\hbox{\yoko$\m@th^\thefootnote$}#1\protect\par}}} % \end{macrocode} % \end{macro} % @@ -2126,7 +2339,7 @@ % \end{macrocode} % \end{macro} % -% \subsubsection{$B35MW(B} +% \subsection{$B35MW(B} % % \begin{environment}{abstract} % $BMWLsJ8$N$?$a$N4D6-$G$9!#(Bbook$B%/%i%9$G$O;H$($^$;$s!#(B @@ -2163,7 +2376,7 @@ % % \subsection{$B>O8+=P$7(B} % -% \subsection{$B%^!<%/%3%^%s%I(B} +% \subsubsection{$B%^!<%/%3%^%s%I(B} % % \begin{macro}{\chaptermark} % \begin{macro}{\sectionmark} @@ -2331,21 +2544,39 @@ % $B$3$l$i$NL?Na$r(B|openany|$B%*%W%7%g%s$K1~$8$F@Z$jBX$(!"Fs2sL\$O$=$l$r(B % $B85$KLa$7$F$$$^$9!#%"%9%-!<$K$h$k(Bjclasses.dtx$B$O!"(B1997/01/15$B$K(B % $B0l2sL\$N=$@5$KDI?o$7$^$7$?$,!"Fs2sL\$N=$@5$K$ODI?o$7$F$$$^$;$s!#(B -% $B%3%_%e%K%F%#HG$G$O!"%"%9%-!<$K$h$k;EMM$r0];}$9$k$3$H$H$7!"(B -% |openany|$B%*%W%7%g%s$N>l9g$O(B|\cleardoublepage|$B$G$O$J$/(B|\clearpage|$B$,(B -% $BH/9T$5$l$^$9!#$b$7(B|\cleardoublepage|$B$,5/$-$F$[$7$$>l9g$K$O!"(B -% $BL@<(E*$KA^F~$7$F$/$@$5$$!#!J;29M!'(Blatex/2754$B!K(B +% $B%3%_%e%K%F%#HG$G$O!"0lC6$O%"%9%-!<$K$h$k;EMM$r0];}$7$h$&$H9M$((B +% $B$^$7$?(B(2016/11/22)$B$,!"0J2<$NM}M3$K$h$jFs2sL\$N=$@5$K$bDI?o$9$k(B +% $B$3$H$K$7$^$7$?(B(2017/03/05)$B!#(B +% +% $B%"%9%-!<HG$G$N(B|\frontmatter|$B$H(B|\mainmatter|$B$N2~%Z!<%85sF0$O(B +%\begin{quote} +% |openright|$B$J$i(B|\cleardoublepage|$B!"(B|openany|$B$J$i(B|\clearpage|$B$r<B9T(B +%\end{quote} +% $B$H$$$&$b$N$G$7$?!#$7$+$7!"(B|\frontmatter|$B5Z$S(B|\mainmatter|$B$O%N%s%V%k$r(B +% 1$B$K%j%;%C%H$7$^$9$+$i!"2~%Z!<%8$N7k2L$,6v?t%Z!<%8L\$K$J$k>l9g(B +% \footnote{$B=D(Btbook$B$N%G%U%)%k%H(B(openright)$B$,3:Ev$9$k$[$+!"2#(Bjbook$B$H(B +% $B=D(Btbook$B$N(Bopenany$B$N$H$-$K$O@.$j9T$-<!Bh$G3:Ev$9$k2DG=@-$,$"$j$^$9!#(B}$B$K(B +% $B%N%s%V%k$,6v4q5UE>$7$F$7$^$$$^$7$?!#$3$N$^$^$G$O(B|openany|$B$N>l9g$KN>LL(B +% $B0u:~$,$&$^$/$$$+$J$$$?$a!"?7$7$$%3%_%e%K%F%#HG$G$O(B +%\begin{quote} +% $BI,$:(B|\pltx@cleartooddpage|$B$r<B9T(B +%\end{quote} +% $B$H$7$^$7$?!#$3$l$ON>LL0u:~(B(twoside)$B$N>l9g$O4q?t%Z!<%8$KAw$j!"(B +% $BJRLL0u:~(B(oneside)$B$N>l9g$OC1$K2~%Z!<%8$H$J$j$^$9!#!J;29M!'(Blatex/2754$B!K(B % \changes{v1.7b}{2016/11/22}{$BJdB-%I%-%e%a%s%H$rDI2C(B} +% \changes{v1.7e}{2017/03/05}{\cs{frontmatter}$B$H(B\cs{mainmatter}$B$r(B +% $B4q?t%Z!<%8$KAw$k$h$&$KJQ99(B} % \begin{macrocode} %<*book> \newcommand{\frontmatter}{% - \if@openright \cleardoublepage \else \clearpage \fi + \pltx@cleartooddpage \@mainmatterfalse\pagenumbering{roman}} \newcommand{\mainmatter}{% - \if@openright \cleardoublepage \else \clearpage \fi + \pltx@cleartooddpage \@mainmattertrue\pagenumbering{arabic}} \newcommand{\backmatter}{% - \if@openright \cleardoublepage \else \clearpage \fi + \if@openleft \cleardoublepage \else + \if@openright \cleardoublepage \else \clearpage \fi \fi \@mainmatterfalse} %</book> % \end{macrocode} @@ -2437,7 +2668,8 @@ % \begin{macrocode} %<*report|book> \newcommand{\part}{% - \if@openright \cleardoublepage \else \clearpage \fi + \if@openleft \cleardoublepage \else + \if@openright \cleardoublepage \else \clearpage \fi \fi \thispagestyle{empty}% \if@twocolumn\onecolumn\@tempswatrue\else\@tempswafalse\fi \null\vfil @@ -2532,10 +2764,21 @@ % |\@part|$B$H(B|\@spart|$B$N:G8e$G<B9T$5$l$k%^%/%m$G$9!#(B % $BN>LL0u:~%b!<%I$N$H$-$O!"Gr%Z!<%8$rDI2C$7$^$9!#(B % $BFsCJAH%b!<%I$N$H$-$K$O!"$3$l0J9_$N%Z!<%8$rFsCJAH$KLa$7$^$9!#(B +% 2016$BG/(B12$B7n$+$i!"(B|openany| $B$N$H$-$KGr%Z!<%8$rDI2C$9$k$N$r$d$a$^$7$?!#(B +% $B$3$N%P%0$O(B\LaTeX{}$B$G$O(Bclasses.dtx v1.4b (2000/05/19)$B$G=$@5$5$l$F$$$^$7$?!#(B +% $B!J;29M!'(Blatex/3155$B!"(Btexjporg/jsclasses\#48$B!K(B +% \changes{v1.7c}{2016/12/18}{Only add empty page after part if +% twoside and openright (sync with classes.dtx v1.4b)} % \begin{macrocode} %<*report|book> \def\@endpart{\vfil\newpage - \if@twoside\null\thispagestyle{empty}\newpage\fi + \if@twoside + \if@openleft %% \if@openleft added (2017/02/15) + \null\thispagestyle{empty}\newpage + \else\if@openright %% \if@openright added (2016/12/18) + \null\thispagestyle{empty}\newpage + \fi\fi %% added (2016/12/18, 2017/02/15) + \fi % \end{macrocode} % $BFsCJAHJ8=q$N$H$-!"%9%$%C%A$rFsCJAH%b!<%I$KLa$9I,MW$,$"$j$^$9!#(B % \begin{macrocode} @@ -2554,6 +2797,10 @@ % $B$J$*!"=DAH$N>l9g$G$b1&%Z!<%8$+$i$O$8$^$k$h$&$K!"(B % $B%U%)!<%^%C%H%U%!%$%k$G(B|\clerdoublepage|$B$,Dj5A$5$l$F$$$^$9!#(B % +% \emph{$BF|K\8l(B\TeX{}$B3+H/%3%_%e%K%F%#$K$h$kJdB-(B}$B!'%3%_%e%K%F%#HG$N<BAu$G$O!"(B +% |openright|$B$H(B|openleft|$B$N>l9g$K(B|\cleardoublepage|$B$r%/%i%9%U%!%$%k$NCf$G(B +% $B:F!9Dj5A$7$F$$$^$9!#(B\ref{sec:cleardoublepage}$B$r;2>H$7$F$/$@$5$$!#(B +% % $B>O8+=P$7$,=PNO$5$l$k%Z!<%8$N%9%?%$%k$O!"(B\pstyle{jpl@in}$B$K$J$j$^$9!#(B % \pstyle{jpl@in}$B$O!"(B\pstyle{headnomble}$B$+(B\pstyle{footnomble}$B$N$$$:$l$+$G$9!#(B % $B>\:Y$O!"Bh(B\ref{sec:pagestyle}$B@a$r;2>H$7$F$/$@$5$$!#(B @@ -2563,7 +2810,8 @@ % \begin{macrocode} %<*report|book> \newcommand{\chapter}{% - \if@openright\cleardoublepage\else\clearpage\fi + \if@openleft \cleardoublepage \else + \if@openright \cleardoublepage \else \clearpage \fi \fi \thispagestyle{jpl@in}% \global\@topnum\z@ \@afterindenttrue @@ -2575,6 +2823,12 @@ % $B$3$N%^%/%m$O!">O8+=P$7$KHV9f$rIU$1$k$H$-$K8F$S=P$5$l$^$9!#(B % \Lcount{secnumdepth}$B$,(B$-1$$B$h$j$bBg$-$/!"(B % |\@mainmatter|$B$,??!J(Bbook$B%/%i%9$N>l9g!K$N$H$-$K!"HV9f$r=PNO$7$^$9!#(B +% +% \emph{$BF|K\8l(B\TeX{}$B3+H/%3%_%e%K%F%#$K$h$kJdB-(B}$B!'K\2H(B\LaTeX{}$B$N(B +% \file{classes}$B$G$O!"FsCJAH$N$H$-%A%c%W%?!<%?%$%H%k$O0lCJAH$KLa$5$l(B +% $B$^$9$,!"%"%9%-!<$K$h$k(B\file{jclasses}$B$G$OFsCJAH$N$^$^$K$5$l$F$$$^$9!#(B +% $B$7$?$,$C$F!"%A%c%W%?!<%?%$%H%k$h$j9b$$0LCV$K1&%+%i%`$N;OE@$,Mh$k$H$$$&(B +% $B5sF0$K$J$C$F$$$^$9$,!"%3%_%e%K%F%#HG$G$b%"%9%-!<HG$N5sF0$r0];}$7$F$$$^$9!#(B % \begin{macrocode} \def\@chapter[#1]#2{% \ifnum \c@secnumdepth >\m@ne @@ -2625,11 +2879,14 @@ % % \begin{macro}{\@schapter} % $B$3$N%^%/%m$O!">O8+=P$7$KHV9f$rIU$1$J$$$H$-$K8F$S=P$5$l$^$9!#(B +% +% \emph{$BF|K\8l(B\TeX{}$B3+H/%3%_%e%K%F%#$K$h$kJdB-(B}$B!'$d$O$jFsCJAH$G%A%c%W%?!<(B +% $B%?%$%H%k$h$j9b$$0LCV$K1&%+%i%`$N;OE@$,Mh$k$H$$$&5sF0$r0];}$7$F$"$j$^$9!#(B +% \changes{v1.7c}{2016/12/18}{$B4qL/$J(Barticle$B%,!<%I$H%3!<%I$r:o=|$7$F(B +% $B%I%-%e%a%s%H$rDI2C(B} % \begin{macrocode} \def\@schapter#1{% -%<article> \if@twocolumn\@topnewpage[\@makeschapterhead{#1}]\else \@makeschapterhead{#1}\@afterheading -%<article> \fi } % \end{macrocode} % \end{macro} @@ -2707,9 +2964,9 @@ % \begin{macro}{\subparagraph} % $B8+=P$7$NA0$K6uGr$rIU$1!"(B|\normalsize\bfseries|$B$G=PNO$r$7$^$9!#(B % $B8+=P$7$N8e$m$G2~9T$5$l$^$;$s!#(B -% \begin{macrocode} % \changes{v1.7a}{2016/11/16}{replace \cs{reset@font} with % \cs{normalfont} (sync with classes.dtx v1.3c)} +% \begin{macrocode} \newcommand{\subparagraph}{\@startsection{subparagraph}{5}{\z@}% {3.25ex \@plus 1ex \@minus .2ex}% {-1em}% @@ -3452,7 +3709,7 @@ % % \changes{v1.6}{2006/06/27}{$B%U%)%s%H%3%^%s%I$r=$@5!#$"$j$,$H$&!"(Bymt$B$5$s!#(B} % p\LaTeX{} 2.09 -% compatibility mode $B$G$OOBJ8?t<0%U%)%s%H(Bfam $B$,(B2$B=EDj5A$5$l$F$$$?(B +% compatibility mode$B$G$OOBJ8?t<0%U%)%s%H(Bfam$B$,(B2$B=EDj5A$5$l$F$$$?(B % $B$N$G!"$=$NItJ,$rJQ99$7$^$7$?!#(B % \begin{macrocode} \if@enablejfam @@ -4201,7 +4458,7 @@ %<*yoko> \if@twoside \@mparswitchtrue -\else +\else \@mparswitchfalse \fi %</yoko> diff --git a/Master/texmf-dist/source/platex/base/plcore.dtx b/Master/texmf-dist/source/platex/base/plcore.dtx index 0bb4c60b7d5..bfe4d5a0861 100644 --- a/Master/texmf-dist/source/platex/base/plcore.dtx +++ b/Master/texmf-dist/source/platex/base/plcore.dtx @@ -3,7 +3,7 @@ % % Copyright 1994-2001 ASCII Corporation. % Copyright (c) 2010 ASCII MEDIA WORKS -% Copyright (c) 2016 Japanese TeX Development Community +% Copyright (c) 2016-2017 Japanese TeX Development Community % % This file is part of the pLaTeX2e system (community edition). % ------------------------------------------------------------- @@ -54,13 +54,23 @@ % \changes{v1.2i}{2016/09/08}{v1.2g$B$N=$@5$GF~$l$?(B\cs{null}$B$,$^$:$+$C$?$N$G(B % $B?eJ?%b!<%I$N$H$-$@$1H/9T$9$k$3$H$K$7$?(B(Issue 23)} % \changes{v1.2j}{2016/11/09}{FAM256$B%Q%C%AE,MQ(Be-p\TeX{}$B$KBP1~(B} +% \changes{v1.2k}{2017/02/20}{$BL\<!$G(B\cs{ref}$B$r;H$C$?>l9g$K8e$m$N6uGr$,>C$($k(B +% $B8=>]$KBP=h$9$k$?$a!"(B\cs{relax}$B$N$"$H$K(B\{\}$B$rDI2C(B} +% \changes{v1.2l}{2017/02/25}{$B5SCm$H%\%H%`%U%m!<%H$N=g=x$rF~$lBX$($?$3$H$G(B +% $BHGLLA4BN$N?bD>0LCV$,$:$l$F$$$?$N$r=$@5(B(Issue 32)} +% \changes{v1.2l}{2017/02/25}{\cs{@makecol}$B$rJQ99$7$?$N$K(B +% \cs{@makespecialcolbox}$B$rJQ99$7$J$$!"$H$$$&H=CG$K$D$$$FL@J82=(B} +% \changes{v1.2m}{2017/03/19}{\cs{language}$B$r%j%;%C%H(B +% (sync with ltoutput.dtx 2017/03/10 v1.3c)} +% \changes{v1.2m}{2017/03/19}{\cs{verb}$B$NESCf$G%O%$%U%M!<%7%g%s$,5/$-$J$$(B +% $B$h$&$K(B\cs{language}$B$r@_Dj(B(sync with ltmiscen.dtx 2017/03/09 v1.1m)} % \fi % % \iffalse %<*driver> \NeedsTeXFormat{pLaTeX2e} % \fi -\ProvidesFile{plcore.dtx}[2016/11/09 v1.2j pLaTeX core file] +\ProvidesFile{plcore.dtx}[2017/03/19 v1.2m pLaTeX core file] % \iffalse \documentclass{jltxdoc} \GetFileInfo{plcore.dtx} @@ -253,13 +263,40 @@ % $B$3$N%^%/%m$,AH$_N)$F$kItJ,$NCf?4$H$J$j$^$9!#(B % \file{ltoutput.dtx}$B$GDj5A$5$l$F$$$k$b$N$G$9!#(B % \begin{macrocode} -%<platexrelease>\plIncludeInRelease{2016/09/03}{\@makecol}{\@makecol}% +%<platexrelease>\plIncludeInRelease{2017/04/08}{\@makecol}{\@makecol}% %<*plcore|platexrelease> \gdef\@makecol{% \setbox\@outputbox\box\@cclv% + \let\@elt\relax % added on LaTeX (ltoutput.dtx 2003/12/16 v1.2k) \xdef\@freelist{\@freelist\@midlist}% \global \let \@midlist \@empty \@combinefloats +% \end{macrocode} +% $B%*%j%8%J%k$N(B\LaTeX{}$B$O!"%H%C%W%U%m!<%H!"K\J8!"5SCm!"%\%H%`%U%m!<%H$N=gHV$G(B +% $B=PNO$7$^$9!#0lJ}(Bp\LaTeX{}$B$O!"%H%C%W%U%m!<%H!"K\J8!"%\%H%`%U%m!<%H!"5SCm$N(B +% $B=gHV$G=PNO$7$^$9!#$H$3$m$,!"%"%9%-!<HG$N%3!<%I$O=gHV$rF~$lBX$($k$@$1$G$J$/!"(B +% $BHGLLA4BN$N?bD>0LCV$,!JFC$K=DAH$G82Cx$K!K$:$l$F$7$^$C$F$$$^$7$?!#(B +% $B$3$l$OJd@5NL(B|\dp\@outputbox|$B$N<hF@$,Aa$9$.$?$?$a$G$9$N$G!"%3%_%e%K%F%#HG(B +% p\LaTeX{}$B$G$O$3$NLdBj$KBP=h$7$F$"$j$^$9!#7k2LE*$K!"(Bfnpos$B%Q%C%1!<%8(B(yafoot)$B$N(B +% |\makeFNbottom|$B$+$D(B|\makeFNbelow|$B$J>uBV$H40A4$KEy2A$K$J$j$^$7$?!#(B +% \changes{v1.2l}{2017/02/25}{$B5SCm$H%\%H%`%U%m!<%H$N=g=x$rF~$lBX$($?$3$H$G(B +% $BHGLLA4BN$N?bD>0LCV$,$:$l$F$$$?$N$r=$@5(B(Issue 32)} +% \begin{macrocode} + \let\pltx@textbottom\@textbottom % save (pLaTeX 2017/02/25) + \ifvoid\footins\else % changed (pLaTeX 2017/02/25) + \setbox\@outputbox \vbox {% + \boxmaxdepth \@maxdepth + \unvbox \@outputbox + \@textbottom % inserted here (pLaTeX 2017/02/25) + \vskip \skip\footins + \color@begingroup + \normalcolor + \footnoterule + \unvbox \footins + \color@endgroup + }% + \let\@textbottom\relax % disable temporarily (pLaTeX 2017/02/25) + \fi \ifvbox\@kludgeins \@makespecialcolbox \else @@ -288,20 +325,43 @@ \iftdir\vbox{\hskip\z@}\fi \vskip -\dimen@ \@textbottom - \ifvoid\footins\else % for pLaTeX - \vskip \skip\footins - \color@begingroup - \normalcolor - \footnoterule - \unvbox \footins - \color@endgroup - \fi }% \fi + \let\@textbottom\pltx@textbottom % restore (pLaTeX 2017/02/25) \global \maxdepth \@maxdepth } %</plcore|platexrelease> %<platexrelease>\plEndIncludeInRelease +%<platexrelease>\plIncludeInRelease{2016/09/03}{\@makecol}{\@makecol}% +%<platexrelease>\gdef\@makecol{% +%<platexrelease> \setbox\@outputbox\box\@cclv% +%<platexrelease> \xdef\@freelist{\@freelist\@midlist}% +%<platexrelease> \global \let \@midlist \@empty +%<platexrelease> \@combinefloats +%<platexrelease> \ifvbox\@kludgeins +%<platexrelease> \@makespecialcolbox +%<platexrelease> \else +%<platexrelease> \setbox\@outputbox \vbox to\@colht {% +%<platexrelease>% \boxmaxdepth \@maxdepth % comment out on LaTeX 1997/12/01 +%<platexrelease> \@texttop +%<platexrelease> \dimen@ \dp\@outputbox +%<platexrelease> \unvbox \@outputbox +%<platexrelease> \iftdir\vbox{\hskip\z@}\fi +%<platexrelease> \vskip -\dimen@ +%<platexrelease> \@textbottom +%<platexrelease> \ifvoid\footins\else % for pLaTeX +%<platexrelease> \vskip \skip\footins +%<platexrelease> \color@begingroup +%<platexrelease> \normalcolor +%<platexrelease> \footnoterule +%<platexrelease> \unvbox \footins +%<platexrelease> \color@endgroup +%<platexrelease> \fi +%<platexrelease> }% +%<platexrelease> \fi +%<platexrelease> \global \maxdepth \@maxdepth +%<platexrelease>} +%<platexrelease>\plEndIncludeInRelease %<platexrelease>\plIncludeInRelease{2016/04/17}{\@makecol}{\@makecol}% %<platexrelease>\gdef\@makecol{% %<platexrelease> \setbox\@outputbox\box\@cclv% @@ -373,13 +433,34 @@ % % $B$3$N%^%/%m$O!"(B|\enlargethispage|$B$,;H$o$l$?$H$-$K!"(B % |\@makecol|$B%^%/%m$+$i8F$S=P$5$l$^$9!#(B +% +% \noindent\emph{$BF|K\8l(B\TeX{}$B3+H/%3%_%e%K%F%#$K$h$kJdB-(B(2017/02/25)}$B!'(B +% 2016/11/29$B0JA0$N(Bp\LaTeX{}$B$G$O!"(B|\@makecol|$B$O%\%H%`%U%m!<%H$rA^F~$7$?8e!"(B +% $B$9$0$K(B|\@kludgeins|$B$,6u$+$I$&$+H=Dj$7(B +% \begin{itemize} +% \item $B6u$N>l9g$O!";D$j$9$Y$F$N=hM}$r(B|\@makespecialcolbox|$B$KG$$;$k(B +% \item $B6u$G$J$$>l9g$O!"(B|\@makecol|$B<+?H$G;D$j$9$Y$F$N=hM}$r9T$&(B +% \end{itemize} +% $B$H$7$F$$$^$7$?!#$7$+$7(B2017/04/08$B0J9_$N(Bp\LaTeX{}$B$G$O!"(B|\@makecol|$B$O%\%H%`(B +% $B%U%m!<%H$H5SCm$rA^F~$7$F$+$i(B|\@kludgeins|$B$NH=Dj$K0\$k$h$&$K$7$F$$$^$9!#(B +% $B$7$?$,$C$F!"?7$7$$(B|\@makecol|$B$+$i0J2<$K5-$9(B|\@makespecialcolbox|$B$,8F$S(B +% $B=P$5$l$k>l9g$O!"(B|\ifvoid\footins|$B!JFs2U=j!K$NH=Dj$O>o$K??$H$J$k$O$:$G$9!#(B +% $BMW$9$k$K!V$D$.$NItJ,$,(Bp\LaTeX{}$BMQ$N=$@5$G$9!#!W$H$$$&Fs2U=j$N%3!<%I$O(B +% $B<B<AE*$KITMW$H$J$j$^$7$?!#(B +% +% $B$7$+$7!"$@$+$i$H$$$C$F>C$7$F$7$^$&$H!"8E$$(Bp\LaTeX{}$B$N(B|\@makecol|$B$r(B +% $B%Y!<%9$K:n$i$l$?30It%Q%C%1!<%8$+$i(B|\@makespecialcolbox|$B$,8F$S=P$5$l$k(B +% $B>l9g$K5SCm$,>CLG$9$k$*$=$l$,$"$j$^$9!#$3$N$?$a!"(B|\@makespecialcolbox|$B$O(B +% $B=>Mh$N%3!<%I$N$^$^0];}$7$F$"$j$^$9!J32$O$"$j$^$;$s!K!#(B +% \changes{v1.2l}{2017/02/25}{\cs{@makecol}$B$rJQ99$7$?$N$K(B +% \cs{@makespecialcolbox}$B$rJQ99$7$J$$!"$H$$$&H=CG$K$D$$$FL@J82=(B} % \begin{macrocode} %<*plcore|fltrace> \gdef\@makespecialcolbox{% %<*trace> \fl@trace{Krudgeins ht \the\ht\@kludgeins\space - dp \the\dp\@kludgeins\space - wd \the\wd\@kludgeins}% + dp \the\dp\@kludgeins\space + wd \the\wd\@kludgeins}% %</trace> \setbox\@outputbox \vbox {% \@texttop @@ -708,12 +789,30 @@ % |\begingroup|$B$H(B|\endgroup|$B$G0O$_$^$9!#(B % \changes{v1.2a}{2001/09/26}{\LaTeX\ \texttt{!<2001/06/01!>}$B$KBP1~(B} % \begin{macrocode} +%</plcore> +%<platexrelease>\plIncludeInRelease{2017/04/08}{\@outputpage} +%<platexrelease> {Reset language for hyphenation}% +%<*plcore|platexrelease> \def\@outputpage{% \begingroup % the \endgroup is put in by \aftergroup \iftdir \dimen\z@\textwidth \textwidth\textheight \textheight\dimen\z@ \fi \let \protect \noexpand +% \end{macrocode} +% \LaTeXe\ 2017-04-15$B$G$O(Bverbatim$B4D6-Fb$G%O%$%U%M!<%7%g%s$,5/$-$J$$$h$&$K(B +% $B=$@5$5$l$^$7$?$,!"(Bverbatim$B4D6-$NESCf$G2~%Z!<%8$,5/$-$?>l9g$K%X%C%@$G(B +% $B%O%$%U%M!<%7%g%s$,M^@)$5$l$k$N$O@5$7$/$J$$$N$G!"(B|\language|$B$r(B +% |\begin{document}|$B$G$NCM$K%j%;%C%H$7$^$9!J;29M!'(Blatex2e svn r1407$B!K!#(B +% $B%W%j%"%s%V%k$GFCJL$K@_Dj$5$l$l$P$=$NCM!"@_Dj$5$l$J$1$l$P(B0$B$G$9!JK|$,0l(B +% |\document|$B$NDj5A$,8E$$>l9g(B\footnote{\LaTeXe\ 2017/01/01$B0JA0$r;H$C$F(B +% p\LaTeXe{}$B$N%U%)!<%^%C%H$r:n@.$7$?>l9g$d!"(Bdinbrief.cls$B$N$h$&$KFH<+$N(B +% $B:FDj5A$r9T$&%/%i%9$d%Q%C%1!<%8$r;H$C$?>l9g$K5/$3$k$+$b$7$l$^$;$s!#(B}$B$O(B +% $-1$$B$K$J$j$^$9$,!"$3$l$O(B0$B$HF1$8$O$?$i$-$r$9$k$N$GLdBj$O5/$-$^$;$s!K!#(B +% \changes{v1.2m}{2017/03/19}{\cs{language}$B$r%j%;%C%H(B +% (sync with ltoutput.dtx 2017/03/10 v1.3c)} +% \begin{macrocode} + \language\document@default@language \@resetactivechars \global\let\@@if@newlist\if@newlist \global\@newlistfalse @@ -794,6 +893,78 @@ \stepcounter{page}% \let\firstmark\botmark } +%</plcore|platexrelease> +%<platexrelease>\plEndIncludeInRelease +%<platexrelease>\plIncludeInRelease{0000/00/00}{\@outputpage} +%<platexrelease> {Reset language for hyphenation}% +%<platexrelease>\def\@outputpage{% +%<platexrelease>\begingroup % the \endgroup is put in by \aftergroup +%<platexrelease> \iftdir +%<platexrelease> \dimen\z@\textwidth \textwidth\textheight \textheight\dimen\z@ +%<platexrelease> \fi +%<platexrelease> \let \protect \noexpand +%<platexrelease> \@resetactivechars +%<platexrelease> \global\let\@@if@newlist\if@newlist +%<platexrelease> \global\@newlistfalse +%<platexrelease> \@parboxrestore +%<platexrelease> \shipout\vbox{\yoko +%<platexrelease> \set@typeset@protect +%<platexrelease> \aftergroup\endgroup +%<platexrelease> \aftergroup\set@typeset@protect +%<platexrelease> \if@specialpage +%<platexrelease> \global\@specialpagefalse\@nameuse{ps@\@specialstyle}% +%<platexrelease> \fi +%<platexrelease> \if@twoside +%<platexrelease> \ifodd\count\z@ \let\@thehead\@oddhead \let\@thefoot\@oddfoot +%<platexrelease> \iftdir\let\@themargin\evensidemargin +%<platexrelease> \else\let\@themargin\oddsidemargin\fi +%<platexrelease> \else \let\@thehead\@evenhead +%<platexrelease> \let\@thefoot\@evenfoot +%<platexrelease> \iftdir\let\@themargin\oddsidemargin +%<platexrelease> \else\let\@themargin\evensidemargin\fi +%<platexrelease> \fi\fi +%<platexrelease> \@@topmargin\topmargin +%<platexrelease> \iftombow +%<platexrelease> \@@paperwidth\paperwidth \advance\@@paperwidth 6mm\relax +%<platexrelease> \@@paperheight\paperheight \advance\@@paperheight 16mm\relax +%<platexrelease> \advance\@@topmargin 1in\relax \advance\@themargin 1in\relax +%<platexrelease> \fi +%<platexrelease> \reset@font +%<platexrelease> \normalsize +%<platexrelease> \normalsfcodes +%<platexrelease> \let\label\@gobble +%<platexrelease> \let\index\@gobble +%<platexrelease> \let\glossary\@gobble +%<platexrelease> \baselineskip\z@skip \lineskip\z@skip \lineskiplimit\z@ +%<platexrelease> \@begindvi +%<platexrelease> \@outputtombow +%<platexrelease> \vskip \@@topmargin +%<platexrelease> \moveright\@themargin\vbox{% +%<platexrelease> \setbox\@tempboxa \vbox to\headheight{% +%<platexrelease> \vfil +%<platexrelease> \color@hbox +%<platexrelease> \normalcolor +%<platexrelease> \hb@xt@\textwidth{\@thehead}% +%<platexrelease> \color@endbox +%<platexrelease> }% %% 22 Feb 87 +%<platexrelease> \dp\@tempboxa \z@ +%<platexrelease> \box\@tempboxa +%<platexrelease> \vskip \headsep +%<platexrelease> \box\@outputbox +%<platexrelease> \baselineskip \footskip +%<platexrelease> \color@hbox +%<platexrelease> \normalcolor +%<platexrelease> \hb@xt@\textwidth{\@thefoot}% +%<platexrelease> \color@endbox +%<platexrelease> }% +%<platexrelease> }% +%<platexrelease> \global\let\if@newlist\@@if@newlist +%<platexrelease> \global \@colht \textheight +%<platexrelease> \stepcounter{page}% +%<platexrelease> \let\firstmark\botmark +%<platexrelease>} +%<platexrelease>\plEndIncludeInRelease +%<*plcore> % \end{macrocode} % \end{macro} % @@ -1090,12 +1261,24 @@ % % \begin{macro}{\@setref} % \changes{v1.1c}{1995/09/07}{change \cs{null} to \cs{relax} in \cs{@setref}.} +% \changes{v1.2k}{2017/02/20}{$BL\<!$G(B\cs{ref}$B$r;H$C$?>l9g$K8e$m$N6uGr$,>C$($k(B +% $B8=>]$KBP=h$9$k$?$a!"(B\cs{relax}$B$N$"$H$K(B\{\}$B$rDI2C(B} % |\ref|$B%3%^%s%I$d(B|\pageref|$B%3%^%s%I$G;2>H$7$?$H$-!"$3$l$i$N%3%^%s%I$K(B % $B$h$C$F=PNO$5$l$?HV9f$HB3$/#2%P%$%HJ8;z$H$N4V$K(B|\xkanjiskip|$B$,F~$j$^$;$s!#(B % $B$3$l$O!"(B|\null|$B$,(B|\hbox{}|$B$HDj5A$5$l$F$$$k$?$a$G$9!#(B % $B$=$3$G(B|\null|$B$r<h$j=|$-$^$9!#(B % $B$3$N%3%^%s%I$O!"(B\file{ltxref.dtx}$B$GDj5A$5$l$F$$$k$b$N$G$9!#(B +% +% $B$7$+$7!"C1$K(B|\null|$B$r(B|\relax|$B$KCV$-49$($k$@$1$G$O!"(B|\section|$B$N$h$&$J(B +% $B!VF0$/0z?t!W$G(B|\ref|$B$J$I$r;H$C$?>l9g$K!"L\<!$G8e$m$N6uGr$,>C$($F$7$^$$$^$9!#(B +% $B$=$3$G!"(B|\relax|$B$N$"$H$K(B|{}|$B$rDI2C$7$^$7$?!#=>Mh$b(B|\protect\ref|$B$N$h$&$K;H$($P(B +% $BLdBj$"$j$^$;$s$G$7$?$,!"(B\LaTeX{}$B$G$OE83+$5$l$F$bLdBj$,5/$-$J$$(Brobust$B$J<BAu$K(B +% $B$J$C$F$$$^$9$N$G!"$3$l$K=>$$$^$9!#(B % \begin{macrocode} +%</plcore> +%<platexrelease>\plIncludeInRelease{2017/04/08}{\@setref} +%<platexrelease> {Spacing after \ref in moving arguments}% +%<*plcore|platexrelease> \def\@setref#1#2#3{% \ifx#1\relax \protect\G@refundefinedtrue @@ -1103,8 +1286,23 @@ \@latex@warning{Reference `#3' on page \thepage \space undefined}% \else - \expandafter#2#1\relax% change \null to \relax + \expandafter#2#1\relax{}% change \null to \relax{} \fi} +%</plcore|platexrelease> +%<platexrelease>\plEndIncludeInRelease +%<platexrelease>\plIncludeInRelease{0000/00/00}{\@setref} +%<platexrelease> {Spacing after \ref in moving arguments}% +%<platexrelease>\def\@setref#1#2#3{% +%<platexrelease> \ifx#1\relax +%<platexrelease> \protect\G@refundefinedtrue +%<platexrelease> \nfss@text{\reset@font\bfseries ??}% +%<platexrelease> \@latex@warning{Reference `#3' on page \thepage \space +%<platexrelease> undefined}% +%<platexrelease> \else +%<platexrelease> \expandafter#2#1\relax% change \null to \relax +%<platexrelease> \fi} +%<platexrelease>\plEndIncludeInRelease +%<*plcore> % \end{macrocode} % \end{macro} % @@ -1122,18 +1320,44 @@ % $B$=$3$G!"(B|\null|$B$r=PNO$7$J$$$h$&%^%/%m$r=$@5$7$^$9!#(B % $B$3$N%^%/%m$O!"(B\file{ltmiscen.dtx}$B$GDj5A$5$l$F$$$^$9!#(B % \begin{macrocode} +%</plcore> +%<platexrelease>\plIncludeInRelease{2017/04/08}{\verb} +%<platexrelease> {Disable hyphenation in verb}% +%<*plcore|platexrelease> \if@compatibility\else \def\verb{\relax\ifmmode\hbox\else\leavevmode\fi \bgroup \verb@eol@error \let\do\@makeother \dospecials \verbatim@font\@noligs +% \end{macrocode} +% \LaTeXe\ 2017-04-15$B$KDI?o$7$F!"(B|\verb|$B$NESCf$G%O%$%U%M!<%7%g%s$,5/$-$J$$(B +% $B$h$&$K(B|\language|$B$r@_Dj$7$^$9!J;29M!'(Blatex2e svn r1405$B!K!#(B +% \changes{v1.2m}{2017/03/19}{\cs{verb}$B$NESCf$G%O%$%U%M!<%7%g%s$,5/$-$J$$(B +% $B$h$&$K(B\cs{language}$B$r@_Dj(B(sync with ltmiscen.dtx 2017/03/09 v1.1m)} +% \begin{macrocode} + \language\l@nohyphenation \@ifstar\@sverb\@verb} \fi +%</plcore|platexrelease> +%<platexrelease>\plEndIncludeInRelease +%<platexrelease>\plIncludeInRelease{0000/00/00}{\verb} +%<platexrelease> {Disable hyphenation in verb}% +%<platexrelease>\if@compatibility\else +%<platexrelease>\def\verb{\relax\ifmmode\hbox\else\leavevmode\fi +%<platexrelease> \bgroup +%<platexrelease> \verb@eol@error \let\do\@makeother \dospecials +%<platexrelease> \verbatim@font\@noligs +%<platexrelease> \@ifstar\@sverb\@verb} +%<platexrelease>\fi +%<platexrelease>\plEndIncludeInRelease +%<*plcore> % \end{macrocode} % \end{macro} % % % \subsection{tabbing$B4D6-(B} +% +% \begin{macro}{\@stopfield} % \changes{v1.1d}{1996/03/12}{\cs{=}$B$N8e$m$KOB2$J84V%9%Z!<%9$,F~$k$N$r=$@5(B} % $BAj8_;2>H$d5?;w%?%$%WF~NO$G$O!"OB2$J84V%9%Z!<%9$,F~$i$J$$$N$G!"(B|\null|$B$r(B % $B<h$j=|$-$^$7$?$,!"(B|tabbing|$B4D6-$G$O!"5U$K(B|\null|$B$,$J$$$?$a!"(B @@ -1142,6 +1366,7 @@ % \begin{macrocode} \gdef\@stopfield{\null\color@endgroup\egroup} % \end{macrocode} +% \end{macro} % % \subsection{$BMQ8l=8$N=PNO(B} % \LaTeX{}$B$K$O!"$J$<$+MQ8l=8$r=PNO$9$k$?$a$N%3%^%s%I$,$"$j$^$;$s$N$G!"(B diff --git a/Master/texmf-dist/source/platex/base/plext.dtx b/Master/texmf-dist/source/platex/base/plext.dtx index 80a83b1a587..d4cae9c7cf3 100644 --- a/Master/texmf-dist/source/platex/base/plext.dtx +++ b/Master/texmf-dist/source/platex/base/plext.dtx @@ -3,7 +3,7 @@ % % Copyright 2001 ASCII Corporation. % Copyright (c) 2010 ASCII MEDIA WORKS -% Copyright (c) 2016 Japanese TeX Development Community +% Copyright (c) 2016-2017 Japanese TeX Development Community % % This file is part of the pLaTeX2e system (community edition). % ------------------------------------------------------------- @@ -50,6 +50,12 @@ % \changes{v1.2c}{2016/11/19}{Ensure \cs{@parboxto} holds the value % of \cs{@tempdimb} not the register itself (pr/3867) % (sync with ltboxes.dtx v1.1g)} +% \changes{v1.2d}{2017/02/04}{\cs{Kanji}$B$N0z?t$@$1$G$J$/8e$KO"B3$9$k(B +% $B?t;z$b4A?t;z$K$J$C$F$7$^$&%P%0$r=$@5(B} +% \changes{v1.2e}{2017/03/02}{Make \cs{parbox} Robust +% (sync with ltboxes 2015/01/08 v1.1h)} +% \changes{v1.2f}{2017/03/28}{$BI=$H<~0O$H$NB7$(0LCV$r=$@5(B} +% \changes{v1.2f}{2017/03/28}{$BCJMn$NH"$H<~0O$H$NB7$(0LCV$r=$@5(B} % \fi % % \iffalse @@ -58,7 +64,7 @@ \ProvidesFile{plext.dtx} %</driver> %<package>\ProvidesPackage{plext} - [2016/11/19 v1.2c pLaTeX package file (community edition)] + [2017/03/28 v1.2f pLaTeX package file (community edition)] %<*driver> \documentclass{jltxdoc} \usepackage{plext} @@ -280,6 +286,43 @@ % \begin{macro}{\fork@array@option} % array$B4D6-$H(Btabular$B4D6-$GM?$($i$l$?(B % $BBh0l0z?t$HBhFs0z?t$NAH9g$;$NJ,4t$r9T$J$$$^$9!#(B +% +% $B%3%_%e%K%F%#HG$G$O!"%"%9%-!<HG$GIT<+A3$@$C$?I=AH!J(Barray$B4D6-$*$h$S(Btabular$B4D6-!K$H(B +% $B<~0O$NK\J8$H$NB7$(0LCV$r=$@5$7!"0J2<$N$h$&$K@_7W$7$^$7$?!#(B +% \begin{itemize} +% \item $B<~0O$NAHJ}8~$,2#AH$+$DAHJ}8~$,(B|<y>|, |<z>|$B;XDj$N>l9g(B +% \begin{itemize} +% \item |[t]|$B;XDj$N$H$-(B\\$B0l9TL\$N%Y!<%9%i%$%s$,<~0O$N$=$l$H0lCW!J7S@~$N>l9g$OOBJ8%Y!<%9%i%$%s$N0LCV!K(B +% \item |[c]|$B;XDj$N$H$-(B\\$BI=AH$NCf?4$,<~0O$N?t<0<4$rDL$k!J2$J8%Y!<%9%i%$%s%7%U%H$N1F6A2<!K(B +% \item |[b]|$B;XDj$N$H$-(B\\$B:G=*9T$N%Y!<%9%i%$%s$,<~0O$N$=$l$H0lCW!J7S@~$N>l9g$OOBJ8%Y!<%9%i%$%s$N0LCV!K(B +% \end{itemize} +% \item $B<~0O$NAHJ}8~$,2#AH$+$DAHJ}8~$,(B|<t>|$B;XDj$N>l9g(B +% \begin{itemize} +% \item |[t]|$B;XDj$N$H$-(B\\$BI=AH$N>eC<$,<~0O$NOBJ8%Y!<%9%i%$%s$H0lCW(B +% \item |[c]|$B;XDj$N$H$-(B\\$BI=AH$NCf?4$,<~0O$N?t<0<4$rDL$k!J2$J8%Y!<%9%i%$%s%7%U%H$N1F6A2<!K(B +% \item |[b]|$B;XDj$N$H$-(B\\$BI=AH$N2<C<$,<~0O$NOBJ8%Y!<%9%i%$%s$H0lCW(B +% \end{itemize} +% \item $B<~0O$NAHJ}8~$,=DAH$+$DAHJ}8~$,(B|<y>|$B;XDj$N>l9g(B +% \begin{itemize} +% \item |[t]|$B;XDj$N$H$-(B\\$BI=AH$N>eC<$,<~0O$NOBJ8%Y!<%9%i%$%s$H0lCW(B +% \item |[c]|$B;XDj$N$H$-(B\\$BI=AH$NCf?4$,<~0O$N?t<0<4$rDL$k!J2$J8%Y!<%9%i%$%s%7%U%H$N1F6A2<!K(B +% \item |[b]|$B;XDj$N$H$-(B\\$BI=AH$N2<C<$,<~0O$NOBJ8%Y!<%9%i%$%s$H0lCW(B +% \end{itemize} +% \item $B<~0O$NAHJ}8~$,=DAH$+$DAHJ}8~$,(B|<t>|$B;XDj$N>l9g(B +% \begin{itemize} +% \item |[t]|$B;XDj$N$H$-(B\\$B0l9TL\$N%Y!<%9%i%$%s$,<~0O$N$=$l$H0lCW!J7S@~$N>l9g$OOBJ8%Y!<%9%i%$%s$N0LCV!K(B +% \item |[c]|$B;XDj$N$H$-(B\\$BI=AH$NCf?4$,<~0O$N?t<0<4$rDL$k!J2$J8%Y!<%9%i%$%s%7%U%H$N1F6A2<!K(B +% \item |[b]|$B;XDj$N$H$-(B\\$B:G=*9T$N%Y!<%9%i%$%s$,<~0O$N$=$l$H0lCW!J7S@~$N>l9g$OOBJ8%Y!<%9%i%$%s$N0LCV!K(B +% \end{itemize} +% \item $B<~0O$NAHJ}8~$,=DAH$+$DAHJ}8~$,(B|<z>|$B;XDj$N>l9g(B +% [TODO] $BL$Dj!*(B +%^^A \begin{itemize} +%^^A \item |[t]|$B;XDj$N$H$-(B\\$BI=AH$N>eC<$,<~0O$NOBJ8%Y!<%9%i%$%s$H0lCW(B +%^^A \item |[c]|$B;XDj$N$H$-(B\\$BI=AH$NCf?4$,<~0O$N?t<0<4$rDL$k!J2$J8%Y!<%9%i%$%s%7%U%H$N1F6A2<!K(B +%^^A \item |[b]|$B;XDj$N$H$-(B\\$BI=AH$N2<C<$,<~0O$NOBJ8%Y!<%9%i%$%s$H0lCW(B +%^^A \end{itemize} +% \end{itemize} +% \changes{v1.2f}{2017/03/28}{$BI=$H<~0O$H$NB7$(0LCV$r=$@5(B} % \begin{macrocode} \def\fork@array@option<#1>[#2]{% \@rotswfalse @@ -289,10 +332,16 @@ \iftdir \if #1y\relax\let\box@dir\yoko \if #2t\relax - \def\@begin@alignbox{\raise\cdp\vtop\bgroup\kern\z@\vbox}% + \def\@begin@alignbox{% + \@tempdima=\tbaselineshift + \advance\@tempdima-\ybaselineshift + \raise\@tempdima\vtop\bgroup\kern\z@\vtop}% \let\@end@alignbox\egroup \else\if #2b\relax - \def\@begin@alignbox{\lower\cdp\vbox\bgroup\vbox}% + \def\@begin@alignbox{% + \@tempdima=\tbaselineshift + \advance\@tempdima-\ybaselineshift + \raise\@tempdima\vbox\bgroup\vbox}% \def\@end@alignbox{\kern\z@\egroup}% \else \let\@begin@alignbox\vcenter @@ -311,7 +360,7 @@ \fi\fi \else\let\box@dir\tate \if #2t\relax - \def\@begin@alignbox{\raise\cdp\vtop}% + \let\@begin@alignbox\vtop \let\@end@alignbox\relax \else\if #2b\relax \let\@begin@alignbox\vbox @@ -338,7 +387,7 @@ \fi\fi \else\let\box@dir\yoko \if #2t\relax - \def\@begin@alignbox{\raise\cdp\vtop}% + \let\@begin@alignbox\vtop \let\@end@alignbox\relax \else\if #2b\relax \let\@begin@alignbox\vbox @@ -759,8 +808,10 @@ % % \begin{macro}{\parbox} % $BAHJ}8~%*%W%7%g%s$rD4$Y$^$9!#(B +% \changes{v1.2e}{2017/03/02}{Make \cs{parbox} Robust +% (sync with ltboxes 2015/01/08 v1.1h)} % \begin{macrocode} -\def\parbox{\@ifnextchar<%> +\DeclareRobustCommand\parbox{\@ifnextchar<%> {\X@parbox}{\X@parbox<Z>}} % \end{macrocode} % \end{macro} @@ -833,6 +884,43 @@ % % \begin{macro}{\fork@parbox@option} % |\parbox|$B$GM?$($i$l$?Bh0l0z?t$HBhFs0z?t$NAH9g$;$NJ,4t$r9T$J$$$^$9!#(B +% +% $B%3%_%e%K%F%#HG$G$O!"%"%9%-!<HG$GIT<+A3$@$C$?(B|\parbox|$B$NH"$H(B +% $B<~0O$NK\J8$H$NB7$(0LCV$r=$@5$7!"0J2<$N$h$&$K@_7W$7$^$7$?!#(B +% \begin{itemize} +% \item $B<~0O$NAHJ}8~$,2#AH$+$DAHJ}8~$,(B|<y>|, |<z>|$B;XDj$N>l9g(B +% \begin{itemize} +% \item |[t]|$B;XDj$N$H$-(B\\$B0l9TL\$N%Y!<%9%i%$%s$,<~0O$N$=$l$H0lCW(B +% \item |[c]|$B;XDj$N$H$-(B\\$BH"$NCf?4$,<~0O$N?t<0<4$rDL$k!J2$J8%Y!<%9%i%$%s%7%U%H$N1F6A2<!K(B +% \item |[b]|$B;XDj$N$H$-(B\\$B:G=*9T$N%Y!<%9%i%$%s$,<~0O$N$=$l$H0lCW(B +% \end{itemize} +% \item $B<~0O$NAHJ}8~$,2#AH$+$DAHJ}8~$,(B|<t>|$B;XDj$N>l9g(B +% \begin{itemize} +% \item |[t]|$B;XDj$N$H$-(B\\$BH"$N>eC<$,<~0O$NOBJ8J8;z$N9b$5$H0lCW(B +% \item |[c]|$B;XDj$N$H$-(B\\$BH"$NCf?4$,<~0O$N?t<0<4$rDL$k!J2$J8%Y!<%9%i%$%s%7%U%H$N1F6A2<!K(B +% \item |[b]|$B;XDj$N$H$-(B\\$BH"$N2<C<$,<~0O$NOBJ8J8;z$N?<$5$H0lCW(B +% \end{itemize} +% \item $B<~0O$NAHJ}8~$,=DAH$+$DAHJ}8~$,(B|<y>|$B;XDj$N>l9g(B +% \begin{itemize} +% \item |[t]|$B;XDj$N$H$-(B\\$BH"$N>eC<$,<~0O$NOBJ8J8;z$N9b$5$H0lCW(B +% \item |[c]|$B;XDj$N$H$-(B\\$BH"$NCf?4$,<~0O$N?t<0<4$rDL$k!J2$J8%Y!<%9%i%$%s%7%U%H$N1F6A2<!K(B +% \item |[b]|$B;XDj$N$H$-(B\\$BH"$N2<C<$,<~0O$NOBJ8J8;z$N?<$5$H0lCW(B +% \end{itemize} +% \item $B<~0O$NAHJ}8~$,=DAH$+$DAHJ}8~$,(B|<t>|$B;XDj$N>l9g(B +% \begin{itemize} +% \item |[t]|$B;XDj$N$H$-(B\\$B0l9TL\$N%Y!<%9%i%$%s$,<~0O$N$=$l$H0lCW(B +% \item |[c]|$B;XDj$N$H$-(B\\$BH"$NCf?4$,<~0O$N?t<0<4$rDL$k!J2$J8%Y!<%9%i%$%s%7%U%H$N1F6A2<!K(B +% \item |[b]|$B;XDj$N$H$-(B\\$B:G=*9T$N%Y!<%9%i%$%s$,<~0O$N$=$l$H0lCW(B +% \end{itemize} +% \item $B<~0O$NAHJ}8~$,=DAH$+$DAHJ}8~$,(B|<z>|$B;XDj$N>l9g(B +% [TODO] $BL$Dj!*(B +%^^A \begin{itemize} +%^^A \item |[t]|$B;XDj$N$H$-(B\\$BH"$N>eC<$,<~0O$NOBJ8%Y!<%9%i%$%s$H0lCW(B +%^^A \item |[c]|$B;XDj$N$H$-(B\\$BH"$NCf?4$,<~0O$N?t<0<4$rDL$k!J2$J8%Y!<%9%i%$%s%7%U%H$N1F6A2<!K(B +%^^A \item |[b]|$B;XDj$N$H$-(B\\$BH"$N2<C<$,<~0O$NOBJ8%Y!<%9%i%$%s$H0lCW(B +%^^A \end{itemize} +% \end{itemize} +% \changes{v1.2f}{2017/03/28}{$BCJMn$NH"$H<~0O$H$NB7$(0LCV$r=$@5(B} % \begin{macrocode} \def\fork@parbox@option<#1>[#2]{% \@rotswfalse @@ -842,7 +930,7 @@ \iftdir \if #1y\relax\let\box@dir\yoko \if #2t\relax - \def\@begin@parbox{\raise\cdp\vtop\bgroup\kern\z@\vtop}% + \def\@begin@parbox{\raise\cht\vtop\bgroup\kern\z@\vtop}% \let\@end@parbox\egroup \else\if #2b\relax \def\@begin@parbox{\lower\cdp\vbox\bgroup\vbox}% @@ -851,7 +939,7 @@ \let\@begin@parbox\vcenter \let\@end@parbox\relax \else - \def\@begin@parbox{\hskip\tbaselineshift$\vcenter}% + \def\@begin@parbox{$\vcenter}% \def\@end@parbox{\m@th$}% \fi\fi\fi \else\if #1z\relax\@rotswtrue \let\box@dir\relax @@ -865,7 +953,7 @@ \let\@begin@parbox\vcenter \let\@end@parbox\relax \else - \def\@begin@parbox{\hskip\tbaselineshift$\vcenter}% + \def\@begin@parbox{$\vcenter}% \def\@end@parbox{\m@th$}% \fi\fi\fi \else\let\box@dir\tate @@ -873,7 +961,7 @@ \let\@begin@parbox\vtop \let\@end@parbox\relax \else\if #2b\relax - \def\@begin@parbox{\lower\cdp\vbox}% + \let\@begin@parbox\vbox \let\@end@parbox\relax \else\ifmmode \let\@begin@parbox\vcenter @@ -889,10 +977,10 @@ \else \if #1t\relax\let\box@dir\tate \if #2t\relax - \def\@begin@parbox{\vtop\bgroup\kern\z@\vbox}% + \def\@begin@parbox{\raise\cht\vtop\bgroup\kern\z@\vtop}% \let\@end@parbox\egroup \else\if #2b\relax - \def\@begin@parbox{\vbox\bgroup\vbox}% + \def\@begin@parbox{\lower\cdp\vbox\bgroup\vbox}% \def\@end@parbox{\kern\z@\egroup}% \else\ifmmode \let\@begin@parbox\vcenter @@ -1167,7 +1255,7 @@ % \begin{macro}{\Kanji} % \begin{macro}{\@Kanji} % \begin{macro}{\kanji} -% |\Kanji|$B%3%^%s%I$rDj5A$7$^$9!#(B|\Kanji|$B%3%^%s%I$O(B|\Alpha|$B$HF1$8$h$&$K!"(B +% |\Kanji|$B%3%^%s%I$rDj5A$7$^$9!#(B|\Kanji|$B%3%^%s%I$O(B|\Alph|$B$HF1$8$h$&$K!"(B % $B%+%&%s%?$KBP$7$F$N$_;HMQ$9$k$3$H$,$G$-$^$9!#(B % % |\kanji|$B%3%^%s%I$O!"8eB3$NH>3Q?t;z$r4A?t;z$K$7$^$9!#(B @@ -1175,10 +1263,13 @@ % $B$?$@$7!"2#AH%b!<%I$N$H$-$K$O!"2?$b$7$^$;$s!#(B % $B$D$M$K4A?t;z$K$7$?$$>l9g$O!"(B|\kansuji|$B%W%j%_%F%#%V$r;H$C$F$/$@$5$$!#(B % +% $B8eB3$N?t;z$^$G4A?t;z$K$J$C$F$7$^$&%P%0$r=$@5$7$^$7$?(B(Issue~\#33)$B!#(B % \changes{v1.0h}{1996/03/13}{\cs{@Kanji}$B$rDI2C!#1Q8lHG$HF1MM$K$7$?!#(B} +% \changes{v1.2d}{2017/02/04}{\cs{Kanji}$B$N0z?t$@$1$G$J$/8e$KO"B3$9$k(B +% $B?t;z$b4A?t;z$K$J$C$F$7$^$&%P%0$r=$@5(B} % \begin{macrocode} \def\Kanji#1{\expandafter\@Kanji\csname c@#1\endcsname} -\def\@Kanji#1{\expandafter\kansuji\number #1} +\def\@Kanji#1{\kansuji #1} \def\kanji{\iftdir\expandafter\kansuji\fi} % \end{macrocode} % \end{macro} diff --git a/Master/texmf-dist/source/platex/base/plfonts.dtx b/Master/texmf-dist/source/platex/base/plfonts.dtx index c7a40e3cf50..7e116ebb358 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 Japanese TeX Development Community +% Copyright (c) 2016-2017 Japanese TeX Development Community % % This file is part of the pLaTeX2e system (community edition). % ------------------------------------------------------------- @@ -57,13 +57,20 @@ % \changes{v1.6d}{2016/06/19}{$B%"%/%;%s%HIU$-J8;z$r$5$i$K=$@5(B(forum:1951)} % \changes{v1.6e}{2016/06/26}{v1.6a$B0J9_$N=$@5$GA4$F$N%"%/%;%s%HIU$-J8;z$G(B % $B%H%i%V%k$,Aj<!$$$@$?$a!"$$$C$?$s%Q%C%A$r=|5n!#(B} +% \changes{v1.6f}{2017/02/20}{ptrace.sty$B$N(Bplatexrelease$BBP1~(B} +% \changes{v1.6f}{2017/02/20}{\cs{ystrutbox}$B$rDI2C(B} +% \changes{v1.6f}{2017/02/20}{\cs{strutbox}$B$r=D2#N>BP1~$K(B} +% \changes{v1.6f}{2017/02/20}{\cs{strutbox}$B$NBe$o$j$K(B\cs{ystrutbox}$B$r;HMQ(B} +% \changes{v1.6f}{2017/02/20}{\cs{ystrut}$B$rDI2C(B} +% \changes{v1.6f}{2017/02/20}{\cs{ystrutbox}$B$rAH$_N)$F$k$h$&$K(B} +% \changes{v1.6g}{2017/03/07}{$B%Y!<%9%i%$%sJd@5NL$r=$@5(B} % \fi % % \iffalse %<*driver> \NeedsTeXFormat{pLaTeX2e} % \fi -\ProvidesFile{plfonts.dtx}[2016/06/26 v1.6e pLaTeX New Font Selection Scheme] +\ProvidesFile{plfonts.dtx}[2017/03/07 v1.6g pLaTeX New Font Selection Scheme] % \iffalse \documentclass{jltxdoc} \GetFileInfo{plfonts.dtx} @@ -137,7 +144,7 @@ %<*trace> \NeedsTeXFormat{pLaTeX2e} \ProvidesPackage{ptrace} - [2016/04/30 v1.6b Standard pLaTeX package (font tracing)] + [2017/02/20 v1.6f Standard pLaTeX package (font tracing)] \RequirePackageWithOptions{tracefnt} %</trace> % \end{macrocode} @@ -406,12 +413,25 @@ % % $B%U%)%s%H%5%$%:$,JQ99$5$l$?$H$-$K!"(B|\set@fontsize|$B%3%^%s%I$G99?7$5$l$^$9!#(B % +% $B=>Mh!"2#AH%\%C%/%9MQ$N;YCl$O(B|\strutbox|$B$G!"9b$5$H?<$5$,(B7$BBP(B3$B$H$J$C$F$$$^$7$?!#(B +% $B$3$l$O(Bp\LaTeX{}$BC1BN$G$OLdBj$K$J$j$^$;$s$G$7$?$,!"3$30@=$N(B\LaTeX{}$B%Q%C%1!<%8$r(B +% $B=DAH$G;HMQ$7$?>l9g$K!"0U?^$7$J$$I}$d9b$5$,<hF@$5$l$k$3$H$,$"$j$^$7$?!#(B +% $B$3$NITET9g$r2sHr$9$k$?$a!"%3%_%e%K%F%#HG(Bp\LaTeX{}$B$G$O<!$NJ}K!$r$H$j$^$9!#(B +% \begin{itemize} +% \item |\ystrutbox|$B!J?7@_!K!'9b$5$H?<$5$,(B7$BBP(B3$B$N2#AH%\%C%/%9MQ$N;YCl(B +% \item |\tstrutbox|$B!'9b$5$H?<$5$,(B5$BBP(B5$B$N=DAH%\%C%/%9MQ$N;YCl(B +% \item |\zstrutbox|$B!'9b$5$H?<$5$,(B7$BBP(B3$B$N=DAH%\%C%/%9MQ$N;YCl(B +% \item |\strutbox|$B!J;EMMJQ99!K!'=D2#$N%G%#%l%/%7%g%s$K1~$8$F(B +% |\tstrutbox|$B$^$?$O(B|\ystrutbox|$B$KE83+$5$l$k%^%/%m(B +% \end{itemize} +% $B$9$J$o$A!"=>Mh$N(Bp\LaTeX{}$B$K$*$1$k(B|\strutbox|$B$HF1$85sF0$r<($9$N$,!"(B +% $B?7@_$5$l$?(B|\ystrutbox|$B$H$$$&$3$H$K$J$j$^$9!#(B +% % \begin{macro}{\tstrutbox} % \begin{macro}{\zstrutbox} -% |\tstrutbox|$B$O9b$5$H?<$5$,#5BP#5!"(B -% |\zstrutbox|$B$O9b$5$H?<$5$,#7BP#3$N;YCl%\%C%/%9$H$J$j$^$9!#(B +% |\tstrutbox|$B$O9b$5$H?<$5$,(B5$BBP(B5$B!"(B +% |\zstrutbox|$B$O9b$5$H?<$5$,(B7$BBP(B3$B$N;YCl%\%C%/%9$H$J$j$^$9!#(B % $B$3$l$i$O=DAH%\%C%/%9$N9T4V$ND4@0$J$I$K;H$$$^$9!#(B -% $B$J$*!"2#AH%\%C%/%9MQ$N;YCl$O(B|\strutbox|$B$G!"9b$5$H?<$5$,#7BP#3$H$J$C$F$$$^$9!#(B % \begin{macrocode} \newbox\tstrutbox \newbox\zstrutbox @@ -419,24 +439,80 @@ % \end{macro} % \end{macro} % +% \begin{macro}{\ystrutbox} +% |\ystrutbox|$B$O9b$5$H?<$5$,(B7$BBP(B3$B$N2#AH%\%C%/%9MQ$N;YCl$G$9!#(B +% \changes{v1.6f}{2017/02/20}{\cs{ystrutbox}$B$rDI2C(B} +% \begin{macrocode} +%</plcore> +%<platexrelease>\plIncludeInRelease{2017/04/08}{\ystrutbox} +%<platexrelease> {Add \ystrutbox}% +%<*plcore|platexrelease> +\newbox\ystrutbox +%</plcore|platexrelease> +%<platexrelease>\plEndIncludeInRelease +%<platexrelease>\plIncludeInRelease{0000/00/00}{\ystrutbox} +%<platexrelease> {Add \ystrutbox}% +%<platexrelease>\let\ystrutbox\@undefined +%<platexrelease>\plEndIncludeInRelease +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\strutbox} +% |\strutbox|$B$O=D2#N>BP1~$G$9!#(B +% \changes{v1.6f}{2017/02/20}{\cs{strutbox}$B$r=D2#N>BP1~$K(B} +% \begin{macrocode} +%<platexrelease>\plIncludeInRelease{2017/04/08}{\strutbox} +%<platexrelease> {Add \strutbox}% +%<*plcore|platexrelease> +\def\strutbox{\iftdir\tstrutbox\else\ystrutbox\fi} +%</plcore|platexrelease> +%<platexrelease>\plEndIncludeInRelease +%<platexrelease>\plIncludeInRelease{0000/00/00}{\strutbox} +%<platexrelease> {Add \strutbox}% +%<platexrelease>\newbox\strutbox % emulation purpose only +%<platexrelease>\plEndIncludeInRelease +% \end{macrocode} +% \end{macro} +% % \begin{macro}{\strut} -% \begin{macro}{\tstrut} -% \begin{macro}{\zstrut} -% |\strutbox|$B$O(B|\yoko|$B%G%#%l%/%7%g%s$GAH$^$l$F$$$^$9$N$G!"(B -% $B=DAH%\%C%/%9Fb$G(B|\unhcopy|$B$r$9$k$H%(%i!<$H$J$j$^$9!#(B -% $B$3$N%^%/%m$O(B\file{ltplain.dtx}$B$GDj5A$5$l$F$$$^$9!#(B +% $B%G%#%l%/%7%g%s$K1~$8$F(B|\ystrutbox|$B$H(B|\tstrutbox|$B$r;H$$J,$1$^$9!#(B +% ^^A |\strutbox|$B$O(B|\yoko|$B%G%#%l%/%7%g%s$GAH$^$l$F$$$^$9$N$G!"(B +% ^^A $B=DAH%\%C%/%9Fb$G(B|\unhcopy|$B$r$9$k$H%(%i!<$H$J$j$^$9!#(B +% $B85!9$3$N%^%/%m$O(B\file{ltplain.dtx}$B$GDj5A$5$l$F$$$^$9!#(B % % \changes{v1.1c}{1995/08/24}{``\cs{centerling}~\cs{strut}''$B$NI}$,%<%m$K(B % $B$J$C$F$7$^$&$N$r=$@5(B} % \changes{v1.3h}{1999/08/09}{$B=DAH$N$H$-!"I}$N$"$k%\%C%/%9$K$J$C$F$7$^$&(B % $B$N$r=$@5(B} +% \changes{v1.6f}{2017/02/20}{\cs{strutbox}$B$NBe$o$j$K(B\cs{ystrutbox}$B$r;HMQ(B} % \begin{macrocode} +%<platexrelease>\plIncludeInRelease{2017/04/08}{\strut} +%<platexrelease> {Use \ystrutbox}% +%<*plcore|platexrelease> \def\strut{\relax \ifydir - \ifmmode\copy\strutbox\else\unhcopy\strutbox\fi + \ifmmode\copy\ystrutbox\else\unhcopy\ystrutbox\fi \else \ifmmode\copy\tstrutbox\else\unhcopy\tstrutbox\fi \fi} +%</plcore|platexrelease> +%<platexrelease>\plEndIncludeInRelease +%<platexrelease>\plIncludeInRelease{0000/00/00}{\strut} +%<platexrelease> {Use \ystrutbox}% +%<platexrelease>\def\strut{\relax +%<platexrelease> \ifydir +%<platexrelease> \ifmmode\copy\strutbox\else\unhcopy\strutbox\fi +%<platexrelease> \else +%<platexrelease> \ifmmode\copy\tstrutbox\else\unhcopy\tstrutbox\fi +%<platexrelease> \fi} +%<platexrelease>\plEndIncludeInRelease +%<*plcore> +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\tstrut} +% \begin{macro}{\zstrut} +% \begin{macrocode} \def\tstrut{\relax\hbox{\tate \ifmmode\copy\tstrutbox\else\unhcopy\tstrutbox\fi}} \def\zstrut{\relax\hbox{\tate @@ -444,6 +520,24 @@ % \end{macrocode} % \end{macro} % \end{macro} +% +% \begin{macro}{\ystrut} +% \changes{v1.6f}{2017/02/20}{\cs{ystrut}$B$rDI2C(B} +% \begin{macrocode} +%</plcore> +%<platexrelease>\plIncludeInRelease{2017/04/08}{\ystrut} +%<platexrelease> {Add \ystrut}% +%<*plcore|platexrelease> +\def\ystrut{\relax\hbox{\yoko + \ifmmode\copy\ystrutbox\else\unhcopy\ystrutbox\fi}} +%</plcore|platexrelease> +%<platexrelease>\plEndIncludeInRelease +%<platexrelease>\plIncludeInRelease{0000/00/00}{\ystrut} +%<platexrelease> {Add \ystrut}% +%<platexrelease>\let\ystrut\@undefined +%<platexrelease>\plEndIncludeInRelease +%<*plcore> +% \end{macrocode} % \end{macro} % % @@ -1069,6 +1163,10 @@ % |\fontsize|$B%3%^%s%I$NFbIt7A<0$G$9!#(B % $B%Y!<%9%i%$%s$N@_Dj$H!";YCl$N@_Dj$r9T$J$$$^$9!#(B % \begin{macrocode} +%</plcore|trace> +%<platexrelease|trace>\plIncludeInRelease{2017/04/08}{\set@fontsize} +%<platexrelease|trace> {Construct \ystrutbox}% +%<*plcore|platexrelease|trace> \def\set@fontsize#1#2#3{% \@defaultunits\@tempdimb#2pt\relax\@nnil \edef\f@size{\strip@pt\@tempdimb}% @@ -1082,9 +1180,10 @@ \normalbaselineskip\baselineskip % \end{macrocode} % $B$3$3$G!"%Y!<%9%i%$%s%7%U%H$ND4@0$H;YCl$rAH$_N)$F$^$9!#(B +% \changes{v1.6f}{2017/02/20}{\cs{ystrutbox}$B$rAH$_N)$F$k$h$&$K(B} % \begin{macrocode} \adjustbaseline - \setbox\strutbox\hbox{\yoko + \setbox\ystrutbox\hbox{\yoko \vrule\@width\z@ \@height.7\baselineskip \@depth.3\baselineskip}% \setbox\tstrutbox\hbox{\tate @@ -1097,18 +1196,58 @@ % $B%U%)%s%H%5%$%:$H%Y!<%9%i%$%s$K4X$9$k?GCG>pJs$r=PNO$7$^$9!#(B % \begin{macrocode} %<*trace> - \ifnum \tracingfonts>\tw@ - \ifx\f@linespread\@empty - \let\reserved@a\@empty - \else - \def\reserved@a{\f@linespread x}% - \fi - \@font@info{Changing size to\space - \f@size/\reserved@a \f@baselineskip}% - \aftergroup\type@restoreinfo - \fi + \ifnum \tracingfonts>\tw@ + \ifx\f@linespread\@empty + \let\reserved@a\@empty + \else + \def\reserved@a{\f@linespread x}% + \fi + \@font@info{Changing size to\space + \f@size/\reserved@a \f@baselineskip}% + \aftergroup\type@restoreinfo + \fi %</trace> \let\size@update\relax}} +%</plcore|platexrelease|trace> +%<platexrelease|trace>\plEndIncludeInRelease +%<platexrelease|trace>\plIncludeInRelease{0000/00/00}{\set@fontsize} +%<platexrelease|trace> {Construct \ystrutbox}% +%<platexrelease|trace>\def\set@fontsize#1#2#3{% +%<platexrelease|trace> \@defaultunits\@tempdimb#2pt\relax\@nnil +%<platexrelease|trace> \edef\f@size{\strip@pt\@tempdimb}% +%<platexrelease|trace> \@defaultunits\@tempskipa#3pt\relax\@nnil +%<platexrelease|trace> \edef\f@baselineskip{\the\@tempskipa}% +%<platexrelease|trace> \edef\f@linespread{#1}% +%<platexrelease|trace> \let\baselinestretch\f@linespread +%<platexrelease|trace> \def\size@update{% +%<platexrelease|trace> \baselineskip\f@baselineskip\relax +%<platexrelease|trace> \baselineskip\f@linespread\baselineskip +%<platexrelease|trace> \normalbaselineskip\baselineskip +%<platexrelease|trace> \adjustbaseline +%<platexrelease|trace> \setbox\strutbox\hbox{\yoko +%<platexrelease|trace> \vrule\@width\z@ +%<platexrelease|trace> \@height.7\baselineskip \@depth.3\baselineskip}% +%<platexrelease|trace> \setbox\tstrutbox\hbox{\tate +%<platexrelease|trace> \vrule\@width\z@ +%<platexrelease|trace> \@height.5\baselineskip \@depth.5\baselineskip}% +%<platexrelease|trace> \setbox\zstrutbox\hbox{\tate +%<platexrelease|trace> \vrule\@width\z@ +%<platexrelease|trace> \@height.7\baselineskip \@depth.3\baselineskip}% +%<*trace> +%<platexrelease|trace> \ifnum \tracingfonts>\tw@ +%<platexrelease|trace> \ifx\f@linespread\@empty +%<platexrelease|trace> \let\reserved@a\@empty +%<platexrelease|trace> \else +%<platexrelease|trace> \def\reserved@a{\f@linespread x}% +%<platexrelease|trace> \fi +%<platexrelease|trace> \@font@info{Changing size to\space +%<platexrelease|trace> \f@size/\reserved@a \f@baselineskip}% +%<platexrelease|trace> \aftergroup\type@restoreinfo +%<platexrelease|trace> \fi +%</trace> +%<platexrelease|trace> \let\size@update\relax}} +%<platexrelease|trace>\plEndIncludeInRelease +%<*plcore|trace> % \end{macrocode} % \end{macro} % @@ -1132,7 +1271,8 @@ % $B$7$^$&$?$a!"7W;;$7$?CM$,Bg$-$/$J$C$F$7$^$$$^$9!#$=$3$G!"$3$N%\%C%/%9(B % $B$NCf$G%<%m$K$9$k$h$&$K$7$^$7$?!#$^$?!"(B``/''$B$HHf3S$7$F$$$?$N$r(B``M''$B$K(B % $B$7$^$7$?!#(B -% \changes{v1.3k}{2001/05/10}{\cs{adjustbaseline}$B$ND4@0NL(B} +% \changes{v1.3k}{2001/05/10}{\cs{adjustbaseline}$B$ND4@0NL(B +% $B!J:F$S(B`M'$B$r4p=`$K$7$?!K(B} % \begin{macrocode} \newbox\adjust@box \newdimen\adjust@dimen @@ -1154,9 +1294,9 @@ % % \begin{eqnarray*} % \textmc{$B%Y!<%9%i%$%s%7%U%HNL(B} &=& -% \{ (\textmc{$BA43Q6uGr$N?<$5(B}) - (\textmc{/$B$N?<$5(B}) \} \\ +% \{ (\textmc{$BA43Q6uGr$N?<$5(B}) - (\textmc{M$B$N?<$5(B}) \} \\ % &&- \frac{(\textmc{$BA43Q6uGr$N9b$5(B$+$$B?<$5(B}) -% - (\textmc{/$B$N9b$5(B$+$$B?<$5(B})}{2} +% - (\textmc{M$B$N9b$5(B$+$$B?<$5(B})}{2} % \end{eqnarray*} % % \begin{macrocode} @@ -1584,11 +1724,32 @@ % $B$b$H$O(B\file{ltoutenc.dtx}$B$GDj5A$5$l$F$$$^$9!#(B % % $B$J$*!"(B|\_|$B$r?t<0%b!<%I$G;H$&$H(B|\mathunderscore|$B$,<B9T$5$l$^$9!#(B +% +% $B%3%_%e%K%F%#HG$G$O=D?t<0%G%#%l%/%7%g%s$G%Y!<%9%i%$%sJd@5NL$,(B +% $BJQ$@$C$?$N$rD>$7$^$7$?!#$"$o$;$F2#%G%#%l%/%7%g%s$G$b%Y!<%9%i%$%s(B +% $BJd@5$KDI?o$9$k$h$&$K$7$F$$$^$9!#(B +% \changes{v1.6g}{2017/03/07}{$B%Y!<%9%i%$%sJd@5NL$r=$@5(B} % \begin{macrocode} +%</plcore> +%<platexrelease>\plIncludeInRelease{2017/04/08}{\textunderscore} +%<platexrelease> {Baseline shift for \textunderscore}% +%<*plcore|platexrelease> \DeclareTextCommandDefault{\textunderscore}{% \leavevmode\kern.06em - \iftdir\raise-\tbaselineshift\fi + \raise-\iftdir\ifmdir\ybaselineshift + \else\tbaselineshift\fi + \else\ybaselineshift\fi \vbox{\hrule\@width.3em}} +%</plcore|platexrelease> +%<platexrelease>\plEndIncludeInRelease +%<platexrelease>\plIncludeInRelease{0000/00/00}{\textunderscore} +%<platexrelease> {Baseline shift for \textunderscore}% +%<platexrelease>\DeclareTextCommandDefault{\textunderscore}{% +%<platexrelease> \leavevmode\kern.06em +%<platexrelease> \iftdir\raise-\tbaselineshift\fi +%<platexrelease> \vbox{\hrule\@width.3em}} +%<platexrelease>\plEndIncludeInRelease +%<*plcore> % \end{macrocode} % \end{macro} % diff --git a/Master/texmf-dist/source/platex/base/plnewsc06.tex b/Master/texmf-dist/source/platex/base/plnewsc06.tex new file mode 100644 index 00000000000..3181bd52266 --- /dev/null +++ b/Master/texmf-dist/source/platex/base/plnewsc06.tex @@ -0,0 +1,114 @@ +%% <2017/04/08> +\documentclass{plnews} + +\publicationyear{2017}% $BH/9TG/(B +\publicationmonth{04}% $BH/9T7n(B +\publicationissue{c6}% $BHV9f(B +\author{$BF|K\8l(B\TeX{}$B3+H/%3%_%e%K%F%#!J(B\texttt{https://texjp.org/}$B!K(B} + +\def\pTeX{p\kern-.15em\TeX} +\def\eTeX{$\varepsilon$-\TeX} +\def\epTeX{$\varepsilon$-\pTeX} +\def\pLaTeX{p\kern-.05em\LaTeX} +\def\pLaTeXe{p\kern-.05em\LaTeXe} + +\begin{document} + +\maketitle + +$B$3$NJ8=q$O%3%_%e%K%F%#HG(B\pLaTeXe\ \texttt{<2017/04/08>}$B$K$D$$$F!"(B +\pLaTeXe\ \texttt{<2016/11/29>}$B$+$i$N99?72U=j$r$^$H$a$?$b$N$G$9!#(B + + +\section{$BI8=`%/%i%9%U%!%$%k$N=$@5(B} +\file{jclasses}$B$,A4BNE*$K?7$7$/$J$j$^$7$?!#(B +\begin{itemize} +\item (j,t)book/report$B%/%i%9!'(B|openleft|$B%*%W%7%g%s$rDI2C$7$^$7$?!#$3$l$O>O$N(B + $B;O$^$j$r:85/$3$7!J2#AH$G$O8+3+$-5/$3$7!"=DAH$G$OJR5/$3$7!K$K$7$^$9!#(B + $B=>Mh$O(B|openright|$B!J2#AH$G$OJR5/$3$7!"=DAH$G$O8+3+$-5/$3$7!K$H(B + |openany|$B!J@.$j9T$-$K=>$&!K$7$+$"$j$^$;$s$G$7$?!#$J$*!"(B|openleft|$B$N>l9g$O(B + |\cleardoublepage|$BL?Na$b:85/$3$7MQ$K:F!9Dj5A$7$^$9!#(B +\item (j,t)book/report$B%/%i%9!'(B|openany|$B;XDj;~$K(B|\part|$B$N$"$H$KGr%Z!<%8$r(B + $BF~$l$k$N$r$d$a$^$7$?!#(B\LaTeX{}$BI8=`%/%i%9$N8E$$%P%0=$@5$K$h$&$d$/DI?o$7$?(B + $B$3$H$K$J$j$^$9!#(B +\item (j,t)book$B%/%i%9!'%?%$%H%k%Z!<%8$rI,$:4q?t%Z!<%8L\$KAw$k$h$&$KJQ99$7$^$7$?!#(B + $B:#2s$N=$@5$K$h$j!"=>Mh$N(Btbook$B%/%i%9$G%?%$%H%k$NA0$K=P$F$$$?6uGr%Z!<%8$O(B + $BL5$/$J$j$^$9!#$^$?!"(B|\frontmatter|$B$H(B|\mainmatter|$B$bI,$:4q?t%Z!<%8L\$KAw$k$h$&(B + $B$KJQ99$7$^$7$?!#(B +\item $B%?%$%H%k$rFHN)%Z!<%8$H$9$k>l9g$K!"4q?t%l%$%"%&%H$N%Z!<%8$H6v?t%l%$%"%&%H(B + $B$N%Z!<%8$,8r8_$K$J$i$J$$!"$9$J$o$AN>LL0u:~$,$&$^$/$$$+$J$$$3$H$,$"$kLdBj$K(B + $BBP=h$7$^$7$?!#(B +\item $B=DAH$N=jB0I=<(!J(B|\thanks|$B!K$NHV9f$,?2$k$N$O4qL/$J$N$GD>$7$^$7$?!#(B +\item $B%H%s%\$KF|IU$rI=<($9$k(B|tombow|$B%*%W%7%g%s$NF|IUI=<($r(B\file{jsclasses}$B$K(B + $B$"$o$;$F7e?t8GDj$H$7$^$7$?!#(B +\end{itemize} + + +\section{\file{plext}$B$NB7$(0LCV(B} +\file{plext}$B%Q%C%1!<%8$O(B|tabular|$B$d(B|\parbox|$B$J$I$r3HD%$7$^$9$,!"7S@~$d%Y!<%9(B +$B%i%$%s$NB7$(J}$KE}0l@-$,$"$j$^$;$s$G$7$?!#$^$?!"%"%9%-!<Ev;~$N(B2001$BG/$+$i(B +$B8=:_$K;j$k$^$G!"(B\pTeX{}$B$N?t!9$N;EMMJQ99$r<u$1$F2?EY$bB7$(0LCV$,!J>!<j$K!K(B +$BJQ2=$7$F$-$?7P0^$,$"$j$^$9!#:#2s!"%3%_%e%K%F%#HG$G(B2017$BG/$N(B\pTeX{}$B$K9g$o$;$F(B +$B;EMM$r:vDj$9$k$3$H$K$7$^$7$?!#(B +$B$^$?!"(B\LaTeXe\ 2015/01/01$B$KDI?o$7$F(B|\parbox|$B$r(Brobust$B$K$7$?$[$+!"(B +|\Kanji|$BL?Na$N%P%0$r=$@5$7$^$7$?!#(B + + +\section{$B;YCl$N9b$5(B} +$B9b$5$d?<$5$@$1$r;}$D8+$($J$$H"!"$9$J$o$A;YCl$H$7$F!"(B\LaTeX{}$B$G$O(B +|\strutbox|$B$H$$$&%\%C%/%9$,MQ0U$5$l$^$9!#=DAH$H2#AH$H$$$&35G0$,DI2C$5$l$?(B +\pLaTeX{}$B$G$O!"(B|\strutbox|$B$r2#AH%\%C%/%9$H$7$FAH$_!"JLES$K=DAH%\%C%/%9(B +|\tstrutbox|$B$rMQ0U$7$F$$$^$7$?!#$3$l$K=>$($P!";YCl$rMxMQ$7$?$$%Q%C%1!<%8B&$,(B +$B!V2#AH$G$O(B|\strutbox|$B$r8F$S=P$7!"=DAH$G$O(B|\tstrutbox|$B$r8F$S=P$9!W$H;H$$J,$1(B +$B$kI,MW$,$"$j$^$9!#(B + +\pLaTeX{}$B$H0l=o$KG[I[$7$F$$$k%Q%C%1!<%8$O<B:]$K$3$N;H$$J,$1$r9T$C$F$*$j!"(B +$B$[$H$s$ILdBj$"$j$^$;$s$G$7$?!#$H$3$m$,!"(B\pLaTeX{}$B=DAH$r9MN8$7$F$$$J$$30It$N(B +$B%Q%C%1!<%8$O$3$N$h$&$J1?MQ$K$J$C$F$$$J$$$?$a!"=DAH$G(B|\strutbox|$B$N@#K!$r<hF@(B +$B$7$h$&$H$7$F!";YCl$N4|BT$KH?$9$kCM$,JV$C$F$7$^$$$^$9!#(B +$B7k2LE*$K!"=DAH$G(B\file{amsmath}$B%Q%C%1!<%8$N(B|align|$B4D6-Fb$N@0Ns$,$&$^$/$$$+$J(B +$B$+$C$?$j!"I=$N(B|\arraystretch|$BL?Na$,8z$+$J$+$C$?$j$H$$$&LdBj$,@8$8$F$$$^$7$?!#(B + +$B?7$7$$(B\pLaTeX{}$B$G$O!"2#AH%\%C%/%9(B|\ystrutbox|$B$H=DAH%\%C%/%9(B|\tstrutbox|$B$r(B +$BMQ0U$7!"(B|\strutbox|$B$O!V8=:_$NAHJ}8~$rH=Dj$7!"2#AH$J$i(B|\ystrutbox|$B$r!"=DAH$J$i(B +|\tstrutbox|$B$rJV$9%^%/%m!W$X$HJQ99$7$^$7$?!#$3$l$G!"2?$b9M$($J$/$F$b(B +|\strutbox|$B$,>o$K;YCl$H$7$F5!G=$9$k$h$&$K$J$j$^$7$?!#(B + + +\section{\LaTeXe\ \texttt{<2017-04-15>}$BBP1~(B} +\LaTeXe\ \texttt{<2017-04-15>}$B$GF~$kM=Dj$N=$@5$N0lIt$,(B\pLaTeXe{}$B$H>WFM$9$k(B +$BItJ,$K$D$$$F!";vA0$KBP:v$r;\$7$^$7$?!#8=;~E@$G$O!"(B|\verb|$B$NESCf$G(B +$B%O%$%U%M!<%7%g%s9TJ,3d$rM^@)$9$k$?$a$N=$@5!"$*$h$S(B|verbatim|$B4D6-Cf$G$N(B +$B%O%$%U%M!<%7%g%sM^@)$KMm$s$@=PNO%k!<%A%s$NL?Na$N=$@5$KBP1~$7$^$7$?!#(B +$B$J$*!"%U%)!<%^%C%H$NF|IU$,(B\texttt{yyyy/mm/dd}$B$+$i(B\texttt{yyyy-mm-dd}$B$H$$$&(B +ISO$B=q<0$KJQ99$5$l$^$7$?$,!"(B\pLaTeXe{}$B$N%U%)!<%^%C%HF|IU$O$^$@=>Mh$N=q<0$N(B +$B$^$^$K$7$F$$$^$9!#(B + + +\section{$B$=$NB>$N%P%0=$@5(B} +\begin{itemize} +\item $BAj8_;2>H$N(B|\ref{$B%i%Y%k(B}|$B$d(B|\pageref{$B%i%Y%k(B}|$B$r%;%/%7%g%s$J$I$N(B + $B!VF0$/0z?t!W$G;H$&$H!"L\<!$K=P$?$H$-$K8e$m$NH>3Q%9%Z!<%9$,>C$($k%P%0$r(B + $B=$@5$7$^$7$?!#(B +\item $B=PNO%k!<%A%s$K4X$o$k%^%/%m$N?<$5Jd@5$N8m$j$K$h$j!"5SCm$r4^$`%Z!<%8(B + $B$NHGLLA4BN$,!JFC$K=DAH$G82Cx$K!K$:$l$F$$$?%P%0$rD>$7$^$7$?!#(B +\item $B=D?t<0%G%#%l%/%7%g%s$G%"%s%@!<%9%3%"(B(|\_|)$B$N%Y!<%9%i%$%sJd@5NL$,(B + $B4V0c$C$F$$$?$N$rD>$7$^$7$?(B +\end{itemize} + + +\section{$B3+H/HG$N%F%9%H$N$*4j$$(B} +$B:#8e(Bp\LaTeX{}$B$KF3F~$9$k$+$b$7$l$J$$=$@5%Q%C%A$d;EMMJQ99$N%F%9%H$K$46(NO$/$@(B +$B$5$$!#(B\TeX{}$B%U%!%$%k$NKAF,!J(B|\documentclass|$B$h$jA0!K$G(B +\begin{verbatim} + \RequirePackage{exppl2e} +\end{verbatim} +$B$H=q$/$3$H$G!"8=:_$N3+H/HG$r%F%9%H$9$k$3$H$,$G$-$^$9!#(B +$B%P%0Js9p$d$40U8+$r4?7^$7$^$9!#(B +\TeX\ Forum$B$d(BGitHub$B$N(BIssue$B%7%9%F%`$,MxMQ$G$-$^$9!#(B +\begin{itemize} +\item \texttt{https://github.com/texjporg/platex} +\item \texttt{https://github.com/texjporg/uplatex} +\end{itemize} + +\end{document} diff --git a/Master/texmf-dist/source/platex/base/plvers.dtx b/Master/texmf-dist/source/platex/base/plvers.dtx index da21dc6c688..43a72df3e70 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 Japanese TeX Development Community +% Copyright (c) 2016-2017 Japanese TeX Development Community % % This file is part of the pLaTeX2e system (community edition). % ------------------------------------------------------------- @@ -50,12 +50,17 @@ % \changes{v1.0z}{2016/08/26}{\file{platex.cfg}$B$NFI$_9~$_$r(B % \file{plcore.ltx}$B$+$i(B\file{platex.ltx}$B$X0\F0(B} % \changes{v1.1}{2016/09/14}{$B5/F0;~$N%P%J!<$r<hF@$9$k%3!<%I$r2~NI(B} +% \changes{v1.1a}{2017/02/20}{\LaTeX\ \texttt{!<2017/01/01!>}$BHGBP1~3NG'(B} +% \changes{v1.1b}{2017/03/19}{\cs{l@nohyphenation}$B$NDj5A$rJ]>Z(B +% (sync with ltfinal 2017/03/09 v2.0t)} +% \changes{v1.1b}{2017/03/19}{\cs{document@default@language}$B$NDj5A$rJ]>Z(B +% (sync with ltfinal 2017/03/09 v2.0t)} % \fi % % \iffalse %<*driver> % \fi -\ProvidesFile{plvers.dtx}[2016/09/14 v1.1 pLaTeX Kernel (Version Info)] +\ProvidesFile{plvers.dtx}[2017/03/19 v1.1b pLaTeX Kernel (Version Info)] % \iffalse \documentclass{jltxdoc} \GetFileInfo{plvers.dtx} @@ -90,6 +95,7 @@ % \changes{v1.0m}{2004/08/10}{\LaTeX\ \texttt{!<2003/12/01!>}$BHGBP1~3NG'(B} % \changes{v1.0s}{2016/02/01}{\LaTeX\ \texttt{!<2015/01/01!>}$BHGMQ$K=$@5(B} % \changes{v1.0u}{2016/04/17}{\LaTeX\ \texttt{!<2016/03/31!>}$BHGBP1~3NG'(B} +% \changes{v1.1a}{2017/02/20}{\LaTeX\ \texttt{!<2017/01/01!>}$BHGBP1~3NG'(B} % % $B$3$N%P!<%8%g%s$N(Bp\LaTeXe{}$B$O!"<!$N%P!<%8%g%s$N(B\LaTeX{}\footnote{% % \LaTeX\ authors: Johannes Braams, David Carlisle, Alan Jeffrey, @@ -103,7 +109,7 @@ %<latexrelease>\edef\latexreleaseversion %<platexrelease>\edef\p@known@latexreleaseversion %<*2ekernel|latexrelease|platexrelease> - {2016/03/31} + {2017/01/01} %</2ekernel|latexrelease|platexrelease> % \end{macrocode} % @@ -119,7 +125,7 @@ %</plcore> %<platexrelease>\edef\platexreleaseversion %<*plcore|platexrelease> - {2016/11/29} + {2017/04/08} %</plcore|platexrelease> %<*plcore> \def\ppatch@level{0} @@ -172,6 +178,9 @@ % }{} % \end{macrocode} % +% \subsection{$B5/F0;~$KI=<($9$k%P%J!<(B} +% +% \begin{macro}{\everyjob} % $B5/F0;~$KI=<($5$l$kJ8;zNs$G$9!#(B % \LaTeX{}$B$K%Q%C%A$,$"$F$i$l$F$$$k>l9g$O!"$=$l$bI=<($7$^$9!#(B % @@ -232,6 +241,7 @@ \endgroup \platexTMP %</plfinal> % \end{macrocode} +% \end{macro} % % ^^A $B5/F0;~$K(B\file{platex.cfg}$B$,$"$k>l9g!"$=$l$rFI$_9~$`$h$&$K$9$k(B % ^^A $B%3!<%I$O!"(B\file{plcore.ltx}$B$+$i(B\file{platex.ltx}$B$X0\F0$7$^$7$?!#(B @@ -239,6 +249,40 @@ % \changes{v1.0z}{2016/08/26}{\file{platex.cfg}$B$NFI$_9~$_$r(B % \file{plcore.ltx}$B$+$i(B\file{platex.ltx}$B$X0\F0(B} % +% \subsection{$B%O%$%U%M!<%7%g%s4XO"(B} +% +% \begin{macro}{\l@nohyphenation} +% \LaTeXe\ 2017-04-15$B$G!"(B|\verb|$B$NESCf$G%O%$%U%M!<%7%g%s$,5/$-$J$$$h$&$K(B +% $B$9$k=$@5$,F~$j$^$7$?!#$3$N=$@5$K$O(B|\l@nohyphenation|$B$,Dj5A:Q$_$G$J$1$l$P(B +% $B$J$j$^$;$s$,!"DL>o$O(BBabel$B$NDj5A%U%!%$%k$K$h$C$FDs6!$5$l$F$$$^$9!#(B +% \LaTeXe{}$B$OFC<l$J>u67$bA[Dj$7$F(Bltfinal$B$GBP:v$7$F$$$k$h$&$G$9$N$G!"(B +% p\LaTeXe{}$B$bG0$N$?$a(Bplfinal$B$GBP:v$7$^$9!J;29M!'(Blatex2e svn r1405$B!K!#(B +% \changes{v1.1b}{2017/03/19}{\cs{l@nohyphenation}$B$NDj5A$rJ]>Z(B +% (sync with ltfinal 2017/03/09 v2.0t)} +% \begin{macrocode} +%<*plfinal> +\ifx\l@nohyphenation \@undefined + \newlanguage\l@nohyphenation +\fi +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\document@default@language} +% \LaTeXe\ 2017-04-15$B$GF3F~$5$l$?%Q%i%a!<%?$G$9!#99?7%?%$%_%s%0$N$:$l$N(B +% $B2DG=@-$r9MN8$7!"(Bp\LaTeXe{}$B$G$b=`Hw$7$F$*$-$^$9!#(Bverbatim$B4D6-$NESCf$G(B +% $B2~%Z!<%8$,5/$-$?>l9g$K%X%C%@$G%O%$%U%M!<%7%g%s$,M^@)$5$l$J$$$h$&$K!"(B +% |\@outputpage|$B$G(B|\language|$B$r%j%;%C%H$9$k$H$-$K;H$o$l$^$9(B +% $B!J;29M!'(Blatex2e svn r1407$B!K!#(B +% \changes{v1.1b}{2017/03/19}{\cs{document@default@language}$B$NDj5A$rJ]>Z(B +% (sync with ltfinal 2017/03/09 v2.0t)} +% \begin{macrocode} +\ifx\document@default@language \@undefined + \let\document@default@language\m@ne +\fi +%</plfinal> +% \end{macrocode} +% \end{macro} +% % \subsection{latexrelease$B%Q%C%1!<%8$X$NBP1~(B} % % $B:G8e$K!"(Blatexrelease$B%Q%C%1!<%8$X$NBP1~$G$9!#(B |