diff options
Diffstat (limited to 'Master/texmf-dist')
38 files changed, 796 insertions, 297 deletions
diff --git a/Master/texmf-dist/doc/platex/base/README.md b/Master/texmf-dist/doc/platex/base/README.md index d2de26b289d..c2d7113d358 100644 --- a/Master/texmf-dist/doc/platex/base/README.md +++ b/Master/texmf-dist/doc/platex/base/README.md @@ -61,6 +61,6 @@ the 3-clause BSD license (see [LICENSE](./LICENSE)). ## Release Date -2018-05-20 +2018-07-28 Japanese TeX Development Community diff --git a/Master/texmf-dist/doc/platex/base/exppl2e.pdf b/Master/texmf-dist/doc/platex/base/exppl2e.pdf Binary files differindex 0517460f60e..74e6f130889 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/platex-en.pdf b/Master/texmf-dist/doc/platex/base/platex-en.pdf Binary files differindex 986e4e12ff2..d7432e02689 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 d8a60720c38..3c3c77b8a43 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 158c4488480..210dba123d3 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 27be4bf1669..83d015f68e0 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 40c8fe035c2..f056c73b3ec 100644 --- a/Master/texmf-dist/source/platex/base/Makefile +++ b/Master/texmf-dist/source/platex/base/Makefile @@ -1,7 +1,7 @@ STRIPTARGET = platex.ltx jarticle.cls pl209.def platexrelease.sty \ jltxdoc.cls DOCTARGET = platex platexrelease pldoc exppl2e \ - platex-en + platex-en #pldoc-en PDFTARGET = $(addsuffix .pdf,$(DOCTARGET)) DVITARGET = $(addsuffix .dvi,$(DOCTARGET)) KANJI = -kanji=jis @@ -85,12 +85,12 @@ pldoc.dvi: $(PLDOC_SRC) rm -f platex.cfg rm -f jltxdoc.cls pldoc.tex Xins.ins platex $(KANJI) pldocs.ins - rm -f mkpldoc.sh dstcheck.pl + rm -f mkpldoc*.sh dstcheck.pl platex $(KANJI) Xins.ins sh mkpldoc.sh rm *.aux *.log pldoc.toc pldoc.idx pldoc.ind pldoc.ilg rm pldoc.glo pldoc.gls pldoc.tex Xins.ins - rm ltxdoc.cfg pldoc.dic mkpldoc.sh dstcheck.pl + rm ltxdoc.cfg pldoc.dic mkpldoc*.sh dstcheck.pl exppl2e.dvi: exppl2e.sty rm -f platex.cfg @@ -108,6 +108,19 @@ platex-en.dvi: $(INTRODOC_SRC) rm platex-en.glo platex-en.gls platex-en.ilg rm platex.cfg +pldoc-en.dvi: $(PLDOC_SRC) + # built-in echo in shell is troublesome, so use perl instead + perl -e "print \"\\\\newif\\\\ifJAPANESE\\n"\" >platex.cfg + rm -f jltxdoc.cls pldoc.tex Xins.ins + platex $(KANJI) pldocs.ins + rm -f mkpldoc*.sh dstcheck.pl + platex $(KANJI) Xins.ins + sh mkpldoc-en.sh + rm *.aux *.log pldoc-en.toc pldoc-en.idx pldoc-en.ind pldoc-en.ilg + rm pldoc-en.glo pldoc-en.gls pldoc.tex Xins.ins + rm ltxdoc.cfg pldoc.dic mkpldoc*.sh dstcheck.pl + rm platex.cfg + platex.pdf: platex.dvi dvipdfmx $(FONTMAP) $< platexrelease.pdf: platexrelease.dvi @@ -118,6 +131,8 @@ exppl2e.pdf: exppl2e.dvi dvipdfmx $(FONTMAP) $< platex-en.pdf: platex-en.dvi dvipdfmx $(FONTMAP) $< +pldoc-en.pdf: pldoc-en.dvi + dvipdfmx $(FONTMAP) $< .PHONY: install clean cleanstrip cleanall cleandoc install: diff --git a/Master/texmf-dist/source/platex/base/jclasses.dtx b/Master/texmf-dist/source/platex/base/jclasses.dtx index f4dfefe2902..2582ed42fcf 100644 --- a/Master/texmf-dist/source/platex/base/jclasses.dtx +++ b/Master/texmf-dist/source/platex/base/jclasses.dtx @@ -94,6 +94,7 @@ % \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} +% \changes{v1.8}{2018/07/03}{\cs{today}$B$N%G%U%)%k%H$rOBNq$+$i@>Nq$KJQ99(B} % \fi % % \iffalse @@ -123,7 +124,7 @@ %<11pt&bk>\ProvidesFile{tbk11.clo} %<12pt&bk>\ProvidesFile{tbk12.clo} %</tate> - [2018/02/04 v1.7h + [2018/07/03 v1.8 %<article|report|book> Standard pLaTeX class] %<10pt|11pt|12pt> Standard pLaTeX file (size option)] %<*driver> @@ -4342,8 +4343,11 @@ % \changes{v1.0h}{1996/12/17}{Typo:$BOBNr(B to $BOBNq(B} % |\today|$B%3%^%s%I$N(B`$BG/(B'$B$r!"(B % $B@>Nq$+OBNq$N$I$A$i$G=PNO$9$k$+$r;XDj$9$k%3%^%s%I$G$9!#(B +% 2018$BG/(B7$B7n0J9_$NF|K\8l(B\TeX{}$B3+H/%3%_%e%K%F%#HG(B(v1.8)$B$G$O!"(B +% $B%G%U%)%k%H$rOBNq$G$O$J$/@>Nq$K@_Dj$7$F$$$^$9!#(B +% \changes{v1.8}{2018/07/03}{\cs{today}$B$N%G%U%)%k%H$rOBNq$+$i@>Nq$KJQ99(B} % \begin{macrocode} -\newif\if$B@>Nq(B \$B@>Nq(Bfalse +\newif\if$B@>Nq(B \$B@>Nq(Btrue \def\$B@>Nq(B{\$B@>Nq(Btrue} \def\$BOBNq(B{\$B@>Nq(Bfalse} % \end{macrocode} diff --git a/Master/texmf-dist/source/platex/base/platex.dtx b/Master/texmf-dist/source/platex/base/platex.dtx index e3328e99796..81cc51712e3 100644 --- a/Master/texmf-dist/source/platex/base/platex.dtx +++ b/Master/texmf-dist/source/platex/base/platex.dtx @@ -33,7 +33,7 @@ % % \iffalse %<*driver|pldoc> -\def\eTeX{$\varepsilon$-\pTeX} +\def\eTeX{$\varepsilon$-\TeX} \def\pTeX{p\kern-.15em\TeX} \def\epTeX{$\varepsilon$-\pTeX} \def\pLaTeX{p\kern-.05em\LaTeX} @@ -218,9 +218,9 @@ %\ifJAPANESE % 2010$BG/0J9_!"%"%9%-!<(B\pTeX{}$B$O!"9q:]E*$K9-$/;H$o$l$F$$$k(B\TeX\ Live$B$H$$$&(B % $B%G%#%9%H%j%S%e!<%7%g%s$K<h$j9~$^$l!"$=$3$GFH<+$N2~NI$d;EMMJQ99$,2C$($i$l(B -% $B$F$-$^$7$?!#:G6a$N(B\TeX\ Live$B$d(BW32\TeX{}$B$G$O!"(B\pLaTeX{}$B$b85!9$N(B\pTeX{}$B$G(B -% $B$O$J$/!"$=$N3HD%HG(B\epTeX{}$B$r%(%s%8%s$H$7$FMQ$$$k$h$&$K$J$C$F$$$^$9!#(B -% $B$^$?!"(B\pLaTeX{}$B$N%Y!<%9$G$"$k(B\LaTeX{}$B$b99?7$,?J$a$i$l$F$$$^$9!#(B +% $B$F$-$^$7$?!#:G6a!J(B2011$BG/0J9_!K$N(B\TeX\ Live$B$d(BW32\TeX{}$B$G$O!"(B\pLaTeX{}$B$b(B +% $B85!9$N(B\pTeX{}$B$G$O$J$/!"$=$N3HD%HG(B\epTeX{}$B$r%(%s%8%s$KMQ$$$k$h$&$K$J$C$F(B +% $B$$$^$9!#$^$?!"(B\pLaTeX{}$B$N%Y!<%9$G$"$k(B\LaTeX{}$B$b99?7$,?J$a$i$l$F$$$^$9!#(B % % $B$3$&$7$?N.$l$K$"$o$;$??7$7$$(B\pLaTeX{}$B$H$7$F!"%"%9%-!<HG$+$i(Bfork$B$7$F(B % $BF|K\8l(B\TeX{}$B3+H/%3%_%e%K%F%#(B (Japanese \TeX\ Development Community) $B$,(B @@ -1329,9 +1329,8 @@ all others indicate the places where it is used.} %\fi % \begin{macrocode} %<*shprog> -for f in pldoc.toc pldoc.idx pldoc.glo ; do -if [ -e $f ]; then rm $f; fi -done +%<ja>rm -f pldoc.toc pldoc.idx pldoc.glo +%<en>rm -f pldoc-en.toc pldoc-en.idx pldoc-en.glo % \end{macrocode} %\ifJAPANESE % $B$=$7$F!"(B\file{ltxdoc.cfg}$B$r6u$K$7$^$9!#(B @@ -1349,7 +1348,8 @@ echo "" > ltxdoc.cfg % Now process \file{pldoc.tex}. %\fi % \begin{macrocode} -platex pldoc.tex +%<ja>platex pldoc.tex +%<en>platex -jobname=pldoc-en pldoc.tex % \end{macrocode} %\ifJAPANESE % $B:w0z$HJQ99MzNr$r:n@.$7$^$9!#(B @@ -1380,8 +1380,10 @@ platex pldoc.tex % in dictionaries. (Makeindex does not have this option.) %\fi % \begin{macrocode} -mendex -s gind.ist -d pldoc.dic -o pldoc.ind pldoc.idx -mendex -f -s gglo.ist -o pldoc.gls pldoc.glo +%<ja>mendex -s gind.ist -d pldoc.dic -o pldoc.ind pldoc.idx +%<en>mendex -s gind.ist -d pldoc.dic -o pldoc-en.ind pldoc-en.idx +%<ja>mendex -f -s gglo.ist -o pldoc.gls pldoc.glo +%<en>mendex -f -s gglo.ist -o pldoc-en.gls pldoc-en.glo % \end{macrocode} %\ifJAPANESE % \file{ltxdoc.cfg}$B$NFbMF$r(B|\includeonly{}|$B$K$7!"(B\file{pldoc.tex}$B$r=hM}$7$^$9!#(B @@ -1398,7 +1400,8 @@ mendex -f -s gglo.ist -o pldoc.gls pldoc.glo %\fi % \begin{macrocode} echo "\includeonly{}" > ltxdoc.cfg -platex pldoc.tex +%<ja>platex pldoc.tex +%<en>platex -jobname=pldoc-en pldoc.tex % \end{macrocode} %\ifJAPANESE % $B:G8e$K!":F$S(B\file{ltxdoc.cfg}$B$r6u$K$7$F!"(B\file{pldoc.tex}$B$r=hM}$r$7$^$9!#(B @@ -1410,7 +1413,8 @@ platex pldoc.tex %\fi % \begin{macrocode} echo "" > ltxdoc.cfg -platex pldoc.tex +%<ja>platex pldoc.tex +%<en>platex -jobname=pldoc-en pldoc.tex # EOT %</shprog> % \end{macrocode} @@ -1650,7 +1654,8 @@ exit; % \begin{macrocode} \generate{ \file{dstcheck.pl}{\from{platex.dtx}{plprog}} - \file{mkpldoc.sh}{\from{platex.dtx}{shprog}} + \file{mkpldoc.sh}{\from{platex.dtx}{shprog,ja}} + \file{mkpldoc-en.sh}{\from{platex.dtx}{shprog,en}} } \endbatchfile %</Xins> diff --git a/Master/texmf-dist/source/platex/base/platexrelease.dtx b/Master/texmf-dist/source/platex/base/platexrelease.dtx index dcf030e27eb..de52a354113 100644 --- a/Master/texmf-dist/source/platex/base/platexrelease.dtx +++ b/Master/texmf-dist/source/platex/base/platexrelease.dtx @@ -28,6 +28,9 @@ % (sync with latexrelease.dtx 2017/12/17 v1.0i)} % \changes{v1.0l}{2018/04/06}{Drop an extra period in warning message % (sync with latexrelease.dtx 2018/02/18 v1.0j)} +% \changes{v1.0m}{2018/05/22}{reset \cs{\requestedLaTeXdate} for +% current and latest options +% (sync with latexrelease.dtx 2018/05/08 v1.0k)} % \fi % % \iffalse @@ -37,7 +40,7 @@ \ProvidesFile{platexrelease.dtx} %</driver> %<platexrelease>\ProvidesPackage{platexrelease} - [2018/04/06 v1.0l latexrelease support for pLaTeX Kernel + [2018/05/22 v1.0m latexrelease support for pLaTeX Kernel (including releases up to \platexreleaseversion)] %<*driver> \documentclass{jltxdoc} @@ -215,18 +218,23 @@ % % \Lpack{platexrelease}$B%Q%C%1!<%8$N%*%W%7%g%s$rDj5A$7$^$9!#%3!<%I$O(B % \Lpack{latexrelease}$B$N$b$N$r(Bp\LaTeXe{}$BMQ$K=q$-49$($?$b$N$G$9!#(B +% \changes{v1.0m}{2018/05/22}{reset \cs{\requestedLaTeXdate} for +% current and latest options +% (sync with latexrelease.dtx 2018/05/08 v1.0k)} % \begin{macrocode} \DeclareOption*{% \def\@plIncludeInRelease#1[#2]{\@plIncludeInRele@se{#1}}% \let\requestedplpatchdate\CurrentOption} \DeclareOption{latest}{% - \let\requestedplpatchdate\platexreleaseversion} + \let\requestedplpatchdate\platexreleaseversion + \AtEndOfPackage{\def\requestedpLaTeXdate{0}}} \DeclareOption{current}{% - \let\requestedplpatchdate\pfmtversion} + \let\requestedplpatchdate\pfmtversion + \AtEndOfPackage{\def\requestedpLaTeXdate{0}}} % \end{macrocode} % % \begin{macrocode} -\ExecuteOptions{current} +\let\requestedplpatchdate\pfmtversion \ProcessOptions\relax % \end{macrocode} % @@ -316,6 +324,7 @@ of this package available from CTAN} some critical bugs. We advise you to\MessageBreak select another format date} \plIncludeInRelease{2017/10/28}{\PackageWarning}{pLaTeX Info}% + % * <2018-07-28> % * <2018-05-20> % * <2018-04-01>+2 % * <2018-04-01>+1 diff --git a/Master/texmf-dist/source/platex/base/plfonts.dtx b/Master/texmf-dist/source/platex/base/plfonts.dtx index 5f64044580f..a095566165b 100644 --- a/Master/texmf-dist/source/platex/base/plfonts.dtx +++ b/Master/texmf-dist/source/platex/base/plfonts.dtx @@ -84,13 +84,17 @@ % (sync with ltfinal.dtx 2018/04/08 v2.1d)} % \changes{v1.6p}{2018/04/09}{v1.6o$B$G2C$($?BP:v$r:o=|!#(B % $B;29M!'(Bplvers.dtx 2018/04/09 v1.1l$B$N(B\cs{everyjob}} +% \changes{v1.6q}{2018/07/03}{$B%7%j!<%:(Bb$B$,(Bbx$B$HEy2A$K$J$k$h$&$K@k8@(B} +% \changes{v1.6r}{2018/07/25}{PDF$B$N$7$*$j$K%"%/%;%s%HJ8;z$,4^$^$l$k>l9g$KBP1~(B} +% \changes{v1.6r}{2018/07/25}{\cs{[no]fixcompositeaccent}$B%^%/%mDI2C(B} +% \changes{v1.6r}{2018/07/25}{$B%3!<%I@0M}(B} % \fi % % \iffalse %<*driver> \NeedsTeXFormat{pLaTeX2e} % \fi -\ProvidesFile{plfonts.dtx}[2018/04/09 v1.6p pLaTeX New Font Selection Scheme] +\ProvidesFile{plfonts.dtx}[2018/07/25 v1.6r pLaTeX New Font Selection Scheme] % \iffalse \documentclass{jltxdoc} \GetFileInfo{plfonts.dtx} @@ -671,8 +675,8 @@ {\default@shape}}% \expandafter\let\csname#1-cmd\endcsname\@changed@cmd % \end{macrocode} -% \LaTeXe\ 2018-04-01$B!JM=Dj!K$G!"4{Dj$NF~NO%(%s%3!<%G%#%s%0$,(B -% UTF-8$B$K$J$j$^$9!#$3$l$O!"(B\file{latex.ltx}$B$,(B\file{utf8.def}$B!J=>Mh$O(B +% \LaTeXe\ 2018-04-01$B$G!"4{Dj$N2$J8F~NO%(%s%3!<%G%#%s%0$,(B +% UTF-8$B$K$J$j$^$7$?!#$3$l$O!"(B\file{latex.ltx}$B$,(B\file{utf8.def}$B!J=>Mh$O(B % \LaTeX{}$B%=!<%9$K(B |\usepackage[utf8]{inputenc}| $B$H=q$$$?$H$-$K(B % $BFI$_9~$^$l$F$$$?$b$N!K$rFI$_9~$`$3$H$G<B8=$5$l$F$$$^$9!#(B % \file{utf8.def}$B$O(B |\DeclareFontEncoding@| $B$r:FDj5A$9$k$N$G!"(B @@ -1929,10 +1933,97 @@ % \LaTeXe{}$B$N%+!<%M%k$N%3!<%I$r$=$N$^$^;H$&$H!"(Bp\TeX{}$B$N%Y!<%9%i%$%s(B % $BJd@5NL$,%<%m$G$J$$$H$-$K9g@.J8;z$,$*$+$7$/$J$C$F$$$?$?$a!"BP:v$7$^$9!#(B % +% \begin{macro}{\pltx@saved@oalign} +% |\b{...}|, |\c{...}|, |\d{...}|, |\k{...}|$B$J$I$N9g@.J8;z$r=$@5$9$k$?$a!"(B +% \file{ltplain.dtx}$B$N(B|\oalign|$B$r>e=q$-$7$^$9!#(B +% \begin{macrocode} +%<platexrelease>%\plIncludeInRelease{0000/00/00}{\pltx@saved@oalign} +%<platexrelease>% {Special case! (This block is required for any emulation date)}% +%<*plcore|platexrelease> +% \end{macrocode} +% $B$^$:!"85$N(B\LaTeX{}$B$N%3!<%I$r%3%T!<$7$?$b$N$G$9!#(B +% $B@\F,<-(B|\pltx@saved...|$B$rIU$1$F$*$-$^$9!#(B +% \changes{v1.6r}{2018/07/25}{$B%3!<%IDI2C(B} +% \begin{macrocode} +\def\pltx@saved@oalign#1{\leavevmode\vtop{\baselineskip\z@skip \lineskip.25ex% + \ialign{##\crcr#1\crcr}}} +%</plcore|platexrelease> +%<platexrelease>%\plEndIncludeInRelease +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\pltx@oalign} +% $B<!$K!"(B\pLaTeX{}$B$N?7$7$$%3!<%I$G$9!#(B +% \changes{v1.6r}{2018/07/25}{$B%3!<%IDI2C(B} +% \begin{macrocode} +%<platexrelease>\plIncludeInRelease{2018/07/28}{\pltx@oalign} +%<platexrelease> {Fix for non-zero baselineshift}% +%<*plcore|platexrelease> +\def\pltx@oalign#1{\ifmmode + \leavevmode\vtop{\baselineskip\z@skip \lineskip.25ex% + \ialign{##\crcr#1\crcr}}% +\else + \iftdir\ybaselineshift\tbaselineshift\fi + \m@th$\hbox{\vtop{\baselineskip\z@skip \lineskip.25ex% + \ialign{##\crcr#1\crcr}}}$% +\fi} +%</plcore|platexrelease> +%<platexrelease>\plEndIncludeInRelease +%<platexrelease>\plIncludeInRelease{0000/00/00}{\pltx@oalign} +%<platexrelease> {Fix for non-zero baselineshift}% +%<platexrelease>\let\pltx@oalign\@undefined +%<platexrelease>\plEndIncludeInRelease +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\pltx@saved@ltx@sh@ft} +% |\b{...}|$B$H(B|\d{...}|$B$N9g@.J8;z$r=$@5$9$k$?$a!"(B +% \file{ltplain.dtx}$B$N(B|\ltx@sh@ft|$B$r>e=q$-$7$^$9!#(B +% \begin{macrocode} +%<platexrelease>%\plIncludeInRelease{0000/00/00}{\pltx@saved@ltx@sh@ft} +%<platexrelease>% {Special case! (This block is required for any emulation date)}% +%<*plcore|platexrelease> +% \end{macrocode} +% $B$^$:!"85$N(B\LaTeX{}$B$N%3!<%I$r%3%T!<$7$?$b$N$G$9!#(B +% $B@\F,<-(B|\pltx@saved...|$B$rIU$1$F$*$-$^$9!#(B +% \changes{v1.6r}{2018/07/25}{$B%3!<%IDI2C(B} +% \begin{macrocode} +\def\pltx@saved@ltx@sh@ft #1{% + \dimen@ #1% + \kern \strip@pt + \fontdimen1\font \dimen@ + } % kern by #1 times the current slant +%</plcore|platexrelease> +%<platexrelease>%\plEndIncludeInRelease +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\pltx@ltx@sh@ft} +% $B<!$K!"(B\pLaTeX{}$B$N?7$7$$%3!<%I$G$9!#(B +% \changes{v1.6r}{2018/07/25}{$B%3!<%IDI2C(B} +% \begin{macrocode} +%<platexrelease>\plIncludeInRelease{2018/07/28}{\pltx@ltx@sh@ft} +%<platexrelease> {Fix for non-zero baselineshift}% +%<*plcore|platexrelease> +\def\pltx@ltx@sh@ft #1{% + \ybaselineshift\z@ + \dimen@ #1% + \kern \strip@pt + \fontdimen1\font \dimen@ + } % kern by #1 times the current slant +%</plcore|platexrelease> +%<platexrelease>\plEndIncludeInRelease +%<platexrelease>\plIncludeInRelease{0000/00/00}{\pltx@ltx@sh@ft} +%<platexrelease> {Fix for non-zero baselineshift}% +%<platexrelease>\let\pltx@ltx@sh@ft\@undefined +%<platexrelease>\plEndIncludeInRelease +% \end{macrocode} +% \end{macro} +% % \begin{macro}{\g@tlastchart@} % \TeX\ Live 2015$B$GDI2C$5$l$?(B\cs{lastnodechar}$B$rMxMQ$7$F!"(B -% $B!VD>A0$NJ8;z!W$NId9f0LCV$rF@$k%3!<%I$G$9!#(B\cs{lastnodechar}$B$,L$Dj5A$N>l9g$O(B -% $-1$$B$,JV$j$^$9!#(B +% $B!VD>A0$NJ8;z!W$NId9f0LCV$rF@$k%3!<%I$G$9!#(B +% \cs{lastnodechar}$B$,L$Dj5A$N>l9g$O(B$-1$$B$,JV$j$^$9!#(B % \changes{v1.6c}{2016/06/06}{$B%^%/%mDI2C(B} % \begin{macrocode} %<platexrelease>\plIncludeInRelease{2016/06/10}{\g@tlastchart@} @@ -1953,14 +2044,22 @@ % $B>l9g$KBhFs0z?t$NFbMF$KE83+$5$l!"$=$&$G$J$$>l9g$OBh;00z?t$NFbMF$KE83+$5$l$^$9!#(B % \changes{v1.6c}{2016/06/06}{$B%^%/%mDI2C(B} % \changes{v1.6d}{2016/06/19}{$B%"%/%;%s%HIU$-J8;z$r$5$i$K=$@5(B(forum:1951)} +% \changes{v1.6r}{2018/07/25}{PDF$B$N$7$*$j$K%"%/%;%s%HJ8;z$,4^$^$l$k>l9g$KBP1~(B} % \begin{macrocode} -%<platexrelease>\plIncludeInRelease{2016/06/10}{\pltx@isletter} -%<platexrelease> {Added \pltx@isletter}% +%<platexrelease>\plIncludeInRelease{2018/07/28}{\pltx@isletter} +%<platexrelease> {Support PD1 encoding}% %<*plcore|platexrelease> \def\pltx@mark{\pltx@mark@} \let\pltx@scanstop\relax \long\def\pltx@cond#1\fi{% #1\expandafter\@firstoftwo\else\expandafter\@secondoftwo\fi} +\def\pltx@pdfencA{PD1} +\def\pltx@composite@chkenc{% + \ifx\pltx@pdfencA\f@encoding + \expandafter\@firstoftwo + \else + \expandafter\@secondoftwo + \fi} \long\def\pltx@isletter#1{% \expandafter\pltx@isletter@i#1\pltx@scanstop} \long\def\pltx@isletter@i#1\pltx@scanstop{% @@ -1973,10 +2072,31 @@ \long\def\pltx@isletter@iv#1#2#3\pltx@mark{% \pltx@cond\ifx\pltx@mark#3\pltx@mark\fi{% \pltx@cond{\ifnum0\ifcat A\noexpand#21\fi\ifcat=\noexpand#21\fi>\z@}\fi - {\@firstoftwo}{\@secondoftwo}% - }{\@secondoftwo}} + {\@firstoftwo}{\pltx@composite@chkenc}% + }{\pltx@composite@chkenc}} %</plcore|platexrelease> %<platexrelease>\plEndIncludeInRelease +%<platexrelease>\plIncludeInRelease{2016/06/10}{\pltx@isletter} +%<platexrelease> {Added \pltx@isletter}% +%<platexrelease>\def\pltx@mark{\pltx@mark@} +%<platexrelease>\let\pltx@scanstop\relax +%<platexrelease>\long\def\pltx@cond#1\fi{% +%<platexrelease> #1\expandafter\@firstoftwo\else\expandafter\@secondoftwo\fi} +%<platexrelease>\long\def\pltx@isletter#1{% +%<platexrelease> \expandafter\pltx@isletter@i#1\pltx@scanstop} +%<platexrelease>\long\def\pltx@isletter@i#1\pltx@scanstop{% +%<platexrelease> \pltx@cond\ifx\pltx@mark#1\pltx@mark\fi{\@firstoftwo}% +%<platexrelease> {\pltx@isletter@ii\pltx@scanstop#1\pltx@scanstop{}#1\pltx@mark}} +%<platexrelease>\long\def\pltx@isletter@ii#1\pltx@scanstop#{% +%<platexrelease> \pltx@cond\ifx\pltx@mark#1\pltx@mark\fi% +%<platexrelease> {\pltx@isletter@iii}{\pltx@isletter@iv}} +%<platexrelease>\long\def\pltx@isletter@iii#1\pltx@mark{\@secondoftwo} +%<platexrelease>\long\def\pltx@isletter@iv#1#2#3\pltx@mark{% +%<platexrelease> \pltx@cond\ifx\pltx@mark#3\pltx@mark\fi{% +%<platexrelease> \pltx@cond{\ifnum0\ifcat A\noexpand#21\fi\ifcat=\noexpand#21\fi>\z@}\fi +%<platexrelease> {\@firstoftwo}{\@secondoftwo}% +%<platexrelease> }{\@secondoftwo}} +%<platexrelease>\plEndIncludeInRelease %<platexrelease>\plIncludeInRelease{0000/00/00}{\pltx@isletter} %<platexrelease> {Added \pltx@isletter}% %<platexrelease>\let\pltx@isletter\@undefined @@ -1985,20 +2105,20 @@ % \end{macro} % % \begin{macro}{\@text@composite} -% $B9g@.J8;z$NFbItL?Na$G$9!#(Bv1.6a$B$G8m$C$F(B\LaTeX{}$B$NDj5A$r>e=q$-$7$F$7$^$$$^$7$?(B -% $B$,!"(Bv1.6c$B$G30$7$^$7$?!#(B +% $B9g@.J8;z$NFbItL?Na$G$9!#(B +% v1.6a$B$G8m$C$F(B\LaTeX{}$B$NDj5A$r>e=q$-$7$F$7$^$$$^$7$?$,!"(Bv1.6c$B$G30$7$^$7$?!#(B % \changes{v1.6a}{2016/04/01}{$B%Y!<%9%i%$%sJd@5NL$,(B0$B$G$J$$$H$-$K(B % \cs{AA}$B$J$I0lIt$N9g@.J8;z$,$*$+$7$/$J$k$3$H$KBP1~$9$k$?$a:FDj5A(B} % \changes{v1.6c}{2016/06/06}{v1.6a$B$G$N8m$C$?:FDj5A$r:o=|(B(forum:1941)} % \begin{macrocode} %<platexrelease>\plIncludeInRelease{2016/06/10}{\@text@composite} -%<platexrelease> {Wrong fix for non-zero baselineshift}% +%<platexrelease> {Fix for non-zero baselineshift (wrong)}% %<platexrelease>\def\@text@composite#1#2#3\@text@composite{% %<platexrelease> \expandafter\@text@composite@x %<platexrelease> \csname\string#1-\string#2\endcsname} %<platexrelease>\plEndIncludeInRelease %<platexrelease>\plIncludeInRelease{2016/04/17}{\@text@composite} -%<platexrelease> {Wrong fix for non-zero baselineshift}% +%<platexrelease> {Fix for non-zero baselineshift (wrong)}% %<platexrelease>\def\@text@composite#1#2#3#{% %<platexrelease> \begingroup %<platexrelease> \setbox\z@=\hbox\bgroup% @@ -2007,7 +2127,7 @@ %<platexrelease> \csname\string#1-\string#2\endcsname} %<platexrelease>\plEndIncludeInRelease %<platexrelease>\plIncludeInRelease{0000/00/00}{\@text@composite} -%<platexrelease> {Wrong fix for non-zero baselineshift}% +%<platexrelease> {Fix for non-zero baselineshift (wrong)}% %<platexrelease>\def\@text@composite#1#2#3\@text@composite{% %<platexrelease> \expandafter\@text@composite@x %<platexrelease> \csname\string#1-\string#2\endcsname} @@ -2015,28 +2135,86 @@ % \end{macrocode} % \end{macro} % -% \begin{macro}{\@text@composite@x} -% $B9g@.J8;z$NFbItL?Na$G$9!#(B|\g@tlastchart@|$B$H(B|\pltx@isletter|$B$r;H$$$^$9!#(B -% \changes{v1.6a}{2016/04/01}{$B%Y!<%9%i%$%sJd@5NL$,(B0$B$G$J$$$H$-$K(B -% \cs{AA}$B$J$I0lIt$N9g@.J8;z$,$*$+$7$/$J$k$3$H$X$NBP1~!#(B} -% \changes{v1.6c}{2016/06/06}{v1.6a$B$G$N=$@5$G(B\'e $B$J$IA4$F$N%"%/%;%s%HIU$-J8;z$G(B -% $B<~0O$K(B\cs{xkanjiskip}$B$,F~$i$J$/$J$C$F$$$?$N$r=$@5!#(B} -% \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} +% \begin{macro}{\pltx@saved@text@composite@x} +% $B9g@.J8;z$NFbItL?Na(B|\@text@composite@x|$B$N$?$a$K!"(B2$BDL$j$NDj5A$r=`Hw$7$^$9!#(B % \begin{macrocode} -%<platexrelease>\plIncludeInRelease{2016/07/01}{\@text@composite@x} +%<platexrelease>%\plIncludeInRelease{0000/00/00}{\pltx@saved@text@composite@x} +%<platexrelease>% {Special case! (This block is required for any emulation date)}% +%<*plcore|platexrelease> +% \end{macrocode} +% $B$^$:!"85$N(B\LaTeX{}$B$N%3!<%I$r%3%T!<$7$?$b$N$G$9!#(B +% $B@\F,<-(B|\pltx@saved...|$B$rIU$1$F$*$-$^$9!#(B +% \changes{v1.6r}{2018/07/25}{$B%3!<%I@0M}(B} +% \begin{macrocode} +\def\pltx@saved@text@composite@x#1{% + \ifx#1\relax + \expandafter\@secondoftwo + \else + \expandafter\@firstoftwo + \fi + #1} +%</plcore|platexrelease> +%<platexrelease>%\plEndIncludeInRelease +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\pltx@text@composite@x} +% $B<!$K!"(B\pLaTeX{}$B$N?7$7$$%3!<%I$G$9!#(B|\g@tlastchart@|$B$H(B|\pltx@isletter|$B$r;H$$$^$9!#(B +% \changes{v1.6r}{2018/07/25}{$B%3!<%I@0M}(B} +% \begin{macrocode} +%<platexrelease>\plIncludeInRelease{2018/07/28}{\pltx@text@composite@x} %<platexrelease> {Fix for non-zero baselineshift}% -%<platexrelease>\def\@text@composite@x#1{% -%<platexrelease> \ifx#1\relax -%<platexrelease> \expandafter\@secondoftwo -%<platexrelease> \else -%<platexrelease> \expandafter\@firstoftwo -%<platexrelease> \fi -%<platexrelease> #1} +%<*plcore|platexrelease> +\def\pltx@text@composite@x#1#2{% + \ifx#1\relax + #2% + \else\pltx@isletter{#1}{#1}{% + \begingroup +% \end{macrocode} +% |#1|$B$r<B:]$KAH$s$G$_$F!"Id9f0LCV$N<hF@$r;n$_$^$9!#(B +% $B7k2L$O(B|\@tempcntb|$B$KJ]B8$5$l$^$9!#<hF@$K<:GT$7$?>l9g$O(B$-1$$B$G$9!#(B +% \begin{macrocode} + \setbox\z@\hbox\bgroup + \ybaselineshift\z@\tbaselineshift\z@ + #1% + \g@tlastchart@\@tempcntb + \xdef\pltx@composite@temp{\noexpand\@tempcntb=\the\@tempcntb\relax}% + \aftergroup\pltx@composite@temp + \egroup +% \end{macrocode} +% $B%"%/%;%s%H$,IU$/!VK\BN$NJ8;z!W$,2$J8J8;z$H?dB,$5$l$k>l9g$K$O!"(B +% $B0lC6?t<0%b!<%I$KF~$k$3$H$K$h$C$F(B|\xkanjiskip|$B$,A08e$KF~$k$h$&$K$7$^$9!#(B +% $B$3$3$G$O!"<hF@$K<:GT$7$?>l9g$b2$J8J8;z$G$"$k$H2>Dj$7$F$$$^$9!#(B +% $B$^$?!"Id9f0LCV$N<hF@$K@.8y$7$F$$$?>l9g$O!"$=$N(B|\xspcode|$B$N>uBV$K1~$8$F!"(B +% $B?t<0%b!<%I$NA08e$K(B|\null|$B$rJd$C$F(B|\xkanjiskip|$B$NA^F~$rM^@)$7$^$9!#(B +% \begin{macrocode} + \ifnum\@tempcntb<\@cclvi + \ifnum\@tempcntb>\m@ne + \ifodd\xspcode\@tempcntb\else\leavevmode\null\fi + \fi + \begingroup\m@th$% + \ifx\textbaselineshiftfactor\@undefined\else + \textbaselineshiftfactor\z@\fi + \box\z@ + $\endgroup + \ifnum\@tempcntb>\m@ne + \ifnum\xspcode\@tempcntb<2\null\fi + \fi +% \end{macrocode} +% $B%"%/%;%s%H$,IU$/!VK\BN$NJ8;z!W$,OBJ8J8;z$H?dB,$5$l$k>l9g$K$O!"(B +% $B%Y!<%9%i%$%sJd@5$r9T$o$:$K=PNO$7$^$9!#(B +% \begin{macrocode} + \else + {\ybaselineshift\z@\tbaselineshift\z@#1}% + \fi + \endgroup}% + \fi +} +%</plcore|platexrelease> %<platexrelease>\plEndIncludeInRelease -%<platexrelease>\plIncludeInRelease{2016/06/10}{\@text@composite@x} +%<platexrelease>\plIncludeInRelease{2016/06/10}{\pltx@text@composite@x} %<platexrelease> {Fix for non-zero baselineshift}% -%<platexrelease>\def\@text@composite@x#1#2{% +%<platexrelease>\def\pltx@text@composite@x#1#2{% %<platexrelease> \ifx#1\relax %<platexrelease> #2% %<platexrelease> \else\pltx@isletter{#1}{#1}{% @@ -2075,15 +2253,15 @@ %<platexrelease> \fi\fi %<platexrelease> \else %<platexrelease> \ifdim\@tempdima=\z@{\ybaselineshift\z@\tbaselineshift\z@#1}% -%<platexrelease> \else\lower\@tempdima\box\z@\fi +%<platexrelease> \else\leavevmode\lower\@tempdima\box\z@\fi %<platexrelease> \fi %<platexrelease> \endgroup}% %<platexrelease> \fi %<platexrelease>} %<platexrelease>\plEndIncludeInRelease -%<platexrelease>\plIncludeInRelease{2016/04/17}{\@text@composite@x} +%<platexrelease>\plIncludeInRelease{2016/04/17}{\pltx@text@composite@x} %<platexrelease> {Fix for non-zero baselineshift}% -%<platexrelease>\def\@text@composite@x#1#2{% +%<platexrelease>\def\pltx@text@composite@x#1#2{% %<platexrelease> \ifx#1\relax %<platexrelease> \expandafter\@secondoftwo %<platexrelease> \else @@ -2104,15 +2282,96 @@ %<platexrelease> \box\z@ %<platexrelease> \endgroup} %<platexrelease>\plEndIncludeInRelease -%<platexrelease>\plIncludeInRelease{0000/00/00}{\@text@composite@x} +%<platexrelease>\plIncludeInRelease{0000/00/00}{\pltx@text@composite@x} +%<platexrelease> {Fix for non-zero baselineshift}% +%<platexrelease>\let\pltx@text@composite@x\@undefined +%<platexrelease>\plEndIncludeInRelease +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\fixcompositeaccent} +% \begin{macro}{\nofixcompositeaccent} +% \begin{macro}{\@text@composite@x} +% $B>e5-(B2$BDL$j$NDj5A$N$&$A!"K\Ev$O(B\pLaTeX{}$B$NDj5A$rMQ$$$?$$$N$G$9$,!"(B +% $BA[Dj30$N%(%i!<$,H/@8$9$k$N$rKI$0$?$a!"(B +% $B%G%U%)%k%H$G$O(B\LaTeX{}$B$NDj5A$N$^$^$H$7$F$*$-$^$9!#(B +% $B$=$7$F!"(B|\fixcompositeaccent|$B$,M-8z$J;~$@$1(B\pLaTeX{}$B$NDj5A$rMQ$$$^$9!#(B +% |\nofixcompositeaccent|$B$O$3$NH]Dj$G$9!#(B +% \changes{v1.6r}{2018/07/25}{\cs{[no]fixcompositeaccent}$B%^%/%mDI2C(B} +% \begin{macrocode} +%<platexrelease>%\plIncludeInRelease{0000/00/00}{\@text@composite@x} +%<platexrelease>% {Special case! (This block is required for any emulation date)}% +%<*plcore|platexrelease> +\DeclareRobustCommand\fixcompositeaccent{% + \let\oalign\pltx@oalign + \let\ltx@sh@ft\pltx@ltx@sh@ft + \let\@text@composite@x\pltx@text@composite@x +} +\DeclareRobustCommand\nofixcompositeaccent{% + \let\oalign\pltx@saved@oalign + \let\ltx@sh@ft\pltx@saved@ltx@sh@ft + \let\@text@composite@x\pltx@saved@text@composite@x +} +\nofixcompositeaccent +%</plcore|platexrelease> +%<platexrelease>%\plEndIncludeInRelease +% \end{macrocode} +% \end{macro} +% \end{macro} +% \end{macro} +% +% \begin{macro}{\@text@composite@x} +% $B%(%_%e%l!<%7%g%s@lMQ$N%3!<%I$G$9!#(B +% \changes{v1.6a}{2016/04/01}{$B%Y!<%9%i%$%sJd@5NL$,(B0$B$G$J$$$H$-$K(B +% \cs{AA}$B$J$I0lIt$N9g@.J8;z$,$*$+$7$/$J$k$3$H$X$NBP1~!#(B} +% \changes{v1.6c}{2016/06/06}{v1.6a$B$G$N=$@5$G(B\'e $B$J$IA4$F$N%"%/%;%s%HIU$-J8;z$G(B +% $B<~0O$K(B\cs{xkanjiskip}$B$,F~$i$J$/$J$C$F$$$?$N$r=$@5!#(B} +% \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.6r}{2018/07/25}{$B%3!<%I@0M}(B} +% \begin{macrocode} +%<platexrelease>\plIncludeInRelease{2018/07/28}{\fixcompositeaccent} +%<platexrelease> {Fix for non-zero baselineshift}% +%<platexrelease>\nofixcompositeaccent % force LaTeX original (conditional default) +%<platexrelease>% other commands are actually defined for pLaTeX2e 2018-07-28 +%<platexrelease>\plEndIncludeInRelease +%<platexrelease>\plIncludeInRelease{2016/07/01}{\fixcompositeaccent} +%<platexrelease> {Fix for non-zero baselineshift}% +%<platexrelease>\nofixcompositeaccent % force LaTeX original (always) +%<platexrelease>\let\fixcompositeaccent\@undefined +%<platexrelease>\let\nofixcompositeaccent\@undefined +%<platexrelease>\let\pltx@saved@oalign\@undefined +%<platexrelease>\let\pltx@oalign\@undefined +%<platexrelease>\let\pltx@saved@ltx@sh@ft\@undefined +%<platexrelease>\let\pltx@ltx@sh@ft\@undefined +%<platexrelease>\let\pltx@saved@text@composite@x\@undefined +%<platexrelease>\let\pltx@text@composite@x\@undefined +%<platexrelease>\plEndIncludeInRelease +%<platexrelease>\plIncludeInRelease{2016/04/17}{\fixcompositeaccent} +%<platexrelease> {Fix for non-zero baselineshift}% +%<platexrelease>\fixcompositeaccent % force pLaTeX definition (always) +%<platexrelease>\let\oalign\pltx@saved@oalign % no fix at that time +%<platexrelease>\let\ltx@sh@ft\pltx@saved@ltx@sh@ft % no fix at that time +%<platexrelease>\let\fixcompositeaccent\@undefined +%<platexrelease>\let\nofixcompositeaccent\@undefined +%<platexrelease>\let\pltx@saved@oalign\@undefined +%<platexrelease>\let\pltx@oalign\@undefined +%<platexrelease>\let\pltx@saved@ltx@sh@ft\@undefined +%<platexrelease>\let\pltx@ltx@sh@ft\@undefined +%<platexrelease>\let\pltx@saved@text@composite@x\@undefined +%<platexrelease>\let\pltx@text@composite@x\@undefined +%<platexrelease>\plEndIncludeInRelease +%<platexrelease>\plIncludeInRelease{0000/00/00}{\fixcompositeaccent} %<platexrelease> {Fix for non-zero baselineshift}% -%<platexrelease>\def\@text@composite@x#1{% -%<platexrelease> \ifx#1\relax -%<platexrelease> \expandafter\@secondoftwo -%<platexrelease> \else -%<platexrelease> \expandafter\@firstoftwo -%<platexrelease> \fi -%<platexrelease> #1} +%<platexrelease>\nofixcompositeaccent % force LaTeX original (always) +%<platexrelease>\let\fixcompositeaccent\@undefined +%<platexrelease>\let\nofixcompositeaccent\@undefined +%<platexrelease>\let\pltx@saved@oalign\@undefined +%<platexrelease>\let\pltx@oalign\@undefined +%<platexrelease>\let\pltx@saved@ltx@sh@ft\@undefined +%<platexrelease>\let\pltx@ltx@sh@ft\@undefined +%<platexrelease>\let\pltx@saved@text@composite@x\@undefined +%<platexrelease>\let\pltx@text@composite@x\@undefined %<platexrelease>\plEndIncludeInRelease % \end{macrocode} % \end{macro} @@ -2462,13 +2721,15 @@ %<JY1gt>\ProvidesFile{jy1gt.fd} %<JT1mc>\ProvidesFile{jt1mc.fd} %<JT1gt>\ProvidesFile{jt1gt.fd} -%<JY1mc,JY1gt,JT1mc,JT1gt> [2018/02/04 v1.6l KANJI font defines] +%<JY1mc,JY1gt,JT1mc,JT1gt> [2018/07/03 v1.6q 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.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} +% $B$^$?!"%7%j!<%:(B|b|$B$OF1$8=qBN$N(B|bx|$B$HEy2A$K$J$k$h$&$K@k8@$7$^$9!#(B +% \changes{v1.6q}{2018/07/03}{$B%7%j!<%:(Bb$B$,(Bbx$B$HEy2A$K$J$k$h$&$K@k8@(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 @@ -2488,6 +2749,7 @@ <-> min10 }{} \DeclareFontShape{JY1}{mc}{bx}{n}{<->ssub*gt/m/n}{} +\DeclareFontShape{JY1}{mc}{b}{n}{<->ssub*mc/bx/n}{} %</JY1mc> %<*JT1mc> \DeclareKanjiFamily{JT1}{mc}{} @@ -2498,6 +2760,7 @@ <-> tmin10 }{} \DeclareFontShape{JT1}{mc}{bx}{n}{<->ssub*gt/m/n}{} +\DeclareFontShape{JT1}{mc}{b}{n}{<->ssub*mc/bx/n}{} %</JT1mc> %<*JY1gt> \DeclareKanjiFamily{JY1}{gt}{} @@ -2507,6 +2770,7 @@ <-> goth10 }{} \DeclareFontShape{JY1}{gt}{bx}{n}{<->ssub*gt/m/n}{} +\DeclareFontShape{JY1}{gt}{b}{n}{<->ssub*gt/bx/n}{} %</JY1gt> %<*JT1gt> \DeclareKanjiFamily{JT1}{gt}{} @@ -2516,6 +2780,7 @@ <-> tgoth10 }{} \DeclareFontShape{JT1}{gt}{bx}{n}{<->ssub*gt/m/n}{} +\DeclareFontShape{JT1}{gt}{b}{n}{<->ssub*gt/bx/n}{} %</JT1gt> % \end{macrocode} % diff --git a/Master/texmf-dist/source/platex/base/plnewsc11.tex b/Master/texmf-dist/source/platex/base/plnewsc11.tex new file mode 100644 index 00000000000..2a5ff36713f --- /dev/null +++ b/Master/texmf-dist/source/platex/base/plnewsc11.tex @@ -0,0 +1,94 @@ +%% <2018-07-28> +\documentclass{plnews} + +\publicationyear{2018}% $BH/9TG/(B +\publicationmonth{07}% $BH/9T7n(B +\publicationissue{c11}% $BHV9f(B +\author{$BF|K\8l(B\TeX{}$B3+H/%3%_%e%K%F%#!J(B\texttt{https://texjp.org/}$B!K(B} + +\def\cs#1{\texttt{\char92 #1}} +\def\pTeX{p\kern-.15em\TeX} +\def\eTeX{$\varepsilon$-\TeX} +\def\epTeX{$\varepsilon$-\pTeX} +\def\pLaTeX{p\kern-.05em\LaTeX} +\def\pLaTeXe{p\kern-.05em\LaTeXe} + +\begin{document} + +\maketitle + +$B$3$NJ8=q$O%3%_%e%K%F%#HG(B\pLaTeXe\ \texttt{<2018-07-28>}$B$K$D$$$F!"(B +\pLaTeXe\ \texttt{<2018-05-20>}$B$+$i$N99?72U=j$r$^$H$a$?$b$N$G$9!#(B + + +\section{$BI8=`%/%i%9$N(B\cs{today}$B$r@>Nq$K(B} +\pLaTeX{}$BIUB0$NI8=`%/%i%9(B +(jarticle, jbook, jreport, tarticle, tbook, treport)$B$G$O!"(B +$B$3$l$^$G(B|\today|$BL?Na$GI=<($5$l$kF|IU$N%G%U%)%k%H$r(B +\begin{quote} +\$BOBNq(B\today +\end{quote} +$B$N$h$&$K859f$H$7$F$$$^$7$?!#(B +$B$7$+$7!"J?@.(B31$BG/!J(B2019$BG/!K$K2~85$,M=Dj$5$l$F$$$k$3$H$r5!$K!"(B +$B:#2s$N%j%j!<%9$+$i%G%U%)%k%H$r(B +\begin{quote} +\$B@>Nq(B\today +\end{quote} +$B$N$h$&$J@>Nq$KJQ99$7$^$7$?!#(B +u\pLaTeX{}$BIUB0$N%/%i%9$bF1MM$KJQ99$7$F$$$^$9!#(B + + +\section{$B%7%j!<%:(B\texttt{b}$B$bB@;z$K(B} +\LaTeX{}$BI8=`$G$O!"B@;z(B(|\bfseries|, |\textbf|)$B$r;XDj$9$k$H(B +{\fontseries{bx}\selectfont bold extended} (|bx|)$B$K@Z$jBX$o$j$^$9!#(B + +$B0lJ}!"(B\file{tgtermes}, \file{iwona}$B$J$I$N2$J8%U%)%s%H%Q%C%1!<%8$r(B +$B;H$&$H!"B@;z$,(B{\fontseries{b}\selectfont bold} (|b|)$B$KJQ$o$j$^$9!#(B + +$B=>Mh$N(B(u)\pLaTeX{}$B$G$O!"OBJ8$NB@;z$r%7%j!<%:(B|bx|$B$@$1$K3d$jEv$F!"(B +|b|$B$K$O2?$b@_Dj$7$F$$$^$;$s$G$7$?!#$=$N$?$a!"8e<T$N>l9g$K(B +\begin{quote}\scriptsize +\begin{verbatim} +LaTeX Font Warning: Font shape `JY1/mc/b/n' undefined +(Font) using `JY1/mc/m/n' instead on ... +\end{verbatim} +\end{quote} +$B$N$h$&$J7Y9p$,=P$F!VOBJ8$,B@;z$K$J$i$J$$!W$H$$$&5sF0$G$7$?!#(B +$B:#2s$+$i%7%j!<%:(B|b|$B$K$bOBJ8$NB@;z$r3d$jEv$F!"(B +$BB@;z$K$J$k$h$&$K$7$^$7$?!#(B + + +\section{$B%"%/%;%s%HJ8;z$N:F=$@5(B} +\pLaTeXe\ 2016/04/17$B$+$i(B2016/07/01$B$K$+$1$F!"(B +$B!V%Y!<%9%i%$%sJd@5NL$,%<%m$G$J$$>l9g$K%"%/%;%s%H9g@.J8;z$,Mp$l$k!W(B +$B$H$$$&%P%0$r=$@5$7$h$&$H;n$_$F$$$^$7$?!#(B +$B$3$N;~$O%H%i%V%k$,Aj<!$$$@$?$a!"0lC6A4$F$N%Q%C%A$rE15n$7$?$N(B +$B$G$9$,!J;29M!'(B\file{plnewsc03.tex}$B!K!":#2sJL$NJ}K!$G(B +$B:FEY%Q%C%A$rF3F~$7$^$7$?!#(B +\begin{itemize} +\item \textbf{$B%G%U%)%k%H$G$O=$@5%Q%C%A$OL58z(B}$B$G$9!#(B +\item |\fixcompositeaccent|$BL?Na!Z?7@_![(B\\ + $B$3$NL?Na$rH/9T$9$k$H!"$=$l0J9_$G(B\pLaTeX{}$BMQ=$@5%Q%C%A$,(B + $BM-8z2=$5$l$^$9!#%0%k!<%WFb$GH/9T$5$l$?>l9g$O!"(B + $B$=$N%0%k!<%WFb$G$N$_=$@5%Q%C%A$,M-8z$G$9!#(B +\item |\nofixcompositeaccent|$BL?Na!Z?7@_![(B\\ + |\fixcompositeaccent|$B$N8z2L$rBG$A>C$7!"(B + $B85$N(B\LaTeX{}$B$NDj5A$KLa$7$^$9!#(B +\end{itemize} +|\fixcompositeaccent|$BL?Na$rH/9T$9$k$H!"(B +$B!V%Y!<%9%i%$%sJd@5NL$,%<%m$G$J$$>l9g$N%"%/%;%s%H$N9b$5!W(B +$B!V<~0O$NOBJ8J8;z$H$N4V$K<+F0A^F~$5$l$k(B|\xkanjiskip|$B!W$J$I$N(B +$B5sF0$,$[$\4|BTDL$j$K$J$j$^$9$,!"(B +$B0lIt(B\LaTeX{}$B$H$O0[$J$k5sF0!J7Y9p!&%(%i!<!K$K$J$k>l9g$,$"$j$^$9!#(B +$BI,MW$K1~$8$F(B|\fixcompositeaccent|$B$rM-8z2=!&L58z2=$9$k$3$H$G(B +$BBP=h$7$F$/$@$5$$!#(B + + +\section{$B3+H/HG$N%F%9%H$N$*4j$$(B} +$B%P%0Js9p$d$40U8+!"3+H/HG$NF~<j$O(BGitHub$B$X!#(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 16436150344..76bdf982964 100644 --- a/Master/texmf-dist/source/platex/base/plvers.dtx +++ b/Master/texmf-dist/source/platex/base/plvers.dtx @@ -169,7 +169,7 @@ %</plcore> %<platexrelease>\edef\platexreleaseversion %<*plcore|platexrelease> - {2018-05-20} + {2018-07-28} %</plcore|platexrelease> %<*plcore> \def\ppatch@level{0} @@ -303,10 +303,8 @@ % % \LaTeXe{}$B$N%P!<%8%g%sI=<($N8e$K;D$C$F$$$k%3!<%I$r!"(B % $B$=$N$^$^(B|\everyjob|$B$KDI2C$7$^$9!#(B -% $B$3$NCf$K$O!"(B|\typeout{Babel version}|$B$b4^$^$l$k(B -% $B$O$:$G$9!J(Bp\LaTeX{}$B$OFH<+$N%O%$%U%M!<%7%g%s!&%Q%?!<%s$rDj5A$7$F(B -% $B$$$J$$$N$G!"(B\TeX\ Live$B$NI8=`E*%$%s%9%H!<%k$G$OBe$o$j$K(B\LaTeX{}$B$,(B -% $BFI$_9~$s$G$$$k(BBabel$B%Q%C%1!<%8$N(B\file{hyphen.cfg}$B$,E,MQ$5$l$k$?$a!K!#(B +% ^^A Babel v3.20$B$^$G$O$3$NCf$K(B|\typeout{Babel version}|$B$b4^$^$l$F(B +% ^^A $B$$$^$7$?$,!"(BBabel v3.21$B$+$i$O$3$N%P%J!<I=<($OL5$/$J$C$?$h$&$G$9!#(B % \changes{v1.0w}{2016/05/12}{$B5/F0;~$NJ8;zNs$KF~$l$k(BBabel$B$N%P!<%8%g%s$r(B % $B85$N(B\LaTeX{}$B$N%P%J!<$+$i<hF@$9$k%3!<%I$r(B\file{platex.ini}$B$+$i<h$jF~$l$?(B} % \begin{macrocode} diff --git a/Master/texmf-dist/tex/platex/base/exppl2e.sty b/Master/texmf-dist/tex/platex/base/exppl2e.sty index b3b29d9ae21..a07dcc657aa 100644 --- a/Master/texmf-dist/tex/platex/base/exppl2e.sty +++ b/Master/texmf-dist/tex/platex/base/exppl2e.sty @@ -34,7 +34,7 @@ % case 1: This file must be a normal package \NeedsTeXFormat{pLaTeX2e} \ProvidesPackage{exppl2e} - [2018/05/20 v1.0v Experimental pLaTeX2e features] + [2018/07/28 v1.0w Experimental pLaTeX2e features] \PackageWarningNoLine{exppl2e}{% This is the unstable, experimental part of pLaTeX2e.\MessageBreak This package may contain:\MessageBreak @@ -124,149 +124,6 @@ % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % -% \section{PDF$B$N%V%C%/%^!<%/$H%"%/%;%s%HJ8;z(B} -% -% \begin{macro}{\pltx@isletter} -% \changes{v???}{????/??/??}{PDF$B$N$7$*$j$K%"%/%;%s%HJ8;z$,4^$^$l$k>l9g$KBP1~(B} -% \begin{macrocode} -%<platexrelease>\plIncludeInRelease{????/??/??}{\pltx@isletter} -%<platexrelease> {Support PD1 encoding}% -%<*plcore|platexrelease> -\def\pltx@mark{\pltx@mark@} -\let\pltx@scanstop\relax -\long\def\pltx@cond#1\fi{% - #1\expandafter\@firstoftwo\else\expandafter\@secondoftwo\fi} -\def\pltx@pdfencA{PD1} -\def\pltx@composite@chkenc{% - \ifx\pltx@pdfencA\f@encoding - \expandafter\@firstoftwo - \else - \expandafter\@secondoftwo - \fi} -\long\def\pltx@isletter#1{% - \expandafter\pltx@isletter@i#1\pltx@scanstop} -\long\def\pltx@isletter@i#1\pltx@scanstop{% - \pltx@cond\ifx\pltx@mark#1\pltx@mark\fi{\@firstoftwo}% - {\pltx@isletter@ii\pltx@scanstop#1\pltx@scanstop{}#1\pltx@mark}} -\long\def\pltx@isletter@ii#1\pltx@scanstop#{% - \pltx@cond\ifx\pltx@mark#1\pltx@mark\fi% - {\pltx@isletter@iii}{\pltx@isletter@iv}} -\long\def\pltx@isletter@iii#1\pltx@mark{\@secondoftwo} -\long\def\pltx@isletter@iv#1#2#3\pltx@mark{% - \pltx@cond\ifx\pltx@mark#3\pltx@mark\fi{% - \pltx@cond{\ifnum0\ifcat A\noexpand#21\fi\ifcat=\noexpand#21\fi>\z@}\fi - {\@firstoftwo}{\pltx@composite@chkenc}% - }{\pltx@composite@chkenc}} -%</plcore|platexrelease> -%<platexrelease>\plEndIncludeInRelease -%<platexrelease>\plIncludeInRelease{2016/06/10}{\pltx@isletter} -%<platexrelease> {Added \pltx@isletter}% -%<platexrelease>\def\pltx@mark{\pltx@mark@} -%<platexrelease>\let\pltx@scanstop\relax -%<platexrelease>\long\def\pltx@cond#1\fi{% -%<platexrelease> #1\expandafter\@firstoftwo\else\expandafter\@secondoftwo\fi} -%<platexrelease>\long\def\pltx@isletter#1{% -%<platexrelease> \expandafter\pltx@isletter@i#1\pltx@scanstop} -%<platexrelease>\long\def\pltx@isletter@i#1\pltx@scanstop{% -%<platexrelease> \pltx@cond\ifx\pltx@mark#1\pltx@mark\fi{\@firstoftwo}% -%<platexrelease> {\pltx@isletter@ii\pltx@scanstop#1\pltx@scanstop{}#1\pltx@mark}} -%<platexrelease>\long\def\pltx@isletter@ii#1\pltx@scanstop#{% -%<platexrelease> \pltx@cond\ifx\pltx@mark#1\pltx@mark\fi% -%<platexrelease> {\pltx@isletter@iii}{\pltx@isletter@iv}} -%<platexrelease>\long\def\pltx@isletter@iii#1\pltx@mark{\@secondoftwo} -%<platexrelease>\long\def\pltx@isletter@iv#1#2#3\pltx@mark{% -%<platexrelease> \pltx@cond\ifx\pltx@mark#3\pltx@mark\fi{% -%<platexrelease> \pltx@cond{\ifnum0\ifcat A\noexpand#21\fi\ifcat=\noexpand#21\fi>\z@}\fi -%<platexrelease> {\@firstoftwo}{\@secondoftwo}% -%<platexrelease> }{\@secondoftwo}} -%<platexrelease>\plEndIncludeInRelease -% \end{macrocode} -% \end{macro} -% -% \begin{macro}{\@text@composite@x} -% \changes{v???}{????/??/??}{v1.6e$B$G$$$C$?$s%Q%C%A$r=|5n$7$?%3!<%I$r:FF3F~(B} -% \begin{macrocode} -%<platexrelease>\plIncludeInRelease{????/??/??}{\@text@composite@x} -%<platexrelease> {Fix for non-zero baselineshift}% -%<*plcore|platexrelease> -\def\@text@composite@x#1#2{% - \ifx#1\relax - #2% - \else\pltx@isletter{#1}{#1}{% - \begingroup - \setbox\z@\hbox\bgroup% - \ybaselineshift\z@\tbaselineshift\z@ - #1% - \g@tlastchart@\@tempcntb - \xdef\pltx@composite@temp{\noexpand\@tempcntb=\the\@tempcntb\relax}% - \aftergroup\pltx@composite@temp - \egroup -% \end{macrocode} -% \begin{macrocode} - \ifnum\@tempcntb<\z@ - \@tempdima=\iftdir - \ifmdir - \ifmmode\tbaselineshift\else\ybaselineshift\fi - \else - \tbaselineshift - \fi - \else - \ybaselineshift - \fi - \@tempcntb=\@cclvi - \else\@tempdima=\z@ - \fi -% \end{macrocode} -% $B%"%/%;%s%H$,IU$/!VK\BN$NJ8;z!W$,2$J8J8;z$H?dB,$5$l$k>l9g$K$O!"(B -% $B0lC6?t<0%b!<%I$KF~$k$3$H$K$h$C$F(B\cs{xkanjiskip}$B$,A08e$KF~$k$h$&$K$7$^$9!#(B -% $BI,MW$J$i!"?t<0%b!<%I$NA08e$K(B\cs{null}$B$rJd$C$F(B\cs{xkanjiskip}$B$NA^F~$rM^@)$7$^$9!#(B -% \begin{macrocode} - \ifnum\@tempcntb<\@cclvi - \ifnum\@tempcntb>\m@ne\ifnum\@tempcntb<\@cclvi - \ifodd\xspcode\@tempcntb\else\leavevmode\hbox{}\fi - \fi\fi - \begingroup\mathsurround\z@$% - \ifx\textbaselineshiftfactor\@undefined\else - \textbaselineshiftfactor\z@\fi - \box\z@ - $\endgroup% - \ifnum\@tempcntb>\m@ne\ifnum\@tempcntb<\@cclvi - \ifnum\xspcode\@tempcntb<2\hbox{}\fi - \fi\fi -% \end{macrocode} -% \begin{macrocode} - \else - \ifdim\@tempdima=\z@{\ybaselineshift\z@\tbaselineshift\z@#1}% - \else\leavevmode\lower\@tempdima\box\z@\fi - \fi - \endgroup}% - \fi -} -%</plcore|platexrelease> -%<platexrelease>\plEndIncludeInRelease -% \end{macrocode} -% \end{macro} -% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% -% \section{$B5SCm$N9g0uD>8e$G$N2~9T$r5v2D(B} -% -% p\LaTeXe{}$B%+!<%M%k(B(2016/09/03)$B$KF3F~$7$?$?$a:o=|!#(B -% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% -% \section{$B;YCl(B} -% -% p\LaTeXe{}$B%+!<%M%k(B(2017/04/08)$B$KF3F~$7$?$?$a:o=|!#(B -% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% -% \section{e-p\TeX{}$B$G$N(BFAM256$B%Q%C%A$NMxMQ(B} -% -% p\LaTeXe{}$B%+!<%M%k(B(2016/11/29)$B$KF3F~$7$?$?$a:o=|!#(B -% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% % \section{$B2~9T(B} % % $B6/@)2~9T(B|\\|$B$H(B|\par|$B$,O"B3$7$?>l9g$N5sF0$K$D$$$F$O0J2<$N$H$*$jJ]N1Cf!#(B @@ -344,20 +201,14 @@ % \end{macrocode} % \end{macro} % -% $B9TF,6XB'J8;z$NA0$G$N(B|\linebreak|$B$N5sF0$N=$@5$O!"(B -% p\LaTeXe{}$B%+!<%M%k(B(2017/05/05)$B$KF3F~$7$?$?$a:o=|!#(B -% -% $B>e5-$N=$@5$K$h$j(B|\nolinebreak|$B$G(B|\(x)kanjiskip|$B$,(B -% $BF~$i$J$/$J$C$F$$$?%P%0$N=$@5$O!"(B -% p\LaTeXe{}$B%+!<%M%k(B(2017/07/29+1)$B$KF3F~$7$?$?$a:o=|!#(B +% |\linebreak|$B$N5sF0$N=$@5$O!"%P%0$,Aj<!$$$@$?$a<h$j$d$a$F$$$^$9!#(B % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % % \section{$BAj8_;2>H(B} % -% p\LaTeXe{}$B%+!<%M%k(B(2017/04/08)$B$KF3F~$7$?$?$a:o=|!#(B -% -% $B$5$i$J$k=$@5$b(Bp\LaTeXe{}$B%+!<%M%k(B(2017/10/28)$B$KF3F~$7$?$?$a:o=|!#(B +% p\LaTeXe{}$B%+!<%M%k(B(2017/10/28)$B$N=$@5$K2C$(!"0J2<$N=$@5$r8!F$Cf$G$9$,!"(B +% $B8=;~E@$G$OJ]N1$7$F$$$^$9!#(B % % \begin{macro}{\@setref@} % $B$5$i$K!";2>H$7$?7k2L$,!V6u!W$N>l9g(B @@ -381,59 +232,81 @@ % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % -% \section{$B5SCm$H%\%H%`%U%m!<%H$N=g=x$*$h$S?bD>0LCV(B} +% \section{$B5SCm$N9g0uD>8e$G$N2~9T$r5v2D(B} % -% p\LaTeXe{}$B%+!<%M%k(B(2017/04/08)$B$KF3F~$7$?$?$a:o=|!#(B +% 2016/09/03$B$KF3F~:Q$_!#(B % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % -% \section{$B2<@~%^%/%m(B} +% \section{e-p\TeX{}$B$G$N(BFAM256$B%Q%C%A$NMxMQ(B} % -% p\LaTeXe{}$B%+!<%M%k(B(2017/04/08)$B$KF3F~$7$?$?$a:o=|!#(B +% 2016/11/29$B$KF3F~:Q$_!#(B % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % -% \section{verbatim$B$H%O%$%U%M!<%7%g%s(B} +% \section{$B;YCl(B} % -% p\LaTeXe{}$B%+!<%M%k(B(2017/04/08)$B$KF3F~$7$?$?$a:o=|!#(B +% 2017/04/08$B$KF3F~:Q$_!#(B % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % -% \section{verb$B$NKAF,$N%9%Z!<%9(B} +% \section{$B5SCm$H%\%H%`%U%m!<%H$N=g=x$*$h$S?bD>0LCV(B} % -% p\LaTeXe{}$B%+!<%M%k(B(2017/10/28)$B$KF3F~$7$?$?$a:o=|!#(B +% 2017/04/08$B$KF3F~:Q$_!#(B % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % -% \subsection{$BD>A0$N(BJFM$BM3Mh%9%Z!<%9$N:o=|!Z%3%_%e%K%F%#HGFH<+![(B} +% \section{\cs{textunderscore}$B$N%Y!<%9%i%$%sJd@5(B} % -% p\LaTeXe{}$B%+!<%M%k(B(2018/03/09)$B$KF3F~$7$?$?$a:o=|!#(B +% 2017/04/08$B$KF3F~:Q$_!#(B % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % -% \section{tabular$B4D6-$N%;%kFb$N(BJFM$B%0%k!=(B} +% \section{verbatim$B$H%O%$%U%M!<%7%g%s(B} +% +% 2017/04/08$B$KF3F~:Q$_!#(B % -% p\LaTeXe{}$B%+!<%M%k(B(2017/07/29)$B$KF3F~$7$?$?$a:o=|!#(B +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +% \section{\cs{verb}$B$NKAF,$N%9%Z!<%9(B} % -% $B$5$i$J$k=$@5$b(Bp\LaTeXe{}$B%+!<%M%k(B(2018/03/09)$B$KF3F~$7$?$?$a:o=|!#(B +% 2017/10/28$B$KF3F~:Q$_!#(B % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % % \section{tabbing$B4D6-$N9TKAF,$N(BJFM$B%0%k!=(B} % -% p\LaTeXe{}$B%+!<%M%k(B(2017/10/28)$B$KF3F~$7$?$?$a:o=|!#(B +% 2017/10/28$B$KF3F~:Q$_!#(B % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % % \section{\cs{inhibitglue}$B$N4JN,7A(B} % -% p\LaTeXe{}$B%+!<%M%k(B(2017/10/28)$B$KF3F~$7$?$?$a:o=|!#(B +% 2017/10/28$B$KF3F~:Q$_!#(B % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % % \section{$B%$%?%j%C%/Jd@5$H(B\cs{xkanjiskip}} % -% p\LaTeXe{}$B%+!<%M%k(B(2017/10/28)$B$KF3F~$7$?$?$a:o=|!#(B +% 2017/10/28$B$KF3F~:Q$_!#(B +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +% \subsection{$BD>A0$N(BJFM$BM3Mh%9%Z!<%9$N:o=|!Z%3%_%e%K%F%#HGFH<+![(B} +% +% 2018/03/09$B$KF3F~:Q$_!#(B +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +% \section{tabular$B4D6-$N%;%kFb$N(BJFM$B%0%k!=(B} +% +% 2018/03/09$B$KF3F~:Q$_!#(B +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +% \section{PDF$B$N%V%C%/%^!<%/$H%"%/%;%s%HJ8;z(B} +% +% 2018/07/28$B$KF3F~:Q$_!#(B % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % diff --git a/Master/texmf-dist/tex/platex/base/jarticle.cls b/Master/texmf-dist/tex/platex/base/jarticle.cls index ad7dda0cd24..d20bc4f79ce 100644 --- a/Master/texmf-dist/tex/platex/base/jarticle.cls +++ b/Master/texmf-dist/tex/platex/base/jarticle.cls @@ -15,7 +15,7 @@ %% File: jclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesClass{jarticle} - [2018/02/04 v1.7h + [2018/07/03 v1.8 Standard pLaTeX class] \newcounter{@paper} \newif\if@landscape \@landscapefalse @@ -764,7 +764,7 @@ \kern2.6\p@} \newcommand\@makefntext[1]{\parindent 1em \noindent\hb@xt@ 1.8em{\hss\@makefnmark}#1} -\newif\if$B@>Nq(B \$B@>Nq(Bfalse +\newif\if$B@>Nq(B \$B@>Nq(Btrue \def\$B@>Nq(B{\$B@>Nq(Btrue} \def\$BOBNq(B{\$B@>Nq(Bfalse} \newcount\heisei \heisei\year \advance\heisei-1988\relax diff --git a/Master/texmf-dist/tex/platex/base/jbk10.clo b/Master/texmf-dist/tex/platex/base/jbk10.clo index db8f59405f2..acd70a73140 100644 --- a/Master/texmf-dist/tex/platex/base/jbk10.clo +++ b/Master/texmf-dist/tex/platex/base/jbk10.clo @@ -15,7 +15,7 @@ %% File: jclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{jbk10.clo} - [2018/02/04 v1.7h + [2018/07/03 v1.8 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 e948cdc37b2..cccc01a445f 100644 --- a/Master/texmf-dist/tex/platex/base/jbk11.clo +++ b/Master/texmf-dist/tex/platex/base/jbk11.clo @@ -15,7 +15,7 @@ %% File: jclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{jbk11.clo} - [2018/02/04 v1.7h + [2018/07/03 v1.8 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 c3d78b9d9c6..5c17be75076 100644 --- a/Master/texmf-dist/tex/platex/base/jbk12.clo +++ b/Master/texmf-dist/tex/platex/base/jbk12.clo @@ -15,7 +15,7 @@ %% File: jclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{jbk12.clo} - [2018/02/04 v1.7h + [2018/07/03 v1.8 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 9d8c8f0a0ab..30d6a50f3f7 100644 --- a/Master/texmf-dist/tex/platex/base/jbook.cls +++ b/Master/texmf-dist/tex/platex/base/jbook.cls @@ -15,7 +15,7 @@ %% File: jclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesClass{jbook} - [2018/02/04 v1.7h + [2018/07/03 v1.8 Standard pLaTeX class] \newcounter{@paper} \newif\if@landscape \@landscapefalse @@ -867,7 +867,7 @@ \@addtoreset{footnote}{chapter} \newcommand\@makefntext[1]{\parindent 1em \noindent\hb@xt@ 1.8em{\hss\@makefnmark}#1} -\newif\if$B@>Nq(B \$B@>Nq(Bfalse +\newif\if$B@>Nq(B \$B@>Nq(Btrue \def\$B@>Nq(B{\$B@>Nq(Btrue} \def\$BOBNq(B{\$B@>Nq(Bfalse} \newcount\heisei \heisei\year \advance\heisei-1988\relax diff --git a/Master/texmf-dist/tex/platex/base/jreport.cls b/Master/texmf-dist/tex/platex/base/jreport.cls index 2979b63fffe..c09e5eddbc9 100644 --- a/Master/texmf-dist/tex/platex/base/jreport.cls +++ b/Master/texmf-dist/tex/platex/base/jreport.cls @@ -15,7 +15,7 @@ %% File: jclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesClass{jreport} - [2018/02/04 v1.7h + [2018/07/03 v1.8 Standard pLaTeX class] \newcounter{@paper} \newif\if@landscape \@landscapefalse @@ -863,7 +863,7 @@ \@addtoreset{footnote}{chapter} \newcommand\@makefntext[1]{\parindent 1em \noindent\hb@xt@ 1.8em{\hss\@makefnmark}#1} -\newif\if$B@>Nq(B \$B@>Nq(Bfalse +\newif\if$B@>Nq(B \$B@>Nq(Btrue \def\$B@>Nq(B{\$B@>Nq(Btrue} \def\$BOBNq(B{\$B@>Nq(Bfalse} \newcount\heisei \heisei\year \advance\heisei-1988\relax diff --git a/Master/texmf-dist/tex/platex/base/jsize10.clo b/Master/texmf-dist/tex/platex/base/jsize10.clo index 159b590f2e7..c408ff5ae1d 100644 --- a/Master/texmf-dist/tex/platex/base/jsize10.clo +++ b/Master/texmf-dist/tex/platex/base/jsize10.clo @@ -15,7 +15,7 @@ %% File: jclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{jsize10.clo} - [2018/02/04 v1.7h + [2018/07/03 v1.8 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 b3e8cdb8b43..d1f4e3f32c8 100644 --- a/Master/texmf-dist/tex/platex/base/jsize11.clo +++ b/Master/texmf-dist/tex/platex/base/jsize11.clo @@ -15,7 +15,7 @@ %% File: jclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{jsize11.clo} - [2018/02/04 v1.7h + [2018/07/03 v1.8 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 62cb93d187a..e7e845e097e 100644 --- a/Master/texmf-dist/tex/platex/base/jsize12.clo +++ b/Master/texmf-dist/tex/platex/base/jsize12.clo @@ -15,7 +15,7 @@ %% File: jclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{jsize12.clo} - [2018/02/04 v1.7h + [2018/07/03 v1.8 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 29bc547fc04..7786551eb1a 100644 --- a/Master/texmf-dist/tex/platex/base/jt1gt.fd +++ b/Master/texmf-dist/tex/platex/base/jt1gt.fd @@ -14,7 +14,7 @@ %% %% File: plfonts.dtx \ProvidesFile{jt1gt.fd} - [2018/02/04 v1.6l KANJI font defines] + [2018/07/03 v1.6q 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 @@ -22,6 +22,7 @@ <-> tgoth10 }{} \DeclareFontShape{JT1}{gt}{bx}{n}{<->ssub*gt/m/n}{} +\DeclareFontShape{JT1}{gt}{b}{n}{<->ssub*gt/bx/n}{} \endinput %% %% End of file `jt1gt.fd'. diff --git a/Master/texmf-dist/tex/platex/base/jt1mc.fd b/Master/texmf-dist/tex/platex/base/jt1mc.fd index 3fba2724099..881002be513 100644 --- a/Master/texmf-dist/tex/platex/base/jt1mc.fd +++ b/Master/texmf-dist/tex/platex/base/jt1mc.fd @@ -14,7 +14,7 @@ %% %% File: plfonts.dtx \ProvidesFile{jt1mc.fd} - [2018/02/04 v1.6l KANJI font defines] + [2018/07/03 v1.6q KANJI font defines] \DeclareKanjiFamily{JT1}{mc}{} \DeclareRelationFont{JT1}{mc}{m}{}{OT1}{cmr}{m}{} \DeclareRelationFont{JT1}{mc}{bx}{}{OT1}{cmr}{bx}{} @@ -23,6 +23,7 @@ <-> tmin10 }{} \DeclareFontShape{JT1}{mc}{bx}{n}{<->ssub*gt/m/n}{} +\DeclareFontShape{JT1}{mc}{b}{n}{<->ssub*mc/bx/n}{} \endinput %% %% End of file `jt1mc.fd'. diff --git a/Master/texmf-dist/tex/platex/base/jy1gt.fd b/Master/texmf-dist/tex/platex/base/jy1gt.fd index 2d6943e5862..1a209828462 100644 --- a/Master/texmf-dist/tex/platex/base/jy1gt.fd +++ b/Master/texmf-dist/tex/platex/base/jy1gt.fd @@ -14,7 +14,7 @@ %% %% File: plfonts.dtx \ProvidesFile{jy1gt.fd} - [2018/02/04 v1.6l KANJI font defines] + [2018/07/03 v1.6q 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 @@ -22,6 +22,7 @@ <-> goth10 }{} \DeclareFontShape{JY1}{gt}{bx}{n}{<->ssub*gt/m/n}{} +\DeclareFontShape{JY1}{gt}{b}{n}{<->ssub*gt/bx/n}{} \endinput %% %% End of file `jy1gt.fd'. diff --git a/Master/texmf-dist/tex/platex/base/jy1mc.fd b/Master/texmf-dist/tex/platex/base/jy1mc.fd index 0fd86603a06..00cd00e1b08 100644 --- a/Master/texmf-dist/tex/platex/base/jy1mc.fd +++ b/Master/texmf-dist/tex/platex/base/jy1mc.fd @@ -14,7 +14,7 @@ %% %% File: plfonts.dtx \ProvidesFile{jy1mc.fd} - [2018/02/04 v1.6l KANJI font defines] + [2018/07/03 v1.6q KANJI font defines] \DeclareKanjiFamily{JY1}{mc}{} \DeclareRelationFont{JY1}{mc}{m}{}{OT1}{cmr}{m}{} \DeclareRelationFont{JY1}{mc}{bx}{}{OT1}{cmr}{bx}{} @@ -23,6 +23,7 @@ <-> min10 }{} \DeclareFontShape{JY1}{mc}{bx}{n}{<->ssub*gt/m/n}{} +\DeclareFontShape{JY1}{mc}{b}{n}{<->ssub*mc/bx/n}{} \endinput %% %% End of file `jy1mc.fd'. diff --git a/Master/texmf-dist/tex/platex/base/platexrelease.sty b/Master/texmf-dist/tex/platex/base/platexrelease.sty index 0dcc1e3ac2c..aac95a71650 100644 --- a/Master/texmf-dist/tex/platex/base/platexrelease.sty +++ b/Master/texmf-dist/tex/platex/base/platexrelease.sty @@ -18,7 +18,7 @@ \edef\p@known@latexreleaseversion {2018-04-01} \edef\platexreleaseversion - {2018-05-20} + {2018-07-28} \newif\if@plincludeinrelease \@plincludeinreleasefalse \def\plIncludeInRelease#1{% @@ -68,7 +68,7 @@ %% File: platexrelease.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesPackage{platexrelease} - [2018/04/06 v1.0l latexrelease support for pLaTeX Kernel + [2018/05/22 v1.0m latexrelease support for pLaTeX Kernel (including releases up to \platexreleaseversion)] \RequirePackageWithOptions{latexrelease} \ifnum\expandafter\@parse@version\latexreleaseversion//00\@nil @@ -81,10 +81,12 @@ \def\@plIncludeInRelease#1[#2]{\@plIncludeInRele@se{#1}}% \let\requestedplpatchdate\CurrentOption} \DeclareOption{latest}{% - \let\requestedplpatchdate\platexreleaseversion} + \let\requestedplpatchdate\platexreleaseversion + \AtEndOfPackage{\def\requestedpLaTeXdate{0}}} \DeclareOption{current}{% - \let\requestedplpatchdate\pfmtversion} -\ExecuteOptions{current} + \let\requestedplpatchdate\pfmtversion + \AtEndOfPackage{\def\requestedpLaTeXdate{0}}} +\let\requestedplpatchdate\pfmtversion \ProcessOptions\relax \def\reserved@a{% \edef\requestedpLaTeXdate{\the\count@}% @@ -131,6 +133,7 @@ of this package available from CTAN} some critical bugs. We advise you to\MessageBreak select another format date} \plIncludeInRelease{2017/10/28}{\PackageWarning}{pLaTeX Info}% + % * <2018-07-28> % * <2018-05-20> % * <2018-04-01>+2 % * <2018-04-01>+1 @@ -401,6 +404,47 @@ of this package available from CTAN} \iftdir\raise-\tbaselineshift\fi \vbox{\hrule\@width.3em}} \plEndIncludeInRelease +%\plIncludeInRelease{0000/00/00}{\pltx@saved@oalign} +% {Special case! (This block is required for any emulation date)}% +\def\pltx@saved@oalign#1{\leavevmode\vtop{\baselineskip\z@skip \lineskip.25ex% + \ialign{##\crcr#1\crcr}}} +%\plEndIncludeInRelease +\plIncludeInRelease{2018/07/28}{\pltx@oalign} + {Fix for non-zero baselineshift}% +\def\pltx@oalign#1{\ifmmode + \leavevmode\vtop{\baselineskip\z@skip \lineskip.25ex% + \ialign{##\crcr#1\crcr}}% +\else + \iftdir\ybaselineshift\tbaselineshift\fi + \m@th$\hbox{\vtop{\baselineskip\z@skip \lineskip.25ex% + \ialign{##\crcr#1\crcr}}}$% +\fi} +\plEndIncludeInRelease +\plIncludeInRelease{0000/00/00}{\pltx@oalign} + {Fix for non-zero baselineshift}% +\let\pltx@oalign\@undefined +\plEndIncludeInRelease +%\plIncludeInRelease{0000/00/00}{\pltx@saved@ltx@sh@ft} +% {Special case! (This block is required for any emulation date)}% +\def\pltx@saved@ltx@sh@ft #1{% + \dimen@ #1% + \kern \strip@pt + \fontdimen1\font \dimen@ + } % kern by #1 times the current slant +%\plEndIncludeInRelease +\plIncludeInRelease{2018/07/28}{\pltx@ltx@sh@ft} + {Fix for non-zero baselineshift}% +\def\pltx@ltx@sh@ft #1{% + \ybaselineshift\z@ + \dimen@ #1% + \kern \strip@pt + \fontdimen1\font \dimen@ + } % kern by #1 times the current slant +\plEndIncludeInRelease +\plIncludeInRelease{0000/00/00}{\pltx@ltx@sh@ft} + {Fix for non-zero baselineshift}% +\let\pltx@ltx@sh@ft\@undefined +\plEndIncludeInRelease \plIncludeInRelease{2016/06/10}{\g@tlastchart@} {Added \g@tlastchart@}% \def\g@tlastchart@#1{#1\ifx\lastnodechar\@undefined\m@ne\else\lastnodechar\fi} @@ -409,6 +453,34 @@ of this package available from CTAN} {Added \g@tlastchart@}% \let\g@tlastchart@\@undefined \plEndIncludeInRelease +\plIncludeInRelease{2018/07/28}{\pltx@isletter} + {Support PD1 encoding}% +\def\pltx@mark{\pltx@mark@} +\let\pltx@scanstop\relax +\long\def\pltx@cond#1\fi{% + #1\expandafter\@firstoftwo\else\expandafter\@secondoftwo\fi} +\def\pltx@pdfencA{PD1} +\def\pltx@composite@chkenc{% + \ifx\pltx@pdfencA\f@encoding + \expandafter\@firstoftwo + \else + \expandafter\@secondoftwo + \fi} +\long\def\pltx@isletter#1{% + \expandafter\pltx@isletter@i#1\pltx@scanstop} +\long\def\pltx@isletter@i#1\pltx@scanstop{% + \pltx@cond\ifx\pltx@mark#1\pltx@mark\fi{\@firstoftwo}% + {\pltx@isletter@ii\pltx@scanstop#1\pltx@scanstop{}#1\pltx@mark}} +\long\def\pltx@isletter@ii#1\pltx@scanstop#{% + \pltx@cond\ifx\pltx@mark#1\pltx@mark\fi% + {\pltx@isletter@iii}{\pltx@isletter@iv}} +\long\def\pltx@isletter@iii#1\pltx@mark{\@secondoftwo} +\long\def\pltx@isletter@iv#1#2#3\pltx@mark{% + \pltx@cond\ifx\pltx@mark#3\pltx@mark\fi{% + \pltx@cond{\ifnum0\ifcat A\noexpand#21\fi\ifcat=\noexpand#21\fi>\z@}\fi + {\@firstoftwo}{\pltx@composite@chkenc}% + }{\pltx@composite@chkenc}} +\plEndIncludeInRelease \plIncludeInRelease{2016/06/10}{\pltx@isletter} {Added \pltx@isletter}% \def\pltx@mark{\pltx@mark@} @@ -435,13 +507,13 @@ of this package available from CTAN} \let\pltx@isletter\@undefined \plEndIncludeInRelease \plIncludeInRelease{2016/06/10}{\@text@composite} - {Wrong fix for non-zero baselineshift}% + {Fix for non-zero baselineshift (wrong)}% \def\@text@composite#1#2#3\@text@composite{% \expandafter\@text@composite@x \csname\string#1-\string#2\endcsname} \plEndIncludeInRelease \plIncludeInRelease{2016/04/17}{\@text@composite} - {Wrong fix for non-zero baselineshift}% + {Fix for non-zero baselineshift (wrong)}% \def\@text@composite#1#2#3#{% \begingroup \setbox\z@=\hbox\bgroup% @@ -450,24 +522,57 @@ of this package available from CTAN} \csname\string#1-\string#2\endcsname} \plEndIncludeInRelease \plIncludeInRelease{0000/00/00}{\@text@composite} - {Wrong fix for non-zero baselineshift}% + {Fix for non-zero baselineshift (wrong)}% \def\@text@composite#1#2#3\@text@composite{% \expandafter\@text@composite@x \csname\string#1-\string#2\endcsname} \plEndIncludeInRelease -\plIncludeInRelease{2016/07/01}{\@text@composite@x} - {Fix for non-zero baselineshift}% -\def\@text@composite@x#1{% +%\plIncludeInRelease{0000/00/00}{\pltx@saved@text@composite@x} +% {Special case! (This block is required for any emulation date)}% +\def\pltx@saved@text@composite@x#1{% \ifx#1\relax \expandafter\@secondoftwo \else \expandafter\@firstoftwo \fi #1} +%\plEndIncludeInRelease +\plIncludeInRelease{2018/07/28}{\pltx@text@composite@x} + {Fix for non-zero baselineshift}% +\def\pltx@text@composite@x#1#2{% + \ifx#1\relax + #2% + \else\pltx@isletter{#1}{#1}{% + \begingroup + \setbox\z@\hbox\bgroup + \ybaselineshift\z@\tbaselineshift\z@ + #1% + \g@tlastchart@\@tempcntb + \xdef\pltx@composite@temp{\noexpand\@tempcntb=\the\@tempcntb\relax}% + \aftergroup\pltx@composite@temp + \egroup + \ifnum\@tempcntb<\@cclvi + \ifnum\@tempcntb>\m@ne + \ifodd\xspcode\@tempcntb\else\leavevmode\null\fi + \fi + \begingroup\m@th$% + \ifx\textbaselineshiftfactor\@undefined\else + \textbaselineshiftfactor\z@\fi + \box\z@ + $\endgroup + \ifnum\@tempcntb>\m@ne + \ifnum\xspcode\@tempcntb<2\null\fi + \fi + \else + {\ybaselineshift\z@\tbaselineshift\z@#1}% + \fi + \endgroup}% + \fi +} \plEndIncludeInRelease -\plIncludeInRelease{2016/06/10}{\@text@composite@x} +\plIncludeInRelease{2016/06/10}{\pltx@text@composite@x} {Fix for non-zero baselineshift}% -\def\@text@composite@x#1#2{% +\def\pltx@text@composite@x#1#2{% \ifx#1\relax #2% \else\pltx@isletter{#1}{#1}{% @@ -506,15 +611,15 @@ of this package available from CTAN} \fi\fi \else \ifdim\@tempdima=\z@{\ybaselineshift\z@\tbaselineshift\z@#1}% - \else\lower\@tempdima\box\z@\fi + \else\leavevmode\lower\@tempdima\box\z@\fi \fi \endgroup}% \fi } \plEndIncludeInRelease -\plIncludeInRelease{2016/04/17}{\@text@composite@x} +\plIncludeInRelease{2016/04/17}{\pltx@text@composite@x} {Fix for non-zero baselineshift}% -\def\@text@composite@x#1#2{% +\def\pltx@text@composite@x#1#2{% \ifx#1\relax \expandafter\@secondoftwo \else @@ -535,15 +640,66 @@ of this package available from CTAN} \box\z@ \endgroup} \plEndIncludeInRelease -\plIncludeInRelease{0000/00/00}{\@text@composite@x} +\plIncludeInRelease{0000/00/00}{\pltx@text@composite@x} {Fix for non-zero baselineshift}% -\def\@text@composite@x#1{% - \ifx#1\relax - \expandafter\@secondoftwo - \else - \expandafter\@firstoftwo - \fi - #1} +\let\pltx@text@composite@x\@undefined +\plEndIncludeInRelease +%\plIncludeInRelease{0000/00/00}{\@text@composite@x} +% {Special case! (This block is required for any emulation date)}% +\DeclareRobustCommand\fixcompositeaccent{% + \let\oalign\pltx@oalign + \let\ltx@sh@ft\pltx@ltx@sh@ft + \let\@text@composite@x\pltx@text@composite@x +} +\DeclareRobustCommand\nofixcompositeaccent{% + \let\oalign\pltx@saved@oalign + \let\ltx@sh@ft\pltx@saved@ltx@sh@ft + \let\@text@composite@x\pltx@saved@text@composite@x +} +\nofixcompositeaccent +%\plEndIncludeInRelease +\plIncludeInRelease{2018/07/28}{\fixcompositeaccent} + {Fix for non-zero baselineshift}% +\nofixcompositeaccent % force LaTeX original (conditional default) +% other commands are actually defined for pLaTeX2e 2018-07-28 +\plEndIncludeInRelease +\plIncludeInRelease{2016/07/01}{\fixcompositeaccent} + {Fix for non-zero baselineshift}% +\nofixcompositeaccent % force LaTeX original (always) +\let\fixcompositeaccent\@undefined +\let\nofixcompositeaccent\@undefined +\let\pltx@saved@oalign\@undefined +\let\pltx@oalign\@undefined +\let\pltx@saved@ltx@sh@ft\@undefined +\let\pltx@ltx@sh@ft\@undefined +\let\pltx@saved@text@composite@x\@undefined +\let\pltx@text@composite@x\@undefined +\plEndIncludeInRelease +\plIncludeInRelease{2016/04/17}{\fixcompositeaccent} + {Fix for non-zero baselineshift}% +\fixcompositeaccent % force pLaTeX definition (always) +\let\oalign\pltx@saved@oalign % no fix at that time +\let\ltx@sh@ft\pltx@saved@ltx@sh@ft % no fix at that time +\let\fixcompositeaccent\@undefined +\let\nofixcompositeaccent\@undefined +\let\pltx@saved@oalign\@undefined +\let\pltx@oalign\@undefined +\let\pltx@saved@ltx@sh@ft\@undefined +\let\pltx@ltx@sh@ft\@undefined +\let\pltx@saved@text@composite@x\@undefined +\let\pltx@text@composite@x\@undefined +\plEndIncludeInRelease +\plIncludeInRelease{0000/00/00}{\fixcompositeaccent} + {Fix for non-zero baselineshift}% +\nofixcompositeaccent % force LaTeX original (always) +\let\fixcompositeaccent\@undefined +\let\nofixcompositeaccent\@undefined +\let\pltx@saved@oalign\@undefined +\let\pltx@oalign\@undefined +\let\pltx@saved@ltx@sh@ft\@undefined +\let\pltx@ltx@sh@ft\@undefined +\let\pltx@saved@text@composite@x\@undefined +\let\pltx@text@composite@x\@undefined \plEndIncludeInRelease \plIncludeInRelease{2017/10/28}{\check@nocorr@} {Italic correction before \textt...}% diff --git a/Master/texmf-dist/tex/platex/base/plcore.ltx b/Master/texmf-dist/tex/platex/base/plcore.ltx index 5da961f7a26..9628bf64596 100644 --- a/Master/texmf-dist/tex/platex/base/plcore.ltx +++ b/Master/texmf-dist/tex/platex/base/plcore.ltx @@ -33,7 +33,7 @@ \fi \def\pfmtname{pLaTeX2e} \def\pfmtversion - {2018-05-20} + {2018-07-28} \def\ppatch@level{0} \edef\platexBANNER{\noexpand\platexNILa \the\everyjob % LaTeX banner and delayed codes @@ -738,11 +738,39 @@ \else\tbaselineshift\fi \else\ybaselineshift\fi \vbox{\hrule\@width.3em}} +\def\pltx@saved@oalign#1{\leavevmode\vtop{\baselineskip\z@skip \lineskip.25ex% + \ialign{##\crcr#1\crcr}}} +\def\pltx@oalign#1{\ifmmode + \leavevmode\vtop{\baselineskip\z@skip \lineskip.25ex% + \ialign{##\crcr#1\crcr}}% +\else + \iftdir\ybaselineshift\tbaselineshift\fi + \m@th$\hbox{\vtop{\baselineskip\z@skip \lineskip.25ex% + \ialign{##\crcr#1\crcr}}}$% +\fi} +\def\pltx@saved@ltx@sh@ft #1{% + \dimen@ #1% + \kern \strip@pt + \fontdimen1\font \dimen@ + } % kern by #1 times the current slant +\def\pltx@ltx@sh@ft #1{% + \ybaselineshift\z@ + \dimen@ #1% + \kern \strip@pt + \fontdimen1\font \dimen@ + } % kern by #1 times the current slant \def\g@tlastchart@#1{#1\ifx\lastnodechar\@undefined\m@ne\else\lastnodechar\fi} \def\pltx@mark{\pltx@mark@} \let\pltx@scanstop\relax \long\def\pltx@cond#1\fi{% #1\expandafter\@firstoftwo\else\expandafter\@secondoftwo\fi} +\def\pltx@pdfencA{PD1} +\def\pltx@composite@chkenc{% + \ifx\pltx@pdfencA\f@encoding + \expandafter\@firstoftwo + \else + \expandafter\@secondoftwo + \fi} \long\def\pltx@isletter#1{% \expandafter\pltx@isletter@i#1\pltx@scanstop} \long\def\pltx@isletter@i#1\pltx@scanstop{% @@ -755,8 +783,56 @@ \long\def\pltx@isletter@iv#1#2#3\pltx@mark{% \pltx@cond\ifx\pltx@mark#3\pltx@mark\fi{% \pltx@cond{\ifnum0\ifcat A\noexpand#21\fi\ifcat=\noexpand#21\fi>\z@}\fi - {\@firstoftwo}{\@secondoftwo}% - }{\@secondoftwo}} + {\@firstoftwo}{\pltx@composite@chkenc}% + }{\pltx@composite@chkenc}} +\def\pltx@saved@text@composite@x#1{% + \ifx#1\relax + \expandafter\@secondoftwo + \else + \expandafter\@firstoftwo + \fi + #1} +\def\pltx@text@composite@x#1#2{% + \ifx#1\relax + #2% + \else\pltx@isletter{#1}{#1}{% + \begingroup + \setbox\z@\hbox\bgroup + \ybaselineshift\z@\tbaselineshift\z@ + #1% + \g@tlastchart@\@tempcntb + \xdef\pltx@composite@temp{\noexpand\@tempcntb=\the\@tempcntb\relax}% + \aftergroup\pltx@composite@temp + \egroup + \ifnum\@tempcntb<\@cclvi + \ifnum\@tempcntb>\m@ne + \ifodd\xspcode\@tempcntb\else\leavevmode\null\fi + \fi + \begingroup\m@th$% + \ifx\textbaselineshiftfactor\@undefined\else + \textbaselineshiftfactor\z@\fi + \box\z@ + $\endgroup + \ifnum\@tempcntb>\m@ne + \ifnum\xspcode\@tempcntb<2\null\fi + \fi + \else + {\ybaselineshift\z@\tbaselineshift\z@#1}% + \fi + \endgroup}% + \fi +} +\DeclareRobustCommand\fixcompositeaccent{% + \let\oalign\pltx@oalign + \let\ltx@sh@ft\pltx@ltx@sh@ft + \let\@text@composite@x\pltx@text@composite@x +} +\DeclareRobustCommand\nofixcompositeaccent{% + \let\oalign\pltx@saved@oalign + \let\ltx@sh@ft\pltx@saved@ltx@sh@ft + \let\@text@composite@x\pltx@saved@text@composite@x +} +\nofixcompositeaccent %% File: plcore.dtx \def\NeedsTeXFormat#1{% \def\reserved@a{#1}% diff --git a/Master/texmf-dist/tex/platex/base/tarticle.cls b/Master/texmf-dist/tex/platex/base/tarticle.cls index 4fa11a3d2c1..5a6a6f2f66d 100644 --- a/Master/texmf-dist/tex/platex/base/tarticle.cls +++ b/Master/texmf-dist/tex/platex/base/tarticle.cls @@ -15,7 +15,7 @@ %% File: jclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesClass{tarticle} - [2018/02/04 v1.7h + [2018/07/03 v1.8 Standard pLaTeX class] \newcounter{@paper} \newif\if@landscape \@landscapefalse @@ -768,7 +768,7 @@ \kern2.6\p@} \newcommand\@makefntext[1]{\parindent 1zw \noindent\hb@xt@ 2zw{\hss\@makefnmark}#1} -\newif\if$B@>Nq(B \$B@>Nq(Bfalse +\newif\if$B@>Nq(B \$B@>Nq(Btrue \def\$B@>Nq(B{\$B@>Nq(Btrue} \def\$BOBNq(B{\$B@>Nq(Bfalse} \newcount\heisei \heisei\year \advance\heisei-1988\relax diff --git a/Master/texmf-dist/tex/platex/base/tbk10.clo b/Master/texmf-dist/tex/platex/base/tbk10.clo index 90bb23e8cad..fcc4e2952c7 100644 --- a/Master/texmf-dist/tex/platex/base/tbk10.clo +++ b/Master/texmf-dist/tex/platex/base/tbk10.clo @@ -15,7 +15,7 @@ %% File: jclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{tbk10.clo} - [2018/02/04 v1.7h + [2018/07/03 v1.8 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 e6acf9c2fb1..3cf967d12bf 100644 --- a/Master/texmf-dist/tex/platex/base/tbk11.clo +++ b/Master/texmf-dist/tex/platex/base/tbk11.clo @@ -15,7 +15,7 @@ %% File: jclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{tbk11.clo} - [2018/02/04 v1.7h + [2018/07/03 v1.8 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 ca99d207471..480cbc16e4e 100644 --- a/Master/texmf-dist/tex/platex/base/tbk12.clo +++ b/Master/texmf-dist/tex/platex/base/tbk12.clo @@ -15,7 +15,7 @@ %% File: jclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{tbk12.clo} - [2018/02/04 v1.7h + [2018/07/03 v1.8 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 7361af9b65a..365c08943ad 100644 --- a/Master/texmf-dist/tex/platex/base/tbook.cls +++ b/Master/texmf-dist/tex/platex/base/tbook.cls @@ -15,7 +15,7 @@ %% File: jclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesClass{tbook} - [2018/02/04 v1.7h + [2018/07/03 v1.8 Standard pLaTeX class] \newcounter{@paper} \newif\if@landscape \@landscapefalse @@ -871,7 +871,7 @@ \@addtoreset{footnote}{chapter} \newcommand\@makefntext[1]{\parindent 1zw \noindent\hb@xt@ 2zw{\hss\@makefnmark}#1} -\newif\if$B@>Nq(B \$B@>Nq(Bfalse +\newif\if$B@>Nq(B \$B@>Nq(Btrue \def\$B@>Nq(B{\$B@>Nq(Btrue} \def\$BOBNq(B{\$B@>Nq(Bfalse} \newcount\heisei \heisei\year \advance\heisei-1988\relax diff --git a/Master/texmf-dist/tex/platex/base/treport.cls b/Master/texmf-dist/tex/platex/base/treport.cls index 712bd02dd1d..27422b20fbd 100644 --- a/Master/texmf-dist/tex/platex/base/treport.cls +++ b/Master/texmf-dist/tex/platex/base/treport.cls @@ -15,7 +15,7 @@ %% File: jclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesClass{treport} - [2018/02/04 v1.7h + [2018/07/03 v1.8 Standard pLaTeX class] \newcounter{@paper} \newif\if@landscape \@landscapefalse @@ -867,7 +867,7 @@ \@addtoreset{footnote}{chapter} \newcommand\@makefntext[1]{\parindent 1zw \noindent\hb@xt@ 2zw{\hss\@makefnmark}#1} -\newif\if$B@>Nq(B \$B@>Nq(Bfalse +\newif\if$B@>Nq(B \$B@>Nq(Btrue \def\$B@>Nq(B{\$B@>Nq(Btrue} \def\$BOBNq(B{\$B@>Nq(Bfalse} \newcount\heisei \heisei\year \advance\heisei-1988\relax diff --git a/Master/texmf-dist/tex/platex/base/tsize10.clo b/Master/texmf-dist/tex/platex/base/tsize10.clo index 986f4a10d9d..64e301fdffb 100644 --- a/Master/texmf-dist/tex/platex/base/tsize10.clo +++ b/Master/texmf-dist/tex/platex/base/tsize10.clo @@ -15,7 +15,7 @@ %% File: jclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{tsize10.clo} - [2018/02/04 v1.7h + [2018/07/03 v1.8 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 aaea97795be..d3194562c76 100644 --- a/Master/texmf-dist/tex/platex/base/tsize11.clo +++ b/Master/texmf-dist/tex/platex/base/tsize11.clo @@ -15,7 +15,7 @@ %% File: jclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{tsize11.clo} - [2018/02/04 v1.7h + [2018/07/03 v1.8 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 33d26eea759..67e8e6e0687 100644 --- a/Master/texmf-dist/tex/platex/base/tsize12.clo +++ b/Master/texmf-dist/tex/platex/base/tsize12.clo @@ -15,7 +15,7 @@ %% File: jclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{tsize12.clo} - [2018/02/04 v1.7h + [2018/07/03 v1.8 Standard pLaTeX file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xiipt{18}% |