uplatex (9may16)

git-svn-id: svn://tug.org/texlive/trunk@40991 c570f23f-e606-0410-a88d-b1316a301751
author: Karl Berry <karl@freefriends.org> 2016-05-09 23:41:02 +0000
committer: Karl Berry <karl@freefriends.org> 2016-05-09 23:41:02 +0000
commit: c143a4632d967b1831be9a77ea54f6ceac5da3ec (patch)
tree: cb2748d331ea49b43cf691a5d819bc4a2400f921 /Master/texmf-dist
parent: 91d417296c636d06a8b3e4800715e6f87c900e46 (diff)
42 files changed, 2358 insertions, 521 deletions
diff --git a/Master/texmf-dist/doc/uplatex/base/LICENSE b/Master/texmf-dist/doc/uplatex/base/LICENSE
new file mode 100644
index 00000000000..7e635459a76
--- /dev/null
+++ b/Master/texmf-dist/doc/uplatex/base/LICENSE
@@ -0,0 +1,29 @@
+Copyright (c) 2010 ASCII MEDIA WORKS
+Copyright (c) 2016 Takuji Tanaka
+Copyright (c) 2016 Japanese TeX Development Community
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this
+  list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+
+* Neither the name of uplatex nor the names of its
+  contributors may be used to endorse or promote products derived from
+  this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/Master/texmf-dist/doc/uplatex/base/README.md b/Master/texmf-dist/doc/uplatex/base/README.md
new file mode 100644
index 00000000000..ec3035b6033
--- /dev/null
+++ b/Master/texmf-dist/doc/uplatex/base/README.md
@@ -0,0 +1,22 @@
+# uplatex
+
+The bundle provides pLaTeX2e macros for [upTeX by Takuji Tanaka](http://www.t-lab.opal.ne.jp/tex/uptex_en.html).
+This is a community edition syncing with [platex](https://github.com/texjporg/platex).
+
+## Repository
+
+The bundle is maintained on GitHub:
+https://github.com/texjporg/uplatex
+
+If you have issues, please let us know from the above page.
+
+## License
+
+The bundle may be distributed and/or modified under the terms of
+the 3-clause BSD license (see LICENSE).
+
+## Release Date
+
+2016-05-08
+
+Japanese TeX Development Community
diff --git a/Master/texmf-dist/doc/uplatex/base/uplatex.pdf b/Master/texmf-dist/doc/uplatex/base/uplatex.pdf
new file mode 100644
index 00000000000..c6934b43de4
--- /dev/null
+++ b/Master/texmf-dist/doc/uplatex/base/uplatex.pdf
diff --git a/Master/texmf-dist/doc/uplatex/base/upldoc.pdf b/Master/texmf-dist/doc/uplatex/base/upldoc.pdf
new file mode 100644
index 00000000000..9d46220cd87
--- /dev/null
+++ b/Master/texmf-dist/doc/uplatex/base/upldoc.pdf
diff --git a/Master/texmf-dist/source/uplatex/base/Makefile b/Master/texmf-dist/source/uplatex/base/Makefile
new file mode 100644
index 00000000000..e0bfa12bdc1
--- /dev/null
+++ b/Master/texmf-dist/source/uplatex/base/Makefile
@@ -0,0 +1,56 @@
+TARGET1 = uplatex.ltx ujarticle.cls
+TARGET2 = uplatex.pdf upldoc.pdf
+FONTMAP = -f ipaex.map -f uptex-ipaex.map
+
+all: $(TARGET1) $(TARGET2)
+
+PLFMT = uplatex.ltx uplcore.ltx ukinsoku.tex upldefs.ltx \
+	jy2mc.fd jy2gt.fd jt2mc.fd jt2gt.fd uptrace.sty
+
+PLFMT_SRC = uplatex.dtx uplvers.dtx uplfonts.dtx plcore.dtx \
+	ukinsoku.dtx
+
+PLCLS = ujarticle.cls ujreport.cls ujbook.cls ujsize10.clo \
+	ujsize11.clo ujsize12.clo ujbk10.clo ujbk11.clo ujbk12.clo \
+	utarticle.cls utreport.cls utbook.cls utsize10.clo \
+	utsize11.clo utsize12.clo utbk10.clo utbk11.clo utbk12.clo
+
+PLCLS_SRC = ujclasses.dtx
+
+INTRODOC_SRC = uplatex.dtx
+
+PLDOC_SRC = uplatex.dtx uplvers.dtx uplfonts.dtx \
+	ukinsoku.dtx ujclasses.dtx
+
+uplatex.ltx: $(PLFMT_SRC)
+	uplatex --kanji=utf8 uplfmt.ins
+	rm uplfmt.log
+
+ujarticle.cls: $(PLCLS_SRC)
+	uplatex --kanji=utf8 uplcls.ins
+	rm uplcls.log
+
+uplatex.pdf: $(INTRODOC_SRC)
+	uplatex --kanji=utf8 uplatex.dtx && \
+	uplatex --kanji=utf8 uplatex.dtx && \
+	dvipdfmx $(FONTMAP) uplatex.dvi
+	rm uplatex.aux uplatex.log uplatex.dvi
+
+upldoc.pdf: $(PLDOC_SRC)
+	for x in upldoc.tex Xins.ins; do \
+	if [ -e $$x ]; then rm $$x; fi \
+	done
+	uplatex --kanji=utf8 upldocs.ins && \
+	uplatex --kanji=utf8 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 *.cfg upldoc.dic mkpldoc.sh dstcheck.pl
+
+.PHONY: clean
+clean:
+	for x in $(PLFMT) $(PLCLS) \
+	uplatex.pdf upldoc.pdf \
+	upldoc.tex Xins.ins; do \
+	if [ -e $$x ]; then rm $$x; fi \
+	done
diff --git a/Master/texmf-dist/source/uplatex/base/plcore.dtx b/Master/texmf-dist/source/uplatex/base/plcore.dtx
new file mode 100644
index 00000000000..5ab84bf4a36
--- /dev/null
+++ b/Master/texmf-dist/source/uplatex/base/plcore.dtx
@@ -0,0 +1,1053 @@
+% \iffalse meta-comment
+%% File: plcore.dtx
+%
+%  Copyright 1994-2001 ASCII Corporation.
+%  Copyright (c) 2010 ASCII MEDIA WORKS
+%  Copyright (c) 2016 Japanese TeX Development Community
+%
+%  This file is part of the pLaTeX2e system (community edition).
+%  -------------------------------------------------------------
+%
+% \fi
+%
+% \CheckSum{1266}
+%% \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{}
+%
+% \iffalse
+% \changes{v1.0}{1994/09/16}{first edition}
+% \changes{v1.1}{1995/04/12}{$B5SCm%^%/%m=$@5(B}
+% \changes{v1.1a}{1995/11/10}{\cs{topmargin}$B$,H?1G$5$l$J$$%P%0$r=$@5(B}
+% \changes{v1.1b}{1996/01/26}{$B5SCm%^!<%/$N8e$m$KM>7W$J%9%Z!<%9$,F~$k$N$r=$@5(B}
+% \changes{v1.1c}{1996/01/30}{$B%U%!%$%kL>$r(B\file{ploutput.dtx}$B$+$i(B
+%    \file{plcore.dtx}$B$H$7$?!#%-%c%W%7%g%s3HD%$r(B\file{plext.dtx}$B$K0\F0!#(B
+%    $B%W%j%"%s%V%k%3%^%s%I$rDI2C(B}
+% \changes{v1.1d}{1996/02/17}{\cs{printglossary}$B$rDI2C(B}
+% \changes{v1.1e}{1996/03/12}{tabbing$B4D6-$G$NOB2$J84V%9%Z!<%9(B}
+% \changes{v1.1f}{1996/07/10}{$B%H%s%\$^$o$j$r=$@5(B}
+% \changes{v1.1g}{1997/01/16}{\LaTeX\ \textt{!<1996/06/01!>}$B$KBP1~(B}
+% \changes{v1.1h}{1997/06/25}{\LaTeX\ $B$N2~9T%^%/%m$NJQ99$KBP1~(B}
+% \changes{v1.1i}{1998/02/03}{\cs{@shipoutsetup}$B$r(B\cs{@outputpage}$BFb$KF~$l$?(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.2}{2001/09/04}{$BK\J8$H(B\cs{footnoterule}$B$,=E$J$C$F$7$^$&$N$r=$@5(B}
+% \changes{v1.2a}{2001/09/26}{\LaTeX\ \texttt{!<2001/06/01!>}$B$KBP1~(B}
+% \changes{v1.2b}{2016/01/26}{2013$BG/0J9_$N(Bp\TeX\ (r28720)$B$G5SCmHV9f$NA08e$NOBJ8J8;z(B
+%    $B$H$N4V$K(Bxkanjiskip$B$,F~$C$F$7$^$&LdBj$KBP1~!#(B
+%    \cs{@outputbox}$B$N?<$5$,B>$N$b$N$N0LCV$K1F6A$rM?$($J$$(B
+%    $B$h$&$K$9$k(B\texttt{\cs{vskip}~-\cs{dimen@}}$B$,=DAH%b!<%I$G$OL58z$K$J$C$F$$$?$N$G=$@5(B}
+% \changes{v1.2c}{2016/02/28}{1.2b$B$HF1MM$N=$@5$r(B
+%     tabular$B4D6-!"(B\cs{parbox}$BL?Na!"(B\cs{underline}$BL?Na$K$b9T$C$?(B}
+% \changes{v1.2d}{2016/04/01}{multicol$B%Q%C%1!<%8$r;H$&$H%H%s%\$N2<C<$,=L$`LdBj$r=$@5(B}
+% \fi
+%
+% \iffalse
+%<*driver>
+\NeedsTeXFormat{pLaTeX2e}
+% \fi
+\ProvidesFile{plcore.dtx}[2016/04/01 v1.2d pLaTeX core file]
+% \iffalse
+\documentclass{jltxdoc}
+\GetFileInfo{plcore.dtx}
+\title{p\LaTeXe{}$B$N3HD%(B\space\fileversion}
+\author{Ken Nakano \& Hideaki Togashi}
+\date{$B:n@.F|!'(B\filedate}
+\begin{document}
+   \maketitle
+   \tableofcontents
+   \DocInput{\filename}
+\end{document}
+%</driver>
+% \fi
+%
+%
+% \section{$B35MW(B}\label{plcore:intro}
+% $B$3$N%U%!%$%k$G$O!"$D$.$N5!G=$N3HD%$d=$@5$r9T$C$F$$$^$9!#(B
+% $B>\:Y$O!"$=$l$>$l$N9`L\$N@bL@$r;2>H$7$F$/$@$5$$!#(B
+%
+% \begin{itemize}
+% \item $B%W%j%"%s%V%k%3%^%s%I(B
+% \item $B2~%Z!<%8(B
+% \item $B2~9T(B
+% \item $B%*%V%8%'%/%H$N=PNO=g=x(B
+% \item $B%H%s%\(B
+% \item $B5SCm%^%/%m(B
+% \item $BAj8_;2>H(B
+% \item $B5?;w%?%$%WF~NO(B
+% \item tabbing$B4D6-(B
+% \item $BMQ8l=8$N=PNO(B
+% \item $B;~J,$r<($9%+%&%s%?(B
+% \end{itemize}
+%
+%
+% \section{$B%3!<%I(B}
+%
+% $B$3$N%U%!%$%k$NFbMF$O!"(Bp\LaTeXe{}$B$N%3%"ItJ,$G$9!#(B
+%    \begin{macrocode}
+%<*plcore>
+%    \end{macrocode}
+%
+% \subsection{$B%W%j%"%s%V%k%3%^%s%I(B}
+% $BJ8=q%U%!%$%k$,I,MW$H$9$k%U%)!<%^%C%H%U%!%$%k$N;XDj$r$9$k%3%^%s%I$r(B
+% $B3HD%;R!"(Bp\LaTeXe{}$B%U%)!<%^%C%H%U%!%$%k$bG'<1$9$k$h$&$K$7$^$9!#(B
+%
+% \begin{macro}{\NeedsTeXFormat}
+% \begin{macro}{\@needsPformat}
+% \begin{macro}{\@needsPf@rmat}
+% |\NeedsTeXFormats|$B$K(B``pLaTeX2e''$B$r;XDj$9$k$H!"(B
+% ``LaTeX2e''$B%U%)!<%^%C%H$rI,MW$H$9$k1Q8lHG$N%/%i%9%U%!%$%k$d(B
+% $B%Q%C%1!<%8%U%!%$%k$J$I$,;H$($J$/$J$C$F$7$^$&$?$a$K:FDj5A$7$^$9!#(B
+% $B$3$N%3%^%s%I$O(B\file{ltclass.dtx}$B$GDj5A$5$l$F$$$^$9!#(B
+%    \begin{macrocode}
+\def\NeedsTeXFormat#1{%
+   \def\reserved@a{#1}%
+   \ifx\reserved@a\pfmtname
+     \expandafter\@needsPformat
+   \else
+     \ifx\reserved@a\fmtname
+       \expandafter\expandafter\expandafter\@needsformat
+     \else
+       \@latex@error{This file needs format `\reserved@a'%
+          \MessageBreak but this is `\pfmtname'}{%
+          The current input file will not be processed
+          further,\MessageBreak
+          because it was written for some other flavor of
+          TeX.\MessageBreak\@ehd}%
+       \endinput
+     \fi
+   \fi}
+%
+\def\@needsPformat{\@ifnextchar[\@needsPf@rmat{}}
+%
+\def\@needsPf@rmat[#1]{%
+    \@ifl@t@r\pfmtversion{#1}{}%
+    {\@latex@warning@no@line
+        {You have requested release `#1' of pLaTeX,\MessageBreak
+         but only release `\pfmtversion' is available}}}
+%
+\@onlypreamble\@needsPformat
+\@onlypreamble\@needsPf@rmat
+%    \end{macrocode}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+%
+% \begin{macro}{\documentstyle}
+% |\documentclass|$B$NBe$o$j$K(B|\documentstyle|$B$,;H$o$l$k$H!"(B
+% \LaTeX~2.09$B8_49%b!<%I$KF~$j$^$9!#$3$N$H$-!"(B
+% $B%*%j%8%J%k$N(B\LaTeX{}$B$G$O(B\file{latex209.def}$B$rFI$_9~$_$^$9$,!"(B
+% p\LaTeXe{}$B$G$O(B\file{pl209.def}$B$rFI$_9~$_$^$9!#(B
+% $B$3$N%3%^%s%I$O(B\file{ltclass.dtx}$B$GDj5A$5$l$F$$$^$9!#(B
+%    \begin{macrocode}
+\def\documentstyle{%
+  \makeatletter\input{pl209.def}\makeatother
+  \documentclass}
+%    \end{macrocode}
+% \end{macro}
+%
+%
+%
+% \subsection{$B2~%Z!<%8(B}
+% $B=DAH$N$H$-!"2~%Z!<%88e$NFbMF$,6v?t%Z!<%8!J1&%Z!<%8!K$+$i$O$8$^$k$h$&$K$7$^$9!#(B
+% $B2#AH$N$H$-$K$O!"4q?t%Z!<%8!J1&%Z!<%8!K$+$i$O$8$^$j$^$9!#(B
+%
+% \begin{macro}{\cleardoublepage}
+% $B$3$N%3%^%s%I$K$h$C$F=PNO$5$l$k!"Gr%Z!<%8$N%Z!<%8%9%?%$%k$r(B
+% \pstyle{empty}$B$K$7!"%X%C%@$H%U%C%?$,F~$i$J$$$h$&$K$7$F$$$^$9!#(B
+% \file{ltoutput.dtx}$B$NDj5A$r!"=DAH!"2#AH$K9g$o$;$F!"Dj5A$7$J$*$7$?$b$N$G$9!#(B
+%    \begin{macrocode}
+\def\cleardoublepage{\clearpage\if@twoside
+  \ifodd\c@page
+    \iftdir
+      \hbox{}\thispagestyle{empty}\newpage
+      \if@twocolumn\hbox{}\newpage\fi
+    \fi
+  \else
+    \ifydir
+      \hbox{}\thispagestyle{empty}\newpage
+      \if@twocolumn\hbox{}\newpage\fi
+    \fi
+  \fi\fi}
+%    \end{macrocode}
+% \end{macro}
+%
+% \subsection{$B2~9T(B}
+% \changes{v1.1c}{1995/08/25}{$B9TF,6XB'J8;z$ND>A0$G$N2~9T$G$NIT6q9g$N=$@5(B}
+% $BF|K\8l(B\TeX{}$B$N9TF,6XB'=hM}$O!"6XB'BP>]J8;z$ND>A0$K!"(B
+% |\prekinsokupenalty|$B$G;XDj$5$l$?%Z%J%k%F%#$NCM$rA^F~$9$k$3$H$G(B
+% $B9T$J$C$F$$$^$9!#(B
+% $B$H$3$m$,!"2~9T%3%^%s%I$OIi$N%Z%J%k%F%#$NCM$rA^F~$9$k$3$H$G2~9T$r9T$J$$$^$9!#(B
+% $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}
+% $B$"$$$&$($*(B\\
+% $B!*$+$-$/$1$3(B
+% \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
+% $B2C;;$5$l$J$$$h$&$K$7$^$9!#(B|\\|$B$O(B|\newline|$B%^%/%m$r8F$S=P$7$F$$$^$9!#(B
+%
+% $B$J$*!"(B|\newline|$B%^%/%m$O(B\file{ltspaces.dtx}$B$GDj5A$5$l$F$$$^$9!#(B
+%
+% \changes{v1.1j}{1999/04/05}{$B%*%W%7%g%s$rIU$1$?>l9g$K!"M>7W$J6uGr(B
+%    $B$,F~$C$F$7$^$&$N$r=$@5!#$"$j$,$H$&!"NkLZN4;V!w5~ETBg3X$5$s!#(B}
+% \changes{v1.1h}{1997/06/25}{\LaTeX\ $B$N2~9T%^%/%m$NJQ99$KBP1~!#(B
+%    $B$"$j$,$H$&!"1|B<$5$s!#(B}
+% \LaTeX\ \texttt{<1996/12/01>}$B$G2~9T%^%/%m$,JQ99$5$l!"(B|\\|$B$,(B
+% |\newline|$B$r8F$S=P$5$J$/$J$C$?$?$a!"JQ99$5$l$?2~9T%^%/%m$KBP1~$7$^$7(B
+% $B$?!#(B|\mbox{}|$B$NA^F~0LCV$OF1$8$G$9!#(B
+% \file{ltspace.dtx}$B$NDj5A$r>e5-$K9g$o$;$F!"Dj5A$7$J$*$7$^$7$?!#(B
+%    \begin{macrocode}
+\def\@gnewline #1{%
+  \ifvmode
+    \@nolnerr
+  \else
+    \unskip \reserved@e {\reserved@f#1}\nobreak \hfil \break \null
+    \ignorespaces
+  \fi}
+%    \end{macrocode}
+%
+% \subsection{$B%*%V%8%'%/%H$N=PNO=g=x(B}
+% $B%*%j%8%J%k$N(B\LaTeX{}$B$O!"%H%C%W%U%m!<%H!"K\J8!"5SCm!"%\%H%`%U%m!<%H(B
+% $B$N=gHV$G=PNO$7$^$9$1$l$I$b!"F|K\8lAHHG$G$O!"%H%C%W%U%m!<%H!"K\J8!"(B
+% $B%\%H%`%U%m!<%H!"5SCm$H$$$&=gHV$NJ}$,0lHLE*$G$9$N$G!"(B
+% $B$3$N$h$&$J=gHV$K$J$k$h$&=$@5$r$7$^$9!#(B
+%
+% $B$7$?$,$C$F!"J8=q%U%!%$%k$K$h$C$F$O(B\LaTeX{}$B$NAHHG7k2L$H0[$J$k>l9g$,(B
+% $B$"$j$^$9$N$G!"Cm0U$r$7$F$/$@$5$$!#(B
+%
+% \begin{macro}{\@makecol}
+% $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}
+%</plcore>
+%<platexrelease>\plIncludeInRelease{2016/04/17}{\@makecol}{\@makecol}%
+%<*plcore|platexrelease>
+\gdef\@makecol{%
+   \setbox\@outputbox\box\@cclv%
+   \xdef\@freelist{\@freelist\@midlist}%
+   \global \let \@midlist \@empty
+   \@combinefloats
+   \ifvbox\@kludgeins
+     \@makespecialcolbox
+   \else
+     \setbox\@outputbox \vbox to\@colht {%
+%       \boxmaxdepth \@maxdepth    % comment out on LaTeX 1997/12/01
+       \@texttop
+       \dimen@ \dp\@outputbox
+       \unvbox \@outputbox
+%    \end{macrocode}
+% $B=DAH$N:]$K(B|\@outputbox|$B$NFbMF$,6u$N%\%C%/%9$@$1$N>l9g$K!"(B|\wd\@outputbox|$B$,(B
+% 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
+% \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}
+%    \begin{macrocode}
+       \iftdir\hskip\z@\fi
+       \vskip -\dimen@
+       \@textbottom
+       \ifvoid\footins\else % for pLaTeX
+         \vskip \skip\footins
+         \color@begingroup
+            \normalcolor
+            \footnoterule
+            \unvbox \footins
+         \color@endgroup
+       \fi
+       }%
+   \fi
+   \global \maxdepth \@maxdepth
+}
+%</plcore|platexrelease>
+%<platexrelease>\plEndIncludeInRelease
+%<platexrelease>\plIncludeInRelease{0000/00/00}{\@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@
+%<platexrelease>       \else\vskip -\dimen@\fi
+%<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
+%    \end{macrocode}
+% \end{macro}
+%
+%
+% \begin{macro}{\@makespecialcolbox}
+% $BK\J8!J$"$k$$$O%\%H%`%U%m!<%H!K$H5SCm$N4V$K(B|\@textbottom|$B$rF~$l$?$$$N$G!"(B
+% |\@makespecialcolbox|$B%3%^%s%I$b=$@5$r$7$^$9!#(B
+% $B$d$O$j!"(B\file{ltoutput.dtx}$B$GDj5A$5$l$F$$$k$b$N$G$9!#(B
+%
+% $B$3$N%^%/%m$O!"(B|\enlargedthispage|$B$,;H$o$l$?$H$-$K!"(B
+% |\@makecol|$B%^%/%m$+$i8F$S=P$5$l$^$9!#(B
+%    \begin{macrocode}
+%<*plcore|fltrace>
+\gdef\@makespecialcolbox{%
+%<*trace>
+   \tr@ce{Krudgeins ht \the\ht\@kludgeins\space
+                    dp \the\dp\@kludgeins\space
+                    wd \the\wd\@kludgeins}%
+%</trace>
+   \setbox\@outputbox \vbox {%
+     \@texttop
+     \dimen@ \dp\@outputbox
+     \unvbox\@outputbox
+     \vskip-\dimen@
+     }%
+   \@tempdima \@colht
+   \ifdim \wd\@kludgeins>\z@
+     \advance \@tempdima -\ht\@outputbox
+     \advance \@tempdima \pageshrink
+%<*trace>
+     \tr@ce {Natural ht of col: \the\ht\@outputbox}%
+     \tr@ce {\string \@colht: \the\@colht}%
+     \tr@ce {Pageshrink added: \the\pageshrink}%
+     \tr@ce {Hence, space added: \the\@tempdima}%
+%</trace>
+     \setbox\@outputbox \vbox to \@colht {%
+%       \boxmaxdepth \maxdepth
+       \unvbox\@outputbox
+       \vskip \@tempdima
+       \@textbottom
+%    \end{macrocode}
+% $B$D$.$NItJ,$,(Bp\LaTeX{}$BMQ$N=$@5$G$9!#(B
+% \changes{v1.2}{2001/09/04}{$BK\J8$H(B\cs{footnoterule}$B$,=E$J$C$F$7$^$&$N$r=$@5(B}
+%    \begin{macrocode}
+       \ifvoid\footins\else % for pLaTeX
+         \vskip\skip\footins
+         \color@begingroup
+            \normalcolor
+            \footnoterule
+            \unvbox \footins
+         \color@endgroup
+       \fi
+     }%
+   \else
+     \advance \@tempdima -\ht\@kludgeins
+%<*trace>
+   \tr@ce {Natural ht of col: \the\ht\@outputbox}%
+   \tr@ce {\string \@colht: \the\@colht}%
+   \tr@ce {Extra size added: -\the \ht \@kludgeins}%
+   \tr@ce {Hence, height of inner box: \the\@tempdima}%
+   \tr@ce {Max? pageshrink available: \the\pageshrink}%
+%</trace>
+     \setbox \@outputbox \vbox to \@colht {%
+       \vbox to \@tempdima {%
+         \unvbox\@outputbox
+         \@textbottom
+%    \end{macrocode}
+% $B$D$.$NItJ,$,(Bp\LaTeX{}$BMQ$N=$@5$G$9!#(B
+% $B5SCm$,$"$l$P!"$3$3$G$=$l$r=PNO$7$^$9!#(B
+% \changes{v1.2}{2001/09/04}{$BK\J8$H(B\cs{footnoterule}$B$,=E$J$C$F$7$^$&$N$r=$@5(B}
+%    \begin{macrocode}
+         \ifvoid\footins\else % for pLaTeX
+           \vskip\skip\footins
+           \color@begingroup
+              \normalcolor
+              \footnoterule
+              \unvbox \footins
+           \color@endgroup
+         \fi
+       }\vss}%
+   \fi
+   {\setbox \@tempboxa \box \@kludgeins}%
+}
+%</plcore|fltrace>
+%    \end{macrocode}
+% \end{macro}
+%
+%
+% \begin{macro}{\@reinserts}
+% $B$3$N%^%/%m$O!"(B|\@specialoutput|$B%^%/%m$+$i8F$S=P$5$l$^$9!#(B
+% $B%\%C%/%9(B|footins|$B$,AH$_N)$F$i$l$?%b!<%I$K9g$o$;$F(B
+% $B=D%b!<%I$+2#%b!<%I$G(B|\unvbox|$B$r$7$^$9!#(B
+%    \begin{macrocode}
+%<*plcore>
+\def\@reinserts{%
+  \ifvoid\footins\else\insert\footins{%
+    \iftbox\footins\tate\else\yoko\fi
+    \unvbox\footins}\fi
+  \ifvbox\@kludgeins\insert\@kludgeins{\unvbox\@kludgeins}\fi
+}
+%    \end{macrocode}
+% \end{macro}
+%
+%
+% \subsection{$B%H%s%\(B}
+% $B$3$3$G$O%H%s%\$r=PNO$9$k$?$a$N%^%/%m$rDj5A$7$F$$$^$9!#(B
+%
+% \begin{macro}{\iftombow}
+% \begin{macro}{\iftombowdate}
+% |\iftombow|$B$O%H%s%\$r=PNO$9$k$+$I$&$+!"(B|\iftombowdate|$B$O(BDVI$B$r:n@.$7$?(B
+% $BF|IU$r%H%s%\$NOF$K=PNO$9$k$+$I$&$+$r<($9$?$a$KMQ$$$^$9!#(B
+%    \begin{macrocode}
+\newif\iftombow \tombowfalse
+\newif\iftombowdate \tombowdatetrue
+%    \end{macrocode}
+% \end{macro}
+% \end{macro}
+%
+% \begin{macro}{\@tombowwidth}
+% |\@tombowwidth|$B$K$O!"%H%s%\MQ7S@~$NB@$5$r;XDj$7$^$9!#(B
+% $B%G%U%)%k%H$O(B0.1$B%]%$%s%H$G$9!#(B
+% $B$3$NCM$rJQ99$7!"(B|\maketombowbox|$B%3%^%s%I$r<B9T$9$k$3$H$K$h$j!"%H%s%\$N(B
+% $B7S@~B@$5$rJQ99$7$F=PNO$9$k$3$H$,$G$-$^$9!#DL>o$N;H$$J}$G$O!"(B
+% $B%H%s%\$N7S@~$rJQ99$9$kI,MW$O$"$j$^$;$s!#(BDVI$B$r%U%#%k%`$KLLIU$1=PNO$9$k(B
+% $B$H$-!"%H%s%\$r$D$1$:$K0LCV$O$=$N$^$^$K$9$kI,MW$,$"$k$H$-$K!"$3$NB@$5$r(B
+% $B%<%m%]%$%s%H$K$7$^$9!#(B
+%    \begin{macrocode}
+\newdimen\@tombowwidth
+\setlength{\@tombowwidth}{.1\p@}
+%    \end{macrocode}
+% \end{macro}
+%
+% $B%H%s%\MQ$N7S@~$rDj5A$7$^$9!#(B
+%
+% \begin{macro}{\@TL}
+% \begin{macro}{\@Tl}
+% \begin{macro}{\@TC}
+% \begin{macro}{\@TR}
+% \begin{macro}{\@Tr}
+% |\@TL|$B$H(B|\@Tl|$B$O%Z!<%8>eIt$N:8B&!"(B
+% |\@TC|$B$O%Z!<%8>eIt$NCf1{!"(B
+% |\@TR|$B$H(B|\@Tr|$B$O%Z!<%8>eIt$N:8B&$N%H%s%\$H$J$k%\%C%/%9$G$9!#(B
+%    \begin{macrocode}
+\newbox\@TL\newbox\@Tl
+\newbox\@TC
+\newbox\@TR\newbox\@Tr
+%    \end{macrocode}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+%
+% \begin{macro}{\@BL}
+% \begin{macro}{\@Bl}
+% \begin{macro}{\@BC}
+% \begin{macro}{\@BR}
+% \begin{macro}{\@Br}
+% |\@BL|$B$H(B|\@Bl|$B$O%Z!<%82<It$N:8B&!"(B
+% |\@BC|$B$O%Z!<%82<It$NCf1{!"(B
+% |\@BR|$B$H(B|\@Br|$B$O%Z!<%82<It$N:8B&$N%H%s%\$H$J$k%\%C%/%9$G$9!#(B
+%    \begin{macrocode}
+\newbox\@BL\newbox\@Bl
+\newbox\@BC
+\newbox\@BR\newbox\@Br
+%    \end{macrocode}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+%
+% \begin{macro}{\@CL}
+% \begin{macro}{\@CR}
+% |\@CL|$B$O%Z!<%8:8B&$NCf1{!"(B|\@CR|$B$O%Z!<%81&B&$NCf1{$N%H%s%\$H$J$k(B
+% $B%\%C%/%9$G$9!#(B
+%    \begin{macrocode}
+\newbox\@CL
+\newbox\@CR
+%    \end{macrocode}
+% \end{macro}
+% \end{macro}
+%
+% \begin{macro}{\@bannertoken}
+% \begin{macro}{\@bannerfont}
+% |\@bannertoken|$B%H!<%/%s$O!"%H%s%\$N2#$K=PNO$9$kJ8;zNs$rF~$l$^$9!#(B
+% $B%G%U%)%k%H$G$O2?$b=PNO$7$^$;$s!#(B
+% |\@bannerfont|$B%U%)%s%H$O!"$=$NJ8;zNs$r=PNO$9$k$?$a$N%U%)%s%H$G$9!#(B
+% 9$B%]%$%s%H$N%?%$%W%i%$%?BN$H$7$F$$$^$9!#(B
+% \changes{v1.1f}{1996/09/03}{Add \cs{@bannerbox}.}
+%    \begin{macrocode}
+\font\@bannerfont=cmtt9
+\newtoks\@bannertoken
+\@bannertoken{}
+%    \end{macrocode}
+% \end{macro}
+% \end{macro}
+%
+% \begin{macro}{\maketombowbox}
+% |\maketombow|$B%3%^%s%I$O!"%H%s%\$H$J$k%\%C%/%9$r:n$k$?$a$KMQ$$$^$9!#(B
+% $B$3$N%3%^%s%I$O!"%H%s%\$H$J$k%\%C%/%9$r:n$k$@$1$G!"$=$l$i$N%\%C%/%9$r(B
+% $B=PNO$9$k$N$G$O$J$$$3$H$KCm0U$r$7$F$/$@$5$$!#(B
+%    \begin{macrocode}
+\def\maketombowbox{%
+  \setbox\@TL\hbox to\z@{\yoko\hss
+      \vrule width13mm height\@tombowwidth depth\z@
+      \vrule height10mm width\@tombowwidth depth\z@
+%    \end{macrocode}
+% \changes{v1.0f}{1996/07/10}{$B%H%s%\$N2#$K(BDVI$B%U%!%$%k$N:n@.F|$r=PNO$9$k(B
+%    $B$h$&$K$7$?!#(B}
+% \changes{v1.0g}{1997/01/23}{$B:n@.F|$N=PNO$r$9$k$+$I$&$+$r%U%i%0$G;XDj$9$k(B
+%    $B$h$&$K$7$?!#(B}
+%    \begin{macrocode}
+      \iftombowdate
+        \raise4pt\hbox to\z@{\hskip5mm\@bannerfont\the\@bannertoken\hss}%
+      \fi}%
+  \setbox\@Tl\hbox to\z@{\yoko\hss
+      \vrule width10mm height\@tombowwidth depth\z@
+      \vrule height13mm width\@tombowwidth depth\z@}%
+  \setbox\@TC\hbox{\yoko
+      \vrule width10mm height\@tombowwidth depth\z@
+      \vrule height10mm width\@tombowwidth depth\z@
+      \vrule width10mm height\@tombowwidth depth\z@}%
+  \setbox\@TR\hbox to\z@{\yoko
+      \vrule height10mm width\@tombowwidth depth\z@
+      \vrule width13mm height\@tombowwidth depth\z@\hss}%
+  \setbox\@Tr\hbox to\z@{\yoko
+      \vrule height13mm width\@tombowwidth depth\z@
+      \vrule width10mm height\@tombowwidth depth\z@\hss}%
+%
+  \setbox\@BL\hbox to\z@{\yoko\hss
+      \vrule width13mm depth\@tombowwidth height\z@
+      \vrule depth10mm width\@tombowwidth height\z@}%
+  \setbox\@Bl\hbox to\z@{\yoko\hss
+      \vrule width10mm depth\@tombowwidth height\z@
+      \vrule depth13mm width\@tombowwidth height\z@}%
+  \setbox\@BC\hbox{\yoko
+      \vrule width10mm depth\@tombowwidth height\z@
+      \vrule depth10mm width\@tombowwidth height\z@
+      \vrule width10mm depth\@tombowwidth height\z@}%
+  \setbox\@BR\hbox to\z@{\yoko
+      \vrule depth10mm width\@tombowwidth height\z@
+      \vrule width13mm depth\@tombowwidth height\z@\hss}%
+  \setbox\@Br\hbox to\z@{\yoko
+      \vrule depth13mm width\@tombowwidth height\z@
+      \vrule width10mm depth\@tombowwidth height\z@\hss}%
+%
+  \setbox\@CL\hbox to\z@{\yoko\hss
+      \vrule width10mm height.5\@tombowwidth depth.5\@tombowwidth
+      \vrule height10mm depth10mm width\@tombowwidth}%
+  \setbox\@CR\hbox to\z@{\yoko
+      \vrule height10mm depth10mm width\@tombowwidth
+      \vrule height.5\@tombowwidth depth.5\@tombowwidth width10mm\hss}%
+}
+%    \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\@outputtombow}
+% |\@outputtombow|$B%3%^%s%I$O!"%H%s%\$r=PNO$9$k$N$KMQ$$$^$9!#(B
+% \changes{v1.2d}{2016/04/01}{multicol$B%Q%C%1!<%8$r;H$&$H%H%s%\$N2<C<$,=L$`LdBj$r=$@5(B}
+%    \begin{macrocode}
+%</plcore>
+%<platexrelease>\plIncludeInRelease{2016/04/17}{\@outputtombow}{\@outputtombow}%
+%<*plcore|platexrelease>
+\def\@outputtombow{%
+  \iftombow
+  \vbox to\z@{\kern-13mm\relax
+    \boxmaxdepth\maxdimen%% Added (Apr 1, 2016)
+    \moveleft3mm\vbox to\@@paperheight{%
+      \hbox to\@@paperwidth{\hskip3mm\relax
+         \copy\@TL\hfill\copy\@TC\hfill\copy\@TR\hskip3mm}%
+      \kern-10mm
+      \hbox to\@@paperwidth{\copy\@Tl\hfill\copy\@Tr}%
+      \vfill
+      \hbox to\@@paperwidth{\copy\@CL\hfill\copy\@CR}%
+      \vfill
+      \hbox to\@@paperwidth{\copy\@Bl\hfill\copy\@Br}%
+      \kern-10mm
+      \hbox to\@@paperwidth{\hskip3mm\relax
+         \copy\@BL\hfill\copy\@BC\hfill\copy\@BR\hskip3mm}%
+    }\vss
+  }%
+  \fi
+}
+%</plcore|platexrelease>
+%<platexrelease>\plEndIncludeInRelease
+%<platexrelease>\plIncludeInRelease{0000/00/00}{\@outputtombow}{\@outputtombow}%
+%<platexrelease>\def\@outputtombow{%
+%<platexrelease>  \iftombow
+%<platexrelease>  \vbox to\z@{\kern-13mm\relax
+%<platexrelease>    \moveleft3mm\vbox to\@@paperheight{%
+%<platexrelease>      \hbox to\@@paperwidth{\hskip3mm\relax
+%<platexrelease>         \copy\@TL\hfill\copy\@TC\hfill\copy\@TR\hskip3mm}%
+%<platexrelease>      \kern-10mm
+%<platexrelease>      \hbox to\@@paperwidth{\copy\@Tl\hfill\copy\@Tr}%
+%<platexrelease>      \vfill
+%<platexrelease>      \hbox to\@@paperwidth{\copy\@CL\hfill\copy\@CR}%
+%<platexrelease>      \vfill
+%<platexrelease>      \hbox to\@@paperwidth{\copy\@Bl\hfill\copy\@Br}%
+%<platexrelease>      \kern-10mm
+%<platexrelease>      \hbox to\@@paperwidth{\hskip3mm\relax
+%<platexrelease>         \copy\@BL\hfill\copy\@BC\hfill\copy\@BR\hskip3mm}%
+%<platexrelease>    }\vss
+%<platexrelease>  }%
+%<platexrelease>  \fi
+%<platexrelease>}
+%<platexrelease>\plEndIncludeInRelease
+%<*plcore>
+%    \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\@@paperheight}
+% \begin{macro}{\@@paperwidth}
+% \begin{macro}{\@@topmargin}
+% |\@@pageheight|$B$O!"MQ;f$N=D$ND9$5$K%H%s%\$ND9$5$r2C$($?D9$5$K$J$j$^$9!#(B
+%
+% |\@@pagewidth|$B$O!"MQ;f$N2#$ND9$5$K%H%s%\$ND9$5$r2C$($?D9$5$K$J$j$^$9!#(B
+%
+% |\@@topmargin|$B$O!"8=:_$N%H%C%W%^!<%8%s$K(B1$B%$%s%A2C$($?D9$5$K$J$j$^$9!#(B
+%    \begin{macrocode}
+\newdimen\@@paperheight
+\newdimen\@@paperwidth
+\newdimen\@@topmargin
+%    \end{macrocode}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+%
+%  \begin{macro}{\@shipoutsetup}
+% \changes{v1.1i}{1998/02/03}{Command removed}
+% |\@outputpage|$BFb$KA^F~$7$?$N$G:o=|$7$^$7$?!#(B
+%  \end{macro}
+%
+% \begin{macro}{\@outputpage}
+% |\textwidth|$B$H(B|\textheight|$B$N8r49$O!"(B|\@shipoutsetup|$BFb$G$O9T$J$$$^$;$s!#(B
+% $B$J$<$J$i!"(B|\@shipoutsetup|$B%^%/%m$,<B9T$5$l$k$H$-$O!"(B
+% |\shipout|$B$5$l$k(Bvbox$B$NCf$G$"$j!"$3$N$H$-$O2#AH%b!<%I$G$9$N$G!"(B
+% $B$D$M$K(B|\iftdir|$B$O56$HH=CG$5$l!"=D$H2#$N%5%$%:$r8r49$G$-$J$$$+$i$G$9!#(B
+%
+% $B$J$*!"$3$NJQ99$r%m!<%+%k$J$b$N$K$9$k$?$a$K!"(B
+% |\begingroup|$B$H(B|\endgroup|$B$G0O$_$^$9!#(B
+% \changes{v1.2a}{2001/09/26}{\LaTeX\ \texttt{!<2001/06/01!>}$B$KBP1~(B}
+%    \begin{macrocode}
+\def\@outputpage{%
+\begingroup % the \endgroup is put in by \aftergroup
+  \iftdir
+    \dimen\z@\textwidth \textwidth\textheight \textheight\dimen\z@
+  \fi
+  \let \protect \noexpand
+  \@resetactivechars
+  \global\let\@@if@newlist\if@newlist
+  \global\@newlistfalse
+  \@parboxrestore
+  \shipout\vbox{\yoko
+    \set@typeset@protect
+    \aftergroup\endgroup
+    \aftergroup\set@typeset@protect
+%    \end{macrocode}
+% \changes{v1.1g}{1998/02/03}{\cs{@shipoutsetup}$B$r(B\cs{@outputpage}$BFb$KF~$l$?(B}
+% $B$3$3$+$i(B|\@shipoutsetup|$B$NFbMF!#(B
+%    \begin{macrocode}
+     \if@specialpage
+       \global\@specialpagefalse\@nameuse{ps@\@specialstyle}%
+     \fi
+%    \end{macrocode}
+% \changes{v1.1c}{1995/02/05}{\cs{oddsidemargin}$B$H(B\cs{evensidemargin}$B$,(B
+%    $B5U$@$C$?$N$r=$@5(B}
+%    \begin{macrocode}
+     \if@twoside
+       \ifodd\count\z@ \let\@thehead\@oddhead \let\@thefoot\@oddfoot
+          \iftdir\let\@themargin\evensidemargin
+          \else\let\@themargin\oddsidemargin\fi
+       \else \let\@thehead\@evenhead
+          \let\@thefoot\@evenfoot
+           \iftdir\let\@themargin\oddsidemargin
+           \else\let\@themargin\evensidemargin\fi
+     \fi\fi
+%    \end{macrocode}
+% $B%H%s%\=PNO%*%W%7%g%s$,;XDj$5$l$F$$$k>l9g!"$3$3$GMQ;f%5%$%:$r:F@_Dj$7$^$9!#(B
+% \TeX $B$N2C$($k:8$H>eIt$N(B1$B%$%s%A$O!"%H%s%\$NFbB&$KF~$j$^$9!#(B
+% \changes{v1.1a}{1995/11/10}{\cs{topmargin}$B$,H?1G$5$l$J$$%P%0$r=$@5(B}
+%    \begin{macrocode}
+     \@@topmargin\topmargin
+     \iftombow
+       \@@paperwidth\paperwidth \advance\@@paperwidth 6mm\relax
+       \@@paperheight\paperheight \advance\@@paperheight 16mm\relax
+       \advance\@@topmargin 1in\relax \advance\@themargin 1in\relax
+     \fi
+     \reset@font
+     \normalsize
+     \normalsfcodes
+     \let\label\@gobble
+     \let\index\@gobble
+     \let\glossary\@gobble
+     \baselineskip\z@skip \lineskip\z@skip \lineskiplimit\z@
+%    \end{macrocode}
+% $B$3$3$^$G$,(B|\@shipoutsetup|$B$NFbMF!#(B
+%    \begin{macrocode}
+    \@begindvi
+    \@outputtombow
+    \vskip \@@topmargin
+    \moveright\@themargin\vbox{%
+      \setbox\@tempboxa \vbox to\headheight{%
+        \vfil
+        \color@hbox
+          \normalcolor
+          \hb@xt@\textwidth{\@thehead}%
+        \color@endbox
+      }%                        %% 22 Feb 87
+      \dp\@tempboxa \z@
+      \box\@tempboxa
+      \vskip \headsep
+      \box\@outputbox
+      \baselineskip \footskip
+      \color@hbox
+        \normalcolor
+        \hb@xt@\textwidth{\@thefoot}%
+      \color@endbox
+    }%
+  }%
+%  \endgroup now inserted by \aftergroup
+%    \end{macrocode}
+% |\if@newlist|$B$r=i4|2=!#(B
+%    \begin{macrocode}
+  \global\let\if@newlist\@@if@newlist
+  \global \@colht \textheight
+  \stepcounter{page}%
+  \let\firstmark\botmark
+}
+%    \end{macrocode}
+% \end{macro}
+%
+%
+% \subsection{$B5SCm%^%/%m(B}
+% $B5SCm$rAH$_N)$F$kItJ,$N%^%/%m$r:FDj5A$7$^$9!#(B
+% $B<g$J=$@5E@$O!"=DAH%b!<%I$G$NF0:n$NDI2C$G$9!#(B
+%
+% $B$3$l$i$N%^%/%m$O!"(B\file{ltfloat.dtx}$B$GDj5A$5$l$F$$$?$b$N$G$9!#(B
+%
+% \begin{macro}{\thempfn}
+% $BK\J8$G;H$o$l$k5SCm5-9f$G$9!#(B
+%
+% |\@footnotemark|$B$G=D2#$NH=CG$r$9$k$h$&$K$7$?$?$a!":o=|!#(B
+%
+% \changes{v1.0a}{1995/04/12}{Removed \texttt{\protect\bslash thempfn}}
+%    \begin{macrocode}
+%\def\thempfn{%
+%  \ifydir\thefootnote\else\hbox{\yoko\thefootnote}\fi}
+%    \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\thempfootnote}
+% minipage$B4D6-$G;H$o$l$k5SCm5-9f$G$9!#(B
+%
+% \changes{v1.0a}{1995/04/12}{Removed \texttt{\protect\bslash thempfootnote}}
+%    \begin{macrocode}
+%\def\thempfootnote{%
+%  \ifydir\alph{mpfootnote}\else\hbox{\yoko\alph{mpfootnote}}\fi}
+%    \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\@makefnmark}
+% $B5SCm5-9f$r:n@.$9$k%^%/%m$G$9!#(B
+%
+% \changes{v1.0a}{1995/04/12}{$B=DAH$G$b>eIU$-?t;z$r;H$&$h$&$K=$@5(B}
+% \changes{v1.1b}{1996/01/26}{$B5SCm%^!<%/$N8e$m$KM>7W$J%9%Z!<%9$,F~$k$N$r=$@5(B}
+% \changes{v1.1g}{1997/02/14}{$B=DAH;~$K5SCm%^!<%/$N=qBN$,@5$7$/$J$$$N$r=$@5(B}
+% \changes{v1.2b}{2016/01/26}{2013$BG/0J9_$N(Bp\TeX\ (r28720)$B$G5SCmHV9f$NA08e$NOBJ8J8;z(B
+%    $B$H$N4V$K(Bxkanjiskip$B$,F~$C$F$7$^$&LdBj$KBP1~(B}
+%    \begin{macrocode}
+%</plcore>
+%<platexrelease>\plIncludeInRelease{2016/04/17}{\@makefnmark}
+%<platexrelease>                   {Remove extra \xkanjiskip}%
+%<*plcore|platexrelease>
+\renewcommand\@makefnmark{%
+  \ifydir \hbox{}\hbox{\@textsuperscript{\normalfont\@thefnmark}}\hbox{}%
+  \else\hbox{\yoko\@textsuperscript{\normalfont\@thefnmark}}\fi}
+%</plcore|platexrelease>
+%<platexrelease>\plEndIncludeInRelease
+%<platexrelease>\plIncludeInRelease{0000/00/00}{\@makefnmark}
+%<platexrelease>                   {Remove extra \xkanjiskip}%
+%<platexrelease>\renewcommand\@makefnmark{\hbox{%
+%<platexrelease>  \ifydir \@textsuperscript{\normalfont\@thefnmark}%
+%<platexrelease>  \else\hbox{\yoko\@textsuperscript{\normalfont\@thefnmark}}\fi}}
+%<platexrelease>\plEndIncludeInRelease
+%<*plcore>
+%    \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
+%
+% \changes{v1.0a}{1995/04/07}{$BAHJ}8~$NH=Dj$r%\%C%/%9$N30$G$9$k$h$&$K$7$?(B}
+%    \begin{macrocode}
+\long\def\@footnotetext#1{%
+  \ifydir\def\@tempa{\yoko}\else\def\@tempa{\tate}\fi
+  \insert\footins{\@tempa%
+    \reset@font\footnotesize
+    \interlinepenalty\interfootnotelinepenalty
+    \splittopskip\footnotesep
+    \splitmaxdepth \dp\strutbox \floatingpenalty \@MM
+    \hsize\columnwidth \@parboxrestore
+    \protected@edef\@currentlabel{%
+       \csname p@footnote\endcsname\@thefnmark
+    }%
+    \color@begingroup
+      \@makefntext{%
+        \rule\z@\footnotesep\ignorespaces#1\@finalstrut\strutbox}%
+    \color@endgroup}}
+%    \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\@footnotemark}
+% \changes{v1.0a}{1995/04/12}{$B5SCm5-9f$N=PNO0LCV$ND4@0(B}
+% \changes{v1.1g}{1997/02/14}{$B=DAH;~$N0LCVD4@0$r(B2\cs{ch}$B$+$i(B.9zh$B$KJQ99(B}
+% $B5SCm5-9f$r=PNO$7$^$9!#(B
+%    \begin{macrocode}
+\def\@footnotemark{\leavevmode
+  \ifhmode\edef\@x@sf{\the\spacefactor}\nobreak\fi
+  \ifydir\@makefnmark
+  \else\hbox to\z@{\hskip-.25zw\raise.9zh\@makefnmark\hss}\fi
+  \ifhmode\spacefactor\@x@sf\fi\relax}
+%    \end{macrocode}
+% \end{macro}
+%
+%
+% \subsection{$BAj8_;2>H(B}
+%
+% \begin{macro}{\@setref}
+% \changes{v1.1c}{1995/09/07}{change \cs{null} to \cs{relax} in \cs{@setref}.}
+% |\ref|$B%3%^%s%I$d(B|\pageref|$B%3%^%s%I$G;2>H$7$?$H$-!"$3$l$i$N%3%^%s%I$K(B
+% $B$h$C$F=PNO$5$l$?HV9f$HB3$/#2%P%$%HJ8;z$H$N4V$K(B|\xkanjiskip|$B$,F~$j$^$;$s!#(B
+% $B$3$l$O!"(B|\null|$B$,(B|\hbox{}|$B$HDj5A$5$l$F$$$k$?$a$G$9!#(B
+% $B$=$3$G(B|\null|$B$r<h$j=|$-$^$9!#(B
+% $B$3$N%3%^%s%I$O!"(B\file{ltxref.dtx}$B$GDj5A$5$l$F$$$k$b$N$G$9!#(B
+%    \begin{macrocode}
+\def\@setref#1#2#3{%
+  \ifx#1\relax
+    \protect\G@refundefinedtrue
+    \nfss@text{\reset@font\bfseries ??}%
+    \@latex@warning{Reference `#3' on page \thepage \space
+              undefined}%
+  \else
+    \expandafter#2#1\relax% change \null to \relax
+  \fi}
+%    \end{macrocode}
+% \end{macro}
+%
+%
+% \subsection{$B5?;w%?%$%WF~NO(B}
+%
+% \begin{macro}{\verb}
+% \changes{v1.1b}{1995/04/05}{$B8_49%b!<%I$N$H$-$O!"(Bpl209.def$B$NDj5A$r;H$&(B}
+% \changes{v1.1g}{1997/01/16}
+%    {\cs{verb}$B%3%^%s%I$r(B\LaTeX\ \texttt{!<1996/06/01!>}$B$K9g$o$;$F=$@5(B}
+% \LaTeX{}$B$N(B|\verb|$B%3%^%s%I$G$O!"?t<0%b!<%I$G$J$$$H$-$O!"(B
+% |\leavevmode|$B$G?eJ?%b!<%I$KF~$C$?$"$H!"(B|\null|$B$r=PNO$7$F$$$^$9!#(B
+% $B%^%/%m(B|\null|$B$O(B|\hbox{}|$B$H$7$FDj5A$5$l$F$$$^$9$N$G!"(B
+% $B$3$3$K$OOB2$J84V%9%Z!<%9!J(B|\xkanjiskip|$B!K$,F~$j$^$;$s!#(B
+% $B$=$3$G!"(B|\null|$B$r=PNO$7$J$$$h$&%^%/%m$r=$@5$7$^$9!#(B
+% $B$3$N%^%/%m$O!"(B\file{ltmiscen.dtx}$B$GDj5A$5$l$F$$$^$9!#(B
+%    \begin{macrocode}
+\if@compatibility\else
+\def\verb{\relax\ifmmode\hbox\else\leavevmode\fi
+  \bgroup
+    \verb@eol@error \let\do\@makeother \dospecials
+    \verbatim@font\@noligs
+    \@ifstar\@sverb\@verb}
+\fi
+%    \end{macrocode}
+% \end{macro}
+%
+%
+% \subsection{tabbing$B4D6-(B}
+% \changes{v1.1d}{1996/03/12}{\cs{=}$B$N8e$m$KOB2$J84V%9%Z!<%9$,F~$k$N$r=$@5(B}
+% $BAj8_;2>H$d5?;w%?%$%WF~NO$G$O!"OB2$J84V%9%Z!<%9$,F~$i$J$$$N$G!"(B|\null|$B$r(B
+% $B<h$j=|$-$^$7$?$,!"(B|tabbing|$B4D6-$G$O!"5U$K(B|\null|$B$,$J$$$?$a!"(B
+% $BOB2$J84V%9%Z!<%9$,F~$C$F$7$^$&$N$G!"$=$l$rDI2C$7$^$9!#(B
+% \file{lttab.dtx}$B$GDj5A$5$l$F$$$k$b$N$G$9!#(B
+%    \begin{macrocode}
+\gdef\@stopfield{\null\color@endgroup\egroup}
+%    \end{macrocode}
+%
+% \subsection{$BMQ8l=8$N=PNO(B}
+% \LaTeX{}$B$K$O!"$J$<$+MQ8l=8$r=PNO$9$k$?$a$N%3%^%s%I$,$"$j$^$;$s$N$G!"(B
+% $BDI2C$r$7$^$9!#(B
+% \changes{v1.1e}{1996/02/17}{\cs{printglossary}$B$rDI2C(B}
+%
+% \begin{macro}{\printglossary}
+% \cs{printglossary}$B%3%^%s%I$O!"C1$K3HD%;R$,(B\texttt{gls}$B$N%U%!%$%k$r(B
+% $BFI$_9~$`$@$1$G$9!#$3$N%U%!%$%k$N@8@.$K$O!"(Bmendex$B$J$I$rMQ$$$^$9!#(B
+%    \begin{macrocode}
+\newcommand\printglossary{\@input@{\jobname.gls}}
+%    \end{macrocode}
+% \end{macro}
+%
+% \subsection{$B;~J,$r<($9%+%&%s%?(B}
+% \TeX $B$K$O!"G/7nF|$r<($9?tCM$rJ];}$7$F$$$k%+%&%s%?$H$7$F!"$=$l$>$l(B
+% |\year|, |\month|, |\day|$B$,%W%j%_%F%#%V$H$7$FB8:_$7$^$9!#$7$+$7!"(B
+% $B;~J,$K$D$$$F$O!"?<Lk$NNm;~$+$i$N7P2a;~4V$r<($9(B|\time|$B%+%&%s%?$7$+B8:_(B
+% $B$7$F$$$^$;$s!#$=$3$G!"(Bp\LaTeXe{}$B$G$O!";~J,$r<($9$?$a$N%+%&%s%?(B|\hour|$B$H(B
+% |\minute|$B$r:n@.$7$F$$$^$9!#(B
+%
+% \begin{macro}{\hour}
+% \begin{macro}{\minute}
+% $B2?;~$+!J(B|\hour|$B!K$rF@$k$K$O!"(B|\time|$B$r(B60$B$G3d$C$?>&$r$=$N$^$^MQ$$$^$9!#(B
+% $B2?J,$+!J(B|\minute|$B!K$O!"(B|\hour|$B$K(B60$B$r3]$1$?CM$r(B|\time|$B$+$i0z$$$F;;=P$7$^$9!#(B
+% $B$3$3$G$O%+%&%s%?$r@k8@$9$k$@$1$G$9!#<B:]$N7W;;$O!"%/%i%9$d%Q%C%1!<%8$NCf(B
+% $B$G9T$J$C$F$$$^$9!#(B
+%    \begin{macrocode}
+\newcount\hour
+\newcount\minute
+%    \end{macrocode}
+% \end{macro}
+% \end{macro}
+%
+% \subsection{tabular$B4D6-$J$I(B}
+% \changes{v1.2c}{2016/02/28}{1.2b$B$HF1MM$N=$@5$r(B
+%     tabular$B4D6-!"(B\cs{parbox}$BL?Na!"(B\cs{underline}$BL?Na$K$b9T$C$?(B}
+% \LaTeXe{}$B$N%+!<%M%k$N%3!<%I$r$=$N$^$^;H$&$H!"(Bp\TeX{}$B$N(B|\xkanjiskip|$BM3Mh$N(B
+% $B%"%-$,A08e$KF~$C$F$7$^$&$3$H$,$"$j$^$7$?!#$=$&$7$?L?Na$K%Q%C%A$r$"$F$^$9!#(B
+% \begin{macro}{\@tabular}
+% tabular$B4D6-$NFbItL?Na$G$9!#$b$H$O(B\file{lttab.dtx}$B$GDj5A$5$l$F$$$^$9!#(B
+%    \begin{macrocode}
+%</plcore>
+%<platexrelease>\plIncludeInRelease{2016/04/17}{\@tabular}
+%<platexrelease>                   {Remove extra \xkanjiskip}%
+%<*plcore|platexrelease>
+\def\@tabular{\leavevmode \null\hbox \bgroup $\let\@acol\@tabacol
+   \let\@classz\@tabclassz
+   \let\@classiv\@tabclassiv \let\\\@tabularcr\@tabarray}
+%</plcore|platexrelease>
+%<platexrelease>\plEndIncludeInRelease
+%<platexrelease>\plIncludeInRelease{0000/00/00}{\@tabular}
+%<platexrelease>                   {Remove extra \xkanjiskip}%
+%<platexrelease>\def\@tabular{\leavevmode \hbox \bgroup $\let\@acol\@tabacol
+%<platexrelease>   \let\@classz\@tabclassz
+%<platexrelease>   \let\@classiv\@tabclassiv \let\\\@tabularcr\@tabarray}
+%<platexrelease>\plEndIncludeInRelease
+%    \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\endtabular}
+% \begin{macro}{\endtabular*}
+%    \begin{macrocode}
+%<platexrelease>\plIncludeInRelease{2016/04/17}{\endtabular}
+%<platexrelease>                   {Remove extra \xkanjiskip}%
+%<*plcore|platexrelease>
+\def\endtabular{\crcr\egroup\egroup $\egroup\null}
+\expandafter \let \csname endtabular*\endcsname = \endtabular
+%</plcore|platexrelease>
+%<platexrelease>\plEndIncludeInRelease
+%<platexrelease>\plIncludeInRelease{0000/00/00}{\endtabular}
+%<platexrelease>                   {Remove extra \xkanjiskip}%
+%<platexrelease>\def\endtabular{\crcr\egroup\egroup $\egroup}
+%<platexrelease>\expandafter \let \csname endtabular*\endcsname = \endtabular
+%<platexrelease>\plEndIncludeInRelease
+%    \end{macrocode}
+% \end{macro}
+% \end{macro}
+%
+% \begin{macro}{\@iiiparbox}
+% |\parbox|$B$NFbItL?Na$G$9!#$b$H$O(B\file{ltboxes.dtx}$B$GDj5A$5$l$F$$$^$9!#(B
+%    \begin{macrocode}
+%<platexrelease>\plIncludeInRelease{2016/04/17}{\@iiiparbox}
+%<platexrelease>                   {Remove extra \xkanjiskip}%
+%<*plcore|platexrelease>
+\let\@parboxto\@empty
+\long\def\@iiiparbox#1#2[#3]#4#5{%
+  \leavevmode
+  \@pboxswfalse
+  \setlength\@tempdima{#4}%
+  \@begin@tempboxa\vbox{\hsize\@tempdima\@parboxrestore#5\@@par}%
+    \ifx\relax#2\else
+      \setlength\@tempdimb{#2}%
+      \edef\@parboxto{to\the\@tempdimb}%
+    \fi
+    \if#1b\vbox
+    \else\if #1t\vtop
+    \else\ifmmode\vcenter
+    \else\@pboxswtrue\null$\vcenter% !!!
+    \fi\fi\fi
+    \@parboxto{\let\hss\vss\let\unhbox\unvbox
+       \csname bm@#3\endcsname}%
+    \if@pboxsw \m@th$\null\fi% !!!
+  \@end@tempboxa}
+%</plcore|platexrelease>
+%<platexrelease>\plEndIncludeInRelease
+%<platexrelease>\plIncludeInRelease{0000/00/00}{\@iiiparbox}
+%<platexrelease>                   {Remove extra \xkanjiskip}%
+%<platexrelease>\let\@parboxto\@empty
+%<platexrelease>\long\def\@iiiparbox#1#2[#3]#4#5{%
+%<platexrelease>  \leavevmode
+%<platexrelease>  \@pboxswfalse
+%<platexrelease>  \setlength\@tempdima{#4}%
+%<platexrelease>  \@begin@tempboxa\vbox{\hsize\@tempdima\@parboxrestore#5\@@par}%
+%<platexrelease>    \ifx\relax#2\else
+%<platexrelease>      \setlength\@tempdimb{#2}%
+%<platexrelease>      \edef\@parboxto{to\the\@tempdimb}%
+%<platexrelease>    \fi
+%<platexrelease>    \if#1b\vbox
+%<platexrelease>    \else\if #1t\vtop
+%<platexrelease>    \else\ifmmode\vcenter
+%<platexrelease>    \else\@pboxswtrue $\vcenter
+%<platexrelease>    \fi\fi\fi
+%<platexrelease>    \@parboxto{\let\hss\vss\let\unhbox\unvbox
+%<platexrelease>       \csname bm@#3\endcsname}%
+%<platexrelease>    \if@pboxsw \m@th$\fi
+%<platexrelease>  \@end@tempboxa}
+%<platexrelease>\plEndIncludeInRelease
+%    \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\underline}
+% $B2<@~$r0z$/L?Na$G$9!#$b$H$O(B\file{ltboxes.dtx}$B$GDj5A$5$l$F$$$^$9!#(B
+%    \begin{macrocode}
+%<platexrelease>\plIncludeInRelease{2016/04/17}{\underline}
+%<platexrelease>                   {Remove extra \xkanjiskip}%
+%<*plcore|platexrelease>
+\def\underline#1{%
+  \relax
+  \ifmmode\@@underline{#1}%
+  \else \leavevmode\null$\@@underline{\hbox{#1}}\m@th$\null\relax\fi}
+%</plcore|platexrelease>
+%<platexrelease>\plEndIncludeInRelease
+%<platexrelease>\plIncludeInRelease{0000/00/00}{\underline}
+%<platexrelease>                   {Remove extra \xkanjiskip}%
+%<platexrelease>\def\underline#1{%
+%<platexrelease>  \relax
+%<platexrelease>  \ifmmode\@@underline{#1}%
+%<platexrelease>  \else $\@@underline{\hbox{#1}}\m@th$\relax\fi}
+%<platexrelease>\plEndIncludeInRelease
+%    \end{macrocode}
+% \end{macro}
+%
+% \Finale
+\endinput
diff --git a/Master/texmf-dist/source/uplatex/base/ujclasses.dtx b/Master/texmf-dist/source/uplatex/base/ujclasses.dtx
index 03ac70a99fc..f7565d5932d 100644
--- a/Master/texmf-dist/source/uplatex/base/ujclasses.dtx
+++ b/Master/texmf-dist/source/uplatex/base/ujclasses.dtx
@@ -5,12 +5,16 @@
 %       Copyright 1995-2001 ASCII Corporation.
 %    and modified for upLaTeX
 %
-%  This file is part of the upLaTeX2e system.
-%  -----------------------------------------
+%  Copyright (c) 2010 ASCII MEDIA WORKS
+%  Copyright (c) 2016 Takuji Tanaka
+%  Copyright (c) 2016 Japanese TeX Development Community
+%
+%  This file is part of the upLaTeX2e system (community edition).
+%  --------------------------------------------------------------
 %
 % \fi
 %
-% \CheckSum{4413}
+% \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
@@ -75,7 +79,7 @@
 %   \cs{section},\cs{subsection},\cs{subsubsection}の前後空きの伸縮幅を修正。
 %   (ありがとうございます、鈴木た＠MILNさん)}
 % \changes{v1.6}{2006/06/27}{フォントコマンドを修正。ありがとう、ymtさん。}
-% \changes{v1.6_u00}{2011/05/07}{pLaTeX用からupLaTeX用に修正。}
+% \changes{v1.6-u00}{2011/05/07}{p\LaTeX{}用からup\LaTeX{}用に修正。}
 % \fi
 %
 % \iffalse
@@ -105,7 +109,7 @@
 %<11pt&bk>\ProvidesFile{utbk11.clo}
 %<12pt&bk>\ProvidesFile{utbk12.clo}
 %</tate>
-  [2011/05/07 v1.6_u00
+  [2011/05/07 v1.6-u00
 %<article|report|book> Standard upLaTeX class]
 %<10pt|11pt|12pt>  Standard upLaTeX file (size option)]
 %<*driver>
@@ -232,7 +236,7 @@
 % \end{macro}
 %
 % \begin{macro}{\if@enablejfam}
-% \changes{v1.1b}{1997/01/28}{Add \cs{if@enablejfam}}
+% \changes{v1.1b}{1997/01/28}{\break Add \cs{if@enablejfam}}
 % 日本語ファミリを宣言するために用いるフラグです。
 %    \begin{macrocode}
 \newif\if@enablejfam \@enablejfamtrue
@@ -1342,7 +1346,7 @@
 % |\marginparwidth|を計算します。
 % ここで、|\@tempdima|の値は、\linebreak
 % |\paperwidth| $-$ |\textwidth|です。
-% \changes{v1.1d}{1995/11/24}{typo: \cs{marginmarwidth} to \cs{marginparwidth}}
+% \changes{v1.1d}{1995/11/24}{\break typo: \cs{marginmarwidth} to \cs{marginparwidth}}
 %    \begin{macrocode}
 %<*yoko>
   \if@twoside
@@ -1959,10 +1963,10 @@
     }%
     {\if@restonecol\twocolumn\else\newpage\fi
     }
-%   \end{macrocode}
+%    \end{macrocode}
 %
 % そして、\LaTeX{}ネイティブのための定義です。
-%   \begin{macrocode}
+%    \begin{macrocode}
 \else
 \newenvironment{titlepage}
     {%
@@ -3866,7 +3870,7 @@
          \renewcommand\theenumiv{\@arabic\c@enumiv}}%
    \sloppy
 %    \end{macrocode}
-% \changes{v1.1a}{1997/01/23}{\LaTeX\ \texttt{!<1996/12/01!>}に合わせて修正}
+% \changes{v1.1a}{1997/01/23}{\break\LaTeX\ \texttt{!<1996/12/01!>}に合わせて修正}
 %    \begin{macrocode}
    \clubpenalty4000
    \@clubpenalty\clubpenalty
diff --git a/Master/texmf-dist/source/uplatex/base/ukinsoku.dtx b/Master/texmf-dist/source/uplatex/base/ukinsoku.dtx
index 3dd6951bfcd..275e4b57358 100644
--- a/Master/texmf-dist/source/uplatex/base/ukinsoku.dtx
+++ b/Master/texmf-dist/source/uplatex/base/ukinsoku.dtx
@@ -5,12 +5,16 @@
 %       Copyright 1995 ASCII Corporation.
 %    and modified for upLaTeX
 %
-%  This file is part of upLaTeX2e system.
-%  -------------------------------------
+%  Copyright (c) 2010 ASCII MEDIA WORKS
+%  Copyright (c) 2016 Takuji Tanaka
+%  Copyright (c) 2016 Japanese TeX Development Community
+%
+%  This file is part of the upLaTeX2e system (community edition).
+%  --------------------------------------------------------------
 %
 % \fi
 %
-% \CheckSum{401}
+% \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
@@ -35,7 +39,7 @@
 %<*driver>
 \NeedsTeXFormat{pLaTeX2e}
 % \fi
-\ProvidesFile{ukinsoku.dtx}[2011/05/07 v1.0_u00 upLaTeX Kernel]
+\ProvidesFile{ukinsoku.dtx}[2011/05/07 v1.0-u00 upLaTeX Kernel]
 % \iffalse
 \documentclass{jltxdoc}
 \GetFileInfo{ukinsoku.dtx}
diff --git a/Master/texmf-dist/source/uplatex/base/uplatex.dtx b/Master/texmf-dist/source/uplatex/base/uplatex.dtx
index 1eea733727f..28f88253e0e 100644
--- a/Master/texmf-dist/source/uplatex/base/uplatex.dtx
+++ b/Master/texmf-dist/source/uplatex/base/uplatex.dtx
@@ -5,12 +5,16 @@
 %       Copyright 1995,1996 ASCII Corporation.
 %    and modified for upLaTeX
 %
-%  This file is part of upLaTeX2e system.
-%  -------------------------------------
+%  Copyright (c) 2010 ASCII MEDIA WORKS
+%  Copyright (c) 2016 Takuji Tanaka
+%  Copyright (c) 2016 Japanese TeX Development Community
+%
+%  This file is part of the upLaTeX2e system (community edition).
+%  --------------------------------------------------------------
 %
 % \fi
 %
-% \CheckSum{367}
+% \CheckSum{374}
 %% \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
@@ -31,8 +35,16 @@
 % \setcounter{StandardModuleDepth}{1}
 % \def\chuui#1{\par\vskip.5\baselineskip
 %   \noindent\bfseries{注意：}\par
-%   \noindent\bgroup\bf#1}
+%   \noindent\bgroup\gtfamily\sffamily#1}
 % \def\endchuui{\egroup\vskip.5\baselineskip}
+% \def\pTeX{p\kern-.15em\TeX}
+% \def\epTeX{$\varepsilon$-\pTeX}
+% \def\pLaTeX{p\kern-.05em\LaTeX}
+% \def\pLaTeXe{p\kern-.05em\LaTeXe}
+% \def\upTeX{u\pTeX}
+% \def\eupTeX{$\varepsilon$-\upTeX}
+% \def\upLaTeX{u\pLaTeX}
+% \def\upLaTeXe{u\pLaTeXe}
 % \StopEventually{}
 %
 % \iffalse
@@ -41,20 +53,27 @@
 % \changes{v1.0b}{1996/02/01}{\file{omake-sh.ins}, \file{omake-pl.ins}を
 %     \dst{}の変更にともなう変更をした}
 % \changes{v1.0c}{1997/01/23}{\LaTeX\ \textt{!<1996/12/01!>}に合わせて修正}
-% \changes{v1.0c_u00}{2011/05/07}{pLaTeX用からupLaTeX用に修正。}
+% \changes{v1.0c-u00}{2011/05/07}{p\LaTeX{}用からup\LaTeX{}用に修正。}
+% \changes{v1.0d}{2016/01/27}{\file{mkpldoc.sh}を改善。
+%     p\LaTeXe{}に付属するファイルの説明を更新}
+% \changes{v1.0e}{2016/02/16}{platexreleaseの説明を追加}
+% \changes{v1.0e-u00}{2016/04/06}{p\LaTeX{}の変更に追随。}
+% \changes{v1.0f-u00}{2016/04/12}{ドキュメントを更新}
+% \changes{v1.0g-u00}{2016/05/07}{フォーマット作成時に\LaTeX{}のバナーを一旦保存}
+% \changes{v1.0h-u00}{2016/05/08}{ドキュメントから\file{uplpatch.ltx}を除外}
 % \fi
 %
 % \iffalse
 %<*driver>
 \NeedsTeXFormat{pLaTeX2e}
 % \fi
-\ProvidesFile{uplatex.dtx}[2011/05/07 v1.0c_u00 upLaTeX document file]
+\ProvidesFile{uplatex.dtx}[2016/05/08 v1.0h-u00 upLaTeX document file]
 % \iffalse
 \documentclass{jltxdoc}
 \usepackage{plext}
-\GetFileInfo{platex.dtx}
-\title{p\LaTeXe{}について}
-\author{Ken Nakano \& TTK}
+\GetFileInfo{uplatex.dtx}
+\title{up\LaTeXe{}について}
+\author{Ken Nakano \& Japanese \TeX\ Development Community \& TTK}
 \date{作成日：\filedate}
 \begin{document}
    \MakeShortVerb{\+}
@@ -65,6 +84,36 @@
 % \fi
 %
 %
+% \begin{chuui}
+% これは、アスキーのオリジナル版からforkしたコミュニティ版\pLaTeXe{}の
+% 付属文書を\upLaTeXe{}用に書き換えたものですが、内容はソースコード部分
+% を除いて元の\pLaTeXe{}の文書と全く同一です。
+% \end{chuui}
+%
+% アスキー\pTeX{}には、高品質の日本語組版ソフトウェアとしてデファクト
+% スタンダードの地位にあるといえます。しかし、
+% (1) 直接使える文字集合が原則的にJIS X 0208（JIS第1,2水準）の範囲に限定
+% されていること、
+% (2) 8bitの非英語欧文との親和性が高いとは言えないこと、
+% (3) \pTeX{}の利用が日本語に限られ、中国語・韓国語との混植への利用が
+% 進んでいないこと、といった弱点がありました。
+%
+% これらの弱点を克服するため、\pTeX{}の内部コードをUnicode化した拡張版
+% が\upTeX{}です。また、\upTeX{}上で用いるUnicode版\pLaTeX{}が\upLaTeX{}で
+% す\footnote{\texttt{http://www.t-lab.opal.ne.jp/tex/uptex.html}}。
+% 現在の\upLaTeX{}は、日本語\TeX{}開発コミュニティが配布しているコミュニティ
+% 版\pLaTeX{}\footnote{\texttt{https://github.com/texjporg/platex}}を
+% ベースにしています。開発中の版は\pLaTeX{}と同様に、GitHubの
+% リポジトリ\footnote{\texttt{https://github.com/texjporg/uplatex}}で
+% 管理しています。
+%
+% より詳細な\upTeX{}や\upLaTeX{}の情報は、
+% それぞれ\file{README\_uplatex.txt}や\file{README\_uptex.txt}などの
+% テキストファイルを参照してください。
+%
+%
+% \clearpage
+%
 % \section{概要}\label{platex:intro}
 % この文書は、p\LaTeXe{}の概要を示していますが、使い方のガイドでは
 % ありません。p\LaTeXe{}の機能についての説明は、\cite{platex2e-book}を
@@ -199,12 +248,14 @@
 % したがって\file{platex.ltx}はとても短いものとなっています。
 % \file{latex.ltx}には\LaTeX{}のコマンドが、
 % \file{plcore.ltx}にはp\LaTeXe{}で拡張したコマンドが定義されています。
+% \changes{v1.0g-u00}{2016/05/07}{フォーマット作成時に\LaTeX{}のバナーを一旦保存}
 %
 %    \begin{macrocode}
 %<*plcore>
 \let\orgdump\dump
 \let\dump\relax
 \input latex.ltx
+\edef\platexBANNER{\the\everyjob}% save LaTeX banner
 \typeout{**************************^^J%
          *^^J%
          * making upLaTeX format^^J%
@@ -290,23 +341,20 @@
 % p\LaTeXe{}が提供をする、クラスファイルやパッケージファイルのいくつかは、
 % オリジナルのファイルを修正しています。
 % 修正箇所には``\texttt{platex}''条件が付けられています。
-% 
+%
 % p\LaTeXe{}に付属のクラスファイルは、次のとおりです。
+% \changes{v1.0d}{2016/01/27}{p\LaTeXe{}に付属するファイルの説明を更新}
 %
 % \begin{itemize}
-% \item jbook.cls,jarticle.cls,jreport.cls\par
+% \item jbook.cls, jarticle.cls, jreport.cls\par
 %   横組用の標準クラスファイル。\file{jclasses.dtx}から作成される。
 %
-% \item tbook.cls,tarticle.cls,treport.cls\par
+% \item tbook.cls, tarticle.cls, treport.cls\par
 %   縦組用の標準クラスファイル。\file{jclasses.dtx}から作成される。
 %
 % \item jltxdoc.cls\par
 %   \file{.dtx}ファイルを組版するためのクラスファイル。
 %   \file{jltxdoc.dtx}から作成される。
-%
-% \item jltxguid.cls\par
-%   \file{usrguide.tex}や\file{fntguide.tex}などを組版するための
-%   クラスファイル。
 % \end{itemize}
 %
 % また、p\LaTeXe{}に付属のパッケージファイルは、次のとおりです。
@@ -314,7 +362,7 @@
 % \begin{itemize}
 % \item oldpfont.sty\par
 %    p\LaTeX~2.09のフォントコマンドを提供するパッケージ。
-%    \file{oldpfont.dtx}から作成される。
+%    \file{pl209.dtx}から作成される。
 %
 % \item ptrace.sty\par
 %   \file{tracefnt.sty}で再定義された\NFSS2コマンドをp\LaTeXe{}用に
@@ -325,6 +373,10 @@
 %
 % \item plext.sty\par
 %    縦組用の拡張コマンドなどが定義されているファイル。
+%
+% \item nidanfloat.sty\par
+%   二段組時に段抜きのフロートをページ下部にも配置可能にする
+%   パッケージ。
 % \end{itemize}
 %
 %
@@ -340,7 +392,7 @@
 % これは、英語版の\LaTeX{}でも同じです。
 % 詳細は、\LaTeXe に付属の\file{usrguide.tex}を参照してください。
 %
-% 多くのクラスファイルやパッケージフィルはそのまま使えると思います。
+% 多くのクラスファイルやパッケージファイルはそのまま使えると思います。
 % ただし、それらがp\LaTeXe{}で拡張しているコマンドと同じ名前のコマンドを
 % 再定義している場合は、コマンドの拡張の仕方によってはエラーになることも
 % あります。用いようとしている、クラスファイルやパッケージファイルが
@@ -348,6 +400,14 @@
 % 一番簡単なのは、動かしてみることです。不幸にもうまく動かない場合は、
 % ログファイルや付属の文書ファイルを参考に原因を調べてください。
 %
+% \subsection{latexreleaseパッケージへの対応}
+% \changes{v1.0e}{2016/02/16}{platexreleaseの説明を追加}
+% \LaTeX\ \texttt{<2015/01/01>}で導入されたlatexreleaseパッケージを
+% もとに、新しいp\LaTeX{}ではplatexreleaseパッケージを用意しました。
+% platexreleaseパッケージを用いると、過去のp\LaTeX{}をエミュレート
+% したり、フォーマットを作り直すことなく新しいp\LaTeX{}を試したりする
+% ことができます。詳細はplatexreleaseのドキュメントを参照してください。
+%
 %
 %
 % \appendix
@@ -364,7 +424,7 @@
 % \cs{西暦}, \cs{和暦}に対する「読み」を付けるために必要です。
 %    \begin{macrocode}
 %<*pldoc>
-\begin{filecontents}{pldoc.dic}
+\begin{filecontents}{upldoc.dic}
 西暦    せいれき
 和暦    われき
 \end{filecontents}
@@ -441,25 +501,25 @@
 % \changes{v1.0c}{1997/01/29}{Rename pltpatch to plpatch.}
 %    \begin{macrocode}
 \begin{document}
- \title{The p\LaTeXe\ Sources}
- \author{Ken Nakano}
+ \title{The up\LaTeXe\ Sources}
+ \author{Ken Nakano \& Japanese \TeX\ Development Community \& TTK}
 
 % This command will be used to input the patch file
 % if that file exists.
 \newcommand{\includeltpatch}{%
-  \def\currentfile{plpatch.ltx}
-  \part{plpatch}
+  \def\currentfile{uplpatch.ltx}
+  \part{uplpatch}
   {\let\ttfamily\relax
     \xdef\filekey{\filekey, \thepart={\ttfamily\currentfile}}}%
   Things we did wrong\ldots
-  \IndexInput{plpatch.ltx}}
+  \IndexInput{uplpatch.ltx}}
 
-% Get the date from plvers.dtx
+% Get the date from uplvers.dtx
 \makeatletter
-\let\patchdate=\@empty
+\def\patchdate{0}%% Modified (May 8, 2016)
 \begingroup
    \def\ProvidesFile#1\pfmtversion#2{\date{#2}\endinput}
-   \input{plvers.dtx}
+   \input{uplvers.dtx}
 \global\let\X@date=\@date
 
 % Add the patch version if available.
@@ -467,7 +527,7 @@
     \xdef\X@date{#2}%
     \xdef\patchdate{#5}%
     \endinput}%
-   \InputIfFileExists{plpatch.ltx}
+   \InputIfFileExists{uplpatch.ltx}
     {\let\def\Xdef}{\global\let\includeltpatch\relax}
 \endgroup
 
@@ -477,7 +537,7 @@
     \edef\@date{\@date\space Patch level\patchdate}
   \fi
 \else
-   \@warning{plpatch.ltx does not match plvers.dtx!}
+   \@warning{uplpatch.ltx does not match uplvers.dtx!}
    \let\includeltpatch\relax
 \fi
 \makeatother
@@ -489,23 +549,23 @@
 \clearpage
 \pagenumbering{arabic}
 
-\DocInclude{plvers}   % pLaTeX version
+\DocInclude{uplvers}   % pLaTeX version
 
-\DocInclude{plfonts}  % NFSS2 commands
+\DocInclude{uplfonts}  % NFSS2 commands
 
-\DocInclude{plcore}   % kernel commands
+%\DocInclude{plcore}   % kernel commands
 
-\DocInclude{plext}    % external commands
+%\DocInclude{plext}    % external commands
 
-\DocInclude{pl209}    % 2.09 compatibility mode commands
+%\DocInclude{pl209}    % 2.09 compatibility mode commands
 
-\DocInclude{kinsoku}  % kinsoku parameter
+\DocInclude{ukinsoku}  % kinsoku parameter
 
-\DocInclude{jclasses} % Standard class
+\DocInclude{ujclasses} % Standard class
 
-\DocInclude{jltxdoc}  % dtx documents class
+%\DocInclude{jltxdoc}  % dtx documents class
 
-\includeltpatch       % patch file
+%\includeltpatch       % patch file (comment out May 8, 2016)
 
 %    \end{macrocode}
 % \file{ltxdoc.cfg}に|\AtEndOfClass{\OnlyDescription}|が指定されている場合は、
@@ -569,9 +629,12 @@
 % 目次ファイルや索引ファイルなどを削除します。
 % \changes{v1.0c}{1997/01/23}{Don't copy gind.ist and gglo.ist from
 %        \$TEXMF/tex/latex2e/base directory.}
+% \changes{v1.0d}{2016/01/27}{\file{mkpldoc.sh}を改善}
 %    \begin{macrocode}
 %<*shprog>
-rm pldoc.toc pldoc.idx pldoc.glo
+for f in upldoc.toc upldoc.idx upldoc.glo ; do
+if [ -e $f ]; then rm $f; fi
+done
 %    \end{macrocode}
 % そして、\file{ltxdoc.cfg}を空にします。
 % このファイルは、\file{jltxdoc.cls}の定義を変更するものですが、
@@ -581,7 +644,7 @@ echo "" > ltxdoc.cfg
 %    \end{macrocode}
 % そして、\file{pldoc.tex}を処理します。
 %    \begin{macrocode}
-platex pldoc.tex
+uplatex upldoc.tex
 %    \end{macrocode}
 % 索引と変更履歴を作成します。
 % このスクリプトでは、変更履歴や索引を生成するのにmendexプログラムを用いて
@@ -597,8 +660,8 @@ platex pldoc.tex
 % |-f|は、項目に``読み''がなくてもエラーとしないオプションです。
 % makeindexコマンドには、このオプションがありません。
 %    \begin{macrocode}
-mendex -s gind.ist -d pldoc.dic -o pldoc.ind pldoc.idx
-mendex -f -s gglo.ist -o pldoc.gls pldoc.glo
+mendex -s gind.ist -d upldoc.dic -o upldoc.ind upldoc.idx
+mendex -f -s gglo.ist -o upldoc.gls upldoc.glo
 %    \end{macrocode}
 % \file{ltxdoc.cfg}の内容を|\includeonly{}|にし、\file{pldoc.tex}を処理します。
 % このコマンドは、引数に指定されたファイルだけを``|\include|''するための
@@ -609,14 +672,14 @@ mendex -f -s gglo.ist -o pldoc.gls pldoc.glo
 % この処理は、主に、これらでエラーが出るかどうかの確認です。
 %    \begin{macrocode}
 echo "\includeonly{}" > ltxdoc.cfg
-platex pldoc.tex
+uplatex upldoc.tex
 %    \end{macrocode}
 % 最後に、再び\file{ltxdoc.cfg}を空にして、\file{pldoc.tex}を処理をします。
 % 本文を１ページから開始していますので、この後、もう一度処理をする
 % 必要はありません。
 %    \begin{macrocode}
 echo "" > ltxdoc.cfg
-platex pldoc.tex
+uplatex upldoc.tex
 # EOT
 %</shprog>
 %    \end{macrocode}
@@ -804,8 +867,8 @@ exit;
 % を指定します。
 %    \begin{macrocode}
 \generate{
-   \file{dstcheck.pl}{\from{platex.dtx}{plprog}}
-   \file{mkpldoc.sh}{\from{platex.dtx}{shprog}}
+   \file{dstcheck.pl}{\from{uplatex.dtx}{plprog}}
+   \file{mkpldoc.sh}{\from{uplatex.dtx}{shprog}}
 }
 \endbatchfile
 %</Xins>
@@ -815,7 +878,7 @@ exit;
 % \begin{thebibliography}{1}
 % \bibitem{tex-book}
 % Donald~E. Knuth.
-% \newblock ``{\em The TeX Book}''.
+% \newblock ``{\em The \TeX book}''.
 % \newblock Addison-Wesley, 1984.
 % \newblock (邦訳：斎藤信男監修, 鷺谷好輝訳,
 %             \TeX ブック 改訂新版, アスキー出版局, 1989)
diff --git a/Master/texmf-dist/source/uplatex/base/uplcls.ins b/Master/texmf-dist/source/uplatex/base/uplcls.ins
index a3ff1606099..9f298326138 100644
--- a/Master/texmf-dist/source/uplatex/base/uplcls.ins
+++ b/Master/texmf-dist/source/uplatex/base/uplcls.ins
@@ -5,6 +5,17 @@
 
 \Msg{*** Generating the upLaTeX class files ***}
 
+\preamble
+
+Copyright (c) 2010 ASCII MEDIA WORKS
+Copyright (c) 2016 Takuji Tanaka
+Copyright (c) 2016 Japanese TeX Development Community
+
+This file is part of the upLaTeX2e system (community edition).
+--------------------------------------------------------------
+
+\endpreamble
+
 %
 % 横組用クラスファイル
 %
diff --git a/Master/texmf-dist/source/uplatex/base/upldocs.ins b/Master/texmf-dist/source/uplatex/base/upldocs.ins
new file mode 100644
index 00000000000..61e7f1e1932
--- /dev/null
+++ b/Master/texmf-dist/source/uplatex/base/upldocs.ins
@@ -0,0 +1,24 @@
+\input docstrip
+\keepsilent
+\ifToplevel{\askonceonly}
+\usedir{tex/uplatex/base}
+
+\Msg{*** Generating the upLaTeX files for making the documents ***}
+
+\preamble
+
+Copyright (c) 2010 ASCII MEDIA WORKS
+Copyright (c) 2016 Takuji Tanaka
+Copyright (c) 2016 Japanese TeX Development Community
+
+This file is part of the upLaTeX2e system (community edition).
+--------------------------------------------------------------
+
+\endpreamble
+
+\generate{
+    \file{upldoc.tex}{\from{uplatex.dtx}{pldoc}}
+    \file{Xins.ins}{\from{uplatex.dtx}{Xins}}
+}
+
+\endbatchfile
diff --git a/Master/texmf-dist/source/uplatex/base/uplfmt.ins b/Master/texmf-dist/source/uplatex/base/uplfmt.ins
index 300082f57b2..a93fb9fcd73 100644
--- a/Master/texmf-dist/source/uplatex/base/uplfmt.ins
+++ b/Master/texmf-dist/source/uplatex/base/uplfmt.ins
@@ -5,6 +5,17 @@
 
 \Msg{*** Generating the upLaTeX files for making the documents ***}
 
+\preamble
+
+Copyright (c) 2010 ASCII MEDIA WORKS
+Copyright (c) 2016 Takuji Tanaka
+Copyright (c) 2016 Japanese TeX Development Community
+
+This file is part of the upLaTeX2e system (community edition).
+--------------------------------------------------------------
+
+\endpreamble
+
 \generate{
   \file{uplatex.ltx}{\from{uplatex.dtx}{plcore}}
   \file{uplcore.ltx}{\from{uplvers.dtx}{plcore}
diff --git a/Master/texmf-dist/source/uplatex/base/uplfonts.dtx b/Master/texmf-dist/source/uplatex/base/uplfonts.dtx
index 8dfb4d48195..010a5c43b0b 100644
--- a/Master/texmf-dist/source/uplatex/base/uplfonts.dtx
+++ b/Master/texmf-dist/source/uplatex/base/uplfonts.dtx
@@ -5,12 +5,16 @@
 %       Copyright 1995-2001 ASCII Corporation.
 %    and modified for upLaTeX
 %
-%  This file is part of the upLaTeX2e system.
-%  -------------------------------------
+%  Copyright (c) 2010 ASCII MEDIA WORKS
+%  Copyright (c) 2016 Takuji Tanaka
+%  Copyright (c) 2016 Japanese TeX Development Community
+%
+%  This file is part of the upLaTeX2e system (community edition).
+%  --------------------------------------------------------------
 %
 % \fi
 %
-% \CheckSum{1685}
+% \CheckSum{1811}
 %% \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
@@ -44,7 +48,7 @@
 % \changes{v1.3d}{1997/06/25}{\cs{em},\cs{emph}で和文を強調書体に}
 % \changes{v1.3e}{1997/07/10}{fdファイル名の小文字化が効いていなかったのを修正}
 % \changes{v1.3f}{1998/08/10}{\cs{DeclareFixedCommand}を\cs{@onlypreamble}に
-%	 してしまっていたのを修正}
+%    してしまっていたのを修正}
 % \changes{v1.3g}{1999/04/05}{plpatch.ltxの内容を反映}
 % \changes{v1.3h}{1999/08/09}{\cs{strut}の改善}
 % \changes{v1.3i}{2000/07/13}{\cs{text..}コマンドの左側に\cs{xkanjiskip}が
@@ -63,14 +67,21 @@
 %    ありがとう、ymtさん。}
 % \changes{v1.5}{2006/11/10}{\cs{reDeclareMathAlphabet}を修正。
 %    ありがとう、ymtさん。}
-% \changes{v1.5_u01}{2011/05/07}{pLaTeX用からupLaTeX用に修正。}
+% \changes{v1.5-u01}{2011/05/07}{p\LaTeX{}用からup\LaTeX{}用に修正。}
+% \changes{v1.6}{2016/02/01}{\LaTeX\ \texttt{!<2015/01/01!>}での\cs{em}の
+%    定義変更に対応。\cs{eminnershape}を追加。}
+% \changes{v1.6a}{2016/04/01}{ベースライン補正量が0でないときに
+%    \cs{AA}など一部の合成文字がおかしくなることへの対応。}
+% \changes{v1.6a-u00}{2016/04/06}{p\LaTeX{}の変更に追随。}
+% \changes{v1.6b-u00}{2016/04/30}{uptrace.styの冒頭でtracefnt.styを
+%    \cs{RequirePackageWithOptions}するようにした}
 % \fi
 %
 % \iffalse
 %<*driver>
 \NeedsTeXFormat{pLaTeX2e}
 % \fi
-\ProvidesFile{uplfonts.dtx}[2011/05/07 v1.5_u00 upLaTeX New Font Selection Scheme]
+\ProvidesFile{uplfonts.dtx}[2016/04/30 v1.6b-u00 upLaTeX New Font Selection Scheme]
 % \iffalse
 \documentclass{jltxdoc}
 \GetFileInfo{uplfonts.dtx}
@@ -137,6 +148,17 @@
 % 和文フォントの属性を格納するオブジェクトや長さ変数、
 % 属性を切替える際の判断材料として使うリストなどを定義しています。
 %
+% \file{uptrace}パッケージは\LaTeX{}の\file{tracefnt}パッケージに依存します。
+% \changes{v1.6b-u00}{2016/04/30}{uptrace.styの冒頭でtracefnt.styを
+%    \cs{RequirePackageWithOptions}するようにした}
+%    \begin{macrocode}
+%<*trace>
+\NeedsTeXFormat{pLaTeX2e}
+\ProvidesPackage{uptrace}
+     [2016/04/30 v1.6b-u00 Standard upLaTeX package (font tracing)]
+\RequirePackageWithOptions{tracefnt}
+%</trace>
+%    \end{macrocode}
 %
 % \subsubsection{和文フォント属性}
 % ここでは、和文フォントの属性を格納するためのオブジェクトについて
@@ -484,7 +506,7 @@
 % 欧文エンコードを宣言するためのコマンドです。
 % \file{ltfssbas.dtx}で定義されているものを、
 % |\fenc@list|を作るように再定義をしています。
-% \changes{v1.3p}{2006/01/04}{\cs{DeclareFontEncoding@}中で
+% \changes{v1.3p}{2006/01/04}{\break\cs{DeclareFontEncoding@}中で
 %    \cs{LastDeclaredEncodeng}の再定義が抜けていたので追加}
 %    \begin{macrocode}
 \def\DeclareFontEncoding{%
@@ -723,7 +745,7 @@
 % \begin{macro}{\DeclareFixedFont}
 % フォント名を宣言するコマンドです。
 %
-% \changes{v1.2}{1995/11/09}{\cs{DeclareFixedFont}の日本語化}
+% \changes{v1.2}{1995/11/09}{\break\cs{DeclareFixedFont}の日本語化}
 % \changes{v1.3c}{1997/04/09}{縦横エンコード・リストの分離による拡張}
 % \changes{v1.3f}{1998/08/10}{プリアンブル・コマンドにしてしまっていたのを解除}
 %    \begin{macrocode}
@@ -759,11 +781,11 @@
 %
 %
 % \begin{macro}{\reDeclareMathAlphabet}
-% \changes{v1.0}{1997/01/30}{\cs{reDeclareMathAlphabet}を追加。
+% \changes{v1.0}{1997/01/30}{\break\cs{reDeclareMathAlphabet}を追加。
 %    ありがとう、ymtさん。}
-% \changes{v1.4}{2006/06/27}{\cs{reDeclareMathAlphabet}を修正。
+% \changes{v1.4}{2006/06/27}{\break\cs{reDeclareMathAlphabet}を修正。
 %    ありがとう、ymtさん。}
-% \changes{v1.5}{2006/11/10}{\cs{reDeclareMathAlphabet}を修正。
+% \changes{v1.5}{2006/11/10}{\break\cs{reDeclareMathAlphabet}を修正。
 %    ありがとう、ymtさん。}
 % 数式モード内で、数式文字用の和欧文フォントを同時に切り替えるコマンドです。
 %
@@ -1031,8 +1053,8 @@
   \xdef\font@name{\csname\curr@fontshape/\f@size\endcsname}%
   \pickup@font
   \font@name
-%<trace>\ifnum \tracingfonts>\tw@
-%<trace>  \@font@info{Roman:Switching to \font@name}\fi
+%<trace>  \ifnum \tracingfonts>\tw@
+%<trace>    \@font@info{Roman:Switching to \font@name}\fi
   \enc@update
 %    \end{macrocode}
 % 最後に、サイズが変更されていれば、ベースラインの調整などを行ないます。
@@ -1136,7 +1158,7 @@
 %    \end{macrocode}
 % 和文フォントの基準値を設定します。
 %    \begin{macrocode}
-    \setbox\adjust@box\hbox{\char\euc"A1A1}%
+    \setbox\adjust@box\hbox{\char\euc"A1A1}%"
     \cht\ht\adjust@box
     \cdp\dp\adjust@box
     \cwd\wd\adjust@box
@@ -1523,7 +1545,7 @@
     \romanseries{\seriesdefault}%
     \romanshape{\shapedefault}%
     \selectfont\ignorespaces}
-	\adjustbaseline
+\adjustbaseline
 \let\reset@font\normalfont
 %    \end{macrocode}
 % \end{macro}
@@ -1621,8 +1643,66 @@
 %    \begin{macrocode}
 %<*pldefs>
 \ProvidesFile{upldefs.ltx}
-      [2000/07/13 v1.2u01 upLaTeX Kernel (Default settings)] 
+      [2016/04/06 v1.6a-u00 upLaTeX Kernel (Default settings)] 
+%    \end{macrocode}
+%
+% \subsection{合成文字}
+% \begin{macro}{\@text@composite}
+% \begin{macro}{\@text@composite@x}
+% \LaTeXe{}のカーネルのコードをそのまま使うと、p\TeX{}のベースライン
+% 補正量がゼロでないときに合成文字がおかしくなっていたため、対策します。
+% \changes{v1.6a}{2016/04/01}{ベースライン補正量が0でないときに
+%    \cs{AA}など一部の合成文字がおかしくなることへの対応。}
+%    \begin{macrocode}
+%</pldefs>
+%<platexrelease>\plIncludeInRelease{2016/04/17}{\@text@composite}
+%<platexrelease>                   {Fix for non-zero baselineshift}%
+%<*pldefs|platexrelease>
+\def\@text@composite#1#2#3#{%
+  \begingroup
+  \setbox\z@=\hbox\bgroup%
+  \ybaselineshift\z@\tbaselineshift\z@
+  \expandafter\@text@composite@x
+  \csname\string#1-\string#2\endcsname}
+\def\@text@composite@x#1#2{%
+  \ifx#1\relax
+    \expandafter\@secondoftwo
+  \else
+    \expandafter\@firstoftwo
+  \fi
+  #1{#2}\egroup
+  \leavevmode
+  \expandafter\lower
+    \iftdir
+      \ifmdir
+        \ifmmode\tbaselineshift\else\ybaselineshift\fi
+      \else
+        \tbaselineshift
+      \fi
+    \else
+      \ybaselineshift
+    \fi
+    \box\z@
+  \endgroup}
+%</pldefs|platexrelease>
+%<platexrelease>\plEndIncludeInRelease
+%<platexrelease>\plIncludeInRelease{0000/00/00}{\@text@composite}
+%<platexrelease>                   {Fix for non-zero baselineshift}%
+%<platexrelease>\def\@text@composite#1#2#3\@text@composite{%
+%<platexrelease>   \expandafter\@text@composite@x
+%<platexrelease>      \csname\string#1-\string#2\endcsname}
+%<platexrelease>\def\@text@composite@x#1{%
+%<platexrelease>   \ifx#1\relax
+%<platexrelease>      \expandafter\@secondoftwo
+%<platexrelease>   \else
+%<platexrelease>      \expandafter\@firstoftwo
+%<platexrelease>   \fi
+%<platexrelease>   #1}
+%<platexrelease>\plEndIncludeInRelease
+%<*pldefs>
 %    \end{macrocode}
+% \end{macro}
+% \end{macro}
 %
 % \subsection{イタリック補正}
 % \changes{v1.3i}{2000/07/13}{\cs{text..}コマンドの左側に\cs{xkanjiskip}が
@@ -1716,16 +1796,41 @@
 %
 % \begin{macro}{\em}
 % \begin{macro}{\emph}
+% \begin{macro}{\eminnershape}
 % \changes{v1.3d}{1997/06/25}{\cs{em},\cs{emph}で和文を強調書体に}
+% \changes{v1.6}{2016/02/01}{\LaTeX\ \texttt{!<2015/01/01!>}での\cs{em}の
+%    定義変更に対応。\cs{eminnershape}を追加。}
 % 従来は|\em|, |\emph|で和文フォントの切り替えは行っていませんでしたが、
 % 和文フォントも|\gtfamily|に切り替えるようにしました。
+% \LaTeX\ \texttt{<2015/01/01>}で追加された|\eminnershape|も取り入れ、
+% 強調コマンドを入れ子にする場合の書体を自由に再定義できるようになりました。
 %    \begin{macrocode}
+%</pldefs>
+%<platexrelease>\plIncludeInRelease{2016/04/17}{\eminnershape}{\eminnershape}%
+%<*pldefs|platexrelease>
 \DeclareRobustCommand\em
-        {\@nomath\em \ifdim \fontdimen\@ne\font >\z@ 
-                       \mcfamily \upshape \else \gtfamily \itshape \fi}
+        {\@nomath\em \ifdim \fontdimen\@ne\font >\z@
+                       \eminnershape \else \gtfamily \itshape \fi}%
+\def\eminnershape{\mcfamily \upshape}%
+%</pldefs|platexrelease>
+%<platexrelease>\plEndIncludeInRelease
+%<platexrelease>\plIncludeInRelease{2015/01/01}{\eminnershape}{\eminnershape}%
+%<platexrelease>\DeclareRobustCommand\em
+%<platexrelease>        {\@nomath\em \ifdim \fontdimen\@ne\font >\z@ 
+%<platexrelease>                       \mcfamily \upshape \else \gtfamily \itshape \fi}
+%<platexrelease>\def\eminnershape{\upshape}% defined by LaTeX, but not used by pLaTeX
+%<platexrelease>\plEndIncludeInRelease
+%<platexrelease>\plIncludeInRelease{0000/00/00}{\eminnershape}{\eminnershape}%
+%<platexrelease>\DeclareRobustCommand\em
+%<platexrelease>        {\@nomath\em \ifdim \fontdimen\@ne\font >\z@ 
+%<platexrelease>                       \mcfamily \upshape \else \gtfamily \itshape \fi}
+%<platexrelease>\let\eminnershape\@undefined
+%<platexrelease>\plEndIncludeInRelease
+%<*pldefs>
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
+% \end{macro}
 %
 %
 % \changes{v1.3b}{1997/01/30}{数式用フォントの宣言をクラスファイルに移動した}
diff --git a/Master/texmf-dist/source/uplatex/base/uplvers.dtx b/Master/texmf-dist/source/uplatex/base/uplvers.dtx
index 4f48cc14a53..bdfe0850619 100644
--- a/Master/texmf-dist/source/uplatex/base/uplvers.dtx
+++ b/Master/texmf-dist/source/uplatex/base/uplvers.dtx
@@ -1,16 +1,20 @@
 % \iffalse meta-comment
-%% File: uplvers
+%% File: uplvers.dtx
 %
 %    pLaTeX version setting file:
 %       Copyright 1995-2006 ASCII Corporation.
 %    and modified for upLaTeX
 %
-%  This file is part of the upLaTeX2e system.
-%  -----------------------------------------
+%  Copyright (c) 2010 ASCII MEDIA WORKS
+%  Copyright (c) 2016 Takuji Tanaka
+%  Copyright (c) 2016 Japanese TeX Development Community
+%
+%  This file is part of the upLaTeX2e system (community edition).
+%  --------------------------------------------------------------
 %
 % \fi
 %
-% \CheckSum{92}
+% \CheckSum{204}
 %% \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
@@ -32,9 +36,40 @@
 % \StopEventually{}
 %
 % \iffalse
+% \changes{v1.0}{1995/05/16}{p\LaTeXe\ 用に\file{ltvers.dtx}を修正}
+% \changes{v1.0a}{1995/08/30}{\LaTeX\ \texttt{!<1995/06/01!>}版用に修正}
+% \changes{v1.0b}{1996/01/31}{\LaTeX\ \texttt{!<1995/12/01!>}版用に修正}
+% \changes{v1.0c}{1997/01/11}{\LaTeX\ \texttt{!<1996/06/01!>}版用に修正}
+% \changes{v1.0d}{1997/01/23}{\LaTeX\ \texttt{!<1996/12/01!>}版用に修正}
+% \changes{v1.0e}{1997/07/02}{\LaTeX\ \texttt{!<1997/06/01!>}版用に修正}
+% \changes{v1.0f}{1998/02/17}{\LaTeX\ \texttt{!<1997/12/01!>}版用に修正}
+% \changes{v1.0g}{1998/09/01}{\LaTeX\ \texttt{!<1998/06/01!>}版用に修正}
+% \changes{v1.0h}{1999/04/05}{\LaTeX\ \texttt{!<1998/12/01!>}版用に修正}
+% \changes{v1.0i}{1999/08/09}{\LaTeX\ \texttt{!<1999/06/01!>}版用に修正}
+% \changes{v1.0j}{2000/02/29}{\LaTeX\ \texttt{!<1999/12/01!>}版用に修正}
+% \changes{v1.0k}{2000/11/03}{\LaTeX\ \texttt{!<2000/06/01!>}版用に修正}
+% \changes{v1.0l}{2001/09/04}{\LaTeX\ \texttt{!<2001/06/01!>}版用に修正}
+% \changes{v1.0m}{2004/08/10}{\LaTeX\ \texttt{!<2003/12/01!>}版対応確認}
+% \changes{v1.0n}{2005/01/04}{plfonts.dtxバグ修正}
+% \changes{v1.0o}{2006/01/04}{plfonts.dtxバグ修正}
+% \changes{v1.0p}{2006/06/27}{plfonts.dtx \LaTeX\ \texttt{!<2005/12/01!>}対応}
+% \changes{v1.0q}{2006/11/10}{plfonts.dtxバグ修正}
+% \changes{v1.0q-u00}{2011/05/07}{p\LaTeX{}用からup\LaTeX{}用に修正。}
+% \changes{v1.0r}{2016/01/26}{plcore.dtx p\TeX\ (r28720)対応}
+% \changes{v1.0s}{2016/02/01}{\LaTeX\ \texttt{!<2015/01/01!>}のlatexreleaseに
+%    対応するためのコードを導入}
+% \changes{v1.0t}{2016/02/03}{\cs{plIncludeInRelease}と
+%    \cs{plEndIncludeInRelease}を新設。}
+% \changes{v1.0t-u00}{2016/04/06}{p\LaTeX{}の変更に追随。}
+% \changes{v1.0u-u00}{2016/04/17}{\LaTeX\ \texttt{!<2016/03/31!>}版対応確認}
+% \changes{v1.0v-u00}{2016/05/07}{パッチファイルをロードするのをやめた。}
+% \changes{v1.0v-u00}{2016/05/07}{起動時の文字列を最新の\LaTeX{}に合わせた。}
+% \fi
+%
+% \iffalse
 %<*driver>
 % \fi
-\ProvidesFile{uplvers.dtx}[2011/05/07 v1.0q_u00 upLaTeX Kernel (Version Info)]
+\ProvidesFile{uplvers.dtx}[2016/05/07 v1.0v-u00 upLaTeX Kernel (Version Info)]
 % \iffalse
 \documentclass{jltxdoc}
 \GetFileInfo{uplvers.dtx}
@@ -49,8 +84,8 @@
 % \fi
 %
 % \section{バージョンの設定}
-% まず、このディストリビューションでのp\LaTeXe{}の日付とバージョン番号
-% を定義します。また、p\LaTeXe{}が起動されたときに表示される文字列の
+% まず、このディストリビューションでのup\LaTeXe{}の日付とバージョン番号
+% を定義します。また、up\LaTeXe{}が起動されたときに表示される文字列の
 % 設定もします。
 %
 % \changes{v1.0}{1995/05/16}{p\LaTeXe\ 用に\file{ltvers.dtx}を修正}
@@ -67,75 +102,95 @@
 % \changes{v1.0k}{2000/11/03}{\LaTeX\ \texttt{!<2000/06/01!>}版用に修正}
 % \changes{v1.0l}{2001/09/04}{\LaTeX\ \texttt{!<2001/06/01!>}版用に修正}
 % \changes{v1.0m}{2004/08/10}{\LaTeX\ \texttt{!<2003/12/01!>}版対応確認}
-% \changes{v1.0n}{2005/01/04}{plfonts.dtxバグ修正}
-% \changes{v1.0o}{2006/01/04}{plfonts.dtxバグ修正}
-% \changes{v1.0p}{2006/06/27}{plfonts.dtx LaTeX <2005/12/01>対応}
-% \changes{v1.0q}{2006/11/10}{plfonts.dtxバグ修正}
-% \changes{v0.0q_u00}{2011/05/07}{pLaTeX用からupLaTeX用に修正。}
+% \changes{v1.0s}{2016/02/01}{\LaTeX\ \texttt{!<2015/01/01!>}版用に修正}
+% \changes{v1.0u-u00}{2016/04/17}{\LaTeX\ \texttt{!<2016/03/31!>}版対応確認}
 %
-% このバージョンのp\LaTeXe{}は、次のバージョンの\LaTeX{}\footnote{%
-% LaTeX authors: Johannes Braams, David Carlisle, Alan Jeffrey,
+% このバージョンのup\LaTeXe{}は、次のバージョンの\LaTeX{}\footnote{%
+% \LaTeX\ authors: Johannes Braams, David Carlisle, Alan Jeffrey,
 %   Leslie Lamport, Frank Mittelbach, Chris Rowley, Rainer Sch\"opf}を
 % もとにしています。
 %    \begin{macrocode}
-%<2ekernel>\def\fmtname{LaTeX2e}
-%<2ekernel>\def\fmtversion{2003/12/01}
+%<*2ekernel>
+%\def\fmtname{LaTeX2e}
+%\edef\fmtversion
+%</2ekernel>
+%<latexrelease>\edef\latexreleaseversion
+%<platexrelease>\edef\p@known@latexreleaseversion
+%<*2ekernel|latexrelease|platexrelease>
+   {2016/03/31}
+%</2ekernel|latexrelease|platexrelease>
 %    \end{macrocode}
 %
-% p\LaTeXe{}のフォーマットファイル名とバージョンです。
+% up\LaTeXe{}のフォーマットファイル名とバージョンです。
 %
+% \begin{macro}{\pfmtname}
+% \begin{macro}{\pfmtversion}
 %    \begin{macrocode}
 %<*plcore>
 \def\pfmtname{pLaTeX2e}
-\def\pfmtversion{2011/05/07u00}
+\def\pfmtversion
 %</plcore>
+%<platexrelease>\edef\platexreleaseversion
+%<*plcore|platexrelease>
+   {2016/05/07u00}
+%</plcore|platexrelease>
 %    \end{macrocode}
+% \end{macro}
+% \end{macro}
 %
 % \subsection{パッチファイルのロード}
 %
-% 次の部分は、p\LaTeXe{}のパッチファイルをロードするためのコードです。
+% 次の部分は、up\LaTeXe{}のパッチファイルをロードするためのコードです。
 % バグを修正するためのパッチを配布するかもしれません。
+%
+% パッチファイルをロードするコードはコメントアウトしました。
+% \changes{v1.0v-u00}{2016/05/07}{パッチファイルをロードするのをやめた。}
 %    \begin{macrocode}
 %<*plfinal>
-\IfFileExists{uplpatch.ltx}
-  {\typeout{************************************^^J%
-            * Appliying patch file uplpatch.ltx *^^J%
-            ************************************}
-  \def\pfmtversion@topatch{unknown}
-  \input{uplpatch.ltx}
-  \ifx\pfmtversion\pfmtversion@topatch
-    \ifx\ppatch@level\@undefined
-      \typeout{^^J^^J^^J%
-   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!^^J%
-   !! Patch file `uplpatch.ltx' (for version <\pfmtversion@topatch>)^^J%
-   !! is not suitable for version <\pfmtversion> of pLaTeX.^^J^^J%
-   !! Please check if iniptex found an old patch file:^^J%
-   !! --- if so, rename it or delete it, and redo the^^J%
-   !!     iniptex run.^^J%
-   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!^^J}%
-      \batchmode \@@end
-    \fi
-  \else
-      \typeout{^^J^^J^^J%
-   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!^^J%
-   !! Patch file `uplpatch.ltx' (for version <\pfmtversion@topatch>)^^J%
-   !! is not suitable for version <\pfmtversion> of pLaTeX.^^J%
-   !!^^J%
-   !! Please check if iniptex found an old patch file:^^J%
-   !! --- if so, rename it or delete it, and redo the^^J%
-   !!     iniptex run.^^J%
-   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!^^J}%
-      \batchmode \@@end
-  \fi
-  \let\pfmtversion@topatch\relax
-  }{}
+%\IfFileExists{uplpatch.ltx}
+%  {\typeout{************************************^^J%
+%            * Appliying patch file uplpatch.ltx *^^J%
+%            ************************************}
+%  \def\pfmtversion@topatch{unknown}
+%  \input{uplpatch.ltx}
+%  \ifx\pfmtversion\pfmtversion@topatch
+%    \ifx\ppatch@level\@undefined
+%      \typeout{^^J^^J^^J%
+%   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!^^J%
+%   !! Patch file `uplpatch.ltx' (for version <\pfmtversion@topatch>)^^J%
+%   !! is not suitable for version <\pfmtversion> of upLaTeX.^^J^^J%
+%   !! Please check if iniptex found an old patch file:^^J%
+%   !! --- if so, rename it or delete it, and redo the^^J%
+%   !!     iniptex run.^^J%
+%   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!^^J}%
+%      \batchmode \@@end
+%    \fi
+%  \else
+%      \typeout{^^J^^J^^J%
+%   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!^^J%
+%   !! Patch file `uplpatch.ltx' (for version <\pfmtversion@topatch>)^^J%
+%   !! is not suitable for version <\pfmtversion> of upLaTeX.^^J%
+%   !!^^J%
+%   !! Please check if iniptex found an old patch file:^^J%
+%   !! --- if so, rename it or delete it, and redo the^^J%
+%   !!     iniptex run.^^J%
+%   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!^^J}%
+%      \batchmode \@@end
+%  \fi
+%  \let\pfmtversion@topatch\relax
+%  }{}
 %    \end{macrocode}
 %
 % 起動時に表示される文字列です。
 % \LaTeX{}にパッチがあてられている場合は、それも表示します。
+% \changes{v1.0v-u00}{2016/05/07}{起動時の文字列を最新の\LaTeX{}に合わせた。}
 %    \begin{macrocode}
-\ifx\patch@level\@undefined
-  \ifx\ppatch@level\@undefined
+\ifx\patch@level\@undefined % fallback if undefined in LaTeX
+  \def\patch@level{0}\fi
+\ifx\ppatch@level\@undefined % fallback if undefined in upLaTeX
+  \def\ppatch@level{0}\fi
+\ifnum\patch@level=0
+  \ifnum\ppatch@level=0
      \everyjob{\typeout{%
         \pfmtname\space<\pfmtversion>\space
           (based on \fmtname\space<\fmtversion>)}}
@@ -144,8 +199,8 @@
         \pfmtname\space<\pfmtversion>+\ppatch@level\space
           (based on \fmtname\space<\fmtversion>)}}
   \fi
-\else
-  \ifx\ppatch@level\@undefined
+\else\ifnum\patch@level>0
+  \ifnum\ppatch@level=0
      \everyjob{\typeout{%
         \pfmtname\space<\pfmtversion>\space
           (based on \fmtname\space<\fmtversion>\space
@@ -156,7 +211,82 @@
           (based on \fmtname\space<\fmtversion>\space
             patch level \patch@level)}}
   \fi
-\fi
+\else
+  \ifnum\ppatch@level=0
+     \everyjob{\typeout{%
+        \pfmtname\space<\pfmtversion>\space
+          (based on \fmtname\space<\fmtversion>\space
+            pre-release\patch@level)}}
+  \else
+     \everyjob{\typeout{%
+        \pfmtname\space<\pfmtversion>+\ppatch@level\space
+          (based on \fmtname\space<\fmtversion>\space
+            pre-release\patch@level)}}
+  \fi
+\fi\fi
+%</plfinal>
+%    \end{macrocode}
+%
+% \subsection{latexreleaseパッケージへの対応}
+%
+% 最後に、latexreleaseパッケージへの対応です。
+% \begin{macro}{\plIncludeInRelease}
+% \changes{v1.0t}{2016/02/03}{\cs{plIncludeInRelease}と
+%    \cs{plEndIncludeInRelease}を新設。}
+%    \begin{macrocode}
+%<*plcore|platexrelease>
+\def\plIncludeInRelease#1{\kernel@ifnextchar[%
+  {\@plIncludeInRelease{#1}}
+  {\@plIncludeInRelease{#1}[#1]}}
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+\def\@plIncludeInRelease#1[#2]{\@plIncludeInRele@se{#2}}
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+\def\@plIncludeInRele@se#1#2#3{%
+  \toks@{[#1] #3}%
+  \expandafter\ifx\csname\string#2+\@currname+IIR\endcsname\relax
+    \ifnum\expandafter\@parse@version#1//00\@nil
+          >\expandafter\@parse@version\pfmtversion//00\@nil
+      \GenericInfo{}{Skipping: \the\toks@}%
+     \expandafter\expandafter\expandafter\@gobble@plIncludeInRelease
+    \else
+      \GenericInfo{}{Applying: \the\toks@}%
+      \expandafter\let\csname\string#2+\@currname+IIR\endcsname\@empty
+    \fi
+  \else
+    \GenericInfo{}{Already applied: \the\toks@}%
+    \expandafter\@gobble@plIncludeInRelease
+  \fi
+}
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+\long\def\@gobble@plIncludeInRelease#1\plEndIncludeInRelease{}
+\let\plEndIncludeInRelease\relax
+%</plcore|platexrelease>
+%    \end{macrocode}
+% \end{macro}
+%
+% \LaTeXe{}が提供するlatexreleaseパッケージが読み込まれていて、
+% かつp\LaTeXe{}が提供するplatexreleaseパッケージが読み込まれていない
+% 場合は、警告を出します。
+% \changes{v1.0s}{2016/02/01}{latexrelease利用時に警告を出すようにした}
+%    \begin{macrocode}
+%<*plfinal>
+\AtBeginDocument{%
+  \@ifpackageloaded{latexrelease}{%
+    \@ifpackageloaded{platexrelease}{}{%
+      \@latex@warning@no@line{%
+        Package latexrelease is loaded.\MessageBreak
+        Some patches in pLaTeX2e core may be overwritten.\MessageBreak
+        Consider using platexrelease.\MessageBreak
+        See platex.pdf for detail}%
+    }%
+  }{}%
+}
 %</plfinal>
 %    \end{macrocode}
 %
diff --git a/Master/texmf-dist/tex/uplatex/base/jt2gt.fd b/Master/texmf-dist/tex/uplatex/base/jt2gt.fd
index adf627c4450..42f7ecc92b9 100644
--- a/Master/texmf-dist/tex/uplatex/base/jt2gt.fd
+++ b/Master/texmf-dist/tex/uplatex/base/jt2gt.fd
@@ -6,20 +6,13 @@
 %%
 %% uplfonts.dtx  (with options: `JT2gt')
 %% 
-%% IMPORTANT NOTICE:
+%% Copyright (c) 2010 ASCII MEDIA WORKS
+%% Copyright (c) 2016 Takuji Tanaka
+%% Copyright (c) 2016 Japanese TeX Development Community
 %% 
-%% For the copyright see the source file.
+%% This file is part of the upLaTeX2e system (community edition).
+%% --------------------------------------------------------------
 %% 
-%% Any modified versions of this file must be renamed
-%% with new filenames distinct from jt2gt.fd.
-%% 
-%% For distribution of the original source see the terms
-%% for copying and modification in the file uplfonts.dtx.
-%% 
-%% This generated file may be distributed as long as the
-%% original source files, as listed above, are part of the
-%% same distribution. (The sources need not necessarily be
-%% in the same archive or directory.)
 %% 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
diff --git a/Master/texmf-dist/tex/uplatex/base/jt2mc.fd b/Master/texmf-dist/tex/uplatex/base/jt2mc.fd
index 0e2ad3e9922..fc494cdef1b 100644
--- a/Master/texmf-dist/tex/uplatex/base/jt2mc.fd
+++ b/Master/texmf-dist/tex/uplatex/base/jt2mc.fd
@@ -6,20 +6,13 @@
 %%
 %% uplfonts.dtx  (with options: `JT2mc')
 %% 
-%% IMPORTANT NOTICE:
+%% Copyright (c) 2010 ASCII MEDIA WORKS
+%% Copyright (c) 2016 Takuji Tanaka
+%% Copyright (c) 2016 Japanese TeX Development Community
 %% 
-%% For the copyright see the source file.
+%% This file is part of the upLaTeX2e system (community edition).
+%% --------------------------------------------------------------
 %% 
-%% Any modified versions of this file must be renamed
-%% with new filenames distinct from jt2mc.fd.
-%% 
-%% For distribution of the original source see the terms
-%% for copying and modification in the file uplfonts.dtx.
-%% 
-%% This generated file may be distributed as long as the
-%% original source files, as listed above, are part of the
-%% same distribution. (The sources need not necessarily be
-%% in the same archive or directory.)
 %% 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
diff --git a/Master/texmf-dist/tex/uplatex/base/jy2gt.fd b/Master/texmf-dist/tex/uplatex/base/jy2gt.fd
index d29f4ac0a91..543f9877659 100644
--- a/Master/texmf-dist/tex/uplatex/base/jy2gt.fd
+++ b/Master/texmf-dist/tex/uplatex/base/jy2gt.fd
@@ -6,20 +6,13 @@
 %%
 %% uplfonts.dtx  (with options: `JY2gt')
 %% 
-%% IMPORTANT NOTICE:
+%% Copyright (c) 2010 ASCII MEDIA WORKS
+%% Copyright (c) 2016 Takuji Tanaka
+%% Copyright (c) 2016 Japanese TeX Development Community
 %% 
-%% For the copyright see the source file.
+%% This file is part of the upLaTeX2e system (community edition).
+%% --------------------------------------------------------------
 %% 
-%% Any modified versions of this file must be renamed
-%% with new filenames distinct from jy2gt.fd.
-%% 
-%% For distribution of the original source see the terms
-%% for copying and modification in the file uplfonts.dtx.
-%% 
-%% This generated file may be distributed as long as the
-%% original source files, as listed above, are part of the
-%% same distribution. (The sources need not necessarily be
-%% in the same archive or directory.)
 %% 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
diff --git a/Master/texmf-dist/tex/uplatex/base/jy2mc.fd b/Master/texmf-dist/tex/uplatex/base/jy2mc.fd
index 8d730665d8d..3313d98f2e4 100644
--- a/Master/texmf-dist/tex/uplatex/base/jy2mc.fd
+++ b/Master/texmf-dist/tex/uplatex/base/jy2mc.fd
@@ -6,20 +6,13 @@
 %%
 %% uplfonts.dtx  (with options: `JY2mc')
 %% 
-%% IMPORTANT NOTICE:
+%% Copyright (c) 2010 ASCII MEDIA WORKS
+%% Copyright (c) 2016 Takuji Tanaka
+%% Copyright (c) 2016 Japanese TeX Development Community
 %% 
-%% For the copyright see the source file.
+%% This file is part of the upLaTeX2e system (community edition).
+%% --------------------------------------------------------------
 %% 
-%% Any modified versions of this file must be renamed
-%% with new filenames distinct from jy2mc.fd.
-%% 
-%% For distribution of the original source see the terms
-%% for copying and modification in the file uplfonts.dtx.
-%% 
-%% This generated file may be distributed as long as the
-%% original source files, as listed above, are part of the
-%% same distribution. (The sources need not necessarily be
-%% in the same archive or directory.)
 %% 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
diff --git a/Master/texmf-dist/tex/uplatex/base/ujarticle.cls b/Master/texmf-dist/tex/uplatex/base/ujarticle.cls
index 1acd7172c48..4f10fd5b43c 100644
--- a/Master/texmf-dist/tex/uplatex/base/ujarticle.cls
+++ b/Master/texmf-dist/tex/uplatex/base/ujarticle.cls
@@ -6,20 +6,13 @@
 %%
 %% ujclasses.dtx  (with options: `article,yoko')
 %% 
-%% IMPORTANT NOTICE:
+%% Copyright (c) 2010 ASCII MEDIA WORKS
+%% Copyright (c) 2016 Takuji Tanaka
+%% Copyright (c) 2016 Japanese TeX Development Community
 %% 
-%% For the copyright see the source file.
+%% This file is part of the upLaTeX2e system (community edition).
+%% --------------------------------------------------------------
 %% 
-%% Any modified versions of this file must be renamed
-%% with new filenames distinct from ujarticle.cls.
-%% 
-%% For distribution of the original source see the terms
-%% for copying and modification in the file ujclasses.dtx.
-%% 
-%% This generated file may be distributed as long as the
-%% original source files, as listed above, are part of the
-%% same distribution. (The sources need not necessarily be
-%% in the same archive or directory.)
 %% 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
@@ -39,7 +32,7 @@
 %%
 \NeedsTeXFormat{pLaTeX2e}
 \ProvidesClass{ujarticle}
-  [2011/05/07 v1.6_u00
+  [2011/05/07 v1.6-u00
  Standard upLaTeX class]
 \newcounter{@paper}
 \newif\if@landscape \@landscapefalse
diff --git a/Master/texmf-dist/tex/uplatex/base/ujbk10.clo b/Master/texmf-dist/tex/uplatex/base/ujbk10.clo
index 7ad2b8136a8..6db1836a3c8 100644
--- a/Master/texmf-dist/tex/uplatex/base/ujbk10.clo
+++ b/Master/texmf-dist/tex/uplatex/base/ujbk10.clo
@@ -6,20 +6,13 @@
 %%
 %% ujclasses.dtx  (with options: `10pt,bk,yoko')
 %% 
-%% IMPORTANT NOTICE:
+%% Copyright (c) 2010 ASCII MEDIA WORKS
+%% Copyright (c) 2016 Takuji Tanaka
+%% Copyright (c) 2016 Japanese TeX Development Community
 %% 
-%% For the copyright see the source file.
+%% This file is part of the upLaTeX2e system (community edition).
+%% --------------------------------------------------------------
 %% 
-%% Any modified versions of this file must be renamed
-%% with new filenames distinct from ujbk10.clo.
-%% 
-%% For distribution of the original source see the terms
-%% for copying and modification in the file ujclasses.dtx.
-%% 
-%% This generated file may be distributed as long as the
-%% original source files, as listed above, are part of the
-%% same distribution. (The sources need not necessarily be
-%% in the same archive or directory.)
 %% 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
@@ -39,7 +32,7 @@
 %%
 \NeedsTeXFormat{pLaTeX2e}
 \ProvidesFile{ujbk10.clo}
-  [2011/05/07 v1.6_u00
+  [2011/05/07 v1.6-u00
   Standard upLaTeX file (size option)]
 \renewcommand{\normalsize}{%
     \@setfontsize\normalsize\@xpt{15}%
diff --git a/Master/texmf-dist/tex/uplatex/base/ujbk11.clo b/Master/texmf-dist/tex/uplatex/base/ujbk11.clo
index fa2fe0f6f0b..99725f5a021 100644
--- a/Master/texmf-dist/tex/uplatex/base/ujbk11.clo
+++ b/Master/texmf-dist/tex/uplatex/base/ujbk11.clo
@@ -6,20 +6,13 @@
 %%
 %% ujclasses.dtx  (with options: `11pt,bk,yoko')
 %% 
-%% IMPORTANT NOTICE:
+%% Copyright (c) 2010 ASCII MEDIA WORKS
+%% Copyright (c) 2016 Takuji Tanaka
+%% Copyright (c) 2016 Japanese TeX Development Community
 %% 
-%% For the copyright see the source file.
+%% This file is part of the upLaTeX2e system (community edition).
+%% --------------------------------------------------------------
 %% 
-%% Any modified versions of this file must be renamed
-%% with new filenames distinct from ujbk11.clo.
-%% 
-%% For distribution of the original source see the terms
-%% for copying and modification in the file ujclasses.dtx.
-%% 
-%% This generated file may be distributed as long as the
-%% original source files, as listed above, are part of the
-%% same distribution. (The sources need not necessarily be
-%% in the same archive or directory.)
 %% 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
@@ -39,7 +32,7 @@
 %%
 \NeedsTeXFormat{pLaTeX2e}
 \ProvidesFile{ujbk11.clo}
-  [2011/05/07 v1.6_u00
+  [2011/05/07 v1.6-u00
   Standard upLaTeX file (size option)]
 \renewcommand{\normalsize}{%
     \@setfontsize\normalsize\@xipt{15.5}%
diff --git a/Master/texmf-dist/tex/uplatex/base/ujbk12.clo b/Master/texmf-dist/tex/uplatex/base/ujbk12.clo
index 579e48b6ac7..beab5a451be 100644
--- a/Master/texmf-dist/tex/uplatex/base/ujbk12.clo
+++ b/Master/texmf-dist/tex/uplatex/base/ujbk12.clo
@@ -6,20 +6,13 @@
 %%
 %% ujclasses.dtx  (with options: `12pt,bk,yoko')
 %% 
-%% IMPORTANT NOTICE:
+%% Copyright (c) 2010 ASCII MEDIA WORKS
+%% Copyright (c) 2016 Takuji Tanaka
+%% Copyright (c) 2016 Japanese TeX Development Community
 %% 
-%% For the copyright see the source file.
+%% This file is part of the upLaTeX2e system (community edition).
+%% --------------------------------------------------------------
 %% 
-%% Any modified versions of this file must be renamed
-%% with new filenames distinct from ujbk12.clo.
-%% 
-%% For distribution of the original source see the terms
-%% for copying and modification in the file ujclasses.dtx.
-%% 
-%% This generated file may be distributed as long as the
-%% original source files, as listed above, are part of the
-%% same distribution. (The sources need not necessarily be
-%% in the same archive or directory.)
 %% 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
@@ -39,7 +32,7 @@
 %%
 \NeedsTeXFormat{pLaTeX2e}
 \ProvidesFile{ujbk12.clo}
-  [2011/05/07 v1.6_u00
+  [2011/05/07 v1.6-u00
   Standard upLaTeX file (size option)]
 \renewcommand{\normalsize}{%
     \@setfontsize\normalsize\@xiipt{16.5}%
diff --git a/Master/texmf-dist/tex/uplatex/base/ujbook.cls b/Master/texmf-dist/tex/uplatex/base/ujbook.cls
index 822708a708c..9346ab2647a 100644
--- a/Master/texmf-dist/tex/uplatex/base/ujbook.cls
+++ b/Master/texmf-dist/tex/uplatex/base/ujbook.cls
@@ -6,20 +6,13 @@
 %%
 %% ujclasses.dtx  (with options: `book,yoko')
 %% 
-%% IMPORTANT NOTICE:
+%% Copyright (c) 2010 ASCII MEDIA WORKS
+%% Copyright (c) 2016 Takuji Tanaka
+%% Copyright (c) 2016 Japanese TeX Development Community
 %% 
-%% For the copyright see the source file.
+%% This file is part of the upLaTeX2e system (community edition).
+%% --------------------------------------------------------------
 %% 
-%% Any modified versions of this file must be renamed
-%% with new filenames distinct from ujbook.cls.
-%% 
-%% For distribution of the original source see the terms
-%% for copying and modification in the file ujclasses.dtx.
-%% 
-%% This generated file may be distributed as long as the
-%% original source files, as listed above, are part of the
-%% same distribution. (The sources need not necessarily be
-%% in the same archive or directory.)
 %% 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
@@ -39,7 +32,7 @@
 %%
 \NeedsTeXFormat{pLaTeX2e}
 \ProvidesClass{ujbook}
-  [2011/05/07 v1.6_u00
+  [2011/05/07 v1.6-u00
  Standard upLaTeX class]
 \newcounter{@paper}
 \newif\if@landscape \@landscapefalse
diff --git a/Master/texmf-dist/tex/uplatex/base/ujreport.cls b/Master/texmf-dist/tex/uplatex/base/ujreport.cls
index be1496f2ded..1b29b444b35 100644
--- a/Master/texmf-dist/tex/uplatex/base/ujreport.cls
+++ b/Master/texmf-dist/tex/uplatex/base/ujreport.cls
@@ -6,20 +6,13 @@
 %%
 %% ujclasses.dtx  (with options: `report,yoko')
 %% 
-%% IMPORTANT NOTICE:
+%% Copyright (c) 2010 ASCII MEDIA WORKS
+%% Copyright (c) 2016 Takuji Tanaka
+%% Copyright (c) 2016 Japanese TeX Development Community
 %% 
-%% For the copyright see the source file.
+%% This file is part of the upLaTeX2e system (community edition).
+%% --------------------------------------------------------------
 %% 
-%% Any modified versions of this file must be renamed
-%% with new filenames distinct from ujreport.cls.
-%% 
-%% For distribution of the original source see the terms
-%% for copying and modification in the file ujclasses.dtx.
-%% 
-%% This generated file may be distributed as long as the
-%% original source files, as listed above, are part of the
-%% same distribution. (The sources need not necessarily be
-%% in the same archive or directory.)
 %% 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
@@ -39,7 +32,7 @@
 %%
 \NeedsTeXFormat{pLaTeX2e}
 \ProvidesClass{ujreport}
-  [2011/05/07 v1.6_u00
+  [2011/05/07 v1.6-u00
  Standard upLaTeX class]
 \newcounter{@paper}
 \newif\if@landscape \@landscapefalse
diff --git a/Master/texmf-dist/tex/uplatex/base/ujsize10.clo b/Master/texmf-dist/tex/uplatex/base/ujsize10.clo
index 3a3a250d3a4..5bf21c601df 100644
--- a/Master/texmf-dist/tex/uplatex/base/ujsize10.clo
+++ b/Master/texmf-dist/tex/uplatex/base/ujsize10.clo
@@ -6,20 +6,13 @@
 %%
 %% ujclasses.dtx  (with options: `10pt,yoko')
 %% 
-%% IMPORTANT NOTICE:
+%% Copyright (c) 2010 ASCII MEDIA WORKS
+%% Copyright (c) 2016 Takuji Tanaka
+%% Copyright (c) 2016 Japanese TeX Development Community
 %% 
-%% For the copyright see the source file.
+%% This file is part of the upLaTeX2e system (community edition).
+%% --------------------------------------------------------------
 %% 
-%% Any modified versions of this file must be renamed
-%% with new filenames distinct from ujsize10.clo.
-%% 
-%% For distribution of the original source see the terms
-%% for copying and modification in the file ujclasses.dtx.
-%% 
-%% This generated file may be distributed as long as the
-%% original source files, as listed above, are part of the
-%% same distribution. (The sources need not necessarily be
-%% in the same archive or directory.)
 %% 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
@@ -39,7 +32,7 @@
 %%
 \NeedsTeXFormat{pLaTeX2e}
 \ProvidesFile{ujsize10.clo}
-  [2011/05/07 v1.6_u00
+  [2011/05/07 v1.6-u00
   Standard upLaTeX file (size option)]
 \renewcommand{\normalsize}{%
     \@setfontsize\normalsize\@xpt{15}%
diff --git a/Master/texmf-dist/tex/uplatex/base/ujsize11.clo b/Master/texmf-dist/tex/uplatex/base/ujsize11.clo
index a54457fef16..d4db9de045e 100644
--- a/Master/texmf-dist/tex/uplatex/base/ujsize11.clo
+++ b/Master/texmf-dist/tex/uplatex/base/ujsize11.clo
@@ -6,20 +6,13 @@
 %%
 %% ujclasses.dtx  (with options: `11pt,yoko')
 %% 
-%% IMPORTANT NOTICE:
+%% Copyright (c) 2010 ASCII MEDIA WORKS
+%% Copyright (c) 2016 Takuji Tanaka
+%% Copyright (c) 2016 Japanese TeX Development Community
 %% 
-%% For the copyright see the source file.
+%% This file is part of the upLaTeX2e system (community edition).
+%% --------------------------------------------------------------
 %% 
-%% Any modified versions of this file must be renamed
-%% with new filenames distinct from ujsize11.clo.
-%% 
-%% For distribution of the original source see the terms
-%% for copying and modification in the file ujclasses.dtx.
-%% 
-%% This generated file may be distributed as long as the
-%% original source files, as listed above, are part of the
-%% same distribution. (The sources need not necessarily be
-%% in the same archive or directory.)
 %% 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
@@ -39,7 +32,7 @@
 %%
 \NeedsTeXFormat{pLaTeX2e}
 \ProvidesFile{ujsize11.clo}
-  [2011/05/07 v1.6_u00
+  [2011/05/07 v1.6-u00
   Standard upLaTeX file (size option)]
 \renewcommand{\normalsize}{%
     \@setfontsize\normalsize\@xipt{15.5}%
diff --git a/Master/texmf-dist/tex/uplatex/base/ujsize12.clo b/Master/texmf-dist/tex/uplatex/base/ujsize12.clo
index b5cb57fb60a..72df8c2bcb7 100644
--- a/Master/texmf-dist/tex/uplatex/base/ujsize12.clo
+++ b/Master/texmf-dist/tex/uplatex/base/ujsize12.clo
@@ -6,20 +6,13 @@
 %%
 %% ujclasses.dtx  (with options: `12pt,yoko')
 %% 
-%% IMPORTANT NOTICE:
+%% Copyright (c) 2010 ASCII MEDIA WORKS
+%% Copyright (c) 2016 Takuji Tanaka
+%% Copyright (c) 2016 Japanese TeX Development Community
 %% 
-%% For the copyright see the source file.
+%% This file is part of the upLaTeX2e system (community edition).
+%% --------------------------------------------------------------
 %% 
-%% Any modified versions of this file must be renamed
-%% with new filenames distinct from ujsize12.clo.
-%% 
-%% For distribution of the original source see the terms
-%% for copying and modification in the file ujclasses.dtx.
-%% 
-%% This generated file may be distributed as long as the
-%% original source files, as listed above, are part of the
-%% same distribution. (The sources need not necessarily be
-%% in the same archive or directory.)
 %% 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
@@ -39,7 +32,7 @@
 %%
 \NeedsTeXFormat{pLaTeX2e}
 \ProvidesFile{ujsize12.clo}
-  [2011/05/07 v1.6_u00
+  [2011/05/07 v1.6-u00
   Standard upLaTeX file (size option)]
 \renewcommand{\normalsize}{%
     \@setfontsize\normalsize\@xiipt{16.5}%
diff --git a/Master/texmf-dist/tex/uplatex/base/ukinsoku.tex b/Master/texmf-dist/tex/uplatex/base/ukinsoku.tex
new file mode 100644
index 00000000000..24c982dc76c
--- /dev/null
+++ b/Master/texmf-dist/tex/uplatex/base/ukinsoku.tex
@@ -0,0 +1,427 @@
+%%
+%% This is file `ukinsoku.tex',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% ukinsoku.dtx  (with options: `plcore')
+%% 
+%% Copyright (c) 2010 ASCII MEDIA WORKS
+%% Copyright (c) 2016 Takuji Tanaka
+%% Copyright (c) 2016 Japanese TeX Development Community
+%% 
+%% This file is part of the upLaTeX2e system (community edition).
+%% --------------------------------------------------------------
+%% 
+%% 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         \~}
+%%
+%%
+%% 行頭、行末禁則パラメータ
+%%
+%% 1byte characters
+\prebreakpenalty`!=10000
+\prebreakpenalty`"=10000
+\postbreakpenalty`\#=500
+\postbreakpenalty`\$=500
+\postbreakpenalty`\%=500
+\postbreakpenalty`\&=500
+\postbreakpenalty`\`=10000
+\prebreakpenalty`'=10000
+\prebreakpenalty`)=10000
+\postbreakpenalty`(=10000
+\prebreakpenalty`*=500
+\prebreakpenalty`+=500
+\prebreakpenalty`-=10000
+\prebreakpenalty`.=10000
+\prebreakpenalty`,=10000
+\prebreakpenalty`/=500
+\prebreakpenalty`;=10000
+\prebreakpenalty`?=10000
+\prebreakpenalty`:=10000
+\prebreakpenalty`]=10000
+\postbreakpenalty`[=10000
+%%全角文字
+\prebreakpenalty`、=10000
+\prebreakpenalty`。=10000
+\prebreakpenalty`，=10000
+\prebreakpenalty`．=10000
+\prebreakpenalty`・=10000
+\prebreakpenalty`：=10000
+\prebreakpenalty`；=10000
+\prebreakpenalty`？=10000
+\prebreakpenalty`！=10000
+\prebreakpenalty`゛=10000%\jis"212B
+\prebreakpenalty`゜=10000%\jis"212C
+\prebreakpenalty`´=10000%\jis"212D
+\postbreakpenalty`｀=10000%\jis"212E
+\prebreakpenalty`々=10000%\jis"2139
+\prebreakpenalty`…=250%\jis"2144
+\prebreakpenalty`‥=250%\jis"2145
+\postbreakpenalty`‘=10000%\jis"2146
+\prebreakpenalty`’=10000%\jis"2147
+\postbreakpenalty`“=10000%\jis"2148
+\prebreakpenalty`”=10000%\jis"2149
+\prebreakpenalty`）=10000
+\postbreakpenalty`（=10000
+\prebreakpenalty`｝=10000
+\postbreakpenalty`｛=10000
+\prebreakpenalty`］=10000
+\postbreakpenalty`［=10000
+%%\postbreakpenalty`‘=10000
+%%\prebreakpenalty`’=10000
+\postbreakpenalty`〔=10000%\jis"214C
+\prebreakpenalty`〕=10000%\jis"214D
+\postbreakpenalty`〈=10000%\jis"2152
+\prebreakpenalty`〉=10000%\jis"2153
+\postbreakpenalty`《=10000%\jis"2154
+\prebreakpenalty`》=10000%\jis"2155
+\postbreakpenalty`「=10000%\jis"2156
+\prebreakpenalty`」=10000%\jis"2157
+\postbreakpenalty`『=10000%\jis"2158
+\prebreakpenalty`』=10000%\jis"2159
+\postbreakpenalty`【=10000%\jis"215A
+\prebreakpenalty`】=10000%\jis"215B
+\prebreakpenalty`ー=10000
+\prebreakpenalty`＋=200
+\prebreakpenalty`−=200% U+2212 MINUS SIGN
+\prebreakpenalty`－=200% U+FF0D FULLWIDTH HYPHEN-MINUS
+\prebreakpenalty`＝=200
+\postbreakpenalty`＃=200
+\postbreakpenalty`＄=200
+\postbreakpenalty`％=200
+\postbreakpenalty`＆=200
+\prebreakpenalty`ぁ=150
+\prebreakpenalty`ぃ=150
+\prebreakpenalty`ぅ=150
+\prebreakpenalty`ぇ=150
+\prebreakpenalty`ぉ=150
+\prebreakpenalty`っ=150
+\prebreakpenalty`ゃ=150
+\prebreakpenalty`ゅ=150
+\prebreakpenalty`ょ=150
+\prebreakpenalty`ゎ=150%\jis"246E
+\prebreakpenalty`ァ=150
+\prebreakpenalty`ィ=150
+\prebreakpenalty`ゥ=150
+\prebreakpenalty`ェ=150
+\prebreakpenalty`ォ=150
+\prebreakpenalty`ッ=150
+\prebreakpenalty`ャ=150
+\prebreakpenalty`ュ=150
+\prebreakpenalty`ョ=150
+\prebreakpenalty`ヮ=150%\jis"256E
+\prebreakpenalty`ヵ=150%\jis"2575
+\prebreakpenalty`ヶ=150%\jis"2576
+%% kinsoku  JIS X 0208 additional
+\prebreakpenalty`ヽ=10000
+\prebreakpenalty`ヾ=10000
+\prebreakpenalty`ゝ=10000
+\prebreakpenalty`ゞ=10000
+%%
+%% kinsoku  JIS X 0213
+%%
+\prebreakpenalty`〳=10000
+\prebreakpenalty`〴=10000
+\prebreakpenalty`〵=10000
+\prebreakpenalty`〻=10000
+\postbreakpenalty`⦅=10000
+\prebreakpenalty`⦆=10000
+\postbreakpenalty`｟=10000
+\prebreakpenalty`｠=10000
+\postbreakpenalty`〘=10000
+\prebreakpenalty`〙=10000
+\postbreakpenalty`〖=10000
+\prebreakpenalty`〗=10000
+\postbreakpenalty`«=10000
+\prebreakpenalty`»=10000
+\postbreakpenalty`〝=10000
+\prebreakpenalty`〟=10000
+\prebreakpenalty`‼=10000
+\prebreakpenalty`⁇=10000
+\prebreakpenalty`⁈=10000
+\prebreakpenalty`⁉=10000
+\postbreakpenalty`¡=10000
+\postbreakpenalty`¿=10000
+\prebreakpenalty`ː=10000
+\prebreakpenalty`ª=10000
+\prebreakpenalty`º=10000
+\prebreakpenalty`¹=10000
+\prebreakpenalty`²=10000
+\prebreakpenalty`³=10000
+\postbreakpenalty`€=10000
+\prebreakpenalty`ゕ=150
+\prebreakpenalty`ゖ=150
+\prebreakpenalty`ㇰ=150
+\prebreakpenalty`ㇱ=150
+\prebreakpenalty`ㇲ=150
+\prebreakpenalty`ㇳ=150
+\prebreakpenalty`ㇴ=150
+\prebreakpenalty`ㇵ=150
+\prebreakpenalty`ㇶ=150
+\prebreakpenalty`ㇷ=150
+\prebreakpenalty`ㇸ=150
+\prebreakpenalty`ㇹ=150
+%%\prebreakpenalty`ㇷ゚=150
+\prebreakpenalty`ㇺ=150
+\prebreakpenalty`ㇻ=150
+\prebreakpenalty`ㇼ=150
+\prebreakpenalty`ㇽ=150
+\prebreakpenalty`ㇾ=150
+\prebreakpenalty`ㇿ=150
+%%
+%% kinsoku  JIS X 0212
+%%
+%%\postbreakpenalty`¡=10000
+%%\postbreakpenalty`¿=10000
+%%\prebreakpenalty`º=10000
+%%\prebreakpenalty`ª=10000
+\prebreakpenalty`™=10000
+%%
+%% kinsoku  半角片仮名
+%%
+\prebreakpenalty`｡=10000
+\prebreakpenalty`､=10000
+\prebreakpenalty`ﾞ=10000
+\prebreakpenalty`ﾟ=10000
+\prebreakpenalty`｣=10000
+\postbreakpenalty`｢=10000
+%%
+%% xspcode
+\xspcode`(=1
+\xspcode`)=2
+\xspcode`[=1
+\xspcode`]=2
+\xspcode``=1
+\xspcode`'=2
+\xspcode`;=2
+\xspcode`,=2
+\xspcode`.=2
+%%  for 8bit Latin
+\xspcode"80=3
+\xspcode"81=3
+\xspcode"82=3
+\xspcode"83=3
+\xspcode"84=3
+\xspcode"85=3
+\xspcode"86=3
+\xspcode"87=3
+\xspcode"88=3
+\xspcode"89=3
+\xspcode"8A=3
+\xspcode"8B=3
+\xspcode"8C=3
+\xspcode"8D=3
+\xspcode"8E=3
+\xspcode"8F=3
+\xspcode"90=3
+\xspcode"91=3
+\xspcode"92=3
+\xspcode"93=3
+\xspcode"94=3
+\xspcode"95=3
+\xspcode"96=3
+\xspcode"97=3
+\xspcode"98=3
+\xspcode"99=3
+\xspcode"9A=3
+\xspcode"9B=3
+\xspcode"9C=3
+\xspcode"9D=3
+\xspcode"9E=3
+\xspcode"9F=3
+\xspcode"A0=3
+\xspcode"A1=3
+\xspcode"A2=3
+\xspcode"A3=3
+\xspcode"A4=3
+\xspcode"A5=3
+\xspcode"A6=3
+\xspcode"A7=3
+\xspcode"A8=3
+\xspcode"A9=3
+\xspcode"AA=3
+\xspcode"AB=3
+\xspcode"AC=3
+\xspcode"AD=3
+\xspcode"AE=3
+\xspcode"AF=3
+\xspcode"B0=3
+\xspcode"B1=3
+\xspcode"B2=3
+\xspcode"B3=3
+\xspcode"B4=3
+\xspcode"B5=3
+\xspcode"B6=3
+\xspcode"B7=3
+\xspcode"B8=3
+\xspcode"B9=3
+\xspcode"BA=3
+\xspcode"BB=3
+\xspcode"BC=3
+\xspcode"BD=3
+\xspcode"BE=3
+\xspcode"BF=3
+\xspcode"C0=3
+\xspcode"C1=3
+\xspcode"C2=3
+\xspcode"C3=3
+\xspcode"C4=3
+\xspcode"C5=3
+\xspcode"C6=3
+\xspcode"C7=3
+\xspcode"C8=3
+\xspcode"C9=3
+\xspcode"CA=3
+\xspcode"CB=3
+\xspcode"CC=3
+\xspcode"CD=3
+\xspcode"CE=3
+\xspcode"CF=3
+\xspcode"D0=3
+\xspcode"D1=3
+\xspcode"D2=3
+\xspcode"D3=3
+\xspcode"D4=3
+\xspcode"D5=3
+\xspcode"D6=3
+\xspcode"D7=3
+\xspcode"D8=3
+\xspcode"D9=3
+\xspcode"DA=3
+\xspcode"DB=3
+\xspcode"DC=3
+\xspcode"DD=3
+\xspcode"DE=3
+\xspcode"DF=3
+\xspcode"E0=3
+\xspcode"E1=3
+\xspcode"E2=3
+\xspcode"E3=3
+\xspcode"E4=3
+\xspcode"E5=3
+\xspcode"E6=3
+\xspcode"E7=3
+\xspcode"E8=3
+\xspcode"E9=3
+\xspcode"EA=3
+\xspcode"EB=3
+\xspcode"EC=3
+\xspcode"ED=3
+\xspcode"EE=3
+\xspcode"EF=3
+\xspcode"F0=3
+\xspcode"F1=3
+\xspcode"F2=3
+\xspcode"F3=3
+\xspcode"F4=3
+\xspcode"F5=3
+\xspcode"F6=3
+\xspcode"F7=3
+\xspcode"F8=3
+\xspcode"F9=3
+\xspcode"FA=3
+\xspcode"FB=3
+\xspcode"FC=3
+\xspcode"FD=3
+\xspcode"FE=3
+\xspcode"FF=3
+%%
+%% inhibitxspcode
+\inhibitxspcode`、=1
+\inhibitxspcode`。=1
+\inhibitxspcode`，=1
+\inhibitxspcode`．=1
+\inhibitxspcode`；=1
+\inhibitxspcode`？=1
+\inhibitxspcode`）=1
+\inhibitxspcode`（=2
+\inhibitxspcode`］=1
+\inhibitxspcode`［=2
+\inhibitxspcode`｝=1
+\inhibitxspcode`｛=2
+\inhibitxspcode`‘=2
+\inhibitxspcode`’=1
+\inhibitxspcode`“=2
+\inhibitxspcode`”=1
+\inhibitxspcode`〔=2
+\inhibitxspcode`〕=1
+\inhibitxspcode`〈=2
+\inhibitxspcode`〉=1
+\inhibitxspcode`《=2
+\inhibitxspcode`》=1
+\inhibitxspcode`「=2
+\inhibitxspcode`」=1
+\inhibitxspcode`『=2
+\inhibitxspcode`』=1
+\inhibitxspcode`【=2
+\inhibitxspcode`】=1
+\inhibitxspcode`—=0% U+2014 EM DASH
+\inhibitxspcode`―=0% U+2015 HORIZONTAL BAR
+\inhibitxspcode`〜=0% U+301C WAVE DASH
+\inhibitxspcode`～=0% U+FF5E FULLWIDTH TILDE
+\inhibitxspcode`…=0
+\inhibitxspcode`¥=0% U+00A5 YEN SIGN
+\inhibitxspcode`￥=0% U+FFE5 FULLWIDTH YEN SIGN
+\inhibitxspcode`°=1
+\inhibitxspcode`′=1
+\inhibitxspcode`″=1
+%%
+%% inhibitxspcode  JIS X 0213
+%%
+\inhibitxspcode`⦅=2
+\inhibitxspcode`⦆=1
+\inhibitxspcode`｟=2
+\inhibitxspcode`｠=1
+\inhibitxspcode`〘=2
+\inhibitxspcode`〙=1
+\inhibitxspcode`〖=2
+\inhibitxspcode`〗=1
+\inhibitxspcode`«=2
+\inhibitxspcode`»=1
+\inhibitxspcode`〝=2
+\inhibitxspcode`〟=1
+\inhibitxspcode`‼=1
+\inhibitxspcode`⁇=1
+\inhibitxspcode`⁈=1
+\inhibitxspcode`⁉=1
+\inhibitxspcode`¡=2
+\inhibitxspcode`¿=2
+\inhibitxspcode`ª=1
+\inhibitxspcode`º=1
+\inhibitxspcode`¹=1
+\inhibitxspcode`²=1
+\inhibitxspcode`³=1
+\inhibitxspcode`€=2
+%%
+%% inhibitxspcode  JIS X 0212
+%%
+%%\inhibitxspcode`¡=1
+%%\inhibitxspcode`¿=1
+%%\inhibitxspcode`º=1
+%%\inhibitxspcode`ª=1
+\inhibitxspcode`™=1
+%%
+%% inhibitxspcode  半角片仮名
+%%
+\inhibitxspcode`｡=1
+\inhibitxspcode`､=1
+\inhibitxspcode`｢=2
+\inhibitxspcode`｣=1
+\endinput
+%%
+%% End of file `ukinsoku.tex'.
diff --git a/Master/texmf-dist/tex/uplatex/base/uplatex.ltx b/Master/texmf-dist/tex/uplatex/base/uplatex.ltx
index 470cb4d4415..e06193c8be6 100644
--- a/Master/texmf-dist/tex/uplatex/base/uplatex.ltx
+++ b/Master/texmf-dist/tex/uplatex/base/uplatex.ltx
@@ -6,20 +6,13 @@
 %%
 %% uplatex.dtx  (with options: `plcore')
 %% 
-%% IMPORTANT NOTICE:
+%% Copyright (c) 2010 ASCII MEDIA WORKS
+%% Copyright (c) 2016 Takuji Tanaka
+%% Copyright (c) 2016 Japanese TeX Development Community
 %% 
-%% For the copyright see the source file.
+%% This file is part of the upLaTeX2e system (community edition).
+%% --------------------------------------------------------------
 %% 
-%% Any modified versions of this file must be renamed
-%% with new filenames distinct from uplatex.ltx.
-%% 
-%% For distribution of the original source see the terms
-%% for copying and modification in the file uplatex.dtx.
-%% 
-%% This generated file may be distributed as long as the
-%% original source files, as listed above, are part of the
-%% same distribution. (The sources need not necessarily be
-%% in the same archive or directory.)
 %% 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
@@ -40,6 +33,7 @@
 \let\orgdump\dump
 \let\dump\relax
 \input latex.ltx
+\edef\platexBANNER{\the\everyjob}% save LaTeX banner
 \typeout{**************************^^J%
          *^^J%
          * making upLaTeX format^^J%
diff --git a/Master/texmf-dist/tex/uplatex/base/uplcore.ltx b/Master/texmf-dist/tex/uplatex/base/uplcore.ltx
index 9b6ab0857d7..acea93b4c38 100644
--- a/Master/texmf-dist/tex/uplatex/base/uplcore.ltx
+++ b/Master/texmf-dist/tex/uplatex/base/uplcore.ltx
@@ -9,21 +9,14 @@
 %% plcore.dtx  (with options: `plcore')
 %% uplvers.dtx  (with options: `plfinal')
 %% 
-%% IMPORTANT NOTICE:
+%% Copyright (c) 2010 ASCII MEDIA WORKS
+%% Copyright (c) 2016 Takuji Tanaka
+%% Copyright (c) 2016 Japanese TeX Development Community
 %% 
-%% For the copyright see the source file.
+%% This file is part of the upLaTeX2e system (community edition).
+%% --------------------------------------------------------------
 %% 
-%% Any modified versions of this file must be renamed
-%% with new filenames distinct from uplcore.ltx.
-%% 
-%% For distribution of the original source see the terms
-%% for copying and modification in the file uplvers.dtx uplfonts.dtx plcore.dtx uplvers.dtx.
-%% 
-%% This generated file may be distributed as long as the
-%% original source files, as listed above, are part of the
-%% same distribution. (The sources need not necessarily be
-%% in the same archive or directory.)
-%% File: uplvers
+%% 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
@@ -41,7 +34,30 @@
 %%   Right brace   \}     Tilde         \~}
 %%
 \def\pfmtname{pLaTeX2e}
-\def\pfmtversion{2011/05/07u00}
+\def\pfmtversion
+   {2016/05/07u00}
+\def\plIncludeInRelease#1{\kernel@ifnextchar[%
+  {\@plIncludeInRelease{#1}}
+  {\@plIncludeInRelease{#1}[#1]}}
+\def\@plIncludeInRelease#1[#2]{\@plIncludeInRele@se{#2}}
+\def\@plIncludeInRele@se#1#2#3{%
+  \toks@{[#1] #3}%
+  \expandafter\ifx\csname\string#2+\@currname+IIR\endcsname\relax
+    \ifnum\expandafter\@parse@version#1//00\@nil
+          >\expandafter\@parse@version\pfmtversion//00\@nil
+      \GenericInfo{}{Skipping: \the\toks@}%
+     \expandafter\expandafter\expandafter\@gobble@plIncludeInRelease
+    \else
+      \GenericInfo{}{Applying: \the\toks@}%
+      \expandafter\let\csname\string#2+\@currname+IIR\endcsname\@empty
+    \fi
+  \else
+    \GenericInfo{}{Already applied: \the\toks@}%
+    \expandafter\@gobble@plIncludeInRelease
+  \fi
+}
+\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
@@ -456,7 +472,7 @@
 \newbox\adjust@box
 \newdimen\adjust@dimen
 \def\adjustbaseline{%
-    \setbox\adjust@box\hbox{\char\euc"A1A1}%
+    \setbox\adjust@box\hbox{\char\euc"A1A1}%"
     \cht\ht\adjust@box
     \cdp\dp\adjust@box
     \cwd\wd\adjust@box
@@ -731,8 +747,8 @@
        \@texttop
        \dimen@ \dp\@outputbox
        \unvbox \@outputbox
-       \iftdir\hskip\z@
-       \else\vskip -\dimen@\fi
+       \iftdir\hskip\z@\fi
+       \vskip -\dimen@
        \@textbottom
        \ifvoid\footins\else % for pLaTeX
          \vskip \skip\footins
@@ -762,7 +778,7 @@
        \vskip \@tempdima
        \@textbottom
        \ifvoid\footins\else % for pLaTeX
- \vskip\skip\footins
+         \vskip\skip\footins
          \color@begingroup
             \normalcolor
             \footnoterule
@@ -777,7 +793,7 @@
          \unvbox\@outputbox
          \@textbottom
          \ifvoid\footins\else % for pLaTeX
-   \vskip\skip\footins
+           \vskip\skip\footins
            \color@begingroup
               \normalcolor
               \footnoterule
@@ -855,6 +871,7 @@
 \def\@outputtombow{%
   \iftombow
   \vbox to\z@{\kern-13mm\relax
+    \boxmaxdepth\maxdimen%% Added (Apr 1, 2016)
     \moveleft3mm\vbox to\@@paperheight{%
       \hbox to\@@paperwidth{\hskip3mm\relax
          \copy\@TL\hfill\copy\@TC\hfill\copy\@TR\hskip3mm}%
@@ -940,9 +957,9 @@
   \stepcounter{page}%
   \let\firstmark\botmark
 }
-\renewcommand\@makefnmark{\hbox{%
-  \ifydir \@textsuperscript{\normalfont\@thefnmark}%
-  \else\hbox{\yoko\@textsuperscript{\normalfont\@thefnmark}}\fi}}
+\renewcommand\@makefnmark{%
+  \ifydir \hbox{}\hbox{\@textsuperscript{\normalfont\@thefnmark}}\hbox{}%
+  \else\hbox{\yoko\@textsuperscript{\normalfont\@thefnmark}}\fi}
 \long\def\@footnotetext#1{%
   \ifydir\def\@tempa{\yoko}\else\def\@tempa{\tate}\fi
   \insert\footins{\@tempa%
@@ -983,7 +1000,35 @@
 \newcommand\printglossary{\@input@{\jobname.gls}}
 \newcount\hour
 \newcount\minute
-%% File: uplvers
+\def\@tabular{\leavevmode \null\hbox \bgroup $\let\@acol\@tabacol
+   \let\@classz\@tabclassz
+   \let\@classiv\@tabclassiv \let\\\@tabularcr\@tabarray}
+\def\endtabular{\crcr\egroup\egroup $\egroup\null}
+\expandafter \let \csname endtabular*\endcsname = \endtabular
+\let\@parboxto\@empty
+\long\def\@iiiparbox#1#2[#3]#4#5{%
+  \leavevmode
+  \@pboxswfalse
+  \setlength\@tempdima{#4}%
+  \@begin@tempboxa\vbox{\hsize\@tempdima\@parboxrestore#5\@@par}%
+    \ifx\relax#2\else
+      \setlength\@tempdimb{#2}%
+      \edef\@parboxto{to\the\@tempdimb}%
+    \fi
+    \if#1b\vbox
+    \else\if #1t\vtop
+    \else\ifmmode\vcenter
+    \else\@pboxswtrue\null$\vcenter% !!!
+    \fi\fi\fi
+    \@parboxto{\let\hss\vss\let\unhbox\unvbox
+       \csname bm@#3\endcsname}%
+    \if@pboxsw \m@th$\null\fi% !!!
+  \@end@tempboxa}
+\def\underline#1{%
+  \relax
+  \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
@@ -1000,40 +1045,12 @@
 %%   Grave accent  \`     Left brace    \{     Vertical bar  \|
 %%   Right brace   \}     Tilde         \~}
 %%
-\IfFileExists{uplpatch.ltx}
-  {\typeout{************************************^^J%
-            * Appliying patch file uplpatch.ltx *^^J%
-            ************************************}
-  \def\pfmtversion@topatch{unknown}
-  \input{uplpatch.ltx}
-  \ifx\pfmtversion\pfmtversion@topatch
-    \ifx\ppatch@level\@undefined
-      \typeout{^^J^^J^^J%
-   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!^^J%
-   !! Patch file `uplpatch.ltx' (for version <\pfmtversion@topatch>)^^J%
-   !! is not suitable for version <\pfmtversion> of pLaTeX.^^J^^J%
-   !! Please check if iniptex found an old patch file:^^J%
-   !! --- if so, rename it or delete it, and redo the^^J%
-   !!     iniptex run.^^J%
-   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!^^J}%
-      \batchmode \@@end
-    \fi
-  \else
-      \typeout{^^J^^J^^J%
-   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!^^J%
-   !! Patch file `uplpatch.ltx' (for version <\pfmtversion@topatch>)^^J%
-   !! is not suitable for version <\pfmtversion> of pLaTeX.^^J%
-   !!^^J%
-   !! Please check if iniptex found an old patch file:^^J%
-   !! --- if so, rename it or delete it, and redo the^^J%
-   !!     iniptex run.^^J%
-   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!^^J}%
-      \batchmode \@@end
-  \fi
-  \let\pfmtversion@topatch\relax
-  }{}
-\ifx\patch@level\@undefined
-  \ifx\ppatch@level\@undefined
+\ifx\patch@level\@undefined % fallback if undefined in LaTeX
+  \def\patch@level{0}\fi
+\ifx\ppatch@level\@undefined % fallback if undefined in upLaTeX
+  \def\ppatch@level{0}\fi
+\ifnum\patch@level=0
+  \ifnum\ppatch@level=0
      \everyjob{\typeout{%
         \pfmtname\space<\pfmtversion>\space
           (based on \fmtname\space<\fmtversion>)}}
@@ -1042,8 +1059,8 @@
         \pfmtname\space<\pfmtversion>+\ppatch@level\space
           (based on \fmtname\space<\fmtversion>)}}
   \fi
-\else
-  \ifx\ppatch@level\@undefined
+\else\ifnum\patch@level>0
+  \ifnum\ppatch@level=0
      \everyjob{\typeout{%
         \pfmtname\space<\pfmtversion>\space
           (based on \fmtname\space<\fmtversion>\space
@@ -1054,7 +1071,30 @@
           (based on \fmtname\space<\fmtversion>\space
             patch level \patch@level)}}
   \fi
-\fi
+\else
+  \ifnum\ppatch@level=0
+     \everyjob{\typeout{%
+        \pfmtname\space<\pfmtversion>\space
+          (based on \fmtname\space<\fmtversion>\space
+            pre-release\patch@level)}}
+  \else
+     \everyjob{\typeout{%
+        \pfmtname\space<\pfmtversion>+\ppatch@level\space
+          (based on \fmtname\space<\fmtversion>\space
+            pre-release\patch@level)}}
+  \fi
+\fi\fi
+\AtBeginDocument{%
+  \@ifpackageloaded{latexrelease}{%
+    \@ifpackageloaded{platexrelease}{}{%
+      \@latex@warning@no@line{%
+        Package latexrelease is loaded.\MessageBreak
+        Some patches in pLaTeX2e core may be overwritten.\MessageBreak
+        Consider using platexrelease.\MessageBreak
+        See platex.pdf for detail}%
+    }%
+  }{}%
+}
 \endinput
 %%
 %% End of file `uplcore.ltx'.
diff --git a/Master/texmf-dist/tex/uplatex/base/upldefs.ltx b/Master/texmf-dist/tex/uplatex/base/upldefs.ltx
index 7701d6b218a..3a5455b681b 100644
--- a/Master/texmf-dist/tex/uplatex/base/upldefs.ltx
+++ b/Master/texmf-dist/tex/uplatex/base/upldefs.ltx
@@ -6,20 +6,13 @@
 %%
 %% uplfonts.dtx  (with options: `pldefs,xpt')
 %% 
-%% IMPORTANT NOTICE:
+%% Copyright (c) 2010 ASCII MEDIA WORKS
+%% Copyright (c) 2016 Takuji Tanaka
+%% Copyright (c) 2016 Japanese TeX Development Community
 %% 
-%% For the copyright see the source file.
+%% This file is part of the upLaTeX2e system (community edition).
+%% --------------------------------------------------------------
 %% 
-%% Any modified versions of this file must be renamed
-%% with new filenames distinct from upldefs.ltx.
-%% 
-%% For distribution of the original source see the terms
-%% for copying and modification in the file uplfonts.dtx.
-%% 
-%% This generated file may be distributed as long as the
-%% original source files, as listed above, are part of the
-%% same distribution. (The sources need not necessarily be
-%% in the same archive or directory.)
 %% 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
@@ -38,7 +31,33 @@
 %%   Right brace   \}     Tilde         \~}
 %%
 \ProvidesFile{upldefs.ltx}
-      [2000/07/13 v1.2u01 upLaTeX Kernel (Default settings)]
+      [2016/04/06 v1.6a-u00 upLaTeX Kernel (Default settings)]
+\def\@text@composite#1#2#3#{%
+  \begingroup
+  \setbox\z@=\hbox\bgroup%
+  \ybaselineshift\z@\tbaselineshift\z@
+  \expandafter\@text@composite@x
+  \csname\string#1-\string#2\endcsname}
+\def\@text@composite@x#1#2{%
+  \ifx#1\relax
+    \expandafter\@secondoftwo
+  \else
+    \expandafter\@firstoftwo
+  \fi
+  #1{#2}\egroup
+  \leavevmode
+  \expandafter\lower
+    \iftdir
+      \ifmdir
+        \ifmmode\tbaselineshift\else\ybaselineshift\fi
+      \else
+        \tbaselineshift
+      \fi
+    \else
+      \ybaselineshift
+    \fi
+    \box\z@
+  \endgroup}
 \def \check@nocorr@ #1#2\nocorr#3\@nil {%
   \let \check@icl \relax% \maybe@ic から変更
   \def \check@icr {\ifvmode \else \aftergroup \maybe@ic \fi}%
@@ -82,7 +101,8 @@
 \DeclareTextFontCommand{\textgt}{\gtfamily}
 \DeclareRobustCommand\em
         {\@nomath\em \ifdim \fontdimen\@ne\font >\z@
-                       \mcfamily \upshape \else \gtfamily \itshape \fi}
+                       \eminnershape \else \gtfamily \itshape \fi}%
+\def\eminnershape{\mcfamily \upshape}%
 \DeclarePreloadSizes{JY2}{mc}{m}{n}{5,7,10,12}
 \DeclarePreloadSizes{JY2}{gt}{m}{n}{5,7,10,12}
 \DeclarePreloadSizes{JT2}{mc}{m}{n}{5,7,10,12}
diff --git a/Master/texmf-dist/tex/uplatex/base/uptrace.sty b/Master/texmf-dist/tex/uplatex/base/uptrace.sty
index 63cf8285d1e..acfa6b15249 100644
--- a/Master/texmf-dist/tex/uplatex/base/uptrace.sty
+++ b/Master/texmf-dist/tex/uplatex/base/uptrace.sty
@@ -6,20 +6,13 @@
 %%
 %% uplfonts.dtx  (with options: `trace')
 %% 
-%% IMPORTANT NOTICE:
+%% Copyright (c) 2010 ASCII MEDIA WORKS
+%% Copyright (c) 2016 Takuji Tanaka
+%% Copyright (c) 2016 Japanese TeX Development Community
 %% 
-%% For the copyright see the source file.
+%% This file is part of the upLaTeX2e system (community edition).
+%% --------------------------------------------------------------
 %% 
-%% Any modified versions of this file must be renamed
-%% with new filenames distinct from uptrace.sty.
-%% 
-%% For distribution of the original source see the terms
-%% for copying and modification in the file uplfonts.dtx.
-%% 
-%% This generated file may be distributed as long as the
-%% original source files, as listed above, are part of the
-%% same distribution. (The sources need not necessarily be
-%% in the same archive or directory.)
 %% 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
@@ -37,6 +30,10 @@
 %%   Grave accent  \`     Left brace    \{     Vertical bar  \|
 %%   Right brace   \}     Tilde         \~}
 %%
+\NeedsTeXFormat{pLaTeX2e}
+\ProvidesPackage{uptrace}
+     [2016/04/30 v1.6b-u00 Standard upLaTeX package (font tracing)]
+\RequirePackageWithOptions{tracefnt}
 \DeclareRobustCommand\selectfont{%
   \let\tmp@error@fontshape\error@fontshape
   \let\error@fontshape\error@kfontshape
@@ -85,8 +82,8 @@
   \xdef\font@name{\csname\curr@fontshape/\f@size\endcsname}%
   \pickup@font
   \font@name
-\ifnum \tracingfonts>\tw@
-  \@font@info{Roman:Switching to \font@name}\fi
+  \ifnum \tracingfonts>\tw@
+    \@font@info{Roman:Switching to \font@name}\fi
   \enc@update
   \ifx\f@linespread\baselinestretch \else
     \set@fontsize\baselinestretch\f@size\f@baselineskip
@@ -129,7 +126,7 @@
 \newbox\adjust@box
 \newdimen\adjust@dimen
 \def\adjustbaseline{%
-    \setbox\adjust@box\hbox{\char\euc"A1A1}%
+    \setbox\adjust@box\hbox{\char\euc"A1A1}%"
     \cht\ht\adjust@box
     \cdp\dp\adjust@box
     \cwd\wd\adjust@box
diff --git a/Master/texmf-dist/tex/uplatex/base/utarticle.cls b/Master/texmf-dist/tex/uplatex/base/utarticle.cls
index 5d6c4d851f5..e77c23b53bd 100644
--- a/Master/texmf-dist/tex/uplatex/base/utarticle.cls
+++ b/Master/texmf-dist/tex/uplatex/base/utarticle.cls
@@ -6,20 +6,13 @@
 %%
 %% ujclasses.dtx  (with options: `article,tate')
 %% 
-%% IMPORTANT NOTICE:
+%% Copyright (c) 2010 ASCII MEDIA WORKS
+%% Copyright (c) 2016 Takuji Tanaka
+%% Copyright (c) 2016 Japanese TeX Development Community
 %% 
-%% For the copyright see the source file.
+%% This file is part of the upLaTeX2e system (community edition).
+%% --------------------------------------------------------------
 %% 
-%% Any modified versions of this file must be renamed
-%% with new filenames distinct from utarticle.cls.
-%% 
-%% For distribution of the original source see the terms
-%% for copying and modification in the file ujclasses.dtx.
-%% 
-%% This generated file may be distributed as long as the
-%% original source files, as listed above, are part of the
-%% same distribution. (The sources need not necessarily be
-%% in the same archive or directory.)
 %% 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
@@ -39,7 +32,7 @@
 %%
 \NeedsTeXFormat{pLaTeX2e}
 \ProvidesClass{utarticle}
-  [2011/05/07 v1.6_u00
+  [2011/05/07 v1.6-u00
  Standard upLaTeX class]
 \newcounter{@paper}
 \newif\if@landscape \@landscapefalse
diff --git a/Master/texmf-dist/tex/uplatex/base/utbk10.clo b/Master/texmf-dist/tex/uplatex/base/utbk10.clo
index faedf326ba5..3a3fa510f31 100644
--- a/Master/texmf-dist/tex/uplatex/base/utbk10.clo
+++ b/Master/texmf-dist/tex/uplatex/base/utbk10.clo
@@ -6,20 +6,13 @@
 %%
 %% ujclasses.dtx  (with options: `10pt,bk,tate')
 %% 
-%% IMPORTANT NOTICE:
+%% Copyright (c) 2010 ASCII MEDIA WORKS
+%% Copyright (c) 2016 Takuji Tanaka
+%% Copyright (c) 2016 Japanese TeX Development Community
 %% 
-%% For the copyright see the source file.
+%% This file is part of the upLaTeX2e system (community edition).
+%% --------------------------------------------------------------
 %% 
-%% Any modified versions of this file must be renamed
-%% with new filenames distinct from utbk10.clo.
-%% 
-%% For distribution of the original source see the terms
-%% for copying and modification in the file ujclasses.dtx.
-%% 
-%% This generated file may be distributed as long as the
-%% original source files, as listed above, are part of the
-%% same distribution. (The sources need not necessarily be
-%% in the same archive or directory.)
 %% 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
@@ -39,7 +32,7 @@
 %%
 \NeedsTeXFormat{pLaTeX2e}
 \ProvidesFile{utbk10.clo}
-  [2011/05/07 v1.6_u00
+  [2011/05/07 v1.6-u00
   Standard upLaTeX file (size option)]
 \renewcommand{\normalsize}{%
     \@setfontsize\normalsize\@xpt{17}%
diff --git a/Master/texmf-dist/tex/uplatex/base/utbk11.clo b/Master/texmf-dist/tex/uplatex/base/utbk11.clo
index 2ea56b7cc56..fc0aa86ab44 100644
--- a/Master/texmf-dist/tex/uplatex/base/utbk11.clo
+++ b/Master/texmf-dist/tex/uplatex/base/utbk11.clo
@@ -6,20 +6,13 @@
 %%
 %% ujclasses.dtx  (with options: `11pt,bk,tate')
 %% 
-%% IMPORTANT NOTICE:
+%% Copyright (c) 2010 ASCII MEDIA WORKS
+%% Copyright (c) 2016 Takuji Tanaka
+%% Copyright (c) 2016 Japanese TeX Development Community
 %% 
-%% For the copyright see the source file.
+%% This file is part of the upLaTeX2e system (community edition).
+%% --------------------------------------------------------------
 %% 
-%% Any modified versions of this file must be renamed
-%% with new filenames distinct from utbk11.clo.
-%% 
-%% For distribution of the original source see the terms
-%% for copying and modification in the file ujclasses.dtx.
-%% 
-%% This generated file may be distributed as long as the
-%% original source files, as listed above, are part of the
-%% same distribution. (The sources need not necessarily be
-%% in the same archive or directory.)
 %% 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
@@ -39,7 +32,7 @@
 %%
 \NeedsTeXFormat{pLaTeX2e}
 \ProvidesFile{utbk11.clo}
-  [2011/05/07 v1.6_u00
+  [2011/05/07 v1.6-u00
   Standard upLaTeX file (size option)]
 \renewcommand{\normalsize}{%
     \@setfontsize\normalsize\@xipt{17}%
diff --git a/Master/texmf-dist/tex/uplatex/base/utbk12.clo b/Master/texmf-dist/tex/uplatex/base/utbk12.clo
index 171b46b6f8e..d7e1c3afcfa 100644
--- a/Master/texmf-dist/tex/uplatex/base/utbk12.clo
+++ b/Master/texmf-dist/tex/uplatex/base/utbk12.clo
@@ -6,20 +6,13 @@
 %%
 %% ujclasses.dtx  (with options: `12pt,bk,tate')
 %% 
-%% IMPORTANT NOTICE:
+%% Copyright (c) 2010 ASCII MEDIA WORKS
+%% Copyright (c) 2016 Takuji Tanaka
+%% Copyright (c) 2016 Japanese TeX Development Community
 %% 
-%% For the copyright see the source file.
+%% This file is part of the upLaTeX2e system (community edition).
+%% --------------------------------------------------------------
 %% 
-%% Any modified versions of this file must be renamed
-%% with new filenames distinct from utbk12.clo.
-%% 
-%% For distribution of the original source see the terms
-%% for copying and modification in the file ujclasses.dtx.
-%% 
-%% This generated file may be distributed as long as the
-%% original source files, as listed above, are part of the
-%% same distribution. (The sources need not necessarily be
-%% in the same archive or directory.)
 %% 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
@@ -39,7 +32,7 @@
 %%
 \NeedsTeXFormat{pLaTeX2e}
 \ProvidesFile{utbk12.clo}
-  [2011/05/07 v1.6_u00
+  [2011/05/07 v1.6-u00
   Standard upLaTeX file (size option)]
 \renewcommand{\normalsize}{%
     \@setfontsize\normalsize\@xiipt{18}%
diff --git a/Master/texmf-dist/tex/uplatex/base/utbook.cls b/Master/texmf-dist/tex/uplatex/base/utbook.cls
index 47188f85086..d560bc3e45e 100644
--- a/Master/texmf-dist/tex/uplatex/base/utbook.cls
+++ b/Master/texmf-dist/tex/uplatex/base/utbook.cls
@@ -6,20 +6,13 @@
 %%
 %% ujclasses.dtx  (with options: `book,tate')
 %% 
-%% IMPORTANT NOTICE:
+%% Copyright (c) 2010 ASCII MEDIA WORKS
+%% Copyright (c) 2016 Takuji Tanaka
+%% Copyright (c) 2016 Japanese TeX Development Community
 %% 
-%% For the copyright see the source file.
+%% This file is part of the upLaTeX2e system (community edition).
+%% --------------------------------------------------------------
 %% 
-%% Any modified versions of this file must be renamed
-%% with new filenames distinct from utbook.cls.
-%% 
-%% For distribution of the original source see the terms
-%% for copying and modification in the file ujclasses.dtx.
-%% 
-%% This generated file may be distributed as long as the
-%% original source files, as listed above, are part of the
-%% same distribution. (The sources need not necessarily be
-%% in the same archive or directory.)
 %% 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
@@ -39,7 +32,7 @@
 %%
 \NeedsTeXFormat{pLaTeX2e}
 \ProvidesClass{utbook}
-  [2011/05/07 v1.6_u00
+  [2011/05/07 v1.6-u00
  Standard upLaTeX class]
 \newcounter{@paper}
 \newif\if@landscape \@landscapefalse
diff --git a/Master/texmf-dist/tex/uplatex/base/utreport.cls b/Master/texmf-dist/tex/uplatex/base/utreport.cls
index 6ff7ba9e3c4..53718f4c759 100644
--- a/Master/texmf-dist/tex/uplatex/base/utreport.cls
+++ b/Master/texmf-dist/tex/uplatex/base/utreport.cls
@@ -6,20 +6,13 @@
 %%
 %% ujclasses.dtx  (with options: `report,tate')
 %% 
-%% IMPORTANT NOTICE:
+%% Copyright (c) 2010 ASCII MEDIA WORKS
+%% Copyright (c) 2016 Takuji Tanaka
+%% Copyright (c) 2016 Japanese TeX Development Community
 %% 
-%% For the copyright see the source file.
+%% This file is part of the upLaTeX2e system (community edition).
+%% --------------------------------------------------------------
 %% 
-%% Any modified versions of this file must be renamed
-%% with new filenames distinct from utreport.cls.
-%% 
-%% For distribution of the original source see the terms
-%% for copying and modification in the file ujclasses.dtx.
-%% 
-%% This generated file may be distributed as long as the
-%% original source files, as listed above, are part of the
-%% same distribution. (The sources need not necessarily be
-%% in the same archive or directory.)
 %% 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
@@ -39,7 +32,7 @@
 %%
 \NeedsTeXFormat{pLaTeX2e}
 \ProvidesClass{utreport}
-  [2011/05/07 v1.6_u00
+  [2011/05/07 v1.6-u00
  Standard upLaTeX class]
 \newcounter{@paper}
 \newif\if@landscape \@landscapefalse
diff --git a/Master/texmf-dist/tex/uplatex/base/utsize10.clo b/Master/texmf-dist/tex/uplatex/base/utsize10.clo
index ed9accb5aa7..4cfae4ba789 100644
--- a/Master/texmf-dist/tex/uplatex/base/utsize10.clo
+++ b/Master/texmf-dist/tex/uplatex/base/utsize10.clo
@@ -6,20 +6,13 @@
 %%
 %% ujclasses.dtx  (with options: `10pt,tate')
 %% 
-%% IMPORTANT NOTICE:
+%% Copyright (c) 2010 ASCII MEDIA WORKS
+%% Copyright (c) 2016 Takuji Tanaka
+%% Copyright (c) 2016 Japanese TeX Development Community
 %% 
-%% For the copyright see the source file.
+%% This file is part of the upLaTeX2e system (community edition).
+%% --------------------------------------------------------------
 %% 
-%% Any modified versions of this file must be renamed
-%% with new filenames distinct from utsize10.clo.
-%% 
-%% For distribution of the original source see the terms
-%% for copying and modification in the file ujclasses.dtx.
-%% 
-%% This generated file may be distributed as long as the
-%% original source files, as listed above, are part of the
-%% same distribution. (The sources need not necessarily be
-%% in the same archive or directory.)
 %% 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
@@ -39,7 +32,7 @@
 %%
 \NeedsTeXFormat{pLaTeX2e}
 \ProvidesFile{utsize10.clo}
-  [2011/05/07 v1.6_u00
+  [2011/05/07 v1.6-u00
   Standard upLaTeX file (size option)]
 \renewcommand{\normalsize}{%
     \@setfontsize\normalsize\@xpt{17}%
diff --git a/Master/texmf-dist/tex/uplatex/base/utsize11.clo b/Master/texmf-dist/tex/uplatex/base/utsize11.clo
index 2eead20f7eb..952d36f4e58 100644
--- a/Master/texmf-dist/tex/uplatex/base/utsize11.clo
+++ b/Master/texmf-dist/tex/uplatex/base/utsize11.clo
@@ -6,20 +6,13 @@
 %%
 %% ujclasses.dtx  (with options: `11pt,tate')
 %% 
-%% IMPORTANT NOTICE:
+%% Copyright (c) 2010 ASCII MEDIA WORKS
+%% Copyright (c) 2016 Takuji Tanaka
+%% Copyright (c) 2016 Japanese TeX Development Community
 %% 
-%% For the copyright see the source file.
+%% This file is part of the upLaTeX2e system (community edition).
+%% --------------------------------------------------------------
 %% 
-%% Any modified versions of this file must be renamed
-%% with new filenames distinct from utsize11.clo.
-%% 
-%% For distribution of the original source see the terms
-%% for copying and modification in the file ujclasses.dtx.
-%% 
-%% This generated file may be distributed as long as the
-%% original source files, as listed above, are part of the
-%% same distribution. (The sources need not necessarily be
-%% in the same archive or directory.)
 %% 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
@@ -39,7 +32,7 @@
 %%
 \NeedsTeXFormat{pLaTeX2e}
 \ProvidesFile{utsize11.clo}
-  [2011/05/07 v1.6_u00
+  [2011/05/07 v1.6-u00
   Standard upLaTeX file (size option)]
 \renewcommand{\normalsize}{%
     \@setfontsize\normalsize\@xipt{17}%
diff --git a/Master/texmf-dist/tex/uplatex/base/utsize12.clo b/Master/texmf-dist/tex/uplatex/base/utsize12.clo
index fc034e31072..1ea4a2948f0 100644
--- a/Master/texmf-dist/tex/uplatex/base/utsize12.clo
+++ b/Master/texmf-dist/tex/uplatex/base/utsize12.clo
@@ -6,20 +6,13 @@
 %%
 %% ujclasses.dtx  (with options: `12pt,tate')
 %% 
-%% IMPORTANT NOTICE:
+%% Copyright (c) 2010 ASCII MEDIA WORKS
+%% Copyright (c) 2016 Takuji Tanaka
+%% Copyright (c) 2016 Japanese TeX Development Community
 %% 
-%% For the copyright see the source file.
+%% This file is part of the upLaTeX2e system (community edition).
+%% --------------------------------------------------------------
 %% 
-%% Any modified versions of this file must be renamed
-%% with new filenames distinct from utsize12.clo.
-%% 
-%% For distribution of the original source see the terms
-%% for copying and modification in the file ujclasses.dtx.
-%% 
-%% This generated file may be distributed as long as the
-%% original source files, as listed above, are part of the
-%% same distribution. (The sources need not necessarily be
-%% in the same archive or directory.)
 %% 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
@@ -39,7 +32,7 @@
 %%
 \NeedsTeXFormat{pLaTeX2e}
 \ProvidesFile{utsize12.clo}
-  [2011/05/07 v1.6_u00
+  [2011/05/07 v1.6-u00
   Standard upLaTeX file (size option)]
 \renewcommand{\normalsize}{%
     \@setfontsize\normalsize\@xiipt{18}%
diff --git a/Master/texmf-dist/tex/uplatex/config/uplatex.ini b/Master/texmf-dist/tex/uplatex/config/uplatex.ini
index 401479caa5f..bfacea88e43 100644
--- a/Master/texmf-dist/tex/uplatex/config/uplatex.ini
+++ b/Master/texmf-dist/tex/uplatex/config/uplatex.ini
@@ -1,5 +1,5 @@
 %% for upLaTeX (Unicode pLaTeX)
-%% written by Tono san
+%% written by Tono san (modified by texjporg 2016/05/07)
 %%
 \begingroup  \catcode`\{=1  \catcode`\}=2%
     \immediate\write20{<<< making "uplatex with Babel" format >>>}
@@ -14,9 +14,10 @@
 \input uplatex.ltx
 %
 \begingroup  \makeatletter%
-    \@temptokena=\expandafter{\platexBANNER}
+    \def\parse@BANNER#1{\expandafter\parse@@BANNER#1}%
+    \def\parse@@BANNER#1#2#3#4{#4}%
     \edef\platexTMP{%
-        \the\everyjob\noexpand\typeout{\the\@temptokena loaded.}%
+        \the\everyjob\noexpand\typeout{\parse@BANNER{\platexBANNER}}%
     }%
     \everyjob=\expandafter{\platexTMP}%
     \edef\platexTMP{%
author	Karl Berry <karl@freefriends.org>	2016-05-09 23:41:02 +0000
committer	Karl Berry <karl@freefriends.org>	2016-05-09 23:41:02 +0000
commit	c143a4632d967b1831be9a77ea54f6ceac5da3ec (patch)
tree	cb2748d331ea49b43cf691a5d819bc4a2400f921 /Master/texmf-dist
parent	91d417296c636d06a8b3e4800715e6f87c900e46 (diff)