Make \adjustbaseline, \userelfont, \bou, \kasen robust

diff --git a/src/lltjext.sty b/src/lltjext.sty
index eb1087a..9e1421b 100644 (file)
--- a/src/lltjext.sty
+++ b/src/lltjext.sty
@@ -3,7 +3,7 @@
 %
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{lltjext}[2018/10/07 v1.2k-ltj-10 Macros for vertical writing]
+\ProvidesPackage{lltjext}[2019/09/25 v1.2k-ltj-11 Macros for vertical writing]
 \RequirePackage{luatexja}
 \newcount\ltj@ext@dir
 \let\ltj@lltjext@orig@tabular=\tabular
@@ -631,7 +631,7 @@
 %%% bou
 %%%
 \def\boutenchar{\char\euc"A1A2}%"
-\def\bou#1{\ifvmode\leavevmode\fi\@bou#1\end}
+\DeclareRobustCommand\bou[1]{\ifvmode\leavevmode\fi\@bou#1\end}
 \def\@bou#1{%
   \ifx#1\end \let\ltj@@next=\relax
   \else
@@ -648,7 +648,7 @@
   \fi\ltj@@next}
 
 %%% kasen
-\def\kasen#1{%
+\DeclareRobustCommand\kasen[1]{%
   \ifnum\ltjgetparameter{direction}=3\relax
     \setbox\z@\hbox{#1}\leavevmode\raise.7\zw
     \hbox to\z@{\vrule\@width\wd\z@ \@depth\z@ \@height.4\p@\hss}%

diff --git a/src/patches/lltjfont.sty b/src/patches/lltjfont.sty
index 1e09ae0..0f572b5 100644 (file)
--- a/src/patches/lltjfont.sty
+++ b/src/patches/lltjfont.sty
@@ -3,7 +3,7 @@
 %
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{lltjfont}[2019/08/21 Patch to NFSS2 for LuaTeX-ja]
+\ProvidesPackage{lltjfont}[2019/09/25 Patch to NFSS2 for LuaTeX-ja]
 
 \def\ltj@chardef@text@cmd#1{%
   \let\@ifdefinable\@@ifdefinable%
@@ -308,7 +308,7 @@
   \fi
 }
 \newif\if@knjcmd
-\def\userelfont{\@knjcmdtrue}
+\DeclareRobustCommand\userelfont{\@knjcmdtrue}
 
 
 \RequirePackage{everysel}
@@ -465,7 +465,7 @@
     setdimen('cHT', ht+dp)
   end
 }\endgroup
-\def\adjustbaseline{\luafunction\ltj@@adjust@baseline@inner
+\DeclareRobustCommand\adjustbaseline{\luafunction\ltj@@adjust@baseline@inner
    \cvs\normalbaselineskip}
 \DeclareRobustCommand\romanencoding[1]{%
     \expandafter\ifx\csname T@#1\endcsname\relax
@@ -773,7 +773,7 @@
 %%%%%% Alternate Japanese Fonts
 %%%% \DeclareAlternateKanjiFont<Benc><Bfam><Bser><Bshape><Aenc><Afam><Aser><Ashape><range>
 % いつも global
-\DeclareRobustCommand\DeclareAlternateKanjiFont[9]{%
+\def\DeclareAlternateKanjiFont#1#2#3#4#5#6#7#8#9{%
   \edef\@temp{#9}%
   \ifx\@temp\@empty\else
     {\def\ltj@temp@bfont{#1/#2/#3/#4}\def\ltj@temp@afont{#5/#6/#7/#8}%