9 files changed, 45 insertions, 16 deletions
diff --git a/Master/texmf-dist/doc/luatex/luatexja/README b/Master/texmf-dist/doc/luatex/luatexja/README
index 9e78efbeb53..8e977e82e36 100644
--- a/Master/texmf-dist/doc/luatex/luatexja/README
+++ b/Master/texmf-dist/doc/luatex/luatexja/README
@@ -1,4 +1,4 @@
-The LuaTeX-ja Package 20160331.0
+The LuaTeX-ja Package 20160404.0
 --------------------------------
 Copyright (c) 2011--2016 The LuaTeX-ja project
 License: modified BSD (see COPYING)
@@ -34,9 +34,9 @@ Installation
 2. If you must/want to install manually:
 
    a. Download the source archive from CTAN,
-      or tagged as 20160331.0 in the Git repository by
+      or tagged as 20160404.0 in the Git repository by
       <http://git.osdn.jp/view?p=luatex-ja/luatexja.git
-                              ;a=snapshot;h=refs/tags/20160331.0;sf=tgz>
+                              ;a=snapshot;h=refs/tags/20160404.0;sf=tgz>
 
    b. Extract the archive and process following three files by LuaLaTeX
       to generate classes for Japanese typesetting:
@@ -81,4 +81,4 @@ Notes
 
 * src/*.{ins.dtx} and src/ltj-kinsoku_make.tex are not needed in regular use.
 
-Last commit date: Thu Mar 31 14:06:40 2016 +0900
+Last commit date: Mon Apr 4 18:07:29 2016 +0900
diff --git a/Master/texmf-dist/doc/luatex/luatexja/ltjsclasses.pdf b/Master/texmf-dist/doc/luatex/luatexja/ltjsclasses.pdf
index 58341295fdc..5aaf19b83f1 100644
--- a/Master/texmf-dist/doc/luatex/luatexja/ltjsclasses.pdf
+++ b/Master/texmf-dist/doc/luatex/luatexja/ltjsclasses.pdf
diff --git a/Master/texmf-dist/source/luatex/luatexja/ltjsclasses.dtx b/Master/texmf-dist/source/luatex/luatexja/ltjsclasses.dtx
index 452d46f8c56..5f906b08b52 100644
--- a/Master/texmf-dist/source/luatex/luatexja/ltjsclasses.dtx
+++ b/Master/texmf-dist/source/luatex/luatexja/ltjsclasses.dtx
@@ -50,7 +50,7 @@
 %<*driver>
 \ProvidesFile{ltjsclasses.dtx}
 %</driver>
-  [2016/03/31 ltjsclasses ]
+  [2016/04/04 ltjsclasses ]
 %<*driver>
 \IfFileExists{luatex85.sty}{\RequirePackage{luatex85}}{}
 \documentclass{ltjsarticle}
@@ -681,6 +681,8 @@
 %
 % [2016-03-28 LTJ] |\luafunction|を使うようにし，また本文のフォントサイズが10ptのときには
 % （不要なので）パッチを当てないことにしました。
+%
+% [2016-04-04 LTJ] NFSSへのパッチを修正．
 %    \begin{macrocode}
 \if@ltjs@mag@xreal\RequirePackage{type1cm}
 \ifdim\ltjs@mpt=\p@\else
@@ -710,7 +712,7 @@
         \dimen@\@tempb\relax
         \edef\@tempb{ at\luafunction\ltjs@@magnify@font@calc sp}%
      \fi
-     \edef\@tempa{\def\noexpand\external@font{\@tempa\@tempb}}
+     \edef\@tempa{\def\noexpand\external@font{\@tempa\@tempb}}%
   }
   \let\ltjs@orig@get@external@font=\get@external@font
   \def\get@external@font{%
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjsarticle.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjsarticle.cls
index 7f73c95a582..e4faea7208f 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltjsarticle.cls
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltjsarticle.cls
@@ -38,7 +38,7 @@
 %%   Right brace   \}     Tilde         \~}
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesClass{ltjsarticle}
-  [2016/03/31 ltjsclasses ]
+  [2016/04/04 ltjsclasses ]
 \RequirePackage{luatexja}
 \newif\if@restonecol
 \newif\if@titlepage
@@ -257,7 +257,7 @@
         \dimen@\@tempb\relax
         \edef\@tempb{ at\luafunction\ltjs@@magnify@font@calc sp}%
      \fi
-     \edef\@tempa{\def\noexpand\external@font{\@tempa\@tempb}}
+     \edef\@tempa{\def\noexpand\external@font{\@tempa\@tempb}}%
   }
   \let\ltjs@orig@get@external@font=\get@external@font
   \def\get@external@font{%
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjsbook.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjsbook.cls
index 70042be7a4d..4a4e18fdc81 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltjsbook.cls
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltjsbook.cls
@@ -38,7 +38,7 @@
 %%   Right brace   \}     Tilde         \~}
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesClass{ltjsbook}
-  [2016/03/31 ltjsclasses ]
+  [2016/04/04 ltjsclasses ]
 \RequirePackage{luatexja}
 \newif\if@restonecol
 \newif\if@titlepage
@@ -264,7 +264,7 @@
         \dimen@\@tempb\relax
         \edef\@tempb{ at\luafunction\ltjs@@magnify@font@calc sp}%
      \fi
-     \edef\@tempa{\def\noexpand\external@font{\@tempa\@tempb}}
+     \edef\@tempa{\def\noexpand\external@font{\@tempa\@tempb}}%
   }
   \let\ltjs@orig@get@external@font=\get@external@font
   \def\get@external@font{%
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjskiyou.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjskiyou.cls
index 4781e3cd5dc..1dcfd06558c 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltjskiyou.cls
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltjskiyou.cls
@@ -38,7 +38,7 @@
 %%   Right brace   \}     Tilde         \~}
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesClass{ltjskiyou}
-  [2016/03/31 ltjsclasses ]
+  [2016/04/04 ltjsclasses ]
 \RequirePackage{luatexja}
 \newif\if@restonecol
 \newif\if@titlepage
@@ -258,7 +258,7 @@
         \dimen@\@tempb\relax
         \edef\@tempb{ at\luafunction\ltjs@@magnify@font@calc sp}%
      \fi
-     \edef\@tempa{\def\noexpand\external@font{\@tempa\@tempb}}
+     \edef\@tempa{\def\noexpand\external@font{\@tempa\@tempb}}%
   }
   \let\ltjs@orig@get@external@font=\get@external@font
   \def\get@external@font{%
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjspf.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjspf.cls
index 1a153c41978..ac7b765af02 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltjspf.cls
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltjspf.cls
@@ -38,7 +38,7 @@
 %%   Right brace   \}     Tilde         \~}
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesClass{ltjspf}
-  [2016/03/31 ltjsclasses ]
+  [2016/04/04 ltjsclasses ]
 \RequirePackage{luatexja}
 \newif\if@restonecol
 \newif\if@titlepage
@@ -257,7 +257,7 @@
         \dimen@\@tempb\relax
         \edef\@tempb{ at\luafunction\ltjs@@magnify@font@calc sp}%
      \fi
-     \edef\@tempa{\def\noexpand\external@font{\@tempa\@tempb}}
+     \edef\@tempa{\def\noexpand\external@font{\@tempa\@tempb}}%
   }
   \let\ltjs@orig@get@external@font=\get@external@font
   \def\get@external@font{%
diff --git a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjcore.sty b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjcore.sty
index f8af0aa2d9f..2b301d89ad3 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjcore.sty
+++ b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjcore.sty
@@ -4,7 +4,7 @@
 % 
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{lltjcore}[2015/01/01 Patch to LaTeX2e Kernel for LuaTeX-ja]
+\ProvidesPackage{lltjcore}[2016/04/01 Patch to LaTeX2e Kernel for LuaTeX-ja]
 
 \def\cleardoublepage{\clearpage\if@twoside
   \ifodd\c@page
@@ -79,6 +79,7 @@
 \def\@outputtombow{%
   \iftombow
   \vbox to\z@{\kern-13mm\relax
+    \boxmaxdepth\maxdimen
     \moveleft3mm\vbox to\@@paperheight{%
       \hbox to\@@paperwidth{\hskip3mm\relax
          \copy\@TL\hfill\copy\@TC\hfill\copy\@TR\hskip3mm}%
diff --git a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjfont.sty b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjfont.sty
index 08f9b7ff027..738e192004f 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjfont.sty
+++ b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjfont.sty
@@ -3,7 +3,7 @@
 %
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{lltjfont}[2016/02/07 Patch to NFSS2 for LuaTeX-ja]
+\ProvidesPackage{lltjfont}[2016/04/01 Patch to NFSS2 for LuaTeX-ja]
 
 \let\k@encoding\@empty
 \let\ck@encoding\@empty
@@ -723,4 +723,30 @@
 \def\ltj@@does@alt@set#1{%
   \directlua{luatexja.jfont.does_alt_set'\luatexluaescapestring{#1}'}}
 
+%%%% patch \@text@composite because of {y,t}albaselineshift
+\def\@text@composite#1#2#3#{%
+  \begingroup
+  \setbox\z@=\hbox\bgroup%
+  \ltj@yablshift\z@\ltj@tablshift\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
+    \ifnum\ltjgetparameter{direction}=3
+      \ltjgetparameter{talbaselineshift}
+    \else\ifmmode
+      \z@
+    \else
+      \ltjgetparameter{yalbaselineshift}
+    \fi\fi
+    \box\z@
+  \endgroup}
+
 \endinput