Merge branch 'master' into kitagawa_test

diff --git a/src/addons/luatexja-fontspec-25c.sty b/src/addons/luatexja-fontspec-25c.sty
index 9c67b70..1e227b4 100644 (file)
--- a/src/addons/luatexja-fontspec-25c.sty
+++ b/src/addons/luatexja-fontspec-25c.sty
@@ -104,7 +104,7 @@
     \__fontspec_update_featstr:n {cid=##1}
   }
   \ltj_fontspec_define_option:nn {Kanjiskip} {
-    \str_if_eq_x:nnTF {false} { \str_lower_case:n { ##1 } }{
+    \str_if_eq:eeTF {false} { \str_lower_case:n { ##1 } }{
       \__fontspec_update_featstr:n {-ltjksp}
     } {
       \__fontspec_update_featstr:n {+ltjksp}

diff --git a/src/addons/luatexja-fontspec-26h.sty b/src/addons/luatexja-fontspec-26h.sty
index 1472633..a84fb72 100644 (file)
--- a/src/addons/luatexja-fontspec-26h.sty
+++ b/src/addons/luatexja-fontspec-26h.sty
@@ -131,7 +131,7 @@
     \__fontspec_update_featstr:n {cid=##1}
   }
   \__ltj_fontspec_define_option:nn {Kanjiskip} {
-    \str_if_eq_x:nnTF {false} { \str_lower_case:n { ##1 } }{
+    \str_if_eq:eeTF {false} { \str_lower_case:n { ##1 } }{
       \__fontspec_update_featstr:n {-ltjksp}
     } {
       \__fontspec_update_featstr:n {+ltjksp}

diff --git a/src/addons/luatexja-fontspec-27c.sty b/src/addons/luatexja-fontspec-27c.sty
index 88d6b37..d872da8 100644 (file)
--- a/src/addons/luatexja-fontspec-27c.sty
+++ b/src/addons/luatexja-fontspec-27c.sty
@@ -131,7 +131,7 @@
     \__fontspec_update_featstr:n {cid=##1}
   }
   \__ltj_fontspec_define_option:nn {Kanjiskip} {
-    \str_if_eq_x:nnTF {false} { \str_lower_case:n { ##1 } }{
+    \str_if_eq:eeTF {false} { \str_lower_case:n { ##1 } }{
       \__fontspec_update_featstr:n {-ltjksp}
     } {
       \__fontspec_update_featstr:n {+ltjksp}

diff --git a/src/ltj-base.lua b/src/ltj-base.lua
index a069215..3f4a0ba 100644 (file)
--- a/src/ltj-base.lua
+++ b/src/ltj-base.lua
@@ -185,7 +185,7 @@ end
 -- not used in current LuaTeX-ja
 do
 --! ixbase.counter と同じ
-  counter = {}
+  local counter = {}
   local mt_counter = {}
   setmetatable(counter, mt_counter)
 
@@ -373,10 +373,10 @@ function ltjb.add_to_callback(name,fun,description,priority)
        "resetting exclusive callback: " .. name)
        luatexbase.reset_callback(name)
     end
-    local saved_callback={},ff,dd
+    local saved_callback={}
     for k,v in ipairs(luatexbase.callback_descriptions(name)) do
        if k >= priority then
-           ff,dd= luatexbase.remove_from_callback(name, v)
+           local ff,dd = luatexbase.remove_from_callback(name, v)
            saved_callback[#saved_callback+1]={ff,dd}
        end
     end

diff --git a/src/ltj-lotf_aux.lua b/src/ltj-lotf_aux.lua
index 613291f..04cae9d 100644 (file)
--- a/src/ltj-lotf_aux.lua
+++ b/src/ltj-lotf_aux.lua
@@ -10,10 +10,6 @@ luatexja.lotf_aux = aux
 local font_metric_table = {}
 aux.font_metric_table = font_metric_table
 
-local function is_harf(t)
-  return luaharfbuzz and package.loaded['harf'] and require("harf-base")
-end
-
 local getfont = font.getfont
 local provides_feature = luaotfload.aux.provides_feature
 function aux.exist_feature(id, name)
@@ -28,15 +24,15 @@ function aux.enable_feature(id, name)
   local t = getfont(id)
   if t and t.shared and t.shared.features then
     t.shared.features[name] = true
-  elseif t and is_harf(t) then -- HARFLOAD
-    local hb, tf = require("harf-base"), t.hb.spec.features
+  elseif t and t.hb then -- HARF
+    local hb, tf = luaotfload.harfbuzz, t.hb.spec.hb_features
     tf[#tf+1] = hb.Feature.new(name)
   end
 end
 function aux.specified_feature(id, name)
   local t = getfont(id)
   return t and (t.shared and t.shared.features and t.shared.features[name])
-         or (t.hb and t.hb.spec and t.hb.spec.options and t.hb.spec.options[name]) -- HARFLOAD
+         or (t.hb and t.hb.spec and t.hb.spec.features.raw and t.hb.spec.features.raw[name]) -- HARF
 end
 
 
@@ -53,14 +49,18 @@ end
 local function get_asc_des(id)
   local t, v = getfont(id), font_metric_table[id]
   local a, d
-  if t and t.shared then
+  if t and t.shared and t.shared.rawdata then
     local u = t.units
     local t2 = t.shared.rawdata.metadata
     if t2 then
       a, d = t2.ascender and t2.ascender/u, t2.descender and -t2.descender/u
     end
-  -- HARFLOAD h_extents() returns "too large" value...?
-  -- rawdata.metadata.horizontalmetrics is same
+  elseif t.hb then -- HARF
+    local hbfont, u = t.hb.shared.font, t.hb.shared.upem
+    local h = hbfont:get_h_extents()
+    if h and u then 
+       a, d = h.ascender and h.ascender/u, h.descender and -h.descender/u
+    end
   end
   v.ascender, v.descender =  (a or 0.88)*t.size, (d or 0.12)*t.size
 end
@@ -80,9 +80,10 @@ local dummy_vht, dummy_vorg = {}, {}
 setmetatable(dummy_vht, {__index = function () return 1 end } )
 setmetatable(dummy_vorg, {__index = function () return 0.88 end } )
 local function get_vmet_table(tfmdata, dest)
-   if (not tfmdata) or (not tfmdata.shared) then
+   if (not tfmdata) or (not tfmdata.shared) or (not tfmdata.shared.rawdata) then
      dest = dest or {}
      dest.vorigin, dest.vheight = dummy_vorg, dummy_vht
+     dest.ind_to_uni = {}
      return dest
    end
    local rawdata = tfmdata.shared.rawdata
@@ -115,7 +116,7 @@ end
 local function loop_over_duplicates(id, func)
 -- func: return non-nil iff abort this fn
   local t = (type(id)=="table") and id or getfont(id)
-  if t and t.resources and t.resources.duplicates then
+  if t and t.resources and t.resources.duplicates then -- HARF: not executed
     for i,v in pairs(t.resources.duplicates) do
       func(i,v)
     end
@@ -128,7 +129,7 @@ local function loop_over_feat(id, feature_name, func, universal)
 -- func: return non-nil iff abort this fn
 -- universal: true iff look up all (script, lang) pair
   local t = (type(id)=="table") and id or getfont(id)
-  if t and t.resources and t.resources.sequences then
+  if t and t.resources and t.resources.sequences then -- HARF: not executed
     for _,i in pairs(t.resources.sequences) do
       if i.order[1] and feature_name[i.order[1]] then
         local f = i.features and i.features[i.order[1]]

diff --git a/src/ltj-rmlgbm.lua b/src/ltj-rmlgbm.lua
index 7fc5eb1..bd3110f 100644 (file)
--- a/src/ltj-rmlgbm.lua
+++ b/src/ltj-rmlgbm.lua
@@ -210,7 +210,9 @@ do
       end
 
       -- Save
-      k.characters[46].width = math.floor(655360/14);
+      if k and k.characters and k.characters[46] then
+        k.characters[46].width = math.floor(655360/14);
+      end
       ltjb.save_cache( "ltj-cid-auto-" .. string.lower(cid_name),
                       {
                          version = cache_ver,

diff --git a/src/ltjarticle.cls b/src/ltjarticle.cls
index 98945f4..5315ef9 100644 (file)
--- a/src/ltjarticle.cls
+++ b/src/ltjarticle.cls
@@ -21,10 +21,9 @@
 %% same distribution. (The sources need not necessarily be
 %% in the same archive or directory.)
 %% File: ltjclasses.dtx
-
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesClass{ltjarticle}
-  [2019/08/12 v1.8b-ltj-17
+  [2019/10/17 v1.8c-ltj-17
  Standard LuaLaTeX-ja class]
 \RequirePackage{luatexja}
 \newcounter{@paper}

diff --git a/src/ltjbk10.clo b/src/ltjbk10.clo
index ab67293..615066a 100644 (file)
--- a/src/ltjbk10.clo
+++ b/src/ltjbk10.clo
@@ -21,10 +21,9 @@
 %% same distribution. (The sources need not necessarily be
 %% in the same archive or directory.)
 %% File: ltjclasses.dtx
-
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{ltjbk10.clo}
-  [2019/08/12 v1.8b-ltj-17
+  [2019/10/17 v1.8c-ltj-17
   Standard LuaLaTeX-ja file (size option)]
 \renewcommand{\normalsize}{%
     \@setfontsize\normalsize\@xpt{15}%
@@ -34,6 +33,7 @@
    \belowdisplayskip \abovedisplayskip
    \let\@listi\@listI}
 \normalsize
+\MakeRobust\normalsize
 \setbox0\hbox{漢}
 \setlength\Cht{\ht0}
 \setlength\Cdp{\dp0}
@@ -41,7 +41,7 @@
 \setlength\Cvs{\baselineskip}
 \setlength\Chs{\wd0}
 \setbox0=\box\voidb@x
-\newcommand{\small}{%
+\DeclareRobustCommand{\small}{%
   \@setfontsize\small\@ixpt{11}%
   \abovedisplayskip 8.5\p@ \@plus3\p@ \@minus4\p@
   \abovedisplayshortskip \z@ \@plus2\p@
@@ -51,7 +51,7 @@
               \parsep 2\p@ \@plus\p@ \@minus\p@
               \itemsep \parsep}%
   \belowdisplayskip \abovedisplayskip}
-\newcommand{\footnotesize}{%
+\DeclareRobustCommand{\footnotesize}{%
   \@setfontsize\footnotesize\@viiipt{9.5}%
   \abovedisplayskip 6\p@ \@plus2\p@ \@minus4\p@
   \abovedisplayshortskip \z@ \@plus\p@
@@ -61,13 +61,13 @@
               \parsep 2\p@ \@plus\p@ \@minus\p@
               \itemsep \parsep}%
   \belowdisplayskip \abovedisplayskip}
-\newcommand{\scriptsize}{\@setfontsize\scriptsize\@viipt\@viiipt}
-\newcommand{\tiny}{\@setfontsize\tiny\@vpt\@vipt}
-\newcommand{\large}{\@setfontsize\large\@xiipt{17}}
-\newcommand{\Large}{\@setfontsize\Large\@xivpt{21}}
-\newcommand{\LARGE}{\@setfontsize\LARGE\@xviipt{25}}
-\newcommand{\huge}{\@setfontsize\huge\@xxpt{28}}
-\newcommand{\Huge}{\@setfontsize\Huge\@xxvpt{33}}
+\DeclareRobustCommand{\scriptsize}{\@setfontsize\scriptsize\@viipt\@viiipt}
+\DeclareRobustCommand{\tiny}{\@setfontsize\tiny\@vpt\@vipt}
+\DeclareRobustCommand{\large}{\@setfontsize\large\@xiipt{17}}
+\DeclareRobustCommand{\Large}{\@setfontsize\Large\@xivpt{21}}
+\DeclareRobustCommand{\LARGE}{\@setfontsize\LARGE\@xviipt{25}}
+\DeclareRobustCommand{\huge}{\@setfontsize\huge\@xxpt{28}}
+\DeclareRobustCommand{\Huge}{\@setfontsize\Huge\@xxvpt{33}}
 \setlength\headheight{12\p@}
 \setlength\headsep{.25in}
 \setlength\topskip{1\Cht}

diff --git a/src/ltjbk11.clo b/src/ltjbk11.clo
index 86ddc44..1735984 100644 (file)
--- a/src/ltjbk11.clo
+++ b/src/ltjbk11.clo
@@ -21,10 +21,9 @@
 %% same distribution. (The sources need not necessarily be
 %% in the same archive or directory.)
 %% File: ltjclasses.dtx
-
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{ltjbk11.clo}
-  [2019/08/12 v1.8b-ltj-17
+  [2019/10/17 v1.8c-ltj-17
   Standard LuaLaTeX-ja file (size option)]
 \renewcommand{\normalsize}{%
     \@setfontsize\normalsize\@xipt{15.5}%
@@ -34,6 +33,7 @@
    \belowdisplayskip \abovedisplayskip
    \let\@listi\@listI}
 \normalsize
+\MakeRobust\normalsize
 \setbox0\hbox{漢}
 \setlength\Cht{\ht0}
 \setlength\Cdp{\dp0}
@@ -41,7 +41,7 @@
 \setlength\Cvs{\baselineskip}
 \setlength\Chs{\wd0}
 \setbox0=\box\voidb@x
-\newcommand{\small}{%
+\DeclareRobustCommand{\small}{%
   \@setfontsize\small\@xpt\@xiipt
   \abovedisplayskip 10\p@ \@plus2\p@ \@minus5\p@
   \abovedisplayshortskip \z@ \@plus3\p@
@@ -51,7 +51,7 @@
               \parsep 3\p@ \@plus2\p@ \@minus\p@
               \itemsep \parsep}%
   \belowdisplayskip \abovedisplayskip}
-\newcommand{\footnotesize}{%
+\DeclareRobustCommand{\footnotesize}{%
   \@setfontsize\footnotesize\@ixpt{11}%
   \abovedisplayskip 8\p@ \@plus2\p@ \@minus4\p@
   \abovedisplayshortskip \z@ \@plus\p@
@@ -61,13 +61,13 @@
               \parsep 2\p@ \@plus\p@ \@minus\p@
               \itemsep \parsep}%
   \belowdisplayskip \abovedisplayskip}
-\newcommand{\scriptsize}{\@setfontsize\scriptsize\@viiipt{9.5}}
-\newcommand{\tiny}{\@setfontsize\tiny\@vipt\@viipt}
-\newcommand{\large}{\@setfontsize\large\@xiipt{17}}
-\newcommand{\Large}{\@setfontsize\Large\@xivpt{21}}
-\newcommand{\LARGE}{\@setfontsize\LARGE\@xviipt{25}}
-\newcommand{\huge}{\@setfontsize\huge\@xxpt{28}}
-\newcommand{\Huge}{\@setfontsize\Huge\@xxvpt{33}}
+\DeclareRobustCommand{\scriptsize}{\@setfontsize\scriptsize\@viiipt{9.5}}
+\DeclareRobustCommand{\tiny}{\@setfontsize\tiny\@vipt\@viipt}
+\DeclareRobustCommand{\large}{\@setfontsize\large\@xiipt{17}}
+\DeclareRobustCommand{\Large}{\@setfontsize\Large\@xivpt{21}}
+\DeclareRobustCommand{\LARGE}{\@setfontsize\LARGE\@xviipt{25}}
+\DeclareRobustCommand{\huge}{\@setfontsize\huge\@xxpt{28}}
+\DeclareRobustCommand{\Huge}{\@setfontsize\Huge\@xxvpt{33}}
 \setlength\headheight{12\p@}
 \setlength\headsep{.275in}
 \setlength\topskip{1\Cht}

diff --git a/src/ltjbk12.clo b/src/ltjbk12.clo
index df2a6c9..2515d98 100644 (file)
--- a/src/ltjbk12.clo
+++ b/src/ltjbk12.clo
@@ -21,10 +21,9 @@
 %% same distribution. (The sources need not necessarily be
 %% in the same archive or directory.)
 %% File: ltjclasses.dtx
-
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{ltjbk12.clo}
-  [2019/08/12 v1.8b-ltj-17
+  [2019/10/17 v1.8c-ltj-17
   Standard LuaLaTeX-ja file (size option)]
 \renewcommand{\normalsize}{%
     \@setfontsize\normalsize\@xiipt{16.5}%
@@ -34,6 +33,7 @@
    \belowdisplayskip \abovedisplayskip
    \let\@listi\@listI}
 \normalsize
+\MakeRobust\normalsize
 \setbox0\hbox{漢}
 \setlength\Cht{\ht0}
 \setlength\Cdp{\dp0}
@@ -41,7 +41,7 @@
 \setlength\Cvs{\baselineskip}
 \setlength\Chs{\wd0}
 \setbox0=\box\voidb@x
-\newcommand{\small}{%
+\DeclareRobustCommand{\small}{%
   \@setfontsize\small\@xipt{13.6}%
   \abovedisplayskip 11\p@ \@plus3\p@ \@minus6\p@
   \abovedisplayshortskip \z@ \@plus3\p@
@@ -51,7 +51,7 @@
               \parsep 4.5\p@ \@plus2\p@ \@minus\p@
               \itemsep \parsep}%
   \belowdisplayskip \abovedisplayskip}
-\newcommand{\footnotesize}{%
+\DeclareRobustCommand{\footnotesize}{%
   \@setfontsize\footnotesize\@xpt\@xiipt
   \abovedisplayskip 10\p@ \@plus2\p@ \@minus5\p@
   \abovedisplayshortskip \z@ \@plus3\p@
@@ -61,12 +61,12 @@
               \parsep 3\p@ \@plus2\p@ \@minus\p@
               \itemsep \parsep}%
   \belowdisplayskip \abovedisplayskip}
-\newcommand{\scriptsize}{\@setfontsize\scriptsize\@viiipt{9.5}}
-\newcommand{\tiny}{\@setfontsize\tiny\@vipt\@viipt}
-\newcommand{\large}{\@setfontsize\large\@xivpt{21}}
-\newcommand{\Large}{\@setfontsize\Large\@xviipt{25}}
-\newcommand{\LARGE}{\@setfontsize\LARGE\@xxpt{28}}
-\newcommand{\huge}{\@setfontsize\huge\@xxvpt{33}}
+\DeclareRobustCommand{\scriptsize}{\@setfontsize\scriptsize\@viiipt{9.5}}
+\DeclareRobustCommand{\tiny}{\@setfontsize\tiny\@vipt\@viipt}
+\DeclareRobustCommand{\large}{\@setfontsize\large\@xivpt{21}}
+\DeclareRobustCommand{\Large}{\@setfontsize\Large\@xviipt{25}}
+\DeclareRobustCommand{\LARGE}{\@setfontsize\LARGE\@xxpt{28}}
+\DeclareRobustCommand{\huge}{\@setfontsize\huge\@xxvpt{33}}
 \let\Huge=\huge
 \setlength\headheight{12\p@}
 \setlength\headsep{.275in}

diff --git a/src/ltjbook.cls b/src/ltjbook.cls
index 280da3a..25248a4 100644 (file)
--- a/src/ltjbook.cls
+++ b/src/ltjbook.cls
@@ -21,10 +21,9 @@
 %% same distribution. (The sources need not necessarily be
 %% in the same archive or directory.)
 %% File: ltjclasses.dtx
-
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesClass{ltjbook}
-  [2019/08/12 v1.8b-ltj-17
+  [2019/10/17 v1.8c-ltj-17
  Standard LuaLaTeX-ja class]
 \RequirePackage{luatexja}
 \newcounter{@paper}

diff --git a/src/ltjclasses.dtx b/src/ltjclasses.dtx
index 3112fd1..590ff59 100644 (file)
--- a/src/ltjclasses.dtx
+++ b/src/ltjclasses.dtx
@@ -121,7 +121,8 @@
 %    (sync with ltsect.dtx 2018/09/26 v1.1c)}
 % \changes{v1.8b}{2019/04/02}{新元号対応}
 % \changes{v1.8b-ltj-17}{2019/08/12}{disablejfamの``Unused global option(s)''警告を出さないようにした}
-
+% \changes{v1.8c}{2019/10/17}{フォントサイズ変更命令をrobustに
+%    (sync with classes.dtx 2019/08/27 v1.4j)}
 % \fi
 %
 % \iffalse
@@ -151,7 +152,7 @@
 %<11pt&bk>\ProvidesFile{ltjtbk11.clo}
 %<12pt&bk>\ProvidesFile{ltjtbk12.clo}
 %</tate>
-  [2019/08/12 v1.8b-ltj-17
+  [2019/10/17 v1.8c-ltj-17
 %<article|report|book> Standard LuaLaTeX-ja class]
 %<10pt|11pt|12pt>  Standard LuaLaTeX-ja file (size option)]
 %<*driver>
@@ -718,6 +719,17 @@
 %<tate>\kanjiencoding{\kanjiencodingdefault}%
 \normalsize
 %    \end{macrocode}
+%
+% |\normalsize|をrobustにします。
+% すぐ上で|\DeclareRobustCommand|とせずに、
+% カーネルの定義を|\renewcommand|した後に|\MakeRobust|を使っている理由は、
+% ログに |LaTeX Info: Redefining \normalsize on input line ...| という
+% メッセージを出したくないからです。
+% \changes{v1.8c}{2019/10/17}{フォントサイズ変更命令をrobustに
+%    (sync with classes.dtx 2019/08/27 v1.4j)}
+%    \begin{macrocode}
+\MakeRobust\normalsize
+%    \end{macrocode}
 % \end{macro}
 % \end{macro}
 %
@@ -748,8 +760,11 @@
 %
 % \begin{macro}{\small}
 % |\small|コマンドの定義は、|\normalsize|に似ています。
+% こちらはカーネルで未定義なので、直接|\DeclareRobustCommand|で定義します。
+% \changes{v1.8c}{2019/10/17}{フォントサイズ変更命令をrobustに
+%    (sync with classes.dtx 2019/08/27 v1.4j)}
 %    \begin{macrocode}
-\newcommand{\small}{%
+\DeclareRobustCommand{\small}{%
 %<*10pt>
   \@setfontsize\small\@ixpt{11}%
   \abovedisplayskip 8.5\p@ \@plus3\p@ \@minus4\p@
@@ -786,8 +801,11 @@
 %
 % \begin{macro}{\footnotesize}
 % |\footnotesize|コマンドの定義は、|\normalsize|に似ています。
+% こちらも直接|\DeclareRobustCommand|で定義します。
+% \changes{v1.8c}{2019/10/17}{フォントサイズ変更命令をrobustに
+%    (sync with classes.dtx 2019/08/27 v1.4j)}
 %    \begin{macrocode}
-\newcommand{\footnotesize}{%
+\DeclareRobustCommand{\footnotesize}{%
 %<*10pt>
   \@setfontsize\footnotesize\@viiipt{9.5}%
   \abovedisplayskip 6\p@ \@plus2\p@ \@minus4\p@
@@ -831,32 +849,34 @@
 % \begin{macro}{\Huge}
 % これらは先ほどのマクロよりも簡単です。これらはフォントサイズを変更する
 % だけで、リスト環境とディスプレイ数式のパラメータは変更しません。
+% \changes{v1.8c}{2019/10/17}{フォントサイズ変更命令をrobustに
+%    (sync with classes.dtx 2019/08/27 v1.4j)}
 %    \begin{macrocode}
 %<*10pt>
-\newcommand{\scriptsize}{\@setfontsize\scriptsize\@viipt\@viiipt}
-\newcommand{\tiny}{\@setfontsize\tiny\@vpt\@vipt}
-\newcommand{\large}{\@setfontsize\large\@xiipt{17}}
-\newcommand{\Large}{\@setfontsize\Large\@xivpt{21}}
-\newcommand{\LARGE}{\@setfontsize\LARGE\@xviipt{25}}
-\newcommand{\huge}{\@setfontsize\huge\@xxpt{28}}
-\newcommand{\Huge}{\@setfontsize\Huge\@xxvpt{33}}
+\DeclareRobustCommand{\scriptsize}{\@setfontsize\scriptsize\@viipt\@viiipt}
+\DeclareRobustCommand{\tiny}{\@setfontsize\tiny\@vpt\@vipt}
+\DeclareRobustCommand{\large}{\@setfontsize\large\@xiipt{17}}
+\DeclareRobustCommand{\Large}{\@setfontsize\Large\@xivpt{21}}
+\DeclareRobustCommand{\LARGE}{\@setfontsize\LARGE\@xviipt{25}}
+\DeclareRobustCommand{\huge}{\@setfontsize\huge\@xxpt{28}}
+\DeclareRobustCommand{\Huge}{\@setfontsize\Huge\@xxvpt{33}}
 %</10pt>
 %<*11pt>
-\newcommand{\scriptsize}{\@setfontsize\scriptsize\@viiipt{9.5}}
-\newcommand{\tiny}{\@setfontsize\tiny\@vipt\@viipt}
-\newcommand{\large}{\@setfontsize\large\@xiipt{17}}
-\newcommand{\Large}{\@setfontsize\Large\@xivpt{21}}
-\newcommand{\LARGE}{\@setfontsize\LARGE\@xviipt{25}}
-\newcommand{\huge}{\@setfontsize\huge\@xxpt{28}}
-\newcommand{\Huge}{\@setfontsize\Huge\@xxvpt{33}}
+\DeclareRobustCommand{\scriptsize}{\@setfontsize\scriptsize\@viiipt{9.5}}
+\DeclareRobustCommand{\tiny}{\@setfontsize\tiny\@vipt\@viipt}
+\DeclareRobustCommand{\large}{\@setfontsize\large\@xiipt{17}}
+\DeclareRobustCommand{\Large}{\@setfontsize\Large\@xivpt{21}}
+\DeclareRobustCommand{\LARGE}{\@setfontsize\LARGE\@xviipt{25}}
+\DeclareRobustCommand{\huge}{\@setfontsize\huge\@xxpt{28}}
+\DeclareRobustCommand{\Huge}{\@setfontsize\Huge\@xxvpt{33}}
 %</11pt>
 %<*12pt>
-\newcommand{\scriptsize}{\@setfontsize\scriptsize\@viiipt{9.5}}
-\newcommand{\tiny}{\@setfontsize\tiny\@vipt\@viipt}
-\newcommand{\large}{\@setfontsize\large\@xivpt{21}}
-\newcommand{\Large}{\@setfontsize\Large\@xviipt{25}}
-\newcommand{\LARGE}{\@setfontsize\LARGE\@xxpt{28}}
-\newcommand{\huge}{\@setfontsize\huge\@xxvpt{33}}
+\DeclareRobustCommand{\scriptsize}{\@setfontsize\scriptsize\@viiipt{9.5}}
+\DeclareRobustCommand{\tiny}{\@setfontsize\tiny\@vipt\@viipt}
+\DeclareRobustCommand{\large}{\@setfontsize\large\@xivpt{21}}
+\DeclareRobustCommand{\Large}{\@setfontsize\Large\@xviipt{25}}
+\DeclareRobustCommand{\LARGE}{\@setfontsize\LARGE\@xxpt{28}}
+\DeclareRobustCommand{\huge}{\@setfontsize\huge\@xxvpt{33}}
 \let\Huge=\huge
 %</12pt>
 %</10pt|11pt|12pt>
@@ -2218,9 +2238,9 @@
 % これらの３つのコマンドは\file{ltsect.dtx}で提供されています。
 % これらのコマンドは次のように定義されています。
 %    \begin{macrocode}
-%\newcommand*{\title}[1]{\gdef\@title{#1}}
-%\newcommand*{\author}[1]{\gdef\@author{#1}}
-%\newcommand*{\date}[1]{\gdef\@date{#1}}
+%\DeclareRobustCommand*{\title}[1]{\gdef\@title{#1}}
+%\DeclareRobustCommand*{\author}[1]{\gdef\@author{#1}}
+%\DeclareRobustCommand*{\date}[1]{\gdef\@date{#1}}
 %    \end{macrocode}
 % |\date|マクロのデフォルトは、今日の日付です。
 %    \begin{macrocode}

diff --git a/src/ltjreport.cls b/src/ltjreport.cls
index 4b46fb5..25aca81 100644 (file)
--- a/src/ltjreport.cls
+++ b/src/ltjreport.cls
@@ -21,10 +21,9 @@
 %% same distribution. (The sources need not necessarily be
 %% in the same archive or directory.)
 %% File: ltjclasses.dtx
-
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesClass{ltjreport}
-  [2019/08/12 v1.8b-ltj-17
+  [2019/10/17 v1.8c-ltj-17
  Standard LuaLaTeX-ja class]
 \RequirePackage{luatexja}
 \newcounter{@paper}

diff --git a/src/ltjsize10.clo b/src/ltjsize10.clo
index 601be87..dabde72 100644 (file)
--- a/src/ltjsize10.clo
+++ b/src/ltjsize10.clo
@@ -21,10 +21,9 @@
 %% same distribution. (The sources need not necessarily be
 %% in the same archive or directory.)
 %% File: ltjclasses.dtx
-
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{ltjsize10.clo}
-  [2019/08/12 v1.8b-ltj-17
+  [2019/10/17 v1.8c-ltj-17
   Standard LuaLaTeX-ja file (size option)]
 \renewcommand{\normalsize}{%
     \@setfontsize\normalsize\@xpt{15}%
@@ -34,6 +33,7 @@
    \belowdisplayskip \abovedisplayskip
    \let\@listi\@listI}
 \normalsize
+\MakeRobust\normalsize
 \setbox0\hbox{漢}
 \setlength\Cht{\ht0}
 \setlength\Cdp{\dp0}
@@ -41,7 +41,7 @@
 \setlength\Cvs{\baselineskip}
 \setlength\Chs{\wd0}
 \setbox0=\box\voidb@x
-\newcommand{\small}{%
+\DeclareRobustCommand{\small}{%
   \@setfontsize\small\@ixpt{11}%
   \abovedisplayskip 8.5\p@ \@plus3\p@ \@minus4\p@
   \abovedisplayshortskip \z@ \@plus2\p@
@@ -51,7 +51,7 @@
               \parsep 2\p@ \@plus\p@ \@minus\p@
               \itemsep \parsep}%
   \belowdisplayskip \abovedisplayskip}
-\newcommand{\footnotesize}{%
+\DeclareRobustCommand{\footnotesize}{%
   \@setfontsize\footnotesize\@viiipt{9.5}%
   \abovedisplayskip 6\p@ \@plus2\p@ \@minus4\p@
   \abovedisplayshortskip \z@ \@plus\p@
@@ -61,13 +61,13 @@
               \parsep 2\p@ \@plus\p@ \@minus\p@
               \itemsep \parsep}%
   \belowdisplayskip \abovedisplayskip}
-\newcommand{\scriptsize}{\@setfontsize\scriptsize\@viipt\@viiipt}
-\newcommand{\tiny}{\@setfontsize\tiny\@vpt\@vipt}
-\newcommand{\large}{\@setfontsize\large\@xiipt{17}}
-\newcommand{\Large}{\@setfontsize\Large\@xivpt{21}}
-\newcommand{\LARGE}{\@setfontsize\LARGE\@xviipt{25}}
-\newcommand{\huge}{\@setfontsize\huge\@xxpt{28}}
-\newcommand{\Huge}{\@setfontsize\Huge\@xxvpt{33}}
+\DeclareRobustCommand{\scriptsize}{\@setfontsize\scriptsize\@viipt\@viiipt}
+\DeclareRobustCommand{\tiny}{\@setfontsize\tiny\@vpt\@vipt}
+\DeclareRobustCommand{\large}{\@setfontsize\large\@xiipt{17}}
+\DeclareRobustCommand{\Large}{\@setfontsize\Large\@xivpt{21}}
+\DeclareRobustCommand{\LARGE}{\@setfontsize\LARGE\@xviipt{25}}
+\DeclareRobustCommand{\huge}{\@setfontsize\huge\@xxpt{28}}
+\DeclareRobustCommand{\Huge}{\@setfontsize\Huge\@xxvpt{33}}
 \setlength\headheight{12\p@}
 \setlength\headsep{25\p@}
 \setlength\topskip{1\Cht}

diff --git a/src/ltjsize11.clo b/src/ltjsize11.clo
index fcc0f72..85abf6f 100644 (file)
--- a/src/ltjsize11.clo
+++ b/src/ltjsize11.clo
@@ -21,10 +21,9 @@
 %% same distribution. (The sources need not necessarily be
 %% in the same archive or directory.)
 %% File: ltjclasses.dtx
-
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{ltjsize11.clo}
-  [2019/08/12 v1.8b-ltj-17
+  [2019/10/17 v1.8c-ltj-17
   Standard LuaLaTeX-ja file (size option)]
 \renewcommand{\normalsize}{%
     \@setfontsize\normalsize\@xipt{15.5}%
@@ -34,6 +33,7 @@
    \belowdisplayskip \abovedisplayskip
    \let\@listi\@listI}
 \normalsize
+\MakeRobust\normalsize
 \setbox0\hbox{漢}
 \setlength\Cht{\ht0}
 \setlength\Cdp{\dp0}
@@ -41,7 +41,7 @@
 \setlength\Cvs{\baselineskip}
 \setlength\Chs{\wd0}
 \setbox0=\box\voidb@x
-\newcommand{\small}{%
+\DeclareRobustCommand{\small}{%
   \@setfontsize\small\@xpt\@xiipt
   \abovedisplayskip 10\p@ \@plus2\p@ \@minus5\p@
   \abovedisplayshortskip \z@ \@plus3\p@
@@ -51,7 +51,7 @@
               \parsep 3\p@ \@plus2\p@ \@minus\p@
               \itemsep \parsep}%
   \belowdisplayskip \abovedisplayskip}
-\newcommand{\footnotesize}{%
+\DeclareRobustCommand{\footnotesize}{%
   \@setfontsize\footnotesize\@ixpt{11}%
   \abovedisplayskip 8\p@ \@plus2\p@ \@minus4\p@
   \abovedisplayshortskip \z@ \@plus\p@
@@ -61,13 +61,13 @@
               \parsep 2\p@ \@plus\p@ \@minus\p@
               \itemsep \parsep}%
   \belowdisplayskip \abovedisplayskip}
-\newcommand{\scriptsize}{\@setfontsize\scriptsize\@viiipt{9.5}}
-\newcommand{\tiny}{\@setfontsize\tiny\@vipt\@viipt}
-\newcommand{\large}{\@setfontsize\large\@xiipt{17}}
-\newcommand{\Large}{\@setfontsize\Large\@xivpt{21}}
-\newcommand{\LARGE}{\@setfontsize\LARGE\@xviipt{25}}
-\newcommand{\huge}{\@setfontsize\huge\@xxpt{28}}
-\newcommand{\Huge}{\@setfontsize\Huge\@xxvpt{33}}
+\DeclareRobustCommand{\scriptsize}{\@setfontsize\scriptsize\@viiipt{9.5}}
+\DeclareRobustCommand{\tiny}{\@setfontsize\tiny\@vipt\@viipt}
+\DeclareRobustCommand{\large}{\@setfontsize\large\@xiipt{17}}
+\DeclareRobustCommand{\Large}{\@setfontsize\Large\@xivpt{21}}
+\DeclareRobustCommand{\LARGE}{\@setfontsize\LARGE\@xviipt{25}}
+\DeclareRobustCommand{\huge}{\@setfontsize\huge\@xxpt{28}}
+\DeclareRobustCommand{\Huge}{\@setfontsize\Huge\@xxvpt{33}}
 \setlength\headheight{12\p@}
 \setlength\headsep{25\p@}
 \setlength\topskip{1\Cht}

diff --git a/src/ltjsize12.clo b/src/ltjsize12.clo
index 4e1ad87..ada3335 100644 (file)
--- a/src/ltjsize12.clo
+++ b/src/ltjsize12.clo
@@ -21,10 +21,9 @@
 %% same distribution. (The sources need not necessarily be
 %% in the same archive or directory.)
 %% File: ltjclasses.dtx
-
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{ltjsize12.clo}
-  [2019/08/12 v1.8b-ltj-17
+  [2019/10/17 v1.8c-ltj-17
   Standard LuaLaTeX-ja file (size option)]
 \renewcommand{\normalsize}{%
     \@setfontsize\normalsize\@xiipt{16.5}%
@@ -34,6 +33,7 @@
    \belowdisplayskip \abovedisplayskip
    \let\@listi\@listI}
 \normalsize
+\MakeRobust\normalsize
 \setbox0\hbox{漢}
 \setlength\Cht{\ht0}
 \setlength\Cdp{\dp0}
@@ -41,7 +41,7 @@
 \setlength\Cvs{\baselineskip}
 \setlength\Chs{\wd0}
 \setbox0=\box\voidb@x
-\newcommand{\small}{%
+\DeclareRobustCommand{\small}{%
   \@setfontsize\small\@xipt{13.6}%
   \abovedisplayskip 11\p@ \@plus3\p@ \@minus6\p@
   \abovedisplayshortskip \z@ \@plus3\p@
@@ -51,7 +51,7 @@
               \parsep 4.5\p@ \@plus2\p@ \@minus\p@
               \itemsep \parsep}%
   \belowdisplayskip \abovedisplayskip}
-\newcommand{\footnotesize}{%
+\DeclareRobustCommand{\footnotesize}{%
   \@setfontsize\footnotesize\@xpt\@xiipt
   \abovedisplayskip 10\p@ \@plus2\p@ \@minus5\p@
   \abovedisplayshortskip \z@ \@plus3\p@
@@ -61,12 +61,12 @@
               \parsep 3\p@ \@plus2\p@ \@minus\p@
               \itemsep \parsep}%
   \belowdisplayskip \abovedisplayskip}
-\newcommand{\scriptsize}{\@setfontsize\scriptsize\@viiipt{9.5}}
-\newcommand{\tiny}{\@setfontsize\tiny\@vipt\@viipt}
-\newcommand{\large}{\@setfontsize\large\@xivpt{21}}
-\newcommand{\Large}{\@setfontsize\Large\@xviipt{25}}
-\newcommand{\LARGE}{\@setfontsize\LARGE\@xxpt{28}}
-\newcommand{\huge}{\@setfontsize\huge\@xxvpt{33}}
+\DeclareRobustCommand{\scriptsize}{\@setfontsize\scriptsize\@viiipt{9.5}}
+\DeclareRobustCommand{\tiny}{\@setfontsize\tiny\@vipt\@viipt}
+\DeclareRobustCommand{\large}{\@setfontsize\large\@xivpt{21}}
+\DeclareRobustCommand{\Large}{\@setfontsize\Large\@xviipt{25}}
+\DeclareRobustCommand{\LARGE}{\@setfontsize\LARGE\@xxpt{28}}
+\DeclareRobustCommand{\huge}{\@setfontsize\huge\@xxvpt{33}}
 \let\Huge=\huge
 \setlength\headheight{12\p@}
 \setlength\headsep{25\p@}

diff --git a/src/ltjtarticle.cls b/src/ltjtarticle.cls
index 4f54235..7cebfa2 100644 (file)
--- a/src/ltjtarticle.cls
+++ b/src/ltjtarticle.cls
@@ -21,10 +21,9 @@
 %% same distribution. (The sources need not necessarily be
 %% in the same archive or directory.)
 %% File: ltjclasses.dtx
-
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesClass{ltjtarticle}
-  [2019/08/12 v1.8b-ltj-17
+  [2019/10/17 v1.8c-ltj-17
  Standard LuaLaTeX-ja class]
 \RequirePackage{luatexja}
 \newcounter{@paper}

diff --git a/src/ltjtbk10.clo b/src/ltjtbk10.clo
index 60ee4fa..48aebd8 100644 (file)
--- a/src/ltjtbk10.clo
+++ b/src/ltjtbk10.clo
@@ -21,10 +21,9 @@
 %% same distribution. (The sources need not necessarily be
 %% in the same archive or directory.)
 %% File: ltjclasses.dtx
-
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{ltjtbk10.clo}
-  [2019/08/12 v1.8b-ltj-17
+  [2019/10/17 v1.8c-ltj-17
   Standard LuaLaTeX-ja file (size option)]
 \renewcommand{\normalsize}{%
     \@setfontsize\normalsize\@xpt{17}%
@@ -36,6 +35,7 @@
 \def\kanjiencodingdefault{JT3}%
 \kanjiencoding{\kanjiencodingdefault}%
 \normalsize
+\MakeRobust\normalsize
 \setbox0\hbox{漢}
 \setlength\Cht{\ht0}
 \setlength\Cdp{\dp0}
@@ -43,7 +43,7 @@
 \setlength\Cvs{\baselineskip}
 \setlength\Chs{\wd0}
 \setbox0=\box\voidb@x
-\newcommand{\small}{%
+\DeclareRobustCommand{\small}{%
   \@setfontsize\small\@ixpt{11}%
   \abovedisplayskip 8.5\p@ \@plus3\p@ \@minus4\p@
   \abovedisplayshortskip \z@ \@plus2\p@
@@ -53,7 +53,7 @@
               \parsep 2\p@ \@plus\p@ \@minus\p@
               \itemsep \parsep}%
   \belowdisplayskip \abovedisplayskip}
-\newcommand{\footnotesize}{%
+\DeclareRobustCommand{\footnotesize}{%
   \@setfontsize\footnotesize\@viiipt{9.5}%
   \abovedisplayskip 6\p@ \@plus2\p@ \@minus4\p@
   \abovedisplayshortskip \z@ \@plus\p@
@@ -63,13 +63,13 @@
               \parsep 2\p@ \@plus\p@ \@minus\p@
               \itemsep \parsep}%
   \belowdisplayskip \abovedisplayskip}
-\newcommand{\scriptsize}{\@setfontsize\scriptsize\@viipt\@viiipt}
-\newcommand{\tiny}{\@setfontsize\tiny\@vpt\@vipt}
-\newcommand{\large}{\@setfontsize\large\@xiipt{17}}
-\newcommand{\Large}{\@setfontsize\Large\@xivpt{21}}
-\newcommand{\LARGE}{\@setfontsize\LARGE\@xviipt{25}}
-\newcommand{\huge}{\@setfontsize\huge\@xxpt{28}}
-\newcommand{\Huge}{\@setfontsize\Huge\@xxvpt{33}}
+\DeclareRobustCommand{\scriptsize}{\@setfontsize\scriptsize\@viipt\@viiipt}
+\DeclareRobustCommand{\tiny}{\@setfontsize\tiny\@vpt\@vipt}
+\DeclareRobustCommand{\large}{\@setfontsize\large\@xiipt{17}}
+\DeclareRobustCommand{\Large}{\@setfontsize\Large\@xivpt{21}}
+\DeclareRobustCommand{\LARGE}{\@setfontsize\LARGE\@xviipt{25}}
+\DeclareRobustCommand{\huge}{\@setfontsize\huge\@xxpt{28}}
+\DeclareRobustCommand{\Huge}{\@setfontsize\Huge\@xxvpt{33}}
 \setlength\headheight{12\p@}
 \if@stysize
   \ifnum\c@@paper=2 % A5

diff --git a/src/ltjtbk11.clo b/src/ltjtbk11.clo
index 9b4067c..902ed5d 100644 (file)
--- a/src/ltjtbk11.clo
+++ b/src/ltjtbk11.clo
@@ -21,10 +21,9 @@
 %% same distribution. (The sources need not necessarily be
 %% in the same archive or directory.)
 %% File: ltjclasses.dtx
-
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{ltjtbk11.clo}
-  [2019/08/12 v1.8b-ltj-17
+  [2019/10/17 v1.8c-ltj-17
   Standard LuaLaTeX-ja file (size option)]
 \renewcommand{\normalsize}{%
     \@setfontsize\normalsize\@xipt{17}%
@@ -36,6 +35,7 @@
 \def\kanjiencodingdefault{JT3}%
 \kanjiencoding{\kanjiencodingdefault}%
 \normalsize
+\MakeRobust\normalsize
 \setbox0\hbox{漢}
 \setlength\Cht{\ht0}
 \setlength\Cdp{\dp0}
@@ -43,7 +43,7 @@
 \setlength\Cvs{\baselineskip}
 \setlength\Chs{\wd0}
 \setbox0=\box\voidb@x
-\newcommand{\small}{%
+\DeclareRobustCommand{\small}{%
   \@setfontsize\small\@xpt\@xiipt
   \abovedisplayskip 10\p@ \@plus2\p@ \@minus5\p@
   \abovedisplayshortskip \z@ \@plus3\p@
@@ -53,7 +53,7 @@
               \parsep 3\p@ \@plus2\p@ \@minus\p@
               \itemsep \parsep}%
   \belowdisplayskip \abovedisplayskip}
-\newcommand{\footnotesize}{%
+\DeclareRobustCommand{\footnotesize}{%
   \@setfontsize\footnotesize\@ixpt{11}%
   \abovedisplayskip 8\p@ \@plus2\p@ \@minus4\p@
   \abovedisplayshortskip \z@ \@plus\p@
@@ -63,13 +63,13 @@
               \parsep 2\p@ \@plus\p@ \@minus\p@
               \itemsep \parsep}%
   \belowdisplayskip \abovedisplayskip}
-\newcommand{\scriptsize}{\@setfontsize\scriptsize\@viiipt{9.5}}
-\newcommand{\tiny}{\@setfontsize\tiny\@vipt\@viipt}
-\newcommand{\large}{\@setfontsize\large\@xiipt{17}}
-\newcommand{\Large}{\@setfontsize\Large\@xivpt{21}}
-\newcommand{\LARGE}{\@setfontsize\LARGE\@xviipt{25}}
-\newcommand{\huge}{\@setfontsize\huge\@xxpt{28}}
-\newcommand{\Huge}{\@setfontsize\Huge\@xxvpt{33}}
+\DeclareRobustCommand{\scriptsize}{\@setfontsize\scriptsize\@viiipt{9.5}}
+\DeclareRobustCommand{\tiny}{\@setfontsize\tiny\@vipt\@viipt}
+\DeclareRobustCommand{\large}{\@setfontsize\large\@xiipt{17}}
+\DeclareRobustCommand{\Large}{\@setfontsize\Large\@xivpt{21}}
+\DeclareRobustCommand{\LARGE}{\@setfontsize\LARGE\@xviipt{25}}
+\DeclareRobustCommand{\huge}{\@setfontsize\huge\@xxpt{28}}
+\DeclareRobustCommand{\Huge}{\@setfontsize\Huge\@xxvpt{33}}
 \setlength\headheight{12\p@}
 \if@stysize
   \ifnum\c@@paper=2 % A5

diff --git a/src/ltjtbk12.clo b/src/ltjtbk12.clo
index 1b3f553..7546847 100644 (file)
--- a/src/ltjtbk12.clo
+++ b/src/ltjtbk12.clo
@@ -21,10 +21,9 @@
 %% same distribution. (The sources need not necessarily be
 %% in the same archive or directory.)
 %% File: ltjclasses.dtx
-
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{ltjtbk12.clo}
-  [2019/08/12 v1.8b-ltj-17
+  [2019/10/17 v1.8c-ltj-17
   Standard LuaLaTeX-ja file (size option)]
 \renewcommand{\normalsize}{%
     \@setfontsize\normalsize\@xiipt{18}%
@@ -36,6 +35,7 @@
 \def\kanjiencodingdefault{JT3}%
 \kanjiencoding{\kanjiencodingdefault}%
 \normalsize
+\MakeRobust\normalsize
 \setbox0\hbox{漢}
 \setlength\Cht{\ht0}
 \setlength\Cdp{\dp0}
@@ -43,7 +43,7 @@
 \setlength\Cvs{\baselineskip}
 \setlength\Chs{\wd0}
 \setbox0=\box\voidb@x
-\newcommand{\small}{%
+\DeclareRobustCommand{\small}{%
   \@setfontsize\small\@xipt{13.6}%
   \abovedisplayskip 11\p@ \@plus3\p@ \@minus6\p@
   \abovedisplayshortskip \z@ \@plus3\p@
@@ -53,7 +53,7 @@
               \parsep 4.5\p@ \@plus2\p@ \@minus\p@
               \itemsep \parsep}%
   \belowdisplayskip \abovedisplayskip}
-\newcommand{\footnotesize}{%
+\DeclareRobustCommand{\footnotesize}{%
   \@setfontsize\footnotesize\@xpt\@xiipt
   \abovedisplayskip 10\p@ \@plus2\p@ \@minus5\p@
   \abovedisplayshortskip \z@ \@plus3\p@
@@ -63,12 +63,12 @@
               \parsep 3\p@ \@plus2\p@ \@minus\p@
               \itemsep \parsep}%
   \belowdisplayskip \abovedisplayskip}
-\newcommand{\scriptsize}{\@setfontsize\scriptsize\@viiipt{9.5}}
-\newcommand{\tiny}{\@setfontsize\tiny\@vipt\@viipt}
-\newcommand{\large}{\@setfontsize\large\@xivpt{21}}
-\newcommand{\Large}{\@setfontsize\Large\@xviipt{25}}
-\newcommand{\LARGE}{\@setfontsize\LARGE\@xxpt{28}}
-\newcommand{\huge}{\@setfontsize\huge\@xxvpt{33}}
+\DeclareRobustCommand{\scriptsize}{\@setfontsize\scriptsize\@viiipt{9.5}}
+\DeclareRobustCommand{\tiny}{\@setfontsize\tiny\@vipt\@viipt}
+\DeclareRobustCommand{\large}{\@setfontsize\large\@xivpt{21}}
+\DeclareRobustCommand{\Large}{\@setfontsize\Large\@xviipt{25}}
+\DeclareRobustCommand{\LARGE}{\@setfontsize\LARGE\@xxpt{28}}
+\DeclareRobustCommand{\huge}{\@setfontsize\huge\@xxvpt{33}}
 \let\Huge=\huge
 \setlength\headheight{12\p@}
 \if@stysize

diff --git a/src/ltjtbook.cls b/src/ltjtbook.cls
index 328fd0f..3042792 100644 (file)
--- a/src/ltjtbook.cls
+++ b/src/ltjtbook.cls
@@ -21,10 +21,9 @@
 %% same distribution. (The sources need not necessarily be
 %% in the same archive or directory.)
 %% File: ltjclasses.dtx
-
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesClass{ltjtbook}
-  [2019/08/12 v1.8b-ltj-17
+  [2019/10/17 v1.8c-ltj-17
  Standard LuaLaTeX-ja class]
 \RequirePackage{luatexja}
 \newcounter{@paper}

diff --git a/src/ltjtreport.cls b/src/ltjtreport.cls
index 041e935..f95d459 100644 (file)
--- a/src/ltjtreport.cls
+++ b/src/ltjtreport.cls
@@ -21,10 +21,9 @@
 %% same distribution. (The sources need not necessarily be
 %% in the same archive or directory.)
 %% File: ltjclasses.dtx
-
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesClass{ltjtreport}
-  [2019/08/12 v1.8b-ltj-17
+  [2019/10/17 v1.8c-ltj-17
  Standard LuaLaTeX-ja class]
 \RequirePackage{luatexja}
 \newcounter{@paper}

diff --git a/src/ltjtsize10.clo b/src/ltjtsize10.clo
index 1bb6c8b..4e1e4de 100644 (file)
--- a/src/ltjtsize10.clo
+++ b/src/ltjtsize10.clo
@@ -21,10 +21,9 @@
 %% same distribution. (The sources need not necessarily be
 %% in the same archive or directory.)
 %% File: ltjclasses.dtx
-
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{ltjtsize10.clo}
-  [2019/08/12 v1.8b-ltj-17
+  [2019/10/17 v1.8c-ltj-17
   Standard LuaLaTeX-ja file (size option)]
 \renewcommand{\normalsize}{%
     \@setfontsize\normalsize\@xpt{17}%
@@ -36,6 +35,7 @@
 \def\kanjiencodingdefault{JT3}%
 \kanjiencoding{\kanjiencodingdefault}%
 \normalsize
+\MakeRobust\normalsize
 \setbox0\hbox{漢}
 \setlength\Cht{\ht0}
 \setlength\Cdp{\dp0}
@@ -43,7 +43,7 @@
 \setlength\Cvs{\baselineskip}
 \setlength\Chs{\wd0}
 \setbox0=\box\voidb@x
-\newcommand{\small}{%
+\DeclareRobustCommand{\small}{%
   \@setfontsize\small\@ixpt{11}%
   \abovedisplayskip 8.5\p@ \@plus3\p@ \@minus4\p@
   \abovedisplayshortskip \z@ \@plus2\p@
@@ -53,7 +53,7 @@
               \parsep 2\p@ \@plus\p@ \@minus\p@
               \itemsep \parsep}%
   \belowdisplayskip \abovedisplayskip}
-\newcommand{\footnotesize}{%
+\DeclareRobustCommand{\footnotesize}{%
   \@setfontsize\footnotesize\@viiipt{9.5}%
   \abovedisplayskip 6\p@ \@plus2\p@ \@minus4\p@
   \abovedisplayshortskip \z@ \@plus\p@
@@ -63,13 +63,13 @@
               \parsep 2\p@ \@plus\p@ \@minus\p@
               \itemsep \parsep}%
   \belowdisplayskip \abovedisplayskip}
-\newcommand{\scriptsize}{\@setfontsize\scriptsize\@viipt\@viiipt}
-\newcommand{\tiny}{\@setfontsize\tiny\@vpt\@vipt}
-\newcommand{\large}{\@setfontsize\large\@xiipt{17}}
-\newcommand{\Large}{\@setfontsize\Large\@xivpt{21}}
-\newcommand{\LARGE}{\@setfontsize\LARGE\@xviipt{25}}
-\newcommand{\huge}{\@setfontsize\huge\@xxpt{28}}
-\newcommand{\Huge}{\@setfontsize\Huge\@xxvpt{33}}
+\DeclareRobustCommand{\scriptsize}{\@setfontsize\scriptsize\@viipt\@viiipt}
+\DeclareRobustCommand{\tiny}{\@setfontsize\tiny\@vpt\@vipt}
+\DeclareRobustCommand{\large}{\@setfontsize\large\@xiipt{17}}
+\DeclareRobustCommand{\Large}{\@setfontsize\Large\@xivpt{21}}
+\DeclareRobustCommand{\LARGE}{\@setfontsize\LARGE\@xviipt{25}}
+\DeclareRobustCommand{\huge}{\@setfontsize\huge\@xxpt{28}}
+\DeclareRobustCommand{\Huge}{\@setfontsize\Huge\@xxvpt{33}}
 \setlength\headheight{12\p@}
 \if@stysize
   \ifnum\c@@paper=2 % A5

diff --git a/src/ltjtsize11.clo b/src/ltjtsize11.clo
index 2258dbc..7e86a5a 100644 (file)
--- a/src/ltjtsize11.clo
+++ b/src/ltjtsize11.clo
@@ -21,10 +21,9 @@
 %% same distribution. (The sources need not necessarily be
 %% in the same archive or directory.)
 %% File: ltjclasses.dtx
-
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{ltjtsize11.clo}
-  [2019/08/12 v1.8b-ltj-17
+  [2019/10/17 v1.8c-ltj-17
   Standard LuaLaTeX-ja file (size option)]
 \renewcommand{\normalsize}{%
     \@setfontsize\normalsize\@xipt{17}%
@@ -36,6 +35,7 @@
 \def\kanjiencodingdefault{JT3}%
 \kanjiencoding{\kanjiencodingdefault}%
 \normalsize
+\MakeRobust\normalsize
 \setbox0\hbox{漢}
 \setlength\Cht{\ht0}
 \setlength\Cdp{\dp0}
@@ -43,7 +43,7 @@
 \setlength\Cvs{\baselineskip}
 \setlength\Chs{\wd0}
 \setbox0=\box\voidb@x
-\newcommand{\small}{%
+\DeclareRobustCommand{\small}{%
   \@setfontsize\small\@xpt\@xiipt
   \abovedisplayskip 10\p@ \@plus2\p@ \@minus5\p@
   \abovedisplayshortskip \z@ \@plus3\p@
@@ -53,7 +53,7 @@
               \parsep 3\p@ \@plus2\p@ \@minus\p@
               \itemsep \parsep}%
   \belowdisplayskip \abovedisplayskip}
-\newcommand{\footnotesize}{%
+\DeclareRobustCommand{\footnotesize}{%
   \@setfontsize\footnotesize\@ixpt{11}%
   \abovedisplayskip 8\p@ \@plus2\p@ \@minus4\p@
   \abovedisplayshortskip \z@ \@plus\p@
@@ -63,13 +63,13 @@
               \parsep 2\p@ \@plus\p@ \@minus\p@
               \itemsep \parsep}%
   \belowdisplayskip \abovedisplayskip}
-\newcommand{\scriptsize}{\@setfontsize\scriptsize\@viiipt{9.5}}
-\newcommand{\tiny}{\@setfontsize\tiny\@vipt\@viipt}
-\newcommand{\large}{\@setfontsize\large\@xiipt{17}}
-\newcommand{\Large}{\@setfontsize\Large\@xivpt{21}}
-\newcommand{\LARGE}{\@setfontsize\LARGE\@xviipt{25}}
-\newcommand{\huge}{\@setfontsize\huge\@xxpt{28}}
-\newcommand{\Huge}{\@setfontsize\Huge\@xxvpt{33}}
+\DeclareRobustCommand{\scriptsize}{\@setfontsize\scriptsize\@viiipt{9.5}}
+\DeclareRobustCommand{\tiny}{\@setfontsize\tiny\@vipt\@viipt}
+\DeclareRobustCommand{\large}{\@setfontsize\large\@xiipt{17}}
+\DeclareRobustCommand{\Large}{\@setfontsize\Large\@xivpt{21}}
+\DeclareRobustCommand{\LARGE}{\@setfontsize\LARGE\@xviipt{25}}
+\DeclareRobustCommand{\huge}{\@setfontsize\huge\@xxpt{28}}
+\DeclareRobustCommand{\Huge}{\@setfontsize\Huge\@xxvpt{33}}
 \setlength\headheight{12\p@}
 \if@stysize
   \ifnum\c@@paper=2 % A5

diff --git a/src/ltjtsize12.clo b/src/ltjtsize12.clo
index 645f6ce..03fa123 100644 (file)
--- a/src/ltjtsize12.clo
+++ b/src/ltjtsize12.clo
@@ -21,10 +21,9 @@
 %% same distribution. (The sources need not necessarily be
 %% in the same archive or directory.)
 %% File: ltjclasses.dtx
-
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{ltjtsize12.clo}
-  [2019/08/12 v1.8b-ltj-17
+  [2019/10/17 v1.8c-ltj-17
   Standard LuaLaTeX-ja file (size option)]
 \renewcommand{\normalsize}{%
     \@setfontsize\normalsize\@xiipt{18}%
@@ -36,6 +35,7 @@
 \def\kanjiencodingdefault{JT3}%
 \kanjiencoding{\kanjiencodingdefault}%
 \normalsize
+\MakeRobust\normalsize
 \setbox0\hbox{漢}
 \setlength\Cht{\ht0}
 \setlength\Cdp{\dp0}
@@ -43,7 +43,7 @@
 \setlength\Cvs{\baselineskip}
 \setlength\Chs{\wd0}
 \setbox0=\box\voidb@x
-\newcommand{\small}{%
+\DeclareRobustCommand{\small}{%
   \@setfontsize\small\@xipt{13.6}%
   \abovedisplayskip 11\p@ \@plus3\p@ \@minus6\p@
   \abovedisplayshortskip \z@ \@plus3\p@
@@ -53,7 +53,7 @@
               \parsep 4.5\p@ \@plus2\p@ \@minus\p@
               \itemsep \parsep}%
   \belowdisplayskip \abovedisplayskip}
-\newcommand{\footnotesize}{%
+\DeclareRobustCommand{\footnotesize}{%
   \@setfontsize\footnotesize\@xpt\@xiipt
   \abovedisplayskip 10\p@ \@plus2\p@ \@minus5\p@
   \abovedisplayshortskip \z@ \@plus3\p@
@@ -63,12 +63,12 @@
               \parsep 3\p@ \@plus2\p@ \@minus\p@
               \itemsep \parsep}%
   \belowdisplayskip \abovedisplayskip}
-\newcommand{\scriptsize}{\@setfontsize\scriptsize\@viiipt{9.5}}
-\newcommand{\tiny}{\@setfontsize\tiny\@vipt\@viipt}
-\newcommand{\large}{\@setfontsize\large\@xivpt{21}}
-\newcommand{\Large}{\@setfontsize\Large\@xviipt{25}}
-\newcommand{\LARGE}{\@setfontsize\LARGE\@xxpt{28}}
-\newcommand{\huge}{\@setfontsize\huge\@xxvpt{33}}
+\DeclareRobustCommand{\scriptsize}{\@setfontsize\scriptsize\@viiipt{9.5}}
+\DeclareRobustCommand{\tiny}{\@setfontsize\tiny\@vipt\@viipt}
+\DeclareRobustCommand{\large}{\@setfontsize\large\@xivpt{21}}
+\DeclareRobustCommand{\Large}{\@setfontsize\Large\@xviipt{25}}
+\DeclareRobustCommand{\LARGE}{\@setfontsize\LARGE\@xxpt{28}}
+\DeclareRobustCommand{\huge}{\@setfontsize\huge\@xxvpt{33}}
 \let\Huge=\huge
 \setlength\headheight{12\p@}
 \if@stysize

diff --git a/src/patches/lltjp-fontspec.sty b/src/patches/lltjp-fontspec.sty
index 6f469fc..9f63075 100644 (file)
--- a/src/patches/lltjp-fontspec.sty
+++ b/src/patches/lltjp-fontspec.sty
@@ -1,5 +1,5 @@
 %
-% lltjp-fontspec.sty 2018-08-24
+% lltjp-fontspec.sty 2019-10-21
 %
 
 \NeedsTeXFormat{LaTeX2e}
@@ -13,7 +13,65 @@
 \fi
 
 %%%%%%%% fontspec v2.5c overwrites \rmfamily etc. in \setmainfont
-\@ifpackagelater{fontspec}{2018/07/29}{ %% 2.6h or later
+\@ifpackagelater{fontspec}{2019/10/19}{ %% 2.7d or later
+\cs_set:Nn \__fontspec_main_setmainfont:nn
+  {
+    \fontspec_set_family:Nnn \l__fontspec_rmfamily_family_tl {#1} {#2}
+    \tl_set_eq:NN \rmdefault \l__fontspec_rmfamily_family_tl
+    \use:x
+      {
+        \exp_not:n { \DeclareRobustCommand \rmfamily }
+          {
+            \exp_not:N \fontencoding { \g__fontspec_nfss_enc_tl }
+            \exp_not:N \fontfamily { \exp_not:N \rmdefault }
+    \exp_not:N\if@ltj@match@family\exp_not:N\kanjifamily\exp_not:N\mcdefault\exp_not:N\fi%%%
+            \exp_not:N \selectfont
+          }
+      }
+    \str_if_eq:eeT {\familydefault} {\rmdefault}
+      { \tl_set_eq:NN \encodingdefault \g__fontspec_nfss_enc_tl }
+    \__fontspec_setmainfont_hook:nn {#1} {#2}
+    \normalfont
+  }
+\cs_set:Nn \__fontspec_main_setsansfont:nn
+  {
+    \fontspec_set_family:Nnn \l__fontspec_sffamily_family_tl {#1} {#2}
+    \tl_set_eq:NN \sfdefault \l__fontspec_sffamily_family_tl
+    \use:x
+      {
+        \exp_not:n { \DeclareRobustCommand \sffamily }
+          {
+            \exp_not:N \fontencoding { \g__fontspec_nfss_enc_tl }
+            \exp_not:N \fontfamily { \exp_not:N \sfdefault  }
+    \exp_not:N\if@ltj@match@family\exp_not:N\kanjifamily\exp_not:N\gtdefault\exp_not:N\fi%%%
+            \exp_not:N \selectfont
+          }
+      }
+    \str_if_eq:eeT {\familydefault} {\sfdefault}
+      { \tl_set_eq:NN \encodingdefault \g__fontspec_nfss_enc_tl }
+    \__fontspec_setsansfont_hook:nn {#1} {#2}
+    \normalfont
+  }
+\cs_set:Nn \__fontspec_main_setmonofont:nn
+  {
+    \fontspec_set_family:Nnn \l__fontspec_ttfamily_family_tl {#1} {#2}
+    \tl_set_eq:NN \ttdefault \l__fontspec_ttfamily_family_tl
+    \use:x
+      {
+        \exp_not:n { \DeclareRobustCommand \ttfamily }
+          {
+            \exp_not:N \fontencoding { \g__fontspec_nfss_enc_tl }
+            \exp_not:N \fontfamily {  \exp_not:N \ttdefault }
+    \exp_not:N\if@ltj@match@family\exp_not:N\kanjifamily\exp_not:N\jttdefault\exp_not:N\fi%%%
+            \exp_not:N \selectfont
+          }
+      }
+    \str_if_eq:eeT {\familydefault} {\ttdefault}
+      { \tl_set_eq:NN \encodingdefault \g__fontspec_nfss_enc_tl }
+    \__fontspec_setmonofont_hook:nn {#1} {#2}
+    \normalfont
+  }
+}{\@ifpackagelater{fontspec}{2018/07/29}{ %% 2.6h <= and <= 2.7c
 \cs_set:Nn \__fontspec_main_setmainfont:nn
   {
     \fontspec_set_family:Nnn \l__fontspec_rmfamily_family_tl {#1} {#2}
@@ -28,7 +86,7 @@
             \exp_not:N \selectfont
           }
       }
-    \str_if_eq_x:nnT {\familydefault} {\rmdefault}
+    \str_if_eq:eeT {\familydefault} {\rmdefault}
       { \tl_set_eq:NN \encodingdefault \g__fontspec_nfss_enc_tl }
     \__fontspec_setmainfont_hook:nn {#1} {#2}
     \normalfont
@@ -47,7 +105,7 @@
             \exp_not:N \selectfont
           }
       }
-    \str_if_eq_x:nnT {\familydefault} {\sfdefault}
+    \str_if_eq:eeT {\familydefault} {\sfdefault}
       { \tl_set_eq:NN \encodingdefault \g__fontspec_nfss_enc_tl }
     \__fontspec_setsansfont_hook:nn {#1} {#2}
     \normalfont
@@ -66,7 +124,7 @@
             \exp_not:N \selectfont
           }
       }
-    \str_if_eq_x:nnT {\familydefault} {\ttdefault}
+    \str_if_eq:eeT {\familydefault} {\ttdefault}
       { \tl_set_eq:NN \encodingdefault \g__fontspec_nfss_enc_tl }
     \__fontspec_setmonofont_hook:nn {#1} {#2}
     \normalfont
@@ -84,7 +142,7 @@
     \exp_not:N \selectfont
    }
   }
-  \str_if_eq_x:nnT {\familydefault} {\rmdefault}
+  \str_if_eq:eeT {\familydefault} {\rmdefault}
     { \tl_set_eq:NN \encodingdefault \g__fontspec_nfss_enc_tl }
   \normalfont
   \ignorespaces
@@ -101,7 +159,7 @@
     \exp_not:N \selectfont
    }
   }
-  \str_if_eq_x:nnT {\familydefault} {\sfdefault}
+  \str_if_eq:eeT {\familydefault} {\sfdefault}
     { \tl_set_eq:NN \encodingdefault \g__fontspec_nfss_enc_tl }
   \normalfont
   \ignorespaces
@@ -118,12 +176,12 @@
     \exp_not:N \selectfont
    }
   }
-  \str_if_eq_x:nnT {\familydefault} {\ttdefault}
+  \str_if_eq:eeT {\familydefault} {\ttdefault}
     { \tl_set_eq:NN \encodingdefault \g__fontspec_nfss_enc_tl }
   \normalfont
   \ignorespaces
  }
-}
+}}
 
 \cs_set:Nn \fontspec_visible_space:
  {

diff --git a/src/patches/lltjp-microtype.sty b/src/patches/lltjp-microtype.sty
index db2fac8..5663551 100644 (file)
--- a/src/patches/lltjp-microtype.sty
+++ b/src/patches/lltjp-microtype.sty
@@ -1,33 +1,37 @@
 %
-% lltjp-microtype.sty 2019-08-12
+% lltjp-microtype.sty
 %
 % (Work in Progress)
 % 
 \NeedsTeXFormat{LaTeX2e}
-
 \RequirePackage{etoolbox}
 \makeatletter
 
-\def\MT@register@font{%
-  \xdef\MT@font@list{\expandonce{\MT@font@list\MT@font},}% !!!
-}
-\def\MT@register@subst@font{\MT@exp@one@n\MT@in@clist\font@name\MT@font@list
-  \ifMT@inlist@\else
-       \xdef\MT@font@list{\expandonce{\MT@font@list\font@name},}% !!!
-  \fi}
+\PackageWarningNoLine{luatexja}%
+  {LuaTeX-ja's patch against the microtype package \MessageBreak
+   (lltjp-microtype.sty, 2019-11-08) may not work}
+\patchcmd\MT@register@font
+  {\xdef\MT@font@list{\MT@font@list\MT@font,}}%
+  {\directlua{luatexja.jfont.is_kenc('\luatexluaescapestring{\f@encoding}')}%
+   \unless\ifin@
+     \xdef\MT@font@list{\MT@font@list\MT@font,}
+   \fi
+   }{}{}
+\patchcmd\MT@register@subst@font
+  {\xdef\MT@font@list{\MT@font@list\font@name,}}%
+  {\directlua{luatexja.jfont.is_kenc('\luatexluaescapestring{\f@encoding}')}%
+   \unless\ifin@
+     \xdef\MT@font@list{\MT@font@list\font@name,}
+   \fi}{}{}
 \let\ltj@MT@tracking@\MT@tracking@
-\def\MT@tracking@{%
-  \MT@exp@one@n\MT@in@clist\MT@font\MT@tr@font@list
-  \ifMT@inlist@\else
-    \MT@maybe@do{tr}%
-    \ifMT@do\else
-      \xdef\MT@tr@font@list{\expandonce{\MT@tr@font@list\MT@font,}}% !!!
-    \fi
-  \fi
-}
+\patchcmd\MT@tracking@
+  {\xdef\MT@tr@font@list{\MT@tr@font@list\MT@font,}}%
+  {\directlua{luatexja.jfont.is_kenc('\luatexluaescapestring{\f@encoding}')}%
+   \unless\ifin@
+     \xdef\MT@tr@font@list{\MT@tr@font@list\MT@font,}
+   \fi}{}{}
 \ifx\MT@tracking\ltj@MT@tracking@\let\MT@tracking\MT@tracking@\fi
 
-
 %\endinput
 \begingroup
   \catcode`\/=\z@