luatexja (22sep18)

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

11 files changed, 96 insertions, 64 deletions

diff --git a/Master/texmf-dist/doc/luatex/luatexja/README b/Master/texmf-dist/doc/luatex/luatexja/README
index 44bb796c0ff..b0871f76975 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 20180825.0
+The LuaTeX-ja Package 20180922.1
 --------------------------------
 Copyright (c) 2011--2018 The LuaTeX-ja project
 License: modified BSD (see COPYING)
@@ -40,9 +40,9 @@ Installation
 2. If you must/want to install manually:
 
    a. Download the source archive from CTAN,
-      or tagged as 20180825.0 in the Git repository by
+      or tagged as 20180922.1 in the Git repository by
       <http://git.osdn.jp/view?p=luatex-ja/luatexja.git
-                              ;a=snapshot;h=refs/tags/20180825.0;sf=tgz>
+                              ;a=snapshot;h=refs/tags/20180922.1;sf=tgz>
 
    b. Extract the archive and process following three files by LuaLaTeX
       to generate classes for Japanese typesetting:
@@ -87,4 +87,4 @@ Notes
 
 * src/*.{ins.dtx} and src/ltj-kinsoku_make.tex are not needed in regular use.
 
-Last commit date: Sat Aug 25 09:04:32 2018 +0900
+Last commit date: Sat Sep 22 20:26:32 2018 +0900
diff --git a/Master/texmf-dist/doc/luatex/luatexja/luatexja-en.pdf b/Master/texmf-dist/doc/luatex/luatexja/luatexja-en.pdf
index 77f7763e705..d6fc5743d98 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 e1696751733..7c289c89e48 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/tex/luatex/luatexja/addons/luatexja-fontspec.sty b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec.sty
index 8a686ea4e6d..a121b55bd4d 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec.sty
+++ b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec.sty
@@ -3,14 +3,12 @@
 %
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{luatexja-fontspec}[2018/07/31 fontspec support of LuaTeX-ja]
+\ProvidesPackage{luatexja-fontspec}[2018/09/01 fontspec support of LuaTeX-ja]
 \RequirePackage{l3keys2e,luatexja}
 \ExplSyntaxOn
 
 \cs_if_exist:NF \Cjascale {
-  %%%%%%%% \g_ltj_fontspec_scale_fp
   %% Default scale value for jfont.
-  \fp_new:N \g_ltj_fontspec_scale_fp
   \group_begin:
   \fontsize{16}{16}\selectfont
   \cs_gset:Npx \Cjascale { \fp_to_decimal:n {\zw / 16} }
diff --git a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-preset.sty b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-preset.sty
index 4e577aad5ea..c3a121b8c26 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-preset.sty
+++ b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-preset.sty
@@ -1,5 +1,5 @@
 % luatexja-preset.sty
-\ProvidesPackage{luatexja-preset}[2018/08/01 Japanese font presets]
+\ProvidesPackage{luatexja-preset}[2018/09/09 Japanese font presets]
 
 \RequirePackage{expl3,l3keys2e}
 \RequirePackage{luatexja}
@@ -102,9 +102,13 @@
   mc .groups:n = { preset }, mc .value_required:n = true,
   gt .code:n =
      \prop_put:Nnn \g_ltjpreset_font_prop { gt-u } {#1}
-     \prop_put:Nnn \g_ltjpreset_font_prop { gt-m } {#1}
+     \prop_put:Nnn \g_ltjpreset_font_prop { gt-d } {#1}
      \prop_put:Nnn \g_ltjpreset_font_prop { gt-bx } {#1}
      \prop_put:Nnn \g_ltjpreset_font_prop { gt-eb } {#1},
+  gt-m .code:n = % gtfamily , medium series
+     \prop_put:Nnn \g_ltjpreset_font_prop { gt-u } {#1}
+     \prop_put:Nnn \g_ltjpreset_font_prop { gt-d } {#1},
+  % gt-d, gt-u は隠し
   gt .groups:n = { preset }, gt .value_required:n = true,
 }
 \cs_set:Nn \g_ltjpreset_tmp_cs:n {
@@ -117,7 +121,7 @@
 \g_ltjpreset_tmp_cs:n { mc-m }
 \g_ltjpreset_tmp_cs:n { mc-bx }
 \g_ltjpreset_tmp_cs:n { gt-u }
-\g_ltjpreset_tmp_cs:n { gt-m }
+\g_ltjpreset_tmp_cs:n { gt-d }
 \g_ltjpreset_tmp_cs:n { gt-bx }
 \g_ltjpreset_tmp_cs:n { gt-eb}
 \g_ltjpreset_tmp_cs:n { mg-m }
@@ -129,7 +133,7 @@
 }
 \cs_new:Npn \ltjpreset_set_office:nn #1 #2{
   mc   = #1,         mc-bx = HGMinchoE ,
-  gt-m = HGGothicM , gt-bx = HGGothicE ,
+  gt-d = HGGothicM , gt-bx = HGGothicE ,
   gt-u = #2 ,        gt-eb = HGSoeiKakugothicUB ,
   mg-m = HGMaruGothicMPRO,
   __custom = false, __office = true, __noembed = false,
@@ -149,7 +153,7 @@
 %% Pro
 \ltjpreset_declare_preset:nx{kozuka-pro}{
     mc-m =  KozMinPro-Regular, mc-bx = KozMinPro-Bold,
-    gt-m =  KozGoPro-Regular,  gt-bx = KozGoPro-Bold,
+    gt-d =  KozGoPro-Regular,  gt-bx = KozGoPro-Bold,
     gt-u =  KozGoPro-Medium,   gt-eb = KozGoPro-Heavy,
     mg-m =  KozGoPro-Heavy,    mc-l =  KozMinPro-Light,
     __custom = false, __office = false, __noembed = false,
@@ -157,7 +161,7 @@
 %% Pr6
 \ltjpreset_declare_preset:nx{kozuka-pr6}{
     mc-m =  KozMinProVI-Regular, mc-bx = KozMinProVI-Bold,
-    gt-m =  KozGoProVI-Regular,  gt-bx = KozGoProVI-Bold,
+    gt-d =  KozGoProVI-Regular,  gt-bx = KozGoProVI-Bold,
     gt-u =  KozGoProVI-Medium,   gt-eb = KozGoProVI-Heavy,
     mg-m =  KozGoProVI-Heavy,    mc-l =  KozMinProVI-Light,
     __custom = false, __office = false, __noembed = false,
@@ -165,7 +169,7 @@
 %% Pr6N
 \ltjpreset_declare_preset:nx{kozuka-pr6n}{
     mc-m =  KozMinPr6N-Regular, mc-bx = KozMinPr6N-Bold,
-    gt-m =  KozGoPr6N-Regular,  gt-bx = KozGoPr6N-Bold,
+    gt-d =  KozGoPr6N-Regular,  gt-bx = KozGoPr6N-Bold,
     gt-u =  KozGoPr6N-Medium,   gt-eb = KozGoPr6N-Heavy,
     mg-m =  KozGoPr6N-Heavy,    mc-l =  KozMinPr6N-Light,
     __custom = false, __office = false, __noembed = false,
@@ -174,14 +178,14 @@
 % ヒラギノ (OSX)
 \ltjpreset_declare_preset:nx{hiragino-pro}{
     mc-m = HiraMinPro-W3,  mc-bx = HiraMinPro-W6,
-    gt-m = HiraKakuPro-W3, gt-bx = HiraKakuPro-W6,
+    gt-d = HiraKakuPro-W3, gt-bx = HiraKakuPro-W6,
     gt-u = HiraKakuPro-W6, gt-eb = HiraKakuStd-W8,
     mg-m = HiraMaruPro-W4, mc-l =  HiraMinPro-W2,
     __custom = false, __office = false, __noembed = false,
 }
 \ltjpreset_declare_preset:nx{hiragino-pron}{
     mc-m = HiraMinProN-W3,  mc-bx = HiraMinProN-W6,
-    gt-m = HiraKakuProN-W3, gt-bx = HiraKakuProN-W6,
+    gt-d = HiraKakuProN-W3, gt-bx = HiraKakuProN-W6,
     gt-u = HiraKakuProN-W6, gt-eb = HiraKakuStdN-W8,
     mg-m = HiraMaruProN-W4, mc-l =  HiraMinProN-W2,
     __custom = false, __office = false, __noembed = false,
@@ -190,14 +194,14 @@
 % モリサワ
 \ltjpreset_declare_preset:nx{morisawa-pro}{
     mc =   A-OTF-RyuminPro-Light.otf,      mc-bx = A-OTF-FutoMinA101Pro-Bold.otf,
-    gt-m = A-OTF-GothicBBBPro-Medium.otf , gt-bx = A-OTF-FutoGoB101Pro-Bold.otf,
+    gt-d = A-OTF-GothicBBBPro-Medium.otf , gt-bx = A-OTF-FutoGoB101Pro-Bold.otf,
     gt-u = A-OTF-GothicBBBPro-Medium.otf , gt-eb = A-OTF-MidashiGoPro-MB31.otf,
     mg-m = A-OTF-Jun101Pro-Light.otf,
     __custom = false, __office = false, __noembed = false,
 }
 \ltjpreset_declare_preset:nx{morisawa-pr6n}{
     mc =   A-OTF-RyuminPr6N-Light.otf,      mc-bx = A-OTF-FutoMinA101Pr6N-Bold.otf,
-    gt-m = A-OTF-GothicBBBPr6N-Medium.otf , gt-bx = A-OTF-FutoGoB101Pr6N-Bold.otf,
+    gt-d = A-OTF-GothicBBBPr6N-Medium.otf , gt-bx = A-OTF-FutoGoB101Pr6N-Bold.otf,
     gt-u = A-OTF-GothicBBBPr6N-Medium.otf , gt-eb = A-OTF-MidashiGoPr6N-MB31.otf,
     mg-m = A-OTF-Jun101Pr6N-Light.otf,
     __custom = false, __office = false, __noembed = false,
@@ -206,7 +210,7 @@
 % 游明朝/游ゴシック (Win8.1)
 \ltjpreset_declare_preset:nx{yu-win}{
     mc-m = YuMincho-Regular, mc-bx = YuMincho-Demibold,
-    gt-m = YuGothic-Regular, gt-bx = YuGothic-Bold,
+    gt-d = YuGothic-Regular, gt-bx = YuGothic-Bold,
     gt-u = YuGothic-Regular, gt-eb = YuGothic-Bold,
     mg-m = YuGothic-Bold,    mc-l =  YuMincho-Light,
     __custom = false, __office = false, __noembed = false,
@@ -214,7 +218,7 @@
 % Win10
 \ltjpreset_declare_preset:nx{yu-win10}{
     mc-m = YuMincho-Regular, mc-bx = YuMincho-Demibold,
-    gt-m = YuGothic-Regular, gt-bx = YuGothic-Bold,
+    gt-d = YuGothic-Regular, gt-bx = YuGothic-Bold,
     gt-u = YuGothic-Medium,  gt-eb = YuGothic-Bold,
     mg-m = YuGothic-Bold,    mc-l =  YuMincho-Light,
     __custom = false, __office = false, __noembed = false,
@@ -224,7 +228,7 @@
 % according to http://support.apple.com/kb/HT5944
 \ltjpreset_declare_preset:nx{yu-osx}{
     mc =  YuMincho~Medium, mc-bx = YuMincho~Demibold,
-    gt-m =  YuGothic~Medium, gt-u =  YuGothic~Medium,
+    gt-d =  YuGothic~Medium, gt-u =  YuGothic~Medium,
     gt-bx = YuGothic~Bold,   gt-eb = YuGothic~Bold,
     mg-m =  YuGothic~Bold,
     __custom = false, __office = false, __noembed = false,
@@ -233,14 +237,14 @@
 % moga-mobo
 \ltjpreset_declare_preset:nx{moga-mobo}{
     mc =   Moga90Mincho, mc-bx = Moga90Mincho~Bold,
-    gt-m = Moga90Gothic, gt-bx = Moga90Gothic~Bold,
+    gt-d = Moga90Gothic, gt-bx = Moga90Gothic~Bold,
     gt-u = Moga90Gothic, gt-eb = Moga90Gothic~Bold,
     mg-m = Mobo90Gothic,
     __custom = false, __office = false, __noembed = false,
 }
 \ltjpreset_declare_preset:nx{moga-mobo-ex}{
     mc =   MogaEx90Mincho, mc-bx = MogaEx90Mincho~Bold,
-    gt-m = MogaEx90Gothic, gt-bx = MogaEx90Gothic~Bold,
+    gt-d = MogaEx90Gothic, gt-bx = MogaEx90Gothic~Bold,
     gt-u = MogaEx90Gothic, gt-eb = MogaEx90Gothic~Bold,
     mg-m = MoboEx90Gothic,
     __custom = false, __office = false, __noembed = false,
@@ -249,7 +253,7 @@
 % Ume fones
 \ltjpreset_declare_preset:nx{ume}{
     mc = Ume~Mincho,
-    gt-m = Ume~Gothic,    gt-bx = Ume~Gothic~O5,
+    gt-d = Ume~Gothic,    gt-bx = Ume~Gothic~O5,
     gt-u = Ume~Gothic~O5, gt-eb = Ume~Gothic~O5,
     mg-m = Ume~Gothic~O4,
     __custom = false, __office = false, __noembed = false,
@@ -259,7 +263,7 @@
 \ltjpreset_declare_preset:nx{sourcehan}{
     mc-m =  Source~Han~Serif~Regular,
     mc-bx = Source~Han~Serif~Bold,
-    gt-m =  Source~Han~Sans~Regular,
+    gt-d =  Source~Han~Sans~Regular,
     gt-bx = Source~Han~Sans~Bold,
     gt-u =  Source~Han~Sans~Medium,
     gt-eb = Source~Han~Sans~Heavy,
@@ -270,7 +274,7 @@
 \ltjpreset_declare_preset:nx{sourcehan-jp}{
     mc-m =  Source~Han~Serif~JP~Regular,
     mc-bx = Source~Han~Serif~JP~Bold,
-    gt-m =  Source~Han~Sans~JP~Regular,
+    gt-d =  Source~Han~Sans~JP~Regular,
     gt-bx = Source~Han~Sans~JP~Bold,
     gt-u =  Source~Han~Sans~JP~Medium,
     gt-eb = Source~Han~Sans~JP~Heavy,
@@ -281,7 +285,7 @@
 \ltjpreset_declare_preset:nx{noto-otc}{
     mc-m =  Noto~Serif~CJK~Regular,
     mc-bx = Noto~Serif~CJK~Bold,
-    gt-m =  Noto~Sans~CJK~Regular,
+    gt-d =  Noto~Sans~CJK~Regular,
     gt-bx = Noto~Sans~CJK~Bold,
     gt-u =  Noto~Sans~CJK~Medium,
     gt-eb = Noto~Sans~CJK~Black,
@@ -292,7 +296,7 @@
 \ltjpreset_declare_preset:nx{noto-otf}{
     mc-m =  Noto~Serif~CJK~JP~Regular,
     mc-bx = Noto~Serif~CJK~JP~Bold,
-    gt-m =  Noto~Sans~CJK~JP~Regular,
+    gt-d =  Noto~Sans~CJK~JP~Regular,
     gt-bx = Noto~Sans~CJK~JP~Bold,
     gt-u =  Noto~Sans~CJK~JP~Medium,
     gt-eb = Noto~Sans~CJK~JP~Black,
@@ -369,7 +373,7 @@
   \cs_set:Nx \ltjpreset_font_mc_l:  { \prop_item:Nn \g_ltjpreset_font_prop { mc-l } }
   \cs_set:Nx \ltjpreset_font_mc_m:  { \prop_item:Nn \g_ltjpreset_font_prop { mc-m } }
   \cs_set:Nx \ltjpreset_font_mc_bx: { \prop_item:Nn \g_ltjpreset_font_prop { mc-bx } }
-  \cs_set:Nx \ltjpreset_font_gt_m:  { \prop_item:Nn \g_ltjpreset_font_prop { gt-m } }
+  \cs_set:Nx \ltjpreset_font_gt_m:  { \prop_item:Nn \g_ltjpreset_font_prop { gt-d } }
   \cs_set:Nx \ltjpreset_font_gt_u:  { \prop_item:Nn \g_ltjpreset_font_prop { gt-u } }
   \cs_set:Nx \ltjpreset_font_gt_bx: { \prop_item:Nn \g_ltjpreset_font_prop { gt-bx } }
   \cs_set:Nx \ltjpreset_font_gt_eb: { \prop_item:Nn \g_ltjpreset_font_prop { gt-eb } }
@@ -446,6 +450,13 @@
 \bool_if:NTF \g_ltjpreset_nfssonly_bool {
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%%%%%%% nfss only
+  \cs_if_exist:NF \Cjascale {
+    \group_begin:
+    \fontsize{16}{16}\selectfont
+    \cs_gset:Npx \Cjascale { \fp_to_decimal:n {\zw / 16} }
+    \group_end:
+  }
+
   \msg_warning:nnx { luatexja-preset }{ scale }{ \Cjascale }
 
   \cs_new:Nn \ltj_preset_declare_font_shape:nnnnnn {
@@ -481,6 +492,7 @@
 
   \bool_if:NT \g_ltjpreset_deluxe_bool {
     \DeclareKanjiFamily{JY3}{ltjpmg}{}\DeclareKanjiFamily{JT3}{ltjpmg}{}
+    \let\mgfamily\undefined
     \DeclareRobustCommand\mgfamily {
       \not@math@alphabet\mgfamily\relax\kanjifamily{ltjpmg}\selectfont
     }
@@ -548,9 +560,15 @@
     ] { \ltjpreset_font_gt_m: }
     \bool_if:NT \g_ltjpreset_deluxe_bool {
       %% mg
-      \newjfontfamily \mgfamily [
-        BoldFont = \ltjpreset_font_mg_m: \tl_use:N \l_ltjpreset_add_features_tl
-      ] { \ltjpreset_font_mg_m: }
+	  \bool_if_exist:NTF \setfontfamily {
+        \setjfontfamily \mgfamily [
+          BoldFont = \ltjpreset_font_mg_m: \tl_use:N \l_ltjpreset_add_features_tl
+        ] { \ltjpreset_font_mg_m: }
+	  } {
+        \newjfontfamily \mgfamily [
+          BoldFont = \ltjpreset_font_mg_m: \tl_use:N \l_ltjpreset_add_features_tl
+        ] { \ltjpreset_font_mg_m: }
+      }
       \DeclareTextFontCommand{\textmg}{\mgfamily}
     }
   }
diff --git a/Master/texmf-dist/tex/luatex/luatexja/lltjext.sty b/Master/texmf-dist/tex/luatex/luatexja/lltjext.sty
index 13f2d62456e..49151f5517d 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/lltjext.sty
+++ b/Master/texmf-dist/tex/luatex/luatexja/lltjext.sty
@@ -3,12 +3,9 @@
 %
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{lltjext}[2018/03/29 v1.2g-ltj-9 Macros for vertical writing]
+\ProvidesPackage{lltjext}[2018/09/22 v1.2j-ltj-9 Macros for vertical writing]
 \RequirePackage{luatexja}
 \newcount\ltj@ext@dir
-{\catcode`\*=11
-\global\let\ltj@lltjext@orig@tabularS=\tabular*
-}%
 \let\ltj@lltjext@orig@tabular=\tabular
 \let\ltj@lltjext@orig@array=\array
 
@@ -19,12 +16,15 @@
  \ltj@ext@dir=\ltjgetparameter{direction}\relax\X@tabarray}
 \def\tabular{\let\@halignto\@empty\X@tabular}
 \@namedef{tabular*}{\@ifnextchar<%>
-   {\@stabular}{\@stabular<Z>}}
+   {\p@stabular}{\p@stabular<Z>}}
+{\catcode`\*=11
+\global\let\ltj@lltjext@orig@tabularS=\tabular*
+}%
 \def\X@tabarray{\@ifnextchar<%>
    {\p@tabarray}{\p@tabarray<Z>}}
 \def\X@tabular{\@ifnextchar<%>
    {\p@tabular}{\p@tabular<Z>}}
-\def\@stabular<#1>#2{%
+\def\p@stabular<#1>#2{%
    \setlength\dimen@{#2}%
    \edef\@halignto{to\the\dimen@}\p@tabular<#1>}
 \def\p@tabular<#1>{\leavevmode \hbox \bgroup 
@@ -60,19 +60,22 @@
        \else \let\box@dir\utod\@tempcnta=\zstrutbox% utod
     \fi
   \fi
+  \fork@array@option<#1>[#2]\@begin@alignbox
+  \bgroup\box@dir\adjustbaseline
   \setbox\@arstrutbox\hbox{%
     \box@dir
     \vrule\@height\arraystretch\ltjgetht\@tempcnta
           \@depth\arraystretch\ltjgetdp\@tempcnta \@width\z@}%
-  \fork@array@option<#1>[#2]%
   \@mkpream{#3}\edef\@preamble{\ialign \noexpand\@halignto
   \bgroup\@arstrut \@preamble \tabskip\z@skip \cr}%
   \let\@startpbox\@@startpbox \let\@endpbox\@@endpbox
   \let\tabularnewline\\%
-  \@begin@alignbox\bgroup\box@dir\adjustbaseline
     \let\par\@empty
-    \let\@sharp##\let\protect\relax
-    \lineskip\z@skip\baselineskip\z@skip\@preamble}
+    \let\@sharp##%
+	\set@typeset@protect
+    \lineskip\z@skip\baselineskip\z@skip
+    \ifhmode \@preamerr\z@ \@@par\fi
+	\@preamble}
 \def\endarray{\crcr\egroup\egroup\@end@alignbox}
 \def\endtabular{\endarray$\egroup}
 \expandafter \let \csname endtabular*\endcsname = \endtabular
@@ -193,11 +196,11 @@
     }\hrule width\floatwidth height\floatruletick depth\z@}}
 \def\DeclareLayoutCaption#1<#2>(#3)[#4#5]{%
   \expandafter
-  \ifx\csname #1@layoutcaption\endcsname\relax \else
+  \ifx\csname #1@layoutc@ption\endcsname\relax \else
     \@latex@info{Redeclaring capiton layout setting of '#1'}%
   \fi
   \expandafter
-  \gdef\csname #1@layoutcaption\endcsname{%
+  \gdef\csname #1@layoutc@ption\endcsname{%
      \if Z\caption@dir\def\caption@dir{#2}\fi
      \ifdim\captionwidth=\z@ \captionwidth=#3\relax\fi
      \if Z\caption@posa\def\caption@posa{#4}\fi
@@ -217,12 +220,21 @@
   \@ifnextchar[{\@iilayoutcaption}{\relax}}
 \def\@iilayoutcaption[#1#2]{%
   \def\caption@posa{#1}\def\caption@posb{#2}}
-\def\pcaption{\refstepcounter\@captype \@dblarg{\@pcaption\@captype}}
+\def\pcaption{%
+  \ifx\@captype\@undefined
+    \@latex@error{\noexpand\pcaption outside float}\@ehd
+    \expandafter\@gobble
+  \else
+    \refstepcounter\@captype
+    \expandafter\@firstofone
+  \fi
+  {\@dblarg{\@pcaption\@captype}}%
+}
 \long\def\@pcaption#1[#2]#3{%
   \addcontentsline{\csname ext@#1\endcsname}{#1}{%
     \protect\numberline{\csname the#1\endcsname}{\ignorespaces#2}}%
   \ifvoid\@floatbox
-     \latex@error{Use with `\protect\layoutfloat'.}\@eha
+     \@latex@error{Use \noexpand\pcaption with `\protect\layoutfloat'}\@eha
   \fi
   \make@pcaptionbox{#3}%
   \@pboxswfalse
@@ -230,22 +242,23 @@
     \if l\caption@posb\box\@captionbox\kern\captionfloatsep\fi
     \if t\caption@posa\vtop
     \else\if b\caption@posa\vbox
-    \else\ifmmode\vcenter \else\@pboxswtrue $\vcenter \fi\fi\fi
+    \else\@pboxswtrue $\vcenter \fi\fi
     {\if u\caption@posb\box\@captionbox\kern\captionfloatsep\fi
      \unvbox\@floatbox
      \if d\caption@posb\kern\captionfloatsep\box\@captionbox\fi}%
+    \if@pboxsw \m@th$\fi
     \if r\caption@posb\kern\captionfloatsep\box\@captionbox\fi
-    \if@pboxsw \m@th$\fi \if r\float@pos\else\hss\fi}}%
+    \if r\float@pos\else\hss\fi}}%
   \par\vskip.25\baselineskip
   \box\@tempboxa}
 \def\make@pcaptionbox#1{%
   \expandafter
-  \ifx\csname\@captype @layoutcaption\endcsname\relax
+  \ifx\csname\@captype @layoutc@ption\endcsname\relax
      \@latex@warning{Default caption layout of `\@captype' unknown.}%
        \def\caption@dir{Z}\captionwidth\z@
        \def\caption@posa{Z}\def\caption@posb{Z}%
   \else
-     \csname \@captype @layoutcaption\endcsname
+     \csname \@captype @layoutc@ption\endcsname
   \fi
   \@tempswafalse
   % \@tempswa: 基本組の組方向とキャプションの組方向が直交するか？
@@ -652,9 +665,11 @@
 
 \def\ltj@lltjext@patch@array{%
   \patchcmd{\@tabular}{\hbox\bgroup}{%
-	\hbox\bgroup\ltj@ext@dir=\ltjgetparameter{direction}}{\typeout{SUCC}}{}
+	\hbox\bgroup\ltj@ext@dir=\ltjgetparameter{direction}}{}{}
   \pretocmd{\array}%
 	{\ltj@ext@dir=\ltjgetparameter{direction}\relax}{}{}
+  \expandafter\let\csname tabular*\endcsname=\ltj@lltjext@orig@tabularS
+  \patchcmd{\p@stabular}{\p@tabular}{\@tabular}{}{}
   \def\@startpbox##1{\bgroup
    \box@dir\adjustbaseline%%% これを追加
    \setlength\hsize{##1}\@arrayparboxrestore
@@ -710,12 +725,10 @@
 }
 
 \@ifpackageloaded{array}{%
-  \expandafter\let\csname tabular*\endcsname=\ltj@lltjext@orig@tabularS
   \let\tabular=\ltj@lltjext@orig@tabular
   \let\array=\ltj@lltjext@orig@array
   \ltj@lltjext@patch@array
 }{%
-  \let\ltj@lltjext@orig@tabularS\relax
   \let\ltj@lltjext@orig@tabular\relax
   \let\ltj@lltjext@orig@array\relax
   \RequirePackage{filehook,etoolbox}
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltj-adjust.lua b/Master/texmf-dist/tex/luatex/luatexja/ltj-adjust.lua
index d9bd77a3ea8..382e7602a71 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltj-adjust.lua
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltj-adjust.lua
@@ -453,7 +453,7 @@ do
   function ltjl.p_profile(before, after, mirrored, bw)
     local t = {}
     do
-      local w_acc, d_before = 0, 0
+      local w_acc, d_before = getfield(before,'shift'), 0
       local x = getlist(before); local xn = node_next(x)
       while x do
         local w, d
@@ -469,7 +469,7 @@ do
       end
     end
     do
-      local w_acc, h_before = 0, 0
+      local w_acc, h_before = getfield(after,'shift'), 0
       local x = getlist(after); local xn = node_next(x)
       while x do
         local w, h, d
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltj-jfmglue.lua b/Master/texmf-dist/tex/luatex/luatexja/ltj-jfmglue.lua
index 9c051701557..70250485083 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltj-jfmglue.lua
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltj-jfmglue.lua
@@ -272,7 +272,8 @@ do
 local traverse = node.direct.traverse
 local function check_next_ickern(lp)
    local lx = Np.nuc
-   while lp and getid(lp) == id_kern and ( getsubtype(lp)==3 or ITALIC == get_attr_icflag(lp)) do
+   while lp and getid(lp) == id_kern and ( getsubtype(lp)==0 or 
+     getsubtype(lp)==3 or ITALIC == get_attr_icflag(lp)) do
      set_attr(lp, attr_icflag, IC_PROCESSED);
      lx, lp = lp, node_next(lp)
    end
@@ -1343,4 +1344,4 @@ do
 end
 
 luatexja.jfmglue.after_hlist = after_hlist
-luatexja.jfmglue.check_box_high = check_box_high
\ No newline at end of file
+luatexja.jfmglue.check_box_high = check_box_high
diff --git a/Master/texmf-dist/tex/luatex/luatexja/luatexja.sty b/Master/texmf-dist/tex/luatex/luatexja/luatexja.sty
index acaa035fd59..5398a0f8d8a 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/luatexja.sty
+++ b/Master/texmf-dist/tex/luatex/luatexja/luatexja.sty
@@ -34,10 +34,10 @@
   \expandafter\let\csname ifltj@in@latex\expandafter\endcsname
     \csname iftrue\endcsname
   \NeedsTeXFormat{LaTeX2e}
-  \ProvidesPackage{luatexja}[2018/08/25 Japanese Typesetting with Lua(La)TeX]
+  \ProvidesPackage{luatexja}[2018/09/22 Japanese Typesetting with Lua(La)TeX]
 \fi                             %</LaTeX>
 %%%% VERSION
-\def\LuaTeXjaversion{20180825.0}
+\def\LuaTeXjaversion{20180922.0}
 
 \directlua{require('ltj-unicode-ccfix.lua')}% catcode of ideographs
 
diff --git a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjdefs.sty b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjdefs.sty
index 0c4cfb5f7e6..09c54eaf94e 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjdefs.sty
+++ b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjdefs.sty
@@ -3,10 +3,10 @@
 %
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{lltjdefs}[2018/06/15 Default font settings of LuaTeX-ja]
+\ProvidesPackage{lltjdefs}[2018/09/05 Default font settings of LuaTeX-ja]
 
-\def\ltj@stdmcfont{IPAExMincho}
-\def\ltj@stdgtfont{IPAExGothic}
+\ifdefined\ltj@stdmcfont\else\def\ltj@stdmcfont{IPAExMincho}\fi
+\ifdefined\ltj@stdgtfont\else\def\ltj@stdgtfont{IPAExGothic}\fi
 \InputIfFileExists{luatexja.cfg}{%
   \typeout{*************************^^J%
            * Loading luatexja.cfg.^^J%
diff --git a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-listings.sty b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-listings.sty
index abcf05b9e79..3f7c2208d1b 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-listings.sty
+++ b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-listings.sty
@@ -1,5 +1,5 @@
 %
-% lltjp-listings.sty 2018-08-25
+% lltjp-listings.sty 2018-09-17
 %
 
 \NeedsTeXFormat{LaTeX2e}
@@ -367,11 +367,13 @@
          #3\catcode\ltjlineendcomment=9\lst@escapebegin\expandafter\lst@next%"
          \fi}%
         {}}
+\def\ltj@lst@emptygrp{{}}
 \def\ltj@lst@escape@setup#1{%
   \begingroup\lccode`\~=`#1\lowercase{%
   \gdef\lst@next##1~{%
      \let\lst@arg\@empty\ltj@lst@remove@jacmd{##1}%
-     \expandafter\expandafter\expandafter\scantokens\expandafter{\lst@arg}%
+     \expandafter\expandafter\expandafter\expandafter\expandafter\expandafter\expandafter
+	   \scantokens\expandafter\expandafter\expandafter{\expandafter\ltj@lst@emptygrp\lst@arg\empty}%
      ~}%
   }\endgroup
 }