summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/uplatex/base/README.md2
-rw-r--r--Master/texmf-dist/doc/uplatex/base/uplatex.pdfbin227672 -> 230768 bytes
-rw-r--r--Master/texmf-dist/doc/uplatex/base/upldoc.pdfbin573572 -> 573823 bytes
-rw-r--r--Master/texmf-dist/source/uplatex/base/Makefile33
-rw-r--r--Master/texmf-dist/source/uplatex/base/plcore.dtx211
-rw-r--r--Master/texmf-dist/source/uplatex/base/ujclasses.dtx21
-rw-r--r--Master/texmf-dist/source/uplatex/base/ukinsoku.dtx17
-rw-r--r--Master/texmf-dist/source/uplatex/base/uplatex.dtx84
-rw-r--r--Master/texmf-dist/source/uplatex/base/uplfonts.dtx25
-rw-r--r--Master/texmf-dist/source/uplatex/base/uplvers.dtx46
-rw-r--r--Master/texmf-dist/tex/uplatex/base/jt2gt.fd16
-rw-r--r--Master/texmf-dist/tex/uplatex/base/jt2mc.fd16
-rw-r--r--Master/texmf-dist/tex/uplatex/base/jy2gt.fd16
-rw-r--r--Master/texmf-dist/tex/uplatex/base/jy2mc.fd16
-rw-r--r--Master/texmf-dist/tex/uplatex/base/ujarticle.cls16
-rw-r--r--Master/texmf-dist/tex/uplatex/base/ujbk10.clo16
-rw-r--r--Master/texmf-dist/tex/uplatex/base/ujbk11.clo16
-rw-r--r--Master/texmf-dist/tex/uplatex/base/ujbk12.clo16
-rw-r--r--Master/texmf-dist/tex/uplatex/base/ujbook.cls16
-rw-r--r--Master/texmf-dist/tex/uplatex/base/ujreport.cls16
-rw-r--r--Master/texmf-dist/tex/uplatex/base/ujsize10.clo16
-rw-r--r--Master/texmf-dist/tex/uplatex/base/ujsize11.clo16
-rw-r--r--Master/texmf-dist/tex/uplatex/base/ujsize12.clo16
-rw-r--r--Master/texmf-dist/tex/uplatex/base/ukinsoku.tex16
-rw-r--r--Master/texmf-dist/tex/uplatex/base/uplatex.ltx25
-rw-r--r--Master/texmf-dist/tex/uplatex/base/uplcore.ltx98
-rw-r--r--Master/texmf-dist/tex/uplatex/base/upldefs.ltx16
-rw-r--r--Master/texmf-dist/tex/uplatex/base/uptrace.sty16
-rw-r--r--Master/texmf-dist/tex/uplatex/base/utarticle.cls16
-rw-r--r--Master/texmf-dist/tex/uplatex/base/utbk10.clo16
-rw-r--r--Master/texmf-dist/tex/uplatex/base/utbk11.clo16
-rw-r--r--Master/texmf-dist/tex/uplatex/base/utbk12.clo16
-rw-r--r--Master/texmf-dist/tex/uplatex/base/utbook.cls16
-rw-r--r--Master/texmf-dist/tex/uplatex/base/utreport.cls16
-rw-r--r--Master/texmf-dist/tex/uplatex/base/utsize10.clo16
-rw-r--r--Master/texmf-dist/tex/uplatex/base/utsize11.clo16
-rw-r--r--Master/texmf-dist/tex/uplatex/base/utsize12.clo16
37 files changed, 313 insertions, 649 deletions
diff --git a/Master/texmf-dist/doc/uplatex/base/README.md b/Master/texmf-dist/doc/uplatex/base/README.md
index b6f8dfc0a4e..c059a7c88f6 100644
--- a/Master/texmf-dist/doc/uplatex/base/README.md
+++ b/Master/texmf-dist/doc/uplatex/base/README.md
@@ -17,6 +17,6 @@ the 3-clause BSD license (see [LICENSE](./LICENSE)).
## Release Date
-2016-07-01
+2016-09-03
Japanese TeX Development Community
diff --git a/Master/texmf-dist/doc/uplatex/base/uplatex.pdf b/Master/texmf-dist/doc/uplatex/base/uplatex.pdf
index e9400da38dd..6824832bfcb 100644
--- a/Master/texmf-dist/doc/uplatex/base/uplatex.pdf
+++ b/Master/texmf-dist/doc/uplatex/base/uplatex.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/uplatex/base/upldoc.pdf b/Master/texmf-dist/doc/uplatex/base/upldoc.pdf
index 1a9093744d6..087a9740d85 100644
--- a/Master/texmf-dist/doc/uplatex/base/upldoc.pdf
+++ b/Master/texmf-dist/doc/uplatex/base/upldoc.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/uplatex/base/Makefile b/Master/texmf-dist/source/uplatex/base/Makefile
index ea26c0dbc4d..b4d05398d56 100644
--- a/Master/texmf-dist/source/uplatex/base/Makefile
+++ b/Master/texmf-dist/source/uplatex/base/Makefile
@@ -1,8 +1,11 @@
TARGET1 = uplatex.ltx ujarticle.cls
TARGET2 = uplatex.pdf upldoc.pdf
+TARGET3 = uplatex.dvi upldoc.dvi
KANJI = -kanji=utf8
FONTMAP = -f ipaex.map -f uptex-ipaex.map
+default: $(TARGET1) $(TARGET3)
+strip: $(TARGET1)
all: $(TARGET1) $(TARGET2)
PLFMT = uplatex.ltx uplcore.ltx ukinsoku.tex upldefs.ltx \
@@ -33,26 +36,42 @@ ujarticle.cls: $(PLCLS_SRC)
uplatex $(KANJI) uplcls.ins
rm uplcls.log
-uplatex.pdf: $(INTRODOC_SRC)
+uplatex.dvi: $(INTRODOC_SRC)
uplatex $(KANJI) uplatex.dtx
mendex -U -f -s gglo.ist -o uplatex.gls uplatex.glo
uplatex $(KANJI) uplatex.dtx
- dvipdfmx $(FONTMAP) uplatex.dvi
- rm uplatex.aux uplatex.log uplatex.dvi
+ rm uplatex.aux uplatex.log
rm uplatex.glo uplatex.gls uplatex.ilg
-upldoc.pdf: $(PLDOC_SRC)
+upldoc.dvi: $(PLDOC_SRC)
rm -f upldoc.tex Xins.ins
uplatex $(KANJI) upldocs.ins
+ rm -f mkpldoc.sh dstcheck.pl
uplatex $(KANJI) Xins.ins
sh mkpldoc.sh
- dvipdfmx $(FONTMAP) upldoc.dvi
rm *.aux *.log upldoc.toc upldoc.idx upldoc.ind upldoc.ilg
- rm upldoc.glo upldoc.gls *.dvi upldoc.tex Xins.ins
+ rm upldoc.glo upldoc.gls upldoc.tex Xins.ins
rm ltxdoc.cfg upldoc.dic mkpldoc.sh dstcheck.pl
-.PHONY: clean
+uplatex.pdf: uplatex.dvi
+ dvipdfmx $(FONTMAP) uplatex.dvi
+upldoc.pdf: upldoc.dvi
+ dvipdfmx $(FONTMAP) upldoc.dvi
+
+.PHONY: clean cleanstrip cleanall cleandoc
clean:
rm -f $(PLFMT) $(PLCLS) \
+ uplatex.dvi upldoc.dvi \
+ upldoc.tex Xins.ins
+cleanstrip:
+ rm -f $(PLFMT) $(PLCLS) \
+ upldoc.tex Xins.ins
+cleanall:
+ rm -f $(PLFMT) $(PLCLS) \
+ uplatex.dvi upldoc.dvi \
uplatex.pdf upldoc.pdf \
upldoc.tex Xins.ins
+cleandoc:
+ rm -f \
+ uplatex.dvi upldoc.dvi \
+ uplatex.pdf upldoc.pdf
diff --git a/Master/texmf-dist/source/uplatex/base/plcore.dtx b/Master/texmf-dist/source/uplatex/base/plcore.dtx
index 19db1ed8592..2a73a150a24 100644
--- a/Master/texmf-dist/source/uplatex/base/plcore.dtx
+++ b/Master/texmf-dist/source/uplatex/base/plcore.dtx
@@ -10,23 +10,6 @@
%
% \fi
%
-% \CheckSum{1292}
-%% \CharacterTable
-%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
-%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
-%% Digits \0\1\2\3\4\5\6\7\8\9
-%% Exclamation \! Double quote \" Hash (number) \#
-%% Dollar \$ Percent \% Ampersand \&
-%% Acute accent \' Left paren \( Right paren \)
-%% Asterisk \* Plus \+ Comma \,
-%% Minus \- Point \. Solidus \/
-%% Colon \: Semicolon \; Less than \<
-%% Equals \= Greater than \> Question mark \?
-%% Commercial at \@ Left bracket \[ Backslash \\
-%% Right bracket \] Circumflex \^ Underscore \_
-%% Grave accent \` Left brace \{ Vertical bar \|
-%% Right brace \} Tilde \~}
-%%
%
% \setcounter{StandardModuleDepth}{1}
% \StopEventually{}
@@ -60,13 +43,21 @@
% \changes{v1.2e}{2016/05/20}{\file{fltrace}$B%Q%C%1!<%8$N(Bp\LaTeX{}$BHG(B
% $B$H$7$F(B\file{pfltrace}$B%Q%C%1!<%8$r?7@_(B}
% \changes{v1.2f}{2016/06/30}{\cs{@begindvibox}$B$r>o$K2#AH$K(B}
+% \changes{v1.2g}{2016/08/25}{$B%+%&%s%?(B\cs{pltx@foot@penalty}$B$rDI2C(B}
+% \changes{v1.2g}{2016/08/25}{$B9g0u$NA0$NJ8;z$H9g0u$N4V$r%Y%?AH$K(B}
+% \changes{v1.2g}{2016/08/25}{$BJD$83g8LN`$ND>8e$K(B\cs{footnotetext}$B$,B3$/(B
+% $B>l9g$K2~9T$,5/$-$k$3$H$,$"$kLdBj$KBP=h(B}
+% \changes{v1.2g}{2016/08/25}{$B5SCm$N9g0uD>8e$G$N2~9T$,6X;_$5$l$F$7$^$&(B
+% $BLdBj$KBP=h(B}
+% \changes{v1.2h}{2016/09/01}{$B=DAH$G(Blongtable$B%Q%C%1!<%8$r;H$C$FI=AH$NESCf$G2~%Z!<%8(B
+% $B$9$k$H$-L58B%k!<%W$,5/$3$kLdBj$KBP=h(B(Issue 21)}
% \fi
%
% \iffalse
%<*driver>
\NeedsTeXFormat{pLaTeX2e}
% \fi
-\ProvidesFile{plcore.dtx}[2016/06/30 v1.2f pLaTeX core file]
+\ProvidesFile{plcore.dtx}[2016/09/01 v1.2h pLaTeX core file]
% \iffalse
\documentclass{jltxdoc}
\GetFileInfo{plcore.dtx}
@@ -201,10 +192,10 @@
% $B$=$N$?$a$K!"6XB'%Z%J%k%F%#$NCM$,(B$10000$$B$NJ8;z$ND>8e$G$O!"%Z%J%k%F%#$NCM$,(B
% $BAj;&$5$l!"2~9T$9$k$3$H$,$G$-$^$;$s!#(B
%
-% \begin{verbatim}
+%\begin{verbatim}
% $B$"$$$&$($*(B\\
% $B!*$+$-$/$1$3(B
-% \end{verbatim}
+%\end{verbatim}
%
% $B$7$?$,$C$F!"(B|\newline|$B%^%/%m$K(B|\mbox{}|$B$rF~$l$k$3$H$K$h$C$F!"(B
% |\newline|$B%^%/%m$N%Z%J%k%F%#(B$-10000$$B$H9TF,J8;z$N%Z%J%k%F%#(B$10000$$B$,(B
@@ -259,7 +250,7 @@
% $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/04/17}{\@makecol}{\@makecol}%
+%<platexrelease>\plIncludeInRelease{2016/09/03}{\@makecol}{\@makecol}%
%<*plcore|platexrelease>
\gdef\@makecol{%
\setbox\@outputbox\box\@cclv%
@@ -279,13 +270,19 @@
% 0pt$B$K$J$C$F$7$^$$!"7k2L$H$7$F%U%C%?$N0LCV$,$/$k$C$F$7$^$C$F$$$?!#(B
% 0$B$N(B|\hskip|$B$rH/@8$5$;$k$H(B|\wd\@outputbox|$B$NCM$,4|BT$7$?$b$N$H$J$k$N$G!"(B
% $B=DAH$N>l9g$O$=$NJ}K!$GBP=h$9$k!#(B
+%
+% $B$?$@$7!"(B0$B$N(B|\hskip|$B$rH/@8$5$;$k$H$-!"?eJ?%b!<%I$KF~$C$F$7$^$&$H!"$?$H$($P(B
+% longtable$B%Q%C%1!<%8$r;HMQ$7$FI=AHESCf$G2~%Z!<%8$9$k$H$-$K(B|\par -> {\vskip}|$B$N(B
+% $BL58B%k!<%W$,5/$-$F$7$^$$$^$9!#$=$3$G!"(B|\vbox|$B$NCf$GH/@8$5$;$^$9!#(B
% \changes{v1.1j}{2001/05/10}{\cs{@makecol}$B$GAH$_N)$F$i$l$k(B
% \cs{@outputbox}$B$NBg$-$5$,!"=DAH$GCf?H$,6u$N%\%C%/%9$@$1$N>l9g$bE,@5$K$J$k(B
% $B$h$&$K=$@5(B}
% \changes{v1.2b}{2016/01/26}{\cs{@outputbox}$B$N?<$5$,B>$N$b$N$N0LCV$K1F6A$rM?$($J$$(B
% $B$h$&$K$9$k(B\texttt{\cs{vskip}~-\cs{dimen@}}$B$,=DAH%b!<%I$G$OL58z$K$J$C$F$$$?$N$G=$@5(B}
+% \changes{v1.2h}{2016/09/01}{$B=DAH$G(Blongtable$B%Q%C%1!<%8$r;H$C$FI=AH$NESCf$G2~%Z!<%8(B
+% $B$9$k$H$-L58B%k!<%W$,5/$3$kLdBj$KBP=h(B(Issue 21)}
% \begin{macrocode}
- \iftdir\hskip\z@\fi
+ \iftdir\vbox{\hskip\z@}\fi
\vskip -\dimen@
\@textbottom
\ifvoid\footins\else % for pLaTeX
@@ -302,6 +299,36 @@
}
%</plcore|platexrelease>
%<platexrelease>\plEndIncludeInRelease
+%<platexrelease>\plIncludeInRelease{2016/04/17}{\@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\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{0000/00/00}{\@makecol}{\@makecol}%
%<platexrelease>\gdef\@makecol{%
%<platexrelease> \setbox\@outputbox\box\@cclv%
@@ -852,15 +879,113 @@
%<platexrelease> \ifydir \@textsuperscript{\normalfont\@thefnmark}%
%<platexrelease> \else\hbox{\yoko\@textsuperscript{\normalfont\@thefnmark}}\fi}}
%<platexrelease>\plEndIncludeInRelease
-%<*plcore>
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\pltx@foot@penalty}
+% $BJD$83g8LN`$ND>8e$K(B|\footnotetext|$B$,B3$$$?>l9g!"(B|\footnotetext|$B$NA0$G$N2~9T$O(B
+% $BK>$^$7$/$"$j$^$;$s!#$3$N$h$&$J>l9g$KBP=h$9$k$?$a$K!"(B|\pltx@foot@penalty|$B$H$$$&(B
+% $B%+%&%s%?$rMQ0U$7$^$7$?!#(B|\footnotetext|$B$N:G=i$G!VD>A0$N%Z%J%k%F%#CM!W(B
+% $B$H$7$F$3$N%+%&%s%?$,=i4|2=$5$l$^$9!#(B
+% |\footnotemark|,~|\footnote|$B$G$O;H$o$J$$$N$G(B0$B$K@_Dj$7$F$$$^$9!#(B
+% \changes{v1.2g}{2016/08/25}{$B%+%&%s%?(B\cs{pltx@foot@penalty}$B$rDI2C(B}
+% \begin{macrocode}
+%<platexrelease>\plIncludeInRelease{2016/09/03}{\pltx@foot@penalty}
+%<platexrelease> {Add new counter \pltx@foot@penalty}%
+%<*plcore|platexrelease>
+\ifx\@undefined\pltx@foot@penalty \newcount\pltx@foot@penalty \fi
+\pltx@foot@penalty\z@
+%</plcore|platexrelease>
+%<platexrelease>\plEndIncludeInRelease
+%<platexrelease>\plIncludeInRelease{0000/00/00}{\pltx@foot@penalty}
+%<platexrelease> {Add new counter \pltx@foot@penalty}%
+%<platexrelease>\let\pltx@foot@penalty\@undefined
+%<platexrelease>\plEndIncludeInRelease
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\footnotemark}
+% \begin{macro}{\footnote}
+% $B$^$?!"9g0u$NA0$NJ8;z$H9g0u$N4V$O86B'%Y%?AH$G$9!JC"$7!"(BJIS~X~4051$B$K$ONc30M-$j!K!#(B
+% $B$=$N$?$a!"9g0u$r=PNO$9$k(B|\footnotemark|,~|\footnote|$B$N:G=i$G(B|\inhibitglue|$B$r(B
+% $B<B9T$7$F$*$/$3$H$K$7$^$9!J(B|\@makefnmark|$B$NCf$KCV$$$F$b8zNO$,$"$j$^$;$s!K!#(B
+% \changes{v1.2g}{2016/08/25}{$B9g0u$NA0$NJ8;z$H9g0u$N4V$r%Y%?AH$K(B}
+% \begin{macrocode}
+%<platexrelease>\plIncludeInRelease{2016/09/03}{\footnote}
+%<platexrelease> {Append \inhibitglue in \footnotemark}%
+%<*plcore|platexrelease>
+% \end{macrocode}
+% \begin{macrocode}
+\def\footnote{\inhibitglue
+ \@ifnextchar[\@xfootnote{\stepcounter\@mpfn
+ \protected@xdef\@thefnmark{\thempfn}%
+ \@footnotemark\@footnotetext}}
+\def\footnotemark{\inhibitglue
+ \@ifnextchar[\@xfootnotemark
+ {\stepcounter{footnote}%
+ \protected@xdef\@thefnmark{\thefootnote}%
+ \@footnotemark}}
+% \end{macrocode}
+% \begin{macrocode}
+%</plcore|platexrelease>
+%<platexrelease>\plEndIncludeInRelease
+%<platexrelease>\plIncludeInRelease{0000/00/00}{\footnote}
+%<platexrelease> {Append \inhibitglue in \footnotemark}%
+%<platexrelease>\def\footnote{\@ifnextchar[\@xfootnote{\stepcounter\@mpfn
+%<platexrelease> \protected@xdef\@thefnmark{\thempfn}%
+%<platexrelease> \@footnotemark\@footnotetext}}
+%<platexrelease>\def\footnotemark{%
+%<platexrelease> \@ifnextchar[\@xfootnotemark
+%<platexrelease> {\stepcounter{footnote}%
+%<platexrelease> \protected@xdef\@thefnmark{\thefootnote}%
+%<platexrelease> \@footnotemark}}
+%<platexrelease>\plEndIncludeInRelease
+% \end{macrocode}
+% \end{macro}
+% \end{macro}
+%
+% \begin{macro}{\footnotetext}
+% |\footnotetext|$B$ND>A0$N%Z%J%k%F%#CM$rJ];}$7$^$9!#(B
+% \changes{v1.2g}{2016/08/25}{$BJD$83g8LN`$ND>8e$K(B\cs{footnotetext}$B$,B3$/(B
+% $B>l9g$K2~9T$,5/$-$k$3$H$,$"$kLdBj$KBP=h(B}
+% \begin{macrocode}
+%<platexrelease>\plIncludeInRelease{2016/09/03}{\footnotetext}
+%<platexrelease> {Preserve penalty before \footnotetext}%
+%<*plcore|platexrelease>
+% \end{macrocode}
+% \begin{macrocode}
+\def\footnotetext{%
+ \ifhmode\pltx@foot@penalty\lastpenalty\unpenalty\fi%
+ \@ifnextchar [\@xfootnotenext
+ {\protected@xdef\@thefnmark{\thempfn}%
+ \@footnotetext}}
+% \end{macrocode}
+% \begin{macrocode}
+%</plcore|platexrelease>
+%<platexrelease>\plEndIncludeInRelease
+%<platexrelease>\plIncludeInRelease{0000/00/00}{\footnotetext}
+%<platexrelease> {Preserve penalty before \footnotetext}%
+%<platexrelease>\def\footnotetext{%
+%<platexrelease> \@ifnextchar [\@xfootnotenext
+%<platexrelease> {\protected@xdef\@thefnmark{\thempfn}%
+%<platexrelease> \@footnotetext}}
+%<platexrelease>\plEndIncludeInRelease
% \end{macrocode}
% \end{macro}
%
% \begin{macro}{\@footnotetext}
% $B%$%s%5!<%H%\%C%/%9(B|\footins|$B$K5SCm$N%F%-%9%H$rF~$l$^$9!#(B
+% $B%3%_%e%K%F%#HG(Bp\LaTeX{}$B$G$O(B|\footnotetext|,~|\footnote|$B$ND>8e$G(B
+% $B2~9T$r2DG=$K$7$^$9!#(Bjsclasses$B$G$O$3$NJQ99$K2C$(!"5SCm$G(B|\verb|$B$,(B
+% $B;H$($k$h$&$K:FDj5A$5$l$^$9!#(B
%
% \changes{v1.0a}{1995/04/07}{$BAHJ}8~$NH=Dj$r%\%C%/%9$N30$G$9$k$h$&$K$7$?(B}
% \begin{macrocode}
+%<platexrelease>\plIncludeInRelease{2016/09/03}{\@footnotetext}
+%<platexrelease> {Allow break after \footnote}%
+%<*plcore|platexrelease>
+% \end{macrocode}
+% \begin{macrocode}
\long\def\@footnotetext#1{%
\ifydir\def\@tempa{\yoko}\else\def\@tempa{\tate}\fi
\insert\footins{\@tempa%
@@ -875,7 +1000,45 @@
\color@begingroup
\@makefntext{%
\rule\z@\footnotesep\ignorespaces#1\@finalstrut\strutbox}%
- \color@endgroup}}
+% \end{macrocode}
+%
+% p\TeX{}$B$G$O(B|\insert|$B$ND>8e$KOBJ8J8;z$,Mh$?>l9g!"$=$3$G$N2~9T$O5v$5$l$J$$(B
+% $B$H$$$&5sF0$K$J$C$F$$$^$9!#$3$N$?$a!"=>Mh$O5SCmHV9f!J9g0u!K$ND>8e$N2~9T$,(B
+% $BM^@)$5$l$F$$$^$7$?!#$7$+$7!"(B|\hbox|$B$ND>8e$KOBJ8J8;z$,Mh$?>l9g$O!"$=$3$G(B
+% $B$N2~9T$O5v$5$l$^$9$+$i!":G8e$K(B|\null|$B$rDI2C$7$^$9!#(B
+% $B$^$?!"(B|\pltx@foot@penalty|$B$NCM$,(B0$B$G$O$J$+$C$?>l9g!"(B
+% $B5SCm$NA0$K%Z%J%k%F%#$,$"$C$?$H$$$&$3$H$G$9$+$i!"I|3h$5$;$F$*$-$^$9!#(B
+% \changes{v1.2g}{2016/08/25}{$B5SCm$N9g0uD>8e$G$N2~9T$,6X;_$5$l$F$7$^$&(B
+% $BLdBj$KBP=h(B}
+% \begin{macrocode}
+ \color@endgroup}\null
+ \ifnum\pltx@foot@penalty=\z@\else
+ \penalty\pltx@foot@penalty
+ \pltx@foot@penalty\z@
+ \fi}
+% \end{macrocode}
+% \begin{macrocode}
+%</plcore|platexrelease>
+%<platexrelease>\plEndIncludeInRelease
+%<platexrelease>\plIncludeInRelease{0000/00/00}{\@footnotetext}
+%<platexrelease> {Allow break after \footnote}%
+%<platexrelease>\long\def\@footnotetext#1{%
+%<platexrelease> \ifydir\def\@tempa{\yoko}\else\def\@tempa{\tate}\fi
+%<platexrelease> \insert\footins{\@tempa%
+%<platexrelease> \reset@font\footnotesize
+%<platexrelease> \interlinepenalty\interfootnotelinepenalty
+%<platexrelease> \splittopskip\footnotesep
+%<platexrelease> \splitmaxdepth \dp\strutbox \floatingpenalty \@MM
+%<platexrelease> \hsize\columnwidth \@parboxrestore
+%<platexrelease> \protected@edef\@currentlabel{%
+%<platexrelease> \csname p@footnote\endcsname\@thefnmark
+%<platexrelease> }%
+%<platexrelease> \color@begingroup
+%<platexrelease> \@makefntext{%
+%<platexrelease> \rule\z@\footnotesep\ignorespaces#1\@finalstrut\strutbox}%
+%<platexrelease> \color@endgroup}}
+%<platexrelease>\plEndIncludeInRelease
+%<*plcore>
% \end{macrocode}
% \end{macro}
%
diff --git a/Master/texmf-dist/source/uplatex/base/ujclasses.dtx b/Master/texmf-dist/source/uplatex/base/ujclasses.dtx
index f7565d5932d..27f5289c386 100644
--- a/Master/texmf-dist/source/uplatex/base/ujclasses.dtx
+++ b/Master/texmf-dist/source/uplatex/base/ujclasses.dtx
@@ -14,23 +14,6 @@
%
% \fi
%
-% \CheckSum{4410}
-%% \CharacterTable
-%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
-%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
-%% Digits \0\1\2\3\4\5\6\7\8\9
-%% Exclamation \! Double quote \" Hash (number) \#
-%% Dollar \$ Percent \% Ampersand \&
-%% Acute accent \' Left paren \( Right paren \)
-%% Asterisk \* Plus \+ Comma \,
-%% Minus \- Point \. Solidus \/
-%% Colon \: Semicolon \; Less than \<
-%% Equals \= Greater than \> Question mark \?
-%% Commercial at \@ Left bracket \[ Backslash \\
-%% Right bracket \] Circumflex \^ Underscore \_
-%% Grave accent \` Left brace \{ Vertical bar \|
-%% Right brace \} Tilde \~}
-%%
%
% \setcounter{StandardModuleDepth}{1}
% \StopEventually{}
@@ -2386,11 +2369,11 @@
% \end{description}
%
% |\secdef|は次のようにして使うことができます。
-% \begin{verbatim}
+%\begin{verbatim}
% \def\chapter {... \secdef \CMDA \CMDB }
% \def\CMDA [#1]#2{....} % \chapter[...]{...} の定義
% \def\CMDB #1{....} % \chapter*{...} の定義
-% \end{verbatim}
+%\end{verbatim}
%
%
% \subsubsection{partレベル}
diff --git a/Master/texmf-dist/source/uplatex/base/ukinsoku.dtx b/Master/texmf-dist/source/uplatex/base/ukinsoku.dtx
index 275e4b57358..046b122b6f2 100644
--- a/Master/texmf-dist/source/uplatex/base/ukinsoku.dtx
+++ b/Master/texmf-dist/source/uplatex/base/ukinsoku.dtx
@@ -14,23 +14,6 @@
%
% \fi
%
-% \CheckSum{395}
-%% \CharacterTable
-%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
-%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
-%% Digits \0\1\2\3\4\5\6\7\8\9
-%% Exclamation \! Double quote \" Hash (number) \#
-%% Dollar \$ Percent \% Ampersand \&
-%% Acute accent \' Left paren \( Right paren \)
-%% Asterisk \* Plus \+ Comma \,
-%% Minus \- Point \. Solidus \/
-%% Colon \: Semicolon \; Less than \<
-%% Equals \= Greater than \> Question mark \?
-%% Commercial at \@ Left bracket \[ Backslash \\
-%% Right bracket \] Circumflex \^ Underscore \_
-%% Grave accent \` Left brace \{ Vertical bar \|
-%% Right brace \} Tilde \~}
-%%
%
% \setcounter{StandardModuleDepth}{1}
% \StopEventually{}
diff --git a/Master/texmf-dist/source/uplatex/base/uplatex.dtx b/Master/texmf-dist/source/uplatex/base/uplatex.dtx
index 4b5e923efe4..904d6687430 100644
--- a/Master/texmf-dist/source/uplatex/base/uplatex.dtx
+++ b/Master/texmf-dist/source/uplatex/base/uplatex.dtx
@@ -14,23 +14,6 @@
%
% \fi
%
-% \CheckSum{382}
-%% \CharacterTable
-%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
-%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
-%% Digits \0\1\2\3\4\5\6\7\8\9
-%% Exclamation \! Double quote \" Hash (number) \#
-%% Dollar \$ Percent \% Ampersand \&
-%% Acute accent \' Left paren \( Right paren \)
-%% Asterisk \* Plus \+ Comma \,
-%% Minus \- Point \. Solidus \/
-%% Colon \: Semicolon \; Less than \<
-%% Equals \= Greater than \> Question mark \?
-%% Commercial at \@ Left bracket \[ Backslash \\
-%% Right bracket \] Circumflex \^ Underscore \_
-%% Grave accent \` Left brace \{ Vertical bar \|
-%% Right brace \} Tilde \~}
-%%
%
% \setcounter{StandardModuleDepth}{1}
% \makeatletter
@@ -68,15 +51,16 @@
% \changes{v1.0k}{2016/05/21}{変更履歴も出力するようにした}
% \changes{v1.0k-u00}{2016/05/21}{p\LaTeX{}の変更に追随。}
% \changes{v1.0k-u01}{2016/06/06}{up\LaTeX{}用にドキュメントを全体的に改訂}
-% \changes{v1.0l}{2016/06/19}{パッチレベルを\file{plvers.dtx}から取得}
-% \changes{v1.0l-u01}{2016/06/19}{p\LaTeX{}の変更に追随。}
+% \changes{v1.0l-u01}{2016/06/19}{パッチレベルを\file{uplvers.dtx}から取得}
+% \changes{v1.0m-u01}{2016/08/26}{\file{uplatex.cfg}の読み込みを
+% \file{uplcore.ltx}から\file{uplatex.ltx}へ移動}
% \fi
%
% \iffalse
%<*driver>
\NeedsTeXFormat{pLaTeX2e}
% \fi
-\ProvidesFile{uplatex.dtx}[2016/06/19 v1.0l-u01 upLaTeX document file]
+\ProvidesFile{uplatex.dtx}[2016/08/26 v1.0m-u01 upLaTeX document file]
% \iffalse
\documentclass{jltxdoc}
\usepackage{plext}
@@ -252,9 +236,9 @@
% ただし、\TeX\ LiveやW32\TeX{}ではこの処理を簡単にする|fmtutil|あるいは
% |fmtutil-sys|というプログラムが用意されています。
% 以下を実行すれば、フォーマットファイル\file{uplatex.fmt}が作成されます。
-% \begin{verbatim}
+%\begin{verbatim}
% fmtutil --byfmt uplatex
-% \end{verbatim}
+%\end{verbatim}
%
% 次のリストが、``uplatex.ltx''のの内容です。
% ただし、このバージョンでは、\LaTeX{}からup\LaTeXe{}への拡張を
@@ -263,15 +247,25 @@
% したがって\file{uplatex.ltx}はとても短いものとなっています。
% \file{latex.ltx}には\LaTeX{}のコマンドが、
% \file{uplcore.ltx}にはup\LaTeXe{}で拡張したコマンドが定義されています。
-% \changes{v1.0g-u00}{2016/05/07}{フォーマット作成時に\LaTeX{}のバナーを一旦保存}
-% \changes{v1.0i-u00}{2016/05/12}{一時コマンド\cs{orgdump}を最終的に未定義へ}
-%
% \begin{macrocode}
%<*plcore>
+% \end{macrocode}
+%
+% \file{latex.ltx}の末尾で使われている|\dump|をいったん無効化します。
+% \begin{macrocode}
\let\orgdump\dump
\let\dump\relax
+% \end{macrocode}
+%
+% \file{latex.ltx}を読み込み、起動時のバナーを保存します。
+% \changes{v1.0g-u00}{2016/05/07}{フォーマット作成時に\LaTeX{}のバナーを一旦保存}
+% \begin{macrocode}
\input latex.ltx
\edef\platexBANNER{\the\everyjob}% save LaTeX banner
+% \end{macrocode}
+%
+% \file{uplcore.ltx}を読み込み、このup\LaTeX{}のバージョンを表示します。
+% \begin{macrocode}
\typeout{**************************^^J%
*^^J%
* making upLaTeX format^^J%
@@ -280,11 +274,35 @@
\makeatletter
\input uplcore.ltx
\the\everyjob
+% \end{macrocode}
+%
+% 起動時に\file{uplatex.cfg}がある場合、それを読み込むようにします。
+% バージョン2016/07/01ではコードを\file{uplcore.ltx}に入れていました
+% が、\file{uplatex.ltx}へ移動しました。
+% \changes{v1.0m-u01}{2016/08/26}{\file{uplatex.cfg}の読み込みを
+% \file{uplcore.ltx}から\file{uplatex.ltx}へ移動}
+% \begin{macrocode}
+\everyjob\expandafter{%
+ \the\everyjob
+ \IfFileExists{uplatex.cfg}{%
+ \typeout{*************************^^J%
+ * Loading uplatex.cfg.^^J%
+ *************************}%
+ \input{uplatex.cfg}}{}%
+}
+% \end{macrocode}
+%
+% フォーマットファイルにダンプします。
+% \changes{v1.0i-u00}{2016/05/12}{一時コマンド\cs{orgdump}を最終的に未定義へ}
+% \begin{macrocode}
\let\dump\orgdump
\let\orgdump\@undefined
\makeatother
\dump
-%<plcore>\endinput
+%\endinput
+% \end{macrocode}
+%
+% \begin{macrocode}
%</plcore>
% \end{macrocode}
%
@@ -509,11 +527,11 @@
% あるいは、次のような内容のファイル\file{fmt.ins}を作成し、
% |uplatex fmt.ins|することでも\file{uplatex.ltx}を作ることができます。
%
-% \begin{verbatim}
+%\begin{verbatim}
% \def\batchfile{fmt.ins}
% \input docstrip.tex
% \generateFile{uplatex.ltx}{t}{\from{uplatex.dtx}{plcore}}
-% \end{verbatim}
+%\end{verbatim}
%
%
% \section{文書ファイル}\label{app:pldoc}
@@ -604,7 +622,7 @@
% ここからが本文ページとなります。
% ^^AA \changes{v1.0c}{1997/01/29}{Rename pltpatch to plpatch.}
% \changes{v1.0h-u00}{2016/05/08}{ドキュメントから\file{uplpatch.ltx}を除外}
-% \changes{v1.0l}{2016/06/19}{パッチレベルを\file{plvers.dtx}から取得}
+% \changes{v1.0l-u01}{2016/06/19}{パッチレベルを\file{uplvers.dtx}から取得}
% \begin{macrocode}
\begin{document}
\title{The up\LaTeXe\ Sources}
@@ -723,9 +741,9 @@
% このシェルスクリプト\footnote{このシェルスクリプトはUNIX用です。
% しかしrmコマンドをdeleteコマンドにするなどすれば、簡単にDOSなどのバッチ
% ファイルに修正することができます。}の使用方法は次のとおりです。
-% \begin{verbatim}
+%\begin{verbatim}
% sh mkpldoc.sh
-% \end{verbatim}
+%\end{verbatim}
%
% \subsubsection{\file{mkpldoc.sh}の内容}
% まず、以前に\file{upldoc.tex}を処理したときに作成された、
@@ -807,9 +825,9 @@ uplatex upldoc.tex
%
% このperlスクリプトの使用方法は次のとおりです。
%
-% \begin{verbatim}
+%\begin{verbatim}
% perl dstcheck.pl file-name
-% \end{verbatim}
+%\end{verbatim}
%
% \subsubsection{\file{dstcheck.pl}の内容}
% 最初に、このperlスクリプトが何をするのかを簡単に記述したコメントを
diff --git a/Master/texmf-dist/source/uplatex/base/uplfonts.dtx b/Master/texmf-dist/source/uplatex/base/uplfonts.dtx
index 016758a51c6..1930d077e3f 100644
--- a/Master/texmf-dist/source/uplatex/base/uplfonts.dtx
+++ b/Master/texmf-dist/source/uplatex/base/uplfonts.dtx
@@ -14,23 +14,6 @@
%
% \fi
%
-% \CheckSum{2061}
-%% \CharacterTable
-%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
-%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
-%% Digits \0\1\2\3\4\5\6\7\8\9
-%% Exclamation \! Double quote \" Hash (number) \#
-%% Dollar \$ Percent \% Ampersand \&
-%% Acute accent \' Left paren \( Right paren \)
-%% Asterisk \* Plus \+ Comma \,
-%% Minus \- Point \. Solidus \/
-%% Colon \: Semicolon \; Less than \<
-%% Equals \= Greater than \> Question mark \?
-%% Commercial at \@ Left bracket \[ Backslash \\
-%% Right bracket \] Circumflex \^ Underscore \_
-%% Grave accent \` Left brace \{ Vertical bar \|
-%% Right brace \} Tilde \~}
-%%
%
% \setcounter{StandardModuleDepth}{1}
% \StopEventually{}
@@ -812,9 +795,9 @@
% フォント切り替えコマンドを実行させる必要があります。
%
% \textbf{使い方}
-% \begin{verbatim}
+%\begin{verbatim}
% usage: \reDeclareMathAlphabet{\mathAA}{\mathBB}{\mathCC}
-% \end{verbatim}
+%\end{verbatim}
% 欧文・和文両用の数式文字変更コマンド |\mathAA| を(再)定義します。
% 欧文用のコマンド |\mathBB| と、和文用の |\mathCC| を (p)\LaTeX{} 標準の
% 方法で定義しておいた後、上のように記述します。なお、|{\mathBB}{\mathCC}|
@@ -924,10 +907,10 @@
%
% |\DeclareRelationFont|コマンドの最初の4つの引数の組が和文書体の属性、
% その後の4つの引数の組が従属書体の属性です。
-% \begin{verbatim}
+%\begin{verbatim}
% \DeclareRelationFont{JY2}{mc}{m}{n}{T1}{cmr}{m}{n}
% \DeclareRelationFont{JY2}{gt}{m}{n}{T1}{cmr}{bx}{n}
-% \end{verbatim}
+%\end{verbatim}
% 上記の例は、明朝体の従属書体としてコンピュータモダンローマン、
% ゴシック体の従属書体としてコンピュータモダンボールドを宣言しています。
% カレント和文書体が|\JY2/mc/m/n|となると、
diff --git a/Master/texmf-dist/source/uplatex/base/uplvers.dtx b/Master/texmf-dist/source/uplatex/base/uplvers.dtx
index a9aa5afde48..84eefb53ea2 100644
--- a/Master/texmf-dist/source/uplatex/base/uplvers.dtx
+++ b/Master/texmf-dist/source/uplatex/base/uplvers.dtx
@@ -14,23 +14,6 @@
%
% \fi
%
-% \CheckSum{201}
-%% \CharacterTable
-%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
-%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
-%% Digits \0\1\2\3\4\5\6\7\8\9
-%% Exclamation \! Double quote \" Hash (number) \#
-%% Dollar \$ Percent \% Ampersand \&
-%% Acute accent \' Left paren \( Right paren \)
-%% Asterisk \* Plus \+ Comma \,
-%% Minus \- Point \. Solidus \/
-%% Colon \: Semicolon \; Less than \<
-%% Equals \= Greater than \> Question mark \?
-%% Commercial at \@ Left bracket \[ Backslash \\
-%% Right bracket \] Circumflex \^ Underscore \_
-%% Grave accent \` Left brace \{ Vertical bar \|
-%% Right brace \} Tilde \~}
-%%
%
% \setcounter{StandardModuleDepth}{1}
% \StopEventually{}
@@ -72,13 +55,15 @@
% 使われた場合に明確なエラーを出すようにした。}
% \changes{v1.0x}{2016/06/19}{パッチレベルを\file{plvers.dtx}で設定}
% \changes{v1.0x-u01}{2016/06/19}{p\LaTeX{}の変更に追随。}
-% \changes{v1.0y-u01}{2016/06/27}{uplatex.cfgの読み込みを追加}
+% \changes{v1.0y-u01}{2016/06/29}{\file{uplatex.cfg}の読み込みを追加}
+% \changes{v1.0z-u01}{2016/08/26}{\file{uplatex.cfg}の読み込みを
+% \file{uplcore.ltx}から\file{uplatex.ltx}へ移動}
% \fi
%
% \iffalse
%<*driver>
% \fi
-\ProvidesFile{uplvers.dtx}[2016/06/29 v1.0y-u01 upLaTeX Kernel (Version Info)]
+\ProvidesFile{uplvers.dtx}[2016/08/26 v1.0z-u01 upLaTeX Kernel (Version Info)]
% \iffalse
\documentclass{jltxdoc}
\GetFileInfo{uplvers.dtx}
@@ -142,7 +127,7 @@
%</plcore>
%<platexrelease>\edef\platexreleaseversion
%<*plcore|platexrelease>
- {2016/07/01u01}
+ {2016/09/03u01}
%</plcore|platexrelease>
%<*plcore>
\def\ppatch@level{0}
@@ -261,6 +246,12 @@
%</plfinal>
% \end{macrocode}
%
+% ^^A 起動時に\file{uplatex.cfg}がある場合、それを読み込むようにする
+% ^^A コードは、\file{uplcore.ltx}から\file{uplatex.ltx}へ移動しました。
+% \changes{v1.0y-u01}{2016/06/29}{\file{uplatex.cfg}の読み込みを追加}
+% \changes{v1.0z-u01}{2016/08/26}{\file{uplatex.cfg}の読み込みを
+% \file{uplcore.ltx}から\file{uplatex.ltx}へ移動}
+%
% \subsection{latexreleaseパッケージへの対応}
%
% 最後に、latexreleaseパッケージへの対応です。
@@ -304,21 +295,6 @@
% \end{macrocode}
% \end{macro}
%
-% 起動時にuplatex.cfgがある場合、それを読み込むようにします。
-% \changes{v1.0y-u01}{2016/06/29}{uplatex.cfgの読み込みを追加}
-% \begin{macrocode}
-%<*plfinal>
-\everyjob\expandafter{%
- \the\everyjob
- \IfFileExists{uplatex.cfg}{%
- \typeout{*************************^^J%
- * Loading uplatex.cfg.^^J%
- *************************}%
- \input{uplatex.cfg}}{}%
-}
-%</plfinal>
-% \end{macrocode}
-%
% \LaTeXe{}が提供するlatexreleaseパッケージが読み込まれていて、
% かつp\LaTeXe{}が提供するplatexreleaseパッケージが読み込まれていない
% 場合は、警告を出します。
diff --git a/Master/texmf-dist/tex/uplatex/base/jt2gt.fd b/Master/texmf-dist/tex/uplatex/base/jt2gt.fd
index 42f7ecc92b9..5aabc98e62e 100644
--- a/Master/texmf-dist/tex/uplatex/base/jt2gt.fd
+++ b/Master/texmf-dist/tex/uplatex/base/jt2gt.fd
@@ -14,22 +14,6 @@
%% --------------------------------------------------------------
%%
%% File: uplfonts.dtx
-%% \CharacterTable
-%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
-%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
-%% Digits \0\1\2\3\4\5\6\7\8\9
-%% Exclamation \! Double quote \" Hash (number) \#
-%% Dollar \$ Percent \% Ampersand \&
-%% Acute accent \' Left paren \( Right paren \)
-%% Asterisk \* Plus \+ Comma \,
-%% Minus \- Point \. Solidus \/
-%% Colon \: Semicolon \; Less than \<
-%% Equals \= Greater than \> Question mark \?
-%% Commercial at \@ Left bracket \[ Backslash \\
-%% Right bracket \] Circumflex \^ Underscore \_
-%% Grave accent \` Left brace \{ Vertical bar \|
-%% Right brace \} Tilde \~}
-%%
\ProvidesFile{jt2gt.fd}
[1997/01/24 v1.3 KANJI font defines]
\DeclareKanjiFamily{JT2}{gt}{}
diff --git a/Master/texmf-dist/tex/uplatex/base/jt2mc.fd b/Master/texmf-dist/tex/uplatex/base/jt2mc.fd
index fc494cdef1b..793af32b998 100644
--- a/Master/texmf-dist/tex/uplatex/base/jt2mc.fd
+++ b/Master/texmf-dist/tex/uplatex/base/jt2mc.fd
@@ -14,22 +14,6 @@
%% --------------------------------------------------------------
%%
%% File: uplfonts.dtx
-%% \CharacterTable
-%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
-%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
-%% Digits \0\1\2\3\4\5\6\7\8\9
-%% Exclamation \! Double quote \" Hash (number) \#
-%% Dollar \$ Percent \% Ampersand \&
-%% Acute accent \' Left paren \( Right paren \)
-%% Asterisk \* Plus \+ Comma \,
-%% Minus \- Point \. Solidus \/
-%% Colon \: Semicolon \; Less than \<
-%% Equals \= Greater than \> Question mark \?
-%% Commercial at \@ Left bracket \[ Backslash \\
-%% Right bracket \] Circumflex \^ Underscore \_
-%% Grave accent \` Left brace \{ Vertical bar \|
-%% Right brace \} Tilde \~}
-%%
\ProvidesFile{jt2mc.fd}
[1997/01/24 v1.3 KANJI font defines]
\DeclareKanjiFamily{JT2}{mc}{}
diff --git a/Master/texmf-dist/tex/uplatex/base/jy2gt.fd b/Master/texmf-dist/tex/uplatex/base/jy2gt.fd
index 543f9877659..1aad3e8ea4a 100644
--- a/Master/texmf-dist/tex/uplatex/base/jy2gt.fd
+++ b/Master/texmf-dist/tex/uplatex/base/jy2gt.fd
@@ -14,22 +14,6 @@
%% --------------------------------------------------------------
%%
%% File: uplfonts.dtx
-%% \CharacterTable
-%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
-%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
-%% Digits \0\1\2\3\4\5\6\7\8\9
-%% Exclamation \! Double quote \" Hash (number) \#
-%% Dollar \$ Percent \% Ampersand \&
-%% Acute accent \' Left paren \( Right paren \)
-%% Asterisk \* Plus \+ Comma \,
-%% Minus \- Point \. Solidus \/
-%% Colon \: Semicolon \; Less than \<
-%% Equals \= Greater than \> Question mark \?
-%% Commercial at \@ Left bracket \[ Backslash \\
-%% Right bracket \] Circumflex \^ Underscore \_
-%% Grave accent \` Left brace \{ Vertical bar \|
-%% Right brace \} Tilde \~}
-%%
\ProvidesFile{jy2gt.fd}
[1997/01/24 v1.3 KANJI font defines]
\DeclareKanjiFamily{JY2}{gt}{}
diff --git a/Master/texmf-dist/tex/uplatex/base/jy2mc.fd b/Master/texmf-dist/tex/uplatex/base/jy2mc.fd
index 3313d98f2e4..e760174bade 100644
--- a/Master/texmf-dist/tex/uplatex/base/jy2mc.fd
+++ b/Master/texmf-dist/tex/uplatex/base/jy2mc.fd
@@ -14,22 +14,6 @@
%% --------------------------------------------------------------
%%
%% File: uplfonts.dtx
-%% \CharacterTable
-%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
-%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
-%% Digits \0\1\2\3\4\5\6\7\8\9
-%% Exclamation \! Double quote \" Hash (number) \#
-%% Dollar \$ Percent \% Ampersand \&
-%% Acute accent \' Left paren \( Right paren \)
-%% Asterisk \* Plus \+ Comma \,
-%% Minus \- Point \. Solidus \/
-%% Colon \: Semicolon \; Less than \<
-%% Equals \= Greater than \> Question mark \?
-%% Commercial at \@ Left bracket \[ Backslash \\
-%% Right bracket \] Circumflex \^ Underscore \_
-%% Grave accent \` Left brace \{ Vertical bar \|
-%% Right brace \} Tilde \~}
-%%
\ProvidesFile{jy2mc.fd}
[1997/01/24 v1.3 KANJI font defines]
\DeclareKanjiFamily{JY2}{mc}{}
diff --git a/Master/texmf-dist/tex/uplatex/base/ujarticle.cls b/Master/texmf-dist/tex/uplatex/base/ujarticle.cls
index 4f10fd5b43c..9bd0e57b625 100644
--- a/Master/texmf-dist/tex/uplatex/base/ujarticle.cls
+++ b/Master/texmf-dist/tex/uplatex/base/ujarticle.cls
@@ -14,22 +14,6 @@
%% --------------------------------------------------------------
%%
%% File: ujclasses.dtx
-%% \CharacterTable
-%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
-%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
-%% Digits \0\1\2\3\4\5\6\7\8\9
-%% Exclamation \! Double quote \" Hash (number) \#
-%% Dollar \$ Percent \% Ampersand \&
-%% Acute accent \' Left paren \( Right paren \)
-%% Asterisk \* Plus \+ Comma \,
-%% Minus \- Point \. Solidus \/
-%% Colon \: Semicolon \; Less than \<
-%% Equals \= Greater than \> Question mark \?
-%% Commercial at \@ Left bracket \[ Backslash \\
-%% Right bracket \] Circumflex \^ Underscore \_
-%% Grave accent \` Left brace \{ Vertical bar \|
-%% Right brace \} Tilde \~}
-%%
\NeedsTeXFormat{pLaTeX2e}
\ProvidesClass{ujarticle}
[2011/05/07 v1.6-u00
diff --git a/Master/texmf-dist/tex/uplatex/base/ujbk10.clo b/Master/texmf-dist/tex/uplatex/base/ujbk10.clo
index 6db1836a3c8..c7763770bef 100644
--- a/Master/texmf-dist/tex/uplatex/base/ujbk10.clo
+++ b/Master/texmf-dist/tex/uplatex/base/ujbk10.clo
@@ -14,22 +14,6 @@
%% --------------------------------------------------------------
%%
%% File: ujclasses.dtx
-%% \CharacterTable
-%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
-%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
-%% Digits \0\1\2\3\4\5\6\7\8\9
-%% Exclamation \! Double quote \" Hash (number) \#
-%% Dollar \$ Percent \% Ampersand \&
-%% Acute accent \' Left paren \( Right paren \)
-%% Asterisk \* Plus \+ Comma \,
-%% Minus \- Point \. Solidus \/
-%% Colon \: Semicolon \; Less than \<
-%% Equals \= Greater than \> Question mark \?
-%% Commercial at \@ Left bracket \[ Backslash \\
-%% Right bracket \] Circumflex \^ Underscore \_
-%% Grave accent \` Left brace \{ Vertical bar \|
-%% Right brace \} Tilde \~}
-%%
\NeedsTeXFormat{pLaTeX2e}
\ProvidesFile{ujbk10.clo}
[2011/05/07 v1.6-u00
diff --git a/Master/texmf-dist/tex/uplatex/base/ujbk11.clo b/Master/texmf-dist/tex/uplatex/base/ujbk11.clo
index 99725f5a021..e6b70c390e5 100644
--- a/Master/texmf-dist/tex/uplatex/base/ujbk11.clo
+++ b/Master/texmf-dist/tex/uplatex/base/ujbk11.clo
@@ -14,22 +14,6 @@
%% --------------------------------------------------------------
%%
%% File: ujclasses.dtx
-%% \CharacterTable
-%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
-%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
-%% Digits \0\1\2\3\4\5\6\7\8\9
-%% Exclamation \! Double quote \" Hash (number) \#
-%% Dollar \$ Percent \% Ampersand \&
-%% Acute accent \' Left paren \( Right paren \)
-%% Asterisk \* Plus \+ Comma \,
-%% Minus \- Point \. Solidus \/
-%% Colon \: Semicolon \; Less than \<
-%% Equals \= Greater than \> Question mark \?
-%% Commercial at \@ Left bracket \[ Backslash \\
-%% Right bracket \] Circumflex \^ Underscore \_
-%% Grave accent \` Left brace \{ Vertical bar \|
-%% Right brace \} Tilde \~}
-%%
\NeedsTeXFormat{pLaTeX2e}
\ProvidesFile{ujbk11.clo}
[2011/05/07 v1.6-u00
diff --git a/Master/texmf-dist/tex/uplatex/base/ujbk12.clo b/Master/texmf-dist/tex/uplatex/base/ujbk12.clo
index beab5a451be..b3b6dd48176 100644
--- a/Master/texmf-dist/tex/uplatex/base/ujbk12.clo
+++ b/Master/texmf-dist/tex/uplatex/base/ujbk12.clo
@@ -14,22 +14,6 @@
%% --------------------------------------------------------------
%%
%% File: ujclasses.dtx
-%% \CharacterTable
-%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
-%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
-%% Digits \0\1\2\3\4\5\6\7\8\9
-%% Exclamation \! Double quote \" Hash (number) \#
-%% Dollar \$ Percent \% Ampersand \&
-%% Acute accent \' Left paren \( Right paren \)
-%% Asterisk \* Plus \+ Comma \,
-%% Minus \- Point \. Solidus \/
-%% Colon \: Semicolon \; Less than \<
-%% Equals \= Greater than \> Question mark \?
-%% Commercial at \@ Left bracket \[ Backslash \\
-%% Right bracket \] Circumflex \^ Underscore \_
-%% Grave accent \` Left brace \{ Vertical bar \|
-%% Right brace \} Tilde \~}
-%%
\NeedsTeXFormat{pLaTeX2e}
\ProvidesFile{ujbk12.clo}
[2011/05/07 v1.6-u00
diff --git a/Master/texmf-dist/tex/uplatex/base/ujbook.cls b/Master/texmf-dist/tex/uplatex/base/ujbook.cls
index 9346ab2647a..55ca3f2c1f7 100644
--- a/Master/texmf-dist/tex/uplatex/base/ujbook.cls
+++ b/Master/texmf-dist/tex/uplatex/base/ujbook.cls
@@ -14,22 +14,6 @@
%% --------------------------------------------------------------
%%
%% File: ujclasses.dtx
-%% \CharacterTable
-%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
-%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
-%% Digits \0\1\2\3\4\5\6\7\8\9
-%% Exclamation \! Double quote \" Hash (number) \#
-%% Dollar \$ Percent \% Ampersand \&
-%% Acute accent \' Left paren \( Right paren \)
-%% Asterisk \* Plus \+ Comma \,
-%% Minus \- Point \. Solidus \/
-%% Colon \: Semicolon \; Less than \<
-%% Equals \= Greater than \> Question mark \?
-%% Commercial at \@ Left bracket \[ Backslash \\
-%% Right bracket \] Circumflex \^ Underscore \_
-%% Grave accent \` Left brace \{ Vertical bar \|
-%% Right brace \} Tilde \~}
-%%
\NeedsTeXFormat{pLaTeX2e}
\ProvidesClass{ujbook}
[2011/05/07 v1.6-u00
diff --git a/Master/texmf-dist/tex/uplatex/base/ujreport.cls b/Master/texmf-dist/tex/uplatex/base/ujreport.cls
index 1b29b444b35..c1753a7865e 100644
--- a/Master/texmf-dist/tex/uplatex/base/ujreport.cls
+++ b/Master/texmf-dist/tex/uplatex/base/ujreport.cls
@@ -14,22 +14,6 @@
%% --------------------------------------------------------------
%%
%% File: ujclasses.dtx
-%% \CharacterTable
-%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
-%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
-%% Digits \0\1\2\3\4\5\6\7\8\9
-%% Exclamation \! Double quote \" Hash (number) \#
-%% Dollar \$ Percent \% Ampersand \&
-%% Acute accent \' Left paren \( Right paren \)
-%% Asterisk \* Plus \+ Comma \,
-%% Minus \- Point \. Solidus \/
-%% Colon \: Semicolon \; Less than \<
-%% Equals \= Greater than \> Question mark \?
-%% Commercial at \@ Left bracket \[ Backslash \\
-%% Right bracket \] Circumflex \^ Underscore \_
-%% Grave accent \` Left brace \{ Vertical bar \|
-%% Right brace \} Tilde \~}
-%%
\NeedsTeXFormat{pLaTeX2e}
\ProvidesClass{ujreport}
[2011/05/07 v1.6-u00
diff --git a/Master/texmf-dist/tex/uplatex/base/ujsize10.clo b/Master/texmf-dist/tex/uplatex/base/ujsize10.clo
index 5bf21c601df..b1a8742b6d4 100644
--- a/Master/texmf-dist/tex/uplatex/base/ujsize10.clo
+++ b/Master/texmf-dist/tex/uplatex/base/ujsize10.clo
@@ -14,22 +14,6 @@
%% --------------------------------------------------------------
%%
%% File: ujclasses.dtx
-%% \CharacterTable
-%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
-%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
-%% Digits \0\1\2\3\4\5\6\7\8\9
-%% Exclamation \! Double quote \" Hash (number) \#
-%% Dollar \$ Percent \% Ampersand \&
-%% Acute accent \' Left paren \( Right paren \)
-%% Asterisk \* Plus \+ Comma \,
-%% Minus \- Point \. Solidus \/
-%% Colon \: Semicolon \; Less than \<
-%% Equals \= Greater than \> Question mark \?
-%% Commercial at \@ Left bracket \[ Backslash \\
-%% Right bracket \] Circumflex \^ Underscore \_
-%% Grave accent \` Left brace \{ Vertical bar \|
-%% Right brace \} Tilde \~}
-%%
\NeedsTeXFormat{pLaTeX2e}
\ProvidesFile{ujsize10.clo}
[2011/05/07 v1.6-u00
diff --git a/Master/texmf-dist/tex/uplatex/base/ujsize11.clo b/Master/texmf-dist/tex/uplatex/base/ujsize11.clo
index d4db9de045e..abf92e6e50c 100644
--- a/Master/texmf-dist/tex/uplatex/base/ujsize11.clo
+++ b/Master/texmf-dist/tex/uplatex/base/ujsize11.clo
@@ -14,22 +14,6 @@
%% --------------------------------------------------------------
%%
%% File: ujclasses.dtx
-%% \CharacterTable
-%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
-%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
-%% Digits \0\1\2\3\4\5\6\7\8\9
-%% Exclamation \! Double quote \" Hash (number) \#
-%% Dollar \$ Percent \% Ampersand \&
-%% Acute accent \' Left paren \( Right paren \)
-%% Asterisk \* Plus \+ Comma \,
-%% Minus \- Point \. Solidus \/
-%% Colon \: Semicolon \; Less than \<
-%% Equals \= Greater than \> Question mark \?
-%% Commercial at \@ Left bracket \[ Backslash \\
-%% Right bracket \] Circumflex \^ Underscore \_
-%% Grave accent \` Left brace \{ Vertical bar \|
-%% Right brace \} Tilde \~}
-%%
\NeedsTeXFormat{pLaTeX2e}
\ProvidesFile{ujsize11.clo}
[2011/05/07 v1.6-u00
diff --git a/Master/texmf-dist/tex/uplatex/base/ujsize12.clo b/Master/texmf-dist/tex/uplatex/base/ujsize12.clo
index 72df8c2bcb7..c8eaea001ec 100644
--- a/Master/texmf-dist/tex/uplatex/base/ujsize12.clo
+++ b/Master/texmf-dist/tex/uplatex/base/ujsize12.clo
@@ -14,22 +14,6 @@
%% --------------------------------------------------------------
%%
%% File: ujclasses.dtx
-%% \CharacterTable
-%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
-%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
-%% Digits \0\1\2\3\4\5\6\7\8\9
-%% Exclamation \! Double quote \" Hash (number) \#
-%% Dollar \$ Percent \% Ampersand \&
-%% Acute accent \' Left paren \( Right paren \)
-%% Asterisk \* Plus \+ Comma \,
-%% Minus \- Point \. Solidus \/
-%% Colon \: Semicolon \; Less than \<
-%% Equals \= Greater than \> Question mark \?
-%% Commercial at \@ Left bracket \[ Backslash \\
-%% Right bracket \] Circumflex \^ Underscore \_
-%% Grave accent \` Left brace \{ Vertical bar \|
-%% Right brace \} Tilde \~}
-%%
\NeedsTeXFormat{pLaTeX2e}
\ProvidesFile{ujsize12.clo}
[2011/05/07 v1.6-u00
diff --git a/Master/texmf-dist/tex/uplatex/base/ukinsoku.tex b/Master/texmf-dist/tex/uplatex/base/ukinsoku.tex
index 24c982dc76c..fb85607859c 100644
--- a/Master/texmf-dist/tex/uplatex/base/ukinsoku.tex
+++ b/Master/texmf-dist/tex/uplatex/base/ukinsoku.tex
@@ -14,22 +14,6 @@
%% --------------------------------------------------------------
%%
%% File: ukinsoku.dtx
-%% \CharacterTable
-%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
-%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
-%% Digits \0\1\2\3\4\5\6\7\8\9
-%% Exclamation \! Double quote \" Hash (number) \#
-%% Dollar \$ Percent \% Ampersand \&
-%% Acute accent \' Left paren \( Right paren \)
-%% Asterisk \* Plus \+ Comma \,
-%% Minus \- Point \. Solidus \/
-%% Colon \: Semicolon \; Less than \<
-%% Equals \= Greater than \> Question mark \?
-%% Commercial at \@ Left bracket \[ Backslash \\
-%% Right bracket \] Circumflex \^ Underscore \_
-%% Grave accent \` Left brace \{ Vertical bar \|
-%% Right brace \} Tilde \~}
-%%
%%
%% 行頭、行末禁則パラメータ
%%
diff --git a/Master/texmf-dist/tex/uplatex/base/uplatex.ltx b/Master/texmf-dist/tex/uplatex/base/uplatex.ltx
index 60287e1f6ff..611bcb3c586 100644
--- a/Master/texmf-dist/tex/uplatex/base/uplatex.ltx
+++ b/Master/texmf-dist/tex/uplatex/base/uplatex.ltx
@@ -14,22 +14,6 @@
%% --------------------------------------------------------------
%%
%% File: uplatex.dtx
-%% \CharacterTable
-%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
-%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
-%% Digits \0\1\2\3\4\5\6\7\8\9
-%% Exclamation \! Double quote \" Hash (number) \#
-%% Dollar \$ Percent \% Ampersand \&
-%% Acute accent \' Left paren \( Right paren \)
-%% Asterisk \* Plus \+ Comma \,
-%% Minus \- Point \. Solidus \/
-%% Colon \: Semicolon \; Less than \<
-%% Equals \= Greater than \> Question mark \?
-%% Commercial at \@ Left bracket \[ Backslash \\
-%% Right bracket \] Circumflex \^ Underscore \_
-%% Grave accent \` Left brace \{ Vertical bar \|
-%% Right brace \} Tilde \~}
-%%
\let\orgdump\dump
\let\dump\relax
\input latex.ltx
@@ -42,11 +26,18 @@
\makeatletter
\input uplcore.ltx
\the\everyjob
+\everyjob\expandafter{%
+ \the\everyjob
+ \IfFileExists{uplatex.cfg}{%
+ \typeout{*************************^^J%
+ * Loading uplatex.cfg.^^J%
+ *************************}%
+ \input{uplatex.cfg}}{}%
+}
\let\dump\orgdump
\let\orgdump\@undefined
\makeatother
\dump
\endinput
-\endinput
%%
%% End of file `uplatex.ltx'.
diff --git a/Master/texmf-dist/tex/uplatex/base/uplcore.ltx b/Master/texmf-dist/tex/uplatex/base/uplcore.ltx
index 6425216d4b3..18ba6e4271f 100644
--- a/Master/texmf-dist/tex/uplatex/base/uplcore.ltx
+++ b/Master/texmf-dist/tex/uplatex/base/uplcore.ltx
@@ -17,25 +17,9 @@
%% --------------------------------------------------------------
%%
%% File: uplvers.dtx
-%% \CharacterTable
-%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
-%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
-%% Digits \0\1\2\3\4\5\6\7\8\9
-%% Exclamation \! Double quote \" Hash (number) \#
-%% Dollar \$ Percent \% Ampersand \&
-%% Acute accent \' Left paren \( Right paren \)
-%% Asterisk \* Plus \+ Comma \,
-%% Minus \- Point \. Solidus \/
-%% Colon \: Semicolon \; Less than \<
-%% Equals \= Greater than \> Question mark \?
-%% Commercial at \@ Left bracket \[ Backslash \\
-%% Right bracket \] Circumflex \^ Underscore \_
-%% Grave accent \` Left brace \{ Vertical bar \|
-%% Right brace \} Tilde \~}
-%%
\def\pfmtname{pLaTeX2e}
\def\pfmtversion
- {2016/07/01u01}
+ {2016/09/03u01}
\def\ppatch@level{0}
\def\plIncludeInRelease#1{\kernel@ifnextchar[%
{\@plIncludeInRelease{#1}}
@@ -60,22 +44,6 @@
\long\def\@gobble@plIncludeInRelease#1\plEndIncludeInRelease{}
\let\plEndIncludeInRelease\relax
%% File: uplfonts.dtx
-%% \CharacterTable
-%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
-%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
-%% Digits \0\1\2\3\4\5\6\7\8\9
-%% Exclamation \! Double quote \" Hash (number) \#
-%% Dollar \$ Percent \% Ampersand \&
-%% Acute accent \' Left paren \( Right paren \)
-%% Asterisk \* Plus \+ Comma \,
-%% Minus \- Point \. Solidus \/
-%% Colon \: Semicolon \; Less than \<
-%% Equals \= Greater than \> Question mark \?
-%% Commercial at \@ Left bracket \[ Backslash \\
-%% Right bracket \] Circumflex \^ Underscore \_
-%% Grave accent \` Left brace \{ Vertical bar \|
-%% Right brace \} Tilde \~}
-%%
\let\k@encoding\@empty
\let\ck@encoding\@empty
\def\cy@encoding{JY2}
@@ -673,22 +641,6 @@
*************************************}}%
{\input{upldefs.ltx}}
%% File: plcore.dtx
-%% \CharacterTable
-%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
-%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
-%% Digits \0\1\2\3\4\5\6\7\8\9
-%% Exclamation \! Double quote \" Hash (number) \#
-%% Dollar \$ Percent \% Ampersand \&
-%% Acute accent \' Left paren \( Right paren \)
-%% Asterisk \* Plus \+ Comma \,
-%% Minus \- Point \. Solidus \/
-%% Colon \: Semicolon \; Less than \<
-%% Equals \= Greater than \> Question mark \?
-%% Commercial at \@ Left bracket \[ Backslash \\
-%% Right bracket \] Circumflex \^ Underscore \_
-%% Grave accent \` Left brace \{ Vertical bar \|
-%% Right brace \} Tilde \~}
-%%
\def\NeedsTeXFormat#1{%
\def\reserved@a{#1}%
\ifx\reserved@a\pfmtname
@@ -748,7 +700,7 @@
\@texttop
\dimen@ \dp\@outputbox
\unvbox \@outputbox
- \iftdir\hskip\z@\fi
+ \iftdir\vbox{\hskip\z@}\fi
\vskip -\dimen@
\@textbottom
\ifvoid\footins\else % for pLaTeX
@@ -965,6 +917,22 @@
\renewcommand\@makefnmark{%
\ifydir \hbox{}\hbox{\@textsuperscript{\normalfont\@thefnmark}}\hbox{}%
\else\hbox{\yoko\@textsuperscript{\normalfont\@thefnmark}}\fi}
+\ifx\@undefined\pltx@foot@penalty \newcount\pltx@foot@penalty \fi
+\pltx@foot@penalty\z@
+\def\footnote{\inhibitglue
+ \@ifnextchar[\@xfootnote{\stepcounter\@mpfn
+ \protected@xdef\@thefnmark{\thempfn}%
+ \@footnotemark\@footnotetext}}
+\def\footnotemark{\inhibitglue
+ \@ifnextchar[\@xfootnotemark
+ {\stepcounter{footnote}%
+ \protected@xdef\@thefnmark{\thefootnote}%
+ \@footnotemark}}
+\def\footnotetext{%
+ \ifhmode\pltx@foot@penalty\lastpenalty\unpenalty\fi%
+ \@ifnextchar [\@xfootnotenext
+ {\protected@xdef\@thefnmark{\thempfn}%
+ \@footnotetext}}
\long\def\@footnotetext#1{%
\ifydir\def\@tempa{\yoko}\else\def\@tempa{\tate}\fi
\insert\footins{\@tempa%
@@ -979,7 +947,11 @@
\color@begingroup
\@makefntext{%
\rule\z@\footnotesep\ignorespaces#1\@finalstrut\strutbox}%
- \color@endgroup}}
+ \color@endgroup}\null
+ \ifnum\pltx@foot@penalty=\z@\else
+ \penalty\pltx@foot@penalty
+ \pltx@foot@penalty\z@
+ \fi}
\def\@footnotemark{\leavevmode
\ifhmode\edef\@x@sf{\the\spacefactor}\nobreak\fi
\ifydir\@makefnmark
@@ -1034,22 +1006,6 @@
\ifmmode\@@underline{#1}%
\else \leavevmode\null$\@@underline{\hbox{#1}}\m@th$\null\relax\fi}
%% File: uplvers.dtx
-%% \CharacterTable
-%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
-%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
-%% Digits \0\1\2\3\4\5\6\7\8\9
-%% Exclamation \! Double quote \" Hash (number) \#
-%% Dollar \$ Percent \% Ampersand \&
-%% Acute accent \' Left paren \( Right paren \)
-%% Asterisk \* Plus \+ Comma \,
-%% Minus \- Point \. Solidus \/
-%% Colon \: Semicolon \; Less than \<
-%% Equals \= Greater than \> Question mark \?
-%% Commercial at \@ Left bracket \[ Backslash \\
-%% Right bracket \] Circumflex \^ Underscore \_
-%% Grave accent \` Left brace \{ Vertical bar \|
-%% Right brace \} Tilde \~}
-%%
\def\documentstyle{%
\@latex@error{upLaTeX does NOT support LaTeX 2.09 compatibility mode}\@ehc
\documentclass}
@@ -1086,14 +1042,6 @@
}
\expandafter
\endgroup \platexTMP
-\everyjob\expandafter{%
- \the\everyjob
- \IfFileExists{uplatex.cfg}{%
- \typeout{*************************^^J%
- * Loading uplatex.cfg.^^J%
- *************************}%
- \input{uplatex.cfg}}{}%
-}
\AtBeginDocument{%
\@ifpackageloaded{latexrelease}{%
\@ifpackageloaded{platexrelease}{}{%
diff --git a/Master/texmf-dist/tex/uplatex/base/upldefs.ltx b/Master/texmf-dist/tex/uplatex/base/upldefs.ltx
index a8c379761d9..45f13f69b57 100644
--- a/Master/texmf-dist/tex/uplatex/base/upldefs.ltx
+++ b/Master/texmf-dist/tex/uplatex/base/upldefs.ltx
@@ -14,22 +14,6 @@
%% --------------------------------------------------------------
%%
%% File: uplfonts.dtx
-%% \CharacterTable
-%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
-%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
-%% Digits \0\1\2\3\4\5\6\7\8\9
-%% Exclamation \! Double quote \" Hash (number) \#
-%% Dollar \$ Percent \% Ampersand \&
-%% Acute accent \' Left paren \( Right paren \)
-%% Asterisk \* Plus \+ Comma \,
-%% Minus \- Point \. Solidus \/
-%% Colon \: Semicolon \; Less than \<
-%% Equals \= Greater than \> Question mark \?
-%% Commercial at \@ Left bracket \[ Backslash \\
-%% Right bracket \] Circumflex \^ Underscore \_
-%% Grave accent \` Left brace \{ Vertical bar \|
-%% Right brace \} Tilde \~}
-%%
\ProvidesFile{upldefs.ltx}
[2016/06/29 v1.6e-u00 upLaTeX Kernel (Default settings)]
\def\g@tlastchart@#1{#1\ifx\lastnodechar\@undefined\m@ne\else\lastnodechar\fi}
diff --git a/Master/texmf-dist/tex/uplatex/base/uptrace.sty b/Master/texmf-dist/tex/uplatex/base/uptrace.sty
index acfa6b15249..c2aafd9bf6a 100644
--- a/Master/texmf-dist/tex/uplatex/base/uptrace.sty
+++ b/Master/texmf-dist/tex/uplatex/base/uptrace.sty
@@ -14,22 +14,6 @@
%% --------------------------------------------------------------
%%
%% File: uplfonts.dtx
-%% \CharacterTable
-%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
-%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
-%% Digits \0\1\2\3\4\5\6\7\8\9
-%% Exclamation \! Double quote \" Hash (number) \#
-%% Dollar \$ Percent \% Ampersand \&
-%% Acute accent \' Left paren \( Right paren \)
-%% Asterisk \* Plus \+ Comma \,
-%% Minus \- Point \. Solidus \/
-%% Colon \: Semicolon \; Less than \<
-%% Equals \= Greater than \> Question mark \?
-%% Commercial at \@ Left bracket \[ Backslash \\
-%% Right bracket \] Circumflex \^ Underscore \_
-%% Grave accent \` Left brace \{ Vertical bar \|
-%% Right brace \} Tilde \~}
-%%
\NeedsTeXFormat{pLaTeX2e}
\ProvidesPackage{uptrace}
[2016/04/30 v1.6b-u00 Standard upLaTeX package (font tracing)]
diff --git a/Master/texmf-dist/tex/uplatex/base/utarticle.cls b/Master/texmf-dist/tex/uplatex/base/utarticle.cls
index e77c23b53bd..f9de99aea53 100644
--- a/Master/texmf-dist/tex/uplatex/base/utarticle.cls
+++ b/Master/texmf-dist/tex/uplatex/base/utarticle.cls
@@ -14,22 +14,6 @@
%% --------------------------------------------------------------
%%
%% File: ujclasses.dtx
-%% \CharacterTable
-%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
-%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
-%% Digits \0\1\2\3\4\5\6\7\8\9
-%% Exclamation \! Double quote \" Hash (number) \#
-%% Dollar \$ Percent \% Ampersand \&
-%% Acute accent \' Left paren \( Right paren \)
-%% Asterisk \* Plus \+ Comma \,
-%% Minus \- Point \. Solidus \/
-%% Colon \: Semicolon \; Less than \<
-%% Equals \= Greater than \> Question mark \?
-%% Commercial at \@ Left bracket \[ Backslash \\
-%% Right bracket \] Circumflex \^ Underscore \_
-%% Grave accent \` Left brace \{ Vertical bar \|
-%% Right brace \} Tilde \~}
-%%
\NeedsTeXFormat{pLaTeX2e}
\ProvidesClass{utarticle}
[2011/05/07 v1.6-u00
diff --git a/Master/texmf-dist/tex/uplatex/base/utbk10.clo b/Master/texmf-dist/tex/uplatex/base/utbk10.clo
index 3a3fa510f31..172c234632e 100644
--- a/Master/texmf-dist/tex/uplatex/base/utbk10.clo
+++ b/Master/texmf-dist/tex/uplatex/base/utbk10.clo
@@ -14,22 +14,6 @@
%% --------------------------------------------------------------
%%
%% File: ujclasses.dtx
-%% \CharacterTable
-%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
-%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
-%% Digits \0\1\2\3\4\5\6\7\8\9
-%% Exclamation \! Double quote \" Hash (number) \#
-%% Dollar \$ Percent \% Ampersand \&
-%% Acute accent \' Left paren \( Right paren \)
-%% Asterisk \* Plus \+ Comma \,
-%% Minus \- Point \. Solidus \/
-%% Colon \: Semicolon \; Less than \<
-%% Equals \= Greater than \> Question mark \?
-%% Commercial at \@ Left bracket \[ Backslash \\
-%% Right bracket \] Circumflex \^ Underscore \_
-%% Grave accent \` Left brace \{ Vertical bar \|
-%% Right brace \} Tilde \~}
-%%
\NeedsTeXFormat{pLaTeX2e}
\ProvidesFile{utbk10.clo}
[2011/05/07 v1.6-u00
diff --git a/Master/texmf-dist/tex/uplatex/base/utbk11.clo b/Master/texmf-dist/tex/uplatex/base/utbk11.clo
index fc0aa86ab44..944071011bf 100644
--- a/Master/texmf-dist/tex/uplatex/base/utbk11.clo
+++ b/Master/texmf-dist/tex/uplatex/base/utbk11.clo
@@ -14,22 +14,6 @@
%% --------------------------------------------------------------
%%
%% File: ujclasses.dtx
-%% \CharacterTable
-%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
-%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
-%% Digits \0\1\2\3\4\5\6\7\8\9
-%% Exclamation \! Double quote \" Hash (number) \#
-%% Dollar \$ Percent \% Ampersand \&
-%% Acute accent \' Left paren \( Right paren \)
-%% Asterisk \* Plus \+ Comma \,
-%% Minus \- Point \. Solidus \/
-%% Colon \: Semicolon \; Less than \<
-%% Equals \= Greater than \> Question mark \?
-%% Commercial at \@ Left bracket \[ Backslash \\
-%% Right bracket \] Circumflex \^ Underscore \_
-%% Grave accent \` Left brace \{ Vertical bar \|
-%% Right brace \} Tilde \~}
-%%
\NeedsTeXFormat{pLaTeX2e}
\ProvidesFile{utbk11.clo}
[2011/05/07 v1.6-u00
diff --git a/Master/texmf-dist/tex/uplatex/base/utbk12.clo b/Master/texmf-dist/tex/uplatex/base/utbk12.clo
index d7e1c3afcfa..24efd022525 100644
--- a/Master/texmf-dist/tex/uplatex/base/utbk12.clo
+++ b/Master/texmf-dist/tex/uplatex/base/utbk12.clo
@@ -14,22 +14,6 @@
%% --------------------------------------------------------------
%%
%% File: ujclasses.dtx
-%% \CharacterTable
-%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
-%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
-%% Digits \0\1\2\3\4\5\6\7\8\9
-%% Exclamation \! Double quote \" Hash (number) \#
-%% Dollar \$ Percent \% Ampersand \&
-%% Acute accent \' Left paren \( Right paren \)
-%% Asterisk \* Plus \+ Comma \,
-%% Minus \- Point \. Solidus \/
-%% Colon \: Semicolon \; Less than \<
-%% Equals \= Greater than \> Question mark \?
-%% Commercial at \@ Left bracket \[ Backslash \\
-%% Right bracket \] Circumflex \^ Underscore \_
-%% Grave accent \` Left brace \{ Vertical bar \|
-%% Right brace \} Tilde \~}
-%%
\NeedsTeXFormat{pLaTeX2e}
\ProvidesFile{utbk12.clo}
[2011/05/07 v1.6-u00
diff --git a/Master/texmf-dist/tex/uplatex/base/utbook.cls b/Master/texmf-dist/tex/uplatex/base/utbook.cls
index d560bc3e45e..1aca471bccb 100644
--- a/Master/texmf-dist/tex/uplatex/base/utbook.cls
+++ b/Master/texmf-dist/tex/uplatex/base/utbook.cls
@@ -14,22 +14,6 @@
%% --------------------------------------------------------------
%%
%% File: ujclasses.dtx
-%% \CharacterTable
-%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
-%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
-%% Digits \0\1\2\3\4\5\6\7\8\9
-%% Exclamation \! Double quote \" Hash (number) \#
-%% Dollar \$ Percent \% Ampersand \&
-%% Acute accent \' Left paren \( Right paren \)
-%% Asterisk \* Plus \+ Comma \,
-%% Minus \- Point \. Solidus \/
-%% Colon \: Semicolon \; Less than \<
-%% Equals \= Greater than \> Question mark \?
-%% Commercial at \@ Left bracket \[ Backslash \\
-%% Right bracket \] Circumflex \^ Underscore \_
-%% Grave accent \` Left brace \{ Vertical bar \|
-%% Right brace \} Tilde \~}
-%%
\NeedsTeXFormat{pLaTeX2e}
\ProvidesClass{utbook}
[2011/05/07 v1.6-u00
diff --git a/Master/texmf-dist/tex/uplatex/base/utreport.cls b/Master/texmf-dist/tex/uplatex/base/utreport.cls
index 53718f4c759..22ee61fa9cb 100644
--- a/Master/texmf-dist/tex/uplatex/base/utreport.cls
+++ b/Master/texmf-dist/tex/uplatex/base/utreport.cls
@@ -14,22 +14,6 @@
%% --------------------------------------------------------------
%%
%% File: ujclasses.dtx
-%% \CharacterTable
-%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
-%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
-%% Digits \0\1\2\3\4\5\6\7\8\9
-%% Exclamation \! Double quote \" Hash (number) \#
-%% Dollar \$ Percent \% Ampersand \&
-%% Acute accent \' Left paren \( Right paren \)
-%% Asterisk \* Plus \+ Comma \,
-%% Minus \- Point \. Solidus \/
-%% Colon \: Semicolon \; Less than \<
-%% Equals \= Greater than \> Question mark \?
-%% Commercial at \@ Left bracket \[ Backslash \\
-%% Right bracket \] Circumflex \^ Underscore \_
-%% Grave accent \` Left brace \{ Vertical bar \|
-%% Right brace \} Tilde \~}
-%%
\NeedsTeXFormat{pLaTeX2e}
\ProvidesClass{utreport}
[2011/05/07 v1.6-u00
diff --git a/Master/texmf-dist/tex/uplatex/base/utsize10.clo b/Master/texmf-dist/tex/uplatex/base/utsize10.clo
index 4cfae4ba789..a43e11727dd 100644
--- a/Master/texmf-dist/tex/uplatex/base/utsize10.clo
+++ b/Master/texmf-dist/tex/uplatex/base/utsize10.clo
@@ -14,22 +14,6 @@
%% --------------------------------------------------------------
%%
%% File: ujclasses.dtx
-%% \CharacterTable
-%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
-%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
-%% Digits \0\1\2\3\4\5\6\7\8\9
-%% Exclamation \! Double quote \" Hash (number) \#
-%% Dollar \$ Percent \% Ampersand \&
-%% Acute accent \' Left paren \( Right paren \)
-%% Asterisk \* Plus \+ Comma \,
-%% Minus \- Point \. Solidus \/
-%% Colon \: Semicolon \; Less than \<
-%% Equals \= Greater than \> Question mark \?
-%% Commercial at \@ Left bracket \[ Backslash \\
-%% Right bracket \] Circumflex \^ Underscore \_
-%% Grave accent \` Left brace \{ Vertical bar \|
-%% Right brace \} Tilde \~}
-%%
\NeedsTeXFormat{pLaTeX2e}
\ProvidesFile{utsize10.clo}
[2011/05/07 v1.6-u00
diff --git a/Master/texmf-dist/tex/uplatex/base/utsize11.clo b/Master/texmf-dist/tex/uplatex/base/utsize11.clo
index 952d36f4e58..c3a90edf4bb 100644
--- a/Master/texmf-dist/tex/uplatex/base/utsize11.clo
+++ b/Master/texmf-dist/tex/uplatex/base/utsize11.clo
@@ -14,22 +14,6 @@
%% --------------------------------------------------------------
%%
%% File: ujclasses.dtx
-%% \CharacterTable
-%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
-%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
-%% Digits \0\1\2\3\4\5\6\7\8\9
-%% Exclamation \! Double quote \" Hash (number) \#
-%% Dollar \$ Percent \% Ampersand \&
-%% Acute accent \' Left paren \( Right paren \)
-%% Asterisk \* Plus \+ Comma \,
-%% Minus \- Point \. Solidus \/
-%% Colon \: Semicolon \; Less than \<
-%% Equals \= Greater than \> Question mark \?
-%% Commercial at \@ Left bracket \[ Backslash \\
-%% Right bracket \] Circumflex \^ Underscore \_
-%% Grave accent \` Left brace \{ Vertical bar \|
-%% Right brace \} Tilde \~}
-%%
\NeedsTeXFormat{pLaTeX2e}
\ProvidesFile{utsize11.clo}
[2011/05/07 v1.6-u00
diff --git a/Master/texmf-dist/tex/uplatex/base/utsize12.clo b/Master/texmf-dist/tex/uplatex/base/utsize12.clo
index 1ea4a2948f0..3cb5669cdc6 100644
--- a/Master/texmf-dist/tex/uplatex/base/utsize12.clo
+++ b/Master/texmf-dist/tex/uplatex/base/utsize12.clo
@@ -14,22 +14,6 @@
%% --------------------------------------------------------------
%%
%% File: ujclasses.dtx
-%% \CharacterTable
-%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
-%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
-%% Digits \0\1\2\3\4\5\6\7\8\9
-%% Exclamation \! Double quote \" Hash (number) \#
-%% Dollar \$ Percent \% Ampersand \&
-%% Acute accent \' Left paren \( Right paren \)
-%% Asterisk \* Plus \+ Comma \,
-%% Minus \- Point \. Solidus \/
-%% Colon \: Semicolon \; Less than \<
-%% Equals \= Greater than \> Question mark \?
-%% Commercial at \@ Left bracket \[ Backslash \\
-%% Right bracket \] Circumflex \^ Underscore \_
-%% Grave accent \` Left brace \{ Vertical bar \|
-%% Right brace \} Tilde \~}
-%%
\NeedsTeXFormat{pLaTeX2e}
\ProvidesFile{utsize12.clo}
[2011/05/07 v1.6-u00