uplatex (9may16)

git-svn-id: svn://tug.org/texlive/trunk@40991 c570f23f-e606-0410-a88d-b1316a301751

28 files changed, 711 insertions, 386 deletions

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{%