luatexja (17oct16)

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

15 files changed, 81 insertions, 80 deletions

diff --git a/Master/texmf-dist/doc/luatex/luatexja/README b/Master/texmf-dist/doc/luatex/luatexja/README
index 6fc6aa519e6..8ee381d4e94 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 20160926.0
+The LuaTeX-ja Package 20161017.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 20160926.0 in the Git repository by
+      or tagged as 20161017.0 in the Git repository by
       <http://git.osdn.jp/view?p=luatex-ja/luatexja.git
-                              ;a=snapshot;h=refs/tags/20160926.0;sf=tgz>
+                              ;a=snapshot;h=refs/tags/20161017.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: Mon Sep 26 19:03:31 2016 +0900
+Last commit date: Mon Oct 17 08:31:52 2016 +0900
diff --git a/Master/texmf-dist/doc/luatex/luatexja/lltjp-geometry.pdf b/Master/texmf-dist/doc/luatex/luatexja/lltjp-geometry.pdf
index 9481dda0f62..5c709f3f8d6 100644
--- a/Master/texmf-dist/doc/luatex/luatexja/lltjp-geometry.pdf
+++ b/Master/texmf-dist/doc/luatex/luatexja/lltjp-geometry.pdf
diff --git a/Master/texmf-dist/doc/luatex/luatexja/lltjp-geometry.tex b/Master/texmf-dist/doc/luatex/luatexja/lltjp-geometry.tex
index b9e300a8e76..f2064cb927a 100644
--- a/Master/texmf-dist/doc/luatex/luatexja/lltjp-geometry.tex
+++ b/Master/texmf-dist/doc/luatex/luatexja/lltjp-geometry.tex
@@ -84,6 +84,17 @@
 \end{itemize}
 と変更している．
 
+\subsection{widthとheight}
+\cs{textwidth}が字送り方向の長さ（縦）を表すのと同様に，
+\texttt{width}, \texttt{totalwidth}, \texttt{textwidth}キーの値も字送り方向を，また
+\texttt{height}, \texttt{totalheight}, \texttt{textheight}キーの値も行送り方向（横）を表すようになっている．
+
+しかし，\emph{用紙サイズについては例外}であり，物理的な意味での幅・高さを表す．
+\texttt{paperwidth}, \texttt{layoutwidth}はそれぞれ紙の横幅，レイアウトの横幅を，
+\texttt{paperheight}, \texttt{layoutheight}はそれぞれ紙の高さ，レイアウトの高さを表している．
+
+
+
 \subsection{傍注}
 縦組の場合，傍注は本文の上下に配置される\footnote{%
   二段組の場合は上下共に，一段組の場合は標準では下側だが，
diff --git a/Master/texmf-dist/doc/luatex/luatexja/ltjsclasses.pdf b/Master/texmf-dist/doc/luatex/luatexja/ltjsclasses.pdf
index c75e7a0a9cb..3f16a36fabf 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/doc/luatex/luatexja/luatexja-en.pdf b/Master/texmf-dist/doc/luatex/luatexja/luatexja-en.pdf
index 0210da4ab47..8fb58069c6d 100644
--- a/Master/texmf-dist/doc/luatex/luatexja/luatexja-en.pdf
+++ b/Master/texmf-dist/doc/luatex/luatexja/luatexja-en.pdf
diff --git a/Master/texmf-dist/doc/luatex/luatexja/luatexja-ja.pdf b/Master/texmf-dist/doc/luatex/luatexja/luatexja-ja.pdf
index 9ddf5ca1518..649573b7749 100644
--- a/Master/texmf-dist/doc/luatex/luatexja/luatexja-ja.pdf
+++ b/Master/texmf-dist/doc/luatex/luatexja/luatexja-ja.pdf
diff --git a/Master/texmf-dist/doc/luatex/luatexja/luatexja-ruby.pdf b/Master/texmf-dist/doc/luatex/luatexja/luatexja-ruby.pdf
index 57e69bbfcbf..935ed02930f 100644
--- a/Master/texmf-dist/doc/luatex/luatexja/luatexja-ruby.pdf
+++ b/Master/texmf-dist/doc/luatex/luatexja/luatexja-ruby.pdf
diff --git a/Master/texmf-dist/source/luatex/luatexja/ltjsclasses.dtx b/Master/texmf-dist/source/luatex/luatexja/ltjsclasses.dtx
index 4c04d083a02..ec2fb9c725f 100644
--- a/Master/texmf-dist/source/luatex/luatexja/ltjsclasses.dtx
+++ b/Master/texmf-dist/source/luatex/luatexja/ltjsclasses.dtx
@@ -29,7 +29,6 @@
 %  -----------------------------------------
 %
 % \fi
-% \CheckSum{5366}
 %% \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
@@ -57,7 +56,7 @@
 %<*driver>
 \ProvidesFile{ltjsclasses.dtx}
 %</driver>
-  [2016/08/27 ltjsclasses ]
+  [2016/10/13 ltjsclasses ]
 %<*driver>
 \IfFileExists{luatex85.sty}{\RequirePackage{luatex85}}{}
 \documentclass{ltjsarticle}
@@ -166,6 +165,8 @@
 %
 % [2016-07-21 LTJ] \LaTeX 等のロゴの再定義で，\texttt{jslogo}パッケージがあればそちらを読み込むことにしました。
 %
+% [2016-10-13 LTJ] \texttt{slide}オプションの使用時にエラーが出るのを修正．
+%
 % \StopEventually{}
 %
 % 以下では実際のコードに即して説明します。
@@ -355,9 +356,14 @@
 %
 % [2016-07-24] オプティカルサイズを調整するためにNFSSへパッチを当てるオプション \texttt{nomag*} を新設しました。
 %
+% [2016-10-08] \texttt{slide} オプションは article 以外では使い物にならなかったので，
+% 簡単のため article のみで使えるオプションとしました。
+%
 %    \begin{macrocode}
 \def\jsc@magscale{1}
+%<*article>
 \DeclareOption{slide}{\@slidetrue\def\jsc@magscale{3.583}\@landscapetrue\@titlepagetrue}
+%</article>
 \DeclareOption{8pt} {\def\jsc@magscale{0.833}}% 1.2^(-1)
 \DeclareOption{9pt} {\def\jsc@magscale{0.913}}% 1.2^(-0.5}
 \DeclareOption{10pt}{\def\jsc@magscale{1}}
@@ -1568,10 +1574,16 @@
 % それ以外で25pt（約8.79mm）になっていました。
 % ここでは article は |\footskip| $-$ |\topskip| としました。
 %
+% [2016-10-08] article の \texttt{slide} のとき，
+% および book の非 \texttt{report} と kiyou のときに |\headsep| を
+% 減らしそこねていたのを修正しました（2016-08-17での修正漏れ）。
+%
 %    \begin{macrocode}
 %<*article>
 \if@slide
   \setlength\headsep{0\jsc@mpt}
+  \addtolength\headsep{-\topskip}%% added (2016-10-08)
+  \addtolength\headsep{10\jsc@mpt}%% added (2016-10-08)
 \else
   \setlength\headsep{\footskip}
   \addtolength\headsep{-\topskip}
@@ -1583,6 +1595,8 @@
   \addtolength\headsep{-\topskip}
 \else
   \setlength\headsep{6\jsc@mmm}
+  \addtolength\headsep{-\topskip}%% added (2016-10-08)
+  \addtolength\headsep{10\jsc@mpt}%% added (2016-10-08)
 \fi
 %</book>
 %<*jspf>
@@ -1592,6 +1606,8 @@
 %<*kiyou>
 \setlength\headheight{0\jsc@mpt}
 \setlength\headsep{0\jsc@mpt}
+\addtolength\headsep{-\topskip}%% added (2016-10-08)
+\addtolength\headsep{10\jsc@mpt}%% added (2016-10-08)
 %</kiyou>
 %    \end{macrocode}
 % \end{macro}
@@ -1702,6 +1718,9 @@
 % [2016-08-26] |\topskip| を10ptから1.38zwに増やしましたので，
 % その分 |\textheight| を増やします（2016-08-17での修正漏れ）。
 %
+% [2016-10-08] article の slide のときに |\headheight| はゼロ
+% なので，さらに修正しました（2016-08-17での修正漏れ）。
+%
 %    \begin{macrocode}
 %<*article|book>
 \if@slide
@@ -1709,7 +1728,7 @@
 \else
   \setlength{\textheight}{0.83\paperheight}
 \fi
-\addtolength{\textheight}{-0.5\headheight}%% from -\topskip (2016-08-26); from -\headheight (2003-06-26)
+\addtolength{\textheight}{-10\jsc@mpt}%% from -\topskip (2016-10-08); from -\headheight (2003-06-26)
 \addtolength{\textheight}{-\headsep}
 \addtolength{\textheight}{-\footskip}
 \addtolength{\textheight}{-\topskip}
@@ -1823,7 +1842,7 @@
 \if@slide
   \addtolength\topmargin{-\headheight}
 \else
-  \addtolength\topmargin{-0.5\headheight}%% from -\topskip (2016-08-17); from -\headheight (2003-06-26)
+  \addtolength\topmargin{-10\jsc@mpt}%% from -\topskip (2016-10-08); from -\headheight (2003-06-26)
 \fi
 \addtolength\topmargin{-\headsep}
 \addtolength\topmargin{-\footskip}
@@ -5414,7 +5433,7 @@
   \renewcommand\familydefault{\sfdefault}
   \raggedright
   \ltj@setpar@global
-  \ltjsetxkanjiskip{0.1em}\relax
+  \ltjsetxkanjiskip0.1em\relax
 \fi
 %    \end{macrocode}
 %
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltj-jfont.lua b/Master/texmf-dist/tex/luatex/luatexja/ltj-jfont.lua
index 1c77e829fa9..86d553a7e80 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltj-jfont.lua
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltj-jfont.lua
@@ -953,9 +953,9 @@ luatexbase.add_to_callback(
       local subtables = {}
       if ft.specification then
 	 for feat_name,v in pairs(ft.specification.features.normal) do
-	    if v==true then
+	    if v==true and ft.resources then
 	       for _,i in pairs(ft.resources.sequences) do
-		  if i.order[1]== feat_name and i.type == 'gpos_single' then
+		  if i.order[1]== feat_name and i.type == 'gpos_single' and type(i.subtables)=='table' then
 		     for _,st in pairs(i.subtables) do
 			subtables[st] = true
 		     end
@@ -985,8 +985,9 @@ do
   luatexbase.add_to_callback(
      'luaotfload.patch_font',
      function (tfmdata)
-	if tfmdata.cidinfo then
-	   local rd = ltjr_prepare_cid_font(tfmdata.cidinfo.registry, tfmdata.cidinfo.ordering)
+	local cidinfo = tfmdata.cidinfo or tfmdata.resources.cidinfo
+	if cidinfo and cidinfo.registry and cidinfo.ordering then
+	   local rd = ltjr_prepare_cid_font(cidinfo.registry, cidinfo.ordering)
 	   if rd then
 	      local ru, rc = rd.resources.unicodes, rd.characters
 	      for i,v in pairs(tfmdata.characters) do
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjsarticle.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjsarticle.cls
index df5287c668b..cf69067ba2b 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/08/27 ltjsclasses ]
+  [2016/10/13 ltjsclasses ]
 \def\jsc@clsname{ltjsarticle}
 \RequirePackage{luatexja}
 \newif\if@restonecol
@@ -477,6 +477,8 @@ option, since LuaTeX does not support \string\mag\MessageBreak in pdf output}%
 \fi
 \if@slide
   \setlength\headsep{0\jsc@mpt}
+  \addtolength\headsep{-\topskip}%% added (2016-10-08)
+  \addtolength\headsep{10\jsc@mpt}%% added (2016-10-08)
 \else
   \setlength\headsep{\footskip}
   \addtolength\headsep{-\topskip}
@@ -496,7 +498,7 @@ option, since LuaTeX does not support \string\mag\MessageBreak in pdf output}%
 \else
   \setlength{\textheight}{0.83\paperheight}
 \fi
-\addtolength{\textheight}{-0.5\headheight}%% from -\topskip (2016-08-26); from -\headheight (2003-06-26)
+\addtolength{\textheight}{-10\jsc@mpt}%% from -\topskip (2016-10-08); from -\headheight (2003-06-26)
 \addtolength{\textheight}{-\headsep}
 \addtolength{\textheight}{-\footskip}
 \addtolength{\textheight}{-\topskip}
@@ -532,7 +534,7 @@ option, since LuaTeX does not support \string\mag\MessageBreak in pdf output}%
 \if@slide
   \addtolength\topmargin{-\headheight}
 \else
-  \addtolength\topmargin{-0.5\headheight}%% from -\topskip (2016-08-17); from -\headheight (2003-06-26)
+  \addtolength\topmargin{-10\jsc@mpt}%% from -\topskip (2016-10-08); from -\headheight (2003-06-26)
 \fi
 \addtolength\topmargin{-\headsep}
 \addtolength\topmargin{-\footskip}
@@ -1623,7 +1625,7 @@ class has defined the old font commands like\MessageBreak
   \renewcommand\familydefault{\sfdefault}
   \raggedright
   \ltj@setpar@global
-  \ltjsetxkanjiskip{0.1em}\relax
+  \ltjsetxkanjiskip0.1em\relax
 \fi
 \endinput
 %%
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjsbook.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjsbook.cls
index 19a16ccbdf1..6dc0600b714 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/08/27 ltjsclasses ]
+  [2016/10/13 ltjsclasses ]
 \def\jsc@clsname{ltjsbook}
 \RequirePackage{luatexja}
 \newif\if@restonecol
@@ -100,7 +100,6 @@
 \newif\if@slide
 \@slidefalse
 \def\jsc@magscale{1}
-\DeclareOption{slide}{\@slidetrue\def\jsc@magscale{3.583}\@landscapetrue\@titlepagetrue}
 \DeclareOption{8pt} {\def\jsc@magscale{0.833}}% 1.2^(-1)
 \DeclareOption{9pt} {\def\jsc@magscale{0.913}}% 1.2^(-0.5}
 \DeclareOption{10pt}{\def\jsc@magscale{1}}
@@ -487,6 +486,8 @@ option, since LuaTeX does not support \string\mag\MessageBreak in pdf output}%
   \addtolength\headsep{-\topskip}
 \else
   \setlength\headsep{6\jsc@mmm}
+  \addtolength\headsep{-\topskip}%% added (2016-10-08)
+  \addtolength\headsep{10\jsc@mpt}%% added (2016-10-08)
 \fi
 \setlength\maxdepth{.5\topskip}
 \newdimen\fullwidth
@@ -511,7 +512,7 @@ option, since LuaTeX does not support \string\mag\MessageBreak in pdf output}%
 \else
   \setlength{\textheight}{0.83\paperheight}
 \fi
-\addtolength{\textheight}{-0.5\headheight}%% from -\topskip (2016-08-26); from -\headheight (2003-06-26)
+\addtolength{\textheight}{-10\jsc@mpt}%% from -\topskip (2016-10-08); from -\headheight (2003-06-26)
 \addtolength{\textheight}{-\headsep}
 \addtolength{\textheight}{-\footskip}
 \addtolength{\textheight}{-\topskip}
@@ -547,7 +548,7 @@ option, since LuaTeX does not support \string\mag\MessageBreak in pdf output}%
 \if@slide
   \addtolength\topmargin{-\headheight}
 \else
-  \addtolength\topmargin{-0.5\headheight}%% from -\topskip (2016-08-17); from -\headheight (2003-06-26)
+  \addtolength\topmargin{-10\jsc@mpt}%% from -\topskip (2016-10-08); from -\headheight (2003-06-26)
 \fi
 \addtolength\topmargin{-\headsep}
 \addtolength\topmargin{-\footskip}
@@ -1708,7 +1709,7 @@ class has defined the old font commands like\MessageBreak
   \renewcommand\familydefault{\sfdefault}
   \raggedright
   \ltj@setpar@global
-  \ltjsetxkanjiskip{0.1em}\relax
+  \ltjsetxkanjiskip0.1em\relax
 \fi
 \endinput
 %%
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjskiyou.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjskiyou.cls
index f7c80dff73f..0b54acc35b9 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/08/27 ltjsclasses ]
+  [2016/10/13 ltjsclasses ]
 \def\jsc@clsname{ltjskiyou}
 \RequirePackage{luatexja}
 \newif\if@restonecol
@@ -98,7 +98,6 @@
 \newif\if@slide
 \@slidefalse
 \def\jsc@magscale{1}
-\DeclareOption{slide}{\@slidetrue\def\jsc@magscale{3.583}\@landscapetrue\@titlepagetrue}
 \DeclareOption{8pt} {\def\jsc@magscale{0.833}}% 1.2^(-1)
 \DeclareOption{9pt} {\def\jsc@magscale{0.913}}% 1.2^(-0.5}
 \DeclareOption{10pt}{\def\jsc@magscale{1}}
@@ -478,6 +477,8 @@ option, since LuaTeX does not support \string\mag\MessageBreak in pdf output}%
 \fi
 \setlength\headheight{0\jsc@mpt}
 \setlength\headsep{0\jsc@mpt}
+\addtolength\headsep{-\topskip}%% added (2016-10-08)
+\addtolength\headsep{10\jsc@mpt}%% added (2016-10-08)
 \setlength\maxdepth{.5\topskip}
 \newdimen\fullwidth
 \setlength\fullwidth{48\zw}
@@ -514,7 +515,7 @@ option, since LuaTeX does not support \string\mag\MessageBreak in pdf output}%
 \if@slide
   \addtolength\topmargin{-\headheight}
 \else
-  \addtolength\topmargin{-0.5\headheight}%% from -\topskip (2016-08-17); from -\headheight (2003-06-26)
+  \addtolength\topmargin{-10\jsc@mpt}%% from -\topskip (2016-10-08); from -\headheight (2003-06-26)
 \fi
 \addtolength\topmargin{-\headsep}
 \addtolength\topmargin{-\footskip}
@@ -1609,7 +1610,7 @@ class has defined the old font commands like\MessageBreak
   \renewcommand\familydefault{\sfdefault}
   \raggedright
   \ltj@setpar@global
-  \ltjsetxkanjiskip{0.1em}\relax
+  \ltjsetxkanjiskip0.1em\relax
 \fi
 \endinput
 %%
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjspf.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjspf.cls
index 51193a7c095..388d144ff15 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/08/27 ltjsclasses ]
+  [2016/10/13 ltjsclasses ]
 \def\jsc@clsname{ltjspf}
 \RequirePackage{luatexja}
 \newif\if@restonecol
@@ -98,7 +98,6 @@
 \newif\if@slide
 \@slidefalse
 \def\jsc@magscale{1}
-\DeclareOption{slide}{\@slidetrue\def\jsc@magscale{3.583}\@landscapetrue\@titlepagetrue}
 \DeclareOption{8pt} {\def\jsc@magscale{0.833}}% 1.2^(-1)
 \DeclareOption{9pt} {\def\jsc@magscale{0.913}}% 1.2^(-0.5}
 \DeclareOption{10pt}{\def\jsc@magscale{1}}
@@ -507,7 +506,7 @@ option, since LuaTeX does not support \string\mag\MessageBreak in pdf output}%
 \if@slide
   \addtolength\topmargin{-\headheight}
 \else
-  \addtolength\topmargin{-0.5\headheight}%% from -\topskip (2016-08-17); from -\headheight (2003-06-26)
+  \addtolength\topmargin{-10\jsc@mpt}%% from -\topskip (2016-10-08); from -\headheight (2003-06-26)
 \fi
 \addtolength\topmargin{-\headsep}
 \addtolength\topmargin{-\footskip}
@@ -1506,7 +1505,7 @@ class has defined the old font commands like\MessageBreak
   \renewcommand\familydefault{\sfdefault}
   \raggedright
   \ltj@setpar@global
-  \ltjsetxkanjiskip{0.1em}\relax
+  \ltjsetxkanjiskip0.1em\relax
 \fi
 \endinput
 %%
diff --git a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-fontspec.sty b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-fontspec.sty
index b679d5a436e..2aaa9d6eed8 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-fontspec.sty
+++ b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-fontspec.sty
@@ -3,7 +3,7 @@
 %
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{lltjp-fontspec}[2016/03/31 Patch to fontspec for LuaTeX-ja]
+\ProvidesPackage{lltjp-fontspec}[2016/10/12 Patch to fontspec for LuaTeX-ja]
 
 \RequirePackage{fontspec,luatexja}
 \ExplSyntaxOn
@@ -24,48 +24,6 @@
  }
 
 
-\cs_set_eq:NN \ltj_orig_fontspec_setup_maths: \fontspec_setup_maths: 
-\cs_set:Nn \fontspec_setup_maths:
-  {
-    \group_begin:
-      \cs_set:Npn \DeclareMathSymbol##1##2##3##4{%
-        \expandafter\in@\csname sym##3\expandafter\endcsname
-           \expandafter{\group@list}%
-        \ifin@
-          \begingroup
-            \count\z@=##4\relax
-            \count\tw@\count\z@
-            \divide\count\z@\sixt@@n
-            \count@\count\z@
-            \multiply\count@\sixt@@n
-            \advance\count\tw@-\count@
-            \if\relax\noexpand##1% is command?
-              \edef\reserved@a{\noexpand\in@{\string\mathchar}{\meaning##1}}%
-              \reserved@a
-              \ifin@
-                \expandafter\set@mathsymbol
-                   \csname sym##3\endcsname##1##2%
-                   {\hexnumber@{\count\z@}\hexnumber@{\count\tw@}}%
-                \@font@info{Redeclaring math symbol \string##1}%
-              \else
-                \expandafter\set@mathsymbol
-                \csname sym##3\endcsname##1##2%
-                  {\hexnumber@{\count\z@}\hexnumber@{\count\tw@}}%
-              \fi
-            \else
-              \expandafter\set@mathchar
-                \csname sym##3\endcsname##1##2
-                {\hexnumber@{\count\z@}\hexnumber@{\count\tw@}}%
-            \fi
-          \endgroup
-        \else
-          \@latex@error{Symbol font `##3' is not defined}\@eha
-        \fi
-      }
-    \ltj_orig_fontspec_setup_maths:
-    \group_end:
-  }
-
 %%%%%%%% shapes in \em
 \cs_set:Npn \emshape { \gtfamily \itshape }
 \cs_set:Npn \eminnershape { \mcfamily \upshape }
diff --git a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-geometry.sty b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-geometry.sty
index 76c983a9e7b..9ebda8a4e4f 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-geometry.sty
+++ b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-geometry.sty
@@ -3,7 +3,7 @@
 %
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{lltjp-geometry}[2015/01/04 Patch to geometry for LuaTeX-ja with vertical writing mode]
+\ProvidesPackage{lltjp-geometry}[2016/10/06 Patch to geometry for LuaTeX-ja with vertical writing mode]
 \RequirePackage{ifluatex}
 
 \ifdefined\if@ltj@@geometry@tate\expandafter\endinput\fi
@@ -18,6 +18,7 @@
 \fi
 
 \RequirePackage{filehook}
+\RequirePackage{etoolbox}
 \newif\ifGm@ltj@layoutswitch
 \let\orig@PackageWarningNoLine=\PackageWarningNoLine
 % define ifGm@swap@papersize if it is undefined
@@ -74,6 +75,14 @@
 \define@key{Gm}{noheadfoot}[true]{\Gm@doifelse{noheadfoot}{#1}%
   {\Gm@setlength\headheight\z@\Gm@defbylen{ltj@headsep}\z@
   \Gm@defbylen{ltj@footskip}\z@}{}}%
+\define@key{Gm}{layoutwidth}{\Gm@layouttrue\Gm@setlength\Gm@layoutheight{#1}}%
+\define@key{Gm}{layoutheight}{\Gm@layouttrue\Gm@setlength\Gm@layoutwidth{#1}}%
+\define@key{Gm}{layoutsize}{\Gm@branch{#1}{layoutwidth}{layoutheight}}%
+\define@key{Gm}{layout}{\Gm@layouttrue\@nameuse{Gm@#1}{Gm@layout}%
+  \Gm@setlength\@tempdima{\Gm@layoutheight}%
+  \Gm@setlength\Gm@layoutheight{\Gm@layoutwidth}%
+  \Gm@setlength\Gm@layoutwidth{\@tempdima}%
+}%
 
 % \@mparswitch は傍注の出力位置を左右ページで変えるスイッチだが，
 % geometry.sty はこれを左右ページのレイアウトを変えるか否かの判定にも使っている．
@@ -141,11 +150,11 @@
    \ifGm@showcrop
     \vb@xt@\z@{\vskip-1\Gm@truedimen in\vskip\Gm@layoutvoffset%
      \hb@xt@\z@{\hskip-1\Gm@truedimen in\hskip\Gm@layouthoffset%
-      \vb@xt@\Gm@layoutheight{%
+      \vb@xt@\Gm@layoutwidth{%
        \let\protect\relax
-       \hb@xt@\Gm@layoutwidth{\Gm@cropmark(-1,1,-3,3)\hfil\Gm@cropmark(1,1,3,3)}%
+       \hb@xt@\Gm@layoutheight{\Gm@cropmark(-1,1,-3,3)\hfil\Gm@cropmark(1,1,3,3)}%
        \vfil
-       \hb@xt@\Gm@layoutwidth{\Gm@cropmark(-1,-1,-3,-3)\hfil\Gm@cropmark(1,-1,3,-3)}}%
+       \hb@xt@\Gm@layoutheight{\Gm@cropmark(-1,-1,-3,-3)\hfil\Gm@cropmark(1,-1,3,-3)}}%
      \hss}%
     \vss}%
    \fi%
@@ -412,9 +421,9 @@
     \addtolength\@tempdimb{\topskip}%
     \textheight\@tempdimb
   \fi
-  \advance\oddsidemargin\Gm@layoutvoffset%
-  \advance\evensidemargin\Gm@layoutvoffset%
-  \advance\topmargin\Gm@layouthoffset%
+  \advance\oddsidemargin\Gm@layouthoffset%
+  \advance\evensidemargin\Gm@layouthoffset%
+  \advance\topmargin\Gm@layoutvoffset%
   \addtolength\Gm@layoutheight{\Gm@bindingoffset}%
 }% end of \Gm@@process
 % log