\next -> \ltj@@next

diff --git a/src/addons/luatexja-otf.sty b/src/addons/luatexja-otf.sty
index ad421d0..76cfbcd 100644 (file)
--- a/src/addons/luatexja-otf.sty
+++ b/src/addons/luatexja-otf.sty
@@ -101,7 +101,7 @@
   \def\boutenchar{\char\euc"A1A2}%"
   \def\bou#1{\ifvmode\leavevmode\fi\@bou#1\end}
   \def\@bou#1{%
-    \ifx#1\end \let\next=\relax
+    \ifx#1\end \let\ltj@@next=\relax
     \else
       \ifnum\ltjgetparameter{direction}=3\relax
         \hbox to\z@{\vbox to\z@{\boxmaxdepth\maxdimen
@@ -112,8 +112,8 @@
           \vss\moveleft-0.2\zw\hbox{\boutenchar}\nointerlineskip
           \hbox{\char\euc"A1A1}}\hss}\nobreak#1\relax
       \fi
-      \let\next=\@bou
-    \fi\next}
+      \let\ltj@@next=\@bou
+    \fi\ltj@@next}
   \long\def\mbox#1{\leavevmode\hbox{#1}}
 \fi                             %</LaTeX>
 

diff --git a/src/lltjext.sty b/src/lltjext.sty
index 4cf1978..3393853 100644 (file)
--- a/src/lltjext.sty
+++ b/src/lltjext.sty
@@ -618,7 +618,7 @@
 \def\boutenchar{\char\euc"A1A2}%"
 \def\bou#1{\ifvmode\leavevmode\fi\@bou#1\end}
 \def\@bou#1{%
-  \ifx#1\end \let\next=\relax
+  \ifx#1\end \let\ltj@@next=\relax
   \else
     \ifnum\ltjgetparameter{direction}=3\relax
       \hbox to\z@{\vbox to\z@{\boxmaxdepth\maxdimen
@@ -629,8 +629,8 @@
         \vss\moveleft-0.2\zw\hbox{\boutenchar}\nointerlineskip
         \hbox{\char\euc"A1A1}}\hss}\nobreak#1\relax
     \fi
-    \let\next=\@bou
-  \fi\next}
+    \let\ltj@@next=\@bou
+  \fi\ltj@@next}
 
 %%% kasen
 \def\kasen#1{%

diff --git a/src/ltj-base.sty b/src/ltj-base.sty
index 5782613..717105e 100644 (file)
--- a/src/ltj-base.sty
+++ b/src/ltj-base.sty
@@ -447,16 +447,16 @@ luatexja.base._error_show(true)% and many spaces trail!
 \protected\def\ltj@afterbox#1{%
   \def\ltj@afb@xarg{#1}%
   \afterassignment\ltj@afb@x
-  \chardef\next`.}
-\def\ltj@afb@x{\futurelet\next\ltj@afb@xtest}
+  \chardef\ltj@@next`.}
+\def\ltj@afb@x{\futurelet\ltj@@next\ltj@afb@xtest}
 \def\ltj@afb@xtest{%
-  \ifcase\ifx\next\hbox\tw@\fi
-         \ifx\next\vbox\tw@\fi
-         \ifx\next\vtop\tw@\fi
-         \ifx\next\box\@ne\fi
-         \ifx\next\copy\@ne\fi
-         \ifx\next\vsplit\@ne\fi
-         \ifx\next\lastbox\@ne\fi
+  \ifcase\ifx\ltj@@next\hbox\tw@\fi
+         \ifx\ltj@@next\vbox\tw@\fi
+         \ifx\ltj@@next\vtop\tw@\fi
+         \ifx\ltj@@next\box\@ne\fi
+         \ifx\ltj@@next\copy\@ne\fi
+         \ifx\ltj@@next\vsplit\@ne\fi
+         \ifx\ltj@@next\lastbox\@ne\fi
          0% ``A <box> was ...'' error will be causes by \setbox later anyway.
   \or\afterassignment\ltj@afb@xarg
   \or\afterassignment\ltj@afb@xagarg

diff --git a/src/ltjsarticle.cls b/src/ltjsarticle.cls
index 8c5e2fe..d546d61 100644 (file)
--- a/src/ltjsarticle.cls
+++ b/src/ltjsarticle.cls
@@ -1383,10 +1383,10 @@ class has defined the old font commands like\MessageBreak
     \color@begingroup
       \@makefntext{%
         \rule\z@\footnotesep\ignorespaces}%
-      \futurelet\next\fo@t}
-\def\fo@t{\ifcat\bgroup\noexpand\next \let\next\f@@t
-                                \else \let\next\f@t\fi \next}
-\def\f@@t{\bgroup\aftergroup\@foot\let\next}
+      \futurelet\ltj@@next\fo@t}
+\def\fo@t{\ifcat\bgroup\noexpand\ltj@@next \let\ltj@@next\f@@t
+                                \else \let\ltj@@next\f@t\fi \ltj@@next}
+\def\f@@t{\bgroup\aftergroup\@foot\let\ltj@@next}
 \def\f@t#1{#1\@foot}
 \def\@foot{\@finalstrut\strutbox\color@endgroup\egroup}
 \newcommand\@makefntext[1]{%

diff --git a/src/ltjsbook.cls b/src/ltjsbook.cls
index 454cc66..00294ae 100644 (file)
--- a/src/ltjsbook.cls
+++ b/src/ltjsbook.cls
@@ -1476,10 +1476,10 @@ class has defined the old font commands like\MessageBreak
     \color@begingroup
       \@makefntext{%
         \rule\z@\footnotesep\ignorespaces}%
-      \futurelet\next\fo@t}
-\def\fo@t{\ifcat\bgroup\noexpand\next \let\next\f@@t
-                                \else \let\next\f@t\fi \next}
-\def\f@@t{\bgroup\aftergroup\@foot\let\next}
+      \futurelet\ltj@@next\fo@t}
+\def\fo@t{\ifcat\bgroup\noexpand\ltj@@next \let\ltj@@next\f@@t
+                                \else \let\ltj@@next\f@t\fi \ltj@@next}
+\def\f@@t{\bgroup\aftergroup\@foot\let\ltj@@next}
 \def\f@t#1{#1\@foot}
 \def\@foot{\@finalstrut\strutbox\color@endgroup\egroup}
 \newcommand\@makefntext[1]{%

diff --git a/src/ltjsclasses.dtx b/src/ltjsclasses.dtx
index c255f6a..60845a9 100644 (file)
--- a/src/ltjsclasses.dtx
+++ b/src/ltjsclasses.dtx
@@ -5109,10 +5109,10 @@
     \color@begingroup
       \@makefntext{%
         \rule\z@\footnotesep\ignorespaces}%
-      \futurelet\next\fo@t}
-\def\fo@t{\ifcat\bgroup\noexpand\next \let\next\f@@t
-                                \else \let\next\f@t\fi \next}
-\def\f@@t{\bgroup\aftergroup\@foot\let\next}
+      \futurelet\ltj@@next\fo@t}
+\def\fo@t{\ifcat\bgroup\noexpand\ltj@@next \let\ltj@@next\f@@t
+                                \else \let\ltj@@next\f@t\fi \ltj@@next}
+\def\f@@t{\bgroup\aftergroup\@foot\let\ltj@@next}
 \def\f@t#1{#1\@foot}
 \def\@foot{\@finalstrut\strutbox\color@endgroup\egroup}
 %    \end{macrocode}

diff --git a/src/ltjskiyou.cls b/src/ltjskiyou.cls
index 5414fbc..8f59459 100644 (file)
--- a/src/ltjskiyou.cls
+++ b/src/ltjskiyou.cls
@@ -1348,10 +1348,10 @@ class has defined the old font commands like\MessageBreak
     \color@begingroup
       \@makefntext{%
         \rule\z@\footnotesep\ignorespaces}%
-      \futurelet\next\fo@t}
-\def\fo@t{\ifcat\bgroup\noexpand\next \let\next\f@@t
-                                \else \let\next\f@t\fi \next}
-\def\f@@t{\bgroup\aftergroup\@foot\let\next}
+      \futurelet\ltj@@next\fo@t}
+\def\fo@t{\ifcat\bgroup\noexpand\ltj@@next \let\ltj@@next\f@@t
+                                \else \let\ltj@@next\f@t\fi \ltj@@next}
+\def\f@@t{\bgroup\aftergroup\@foot\let\ltj@@next}
 \def\f@t#1{#1\@foot}
 \def\@foot{\@finalstrut\strutbox\color@endgroup\egroup}
 \newcommand\@makefntext[1]{%

diff --git a/src/ltjspf.cls b/src/ltjspf.cls
index 5b9997d..c4b1cfb 100644 (file)
--- a/src/ltjspf.cls
+++ b/src/ltjspf.cls
@@ -1242,10 +1242,10 @@ class has defined the old font commands like\MessageBreak
     \color@begingroup
       \@makefntext{%
         \rule\z@\footnotesep\ignorespaces}%
-      \futurelet\next\fo@t}
-\def\fo@t{\ifcat\bgroup\noexpand\next \let\next\f@@t
-                                \else \let\next\f@t\fi \next}
-\def\f@@t{\bgroup\aftergroup\@foot\let\next}
+      \futurelet\ltj@@next\fo@t}
+\def\fo@t{\ifcat\bgroup\noexpand\ltj@@next \let\ltj@@next\f@@t
+                                \else \let\ltj@@next\f@t\fi \ltj@@next}
+\def\f@@t{\bgroup\aftergroup\@foot\let\ltj@@next}
 \def\f@t#1{#1\@foot}
 \def\@foot{\@finalstrut\strutbox\color@endgroup\egroup}
 \newcommand\@makefntext[1]{%

diff --git a/src/ltjsreport.cls b/src/ltjsreport.cls
index 006bbf0..dc340b0 100644 (file)
--- a/src/ltjsreport.cls
+++ b/src/ltjsreport.cls
@@ -1469,10 +1469,10 @@ class has defined the old font commands like\MessageBreak
     \color@begingroup
       \@makefntext{%
         \rule\z@\footnotesep\ignorespaces}%
-      \futurelet\next\fo@t}
-\def\fo@t{\ifcat\bgroup\noexpand\next \let\next\f@@t
-                                \else \let\next\f@t\fi \next}
-\def\f@@t{\bgroup\aftergroup\@foot\let\next}
+      \futurelet\ltj@@next\fo@t}
+\def\fo@t{\ifcat\bgroup\noexpand\ltj@@next \let\ltj@@next\f@@t
+                                \else \let\ltj@@next\f@t\fi \ltj@@next}
+\def\f@@t{\bgroup\aftergroup\@foot\let\ltj@@next}
 \def\f@t#1{#1\@foot}
 \def\@foot{\@finalstrut\strutbox\color@endgroup\egroup}
 \newcommand\@makefntext[1]{%

diff --git a/src/luatexja-core.sty b/src/luatexja-core.sty
index ee80128..51adc9b 100644 (file)
--- a/src/luatexja-core.sty
+++ b/src/luatexja-core.sty
@@ -422,10 +422,10 @@
 \define@key[ltj]{japaram}{jacharrange}{\expandafter\ltj@@scrange#1,,}
 \def\ltj@@scrange#1,{%
   \edef\ltj@temp{#1}%
-  \ifx\ltj@temp\empty\let\next=\relax\else\let\next=\ltj@@scrange
+  \ifx\ltj@temp\empty\let\ltj@@next=\relax\else\let\ltj@@next=\ltj@@scrange
     \directlua{luatexja.charrange.toggle_char_range(%
       luatexja.is_global,\ltj@safe@num@or{nil}{#1})}%
-  \fi\next
+  \fi\ltj@@next
 }
 
 \protected\def\ltj@setpar@global{%
@@ -574,7 +574,7 @@
 \let\orig@insert=\insert
 \protected\def\insert{\begingroup\afterassignment\ltj@@insert@A\ltj@tempcnta}
 \protected\def\ltj@@insert@A{\orig@insert\ltj@tempcnta\bgroup
-  \aftergroup\ltj@@insert@B\let\next}
+  \aftergroup\ltj@@insert@B\let\ltj@@next}
 \protected\def\ltj@@insert@B{\directlua{luatexja.direction.populate_insertion_dir_whatsit()}\endgroup}
 
 %%%% vadjust
@@ -582,7 +582,7 @@
 \protected\def\vadjust{%
   \ltj@@orig@vadjust\bgroup
   \directlua{luatexja.direction.set_list_direction_hook('adj')}%
-  \aftergroup\ltj@@vadjust@check@dir\let\next}
+  \aftergroup\ltj@@vadjust@check@dir\let\ltj@@next}
 \protected\def\ltj@@vadjust@check@dir{%
   \directlua{luatexja.direction.check_adjust_direction()}%
 }