ltj-direction.lua: fix that direction can be changed by accident in an align.

[luatex-ja/luatexja.git] / src / luatexja-core.sty

diff --git a/src/luatexja-core.sty b/src/luatexja-core.sty
index 78ccde5..254d0cc 100644 (file)
--- a/src/luatexja-core.sty
+++ b/src/luatexja-core.sty
@@ -65,7 +65,7 @@
   \expandafter\let\csname ifltj@in@latex\expandafter\endcsname
     \csname iftrue\endcsname
   \NeedsTeXFormat{LaTeX2e}
-  \ProvidesPackage{luatexja-core}[2014/02/01 Core of LuaTeX-ja]
+  \ProvidesPackage{luatexja-core}[2014/06/22 Core of LuaTeX-ja]
 \fi                             %</LaTeX>
 
 %% Load prerequisite packages.
@@ -101,11 +101,6 @@
     {Package loading is aborted now.\MessageBreak}
 \expandafter\endinput\fi\relax
 
- \@PackageInfoNoLine{luatexja-core}
-    {using\space%
-  \directlua{if node.direct==node then tex.write('traditional node')
-  else tex.write('DIRECT') end} node access model}
-
 %! なお、luatexbase-compat の説明に従うと、LuaTeX 拡張プリミティブは
 %! plain/LaTeX の両方で \luatex 付の名前（\directlua はそのまま)
 %! で使えると考えてよい。
@@ -204,7 +199,8 @@
 \protected\def\/{\relax\directlua{luatexja.jfont.append_italic()}}
 
 %%%%%%%% \jfont\CS={...:...;jfm=metric;...}, \globaljfont
-\protected\def\jfont{\afterassignment\ltj@@jfont\directlua{luatexja.jfont.jfontdefX(false)}}
+\protected\def\jfont{%
+  \afterassignment\ltj@@jfont\directlua{luatexja.jfont.jfontdefX(false)}}
 \protected\def\globaljfont{%
   \afterassignment\ltj@@jfont\directlua{luatexja.jfont.jfontdefX(true)}}
 \def\ltj@@jfont{\directlua{luatexja.jfont.jfontdefY('yoko')}}
@@ -567,6 +563,27 @@
 \protected\def\ltj@@vadjust@check@dir{%
   \directlua{luatexja.direction.check_adjust_direction()}%
 }
+
+%%%% hbox, vbox, vtop
+\everyhbox{%
+  \ifcase\ltj@dir@count\or\dtou\or\or\tate\or\yoko\fi
+  \aftergroup\ltj@@reset@badness
+}
+\everyvbox{%
+  \ifcase\ltj@dir@count\or\dtou\or\or\tate\or\yoko\fi
+  \aftergroup\ltj@@reset@badness
+}
+\protected\def\ltj@@reset@badness{%
+  \directlua{%
+    if luatexja.global_temp then
+      tex.hbadness= tex.hbadness or luatexja.hbadness_temp
+      tex.vbadness= tex.vbadness or luatexja.vbadness_temp
+      tex.globaldefs= luatexja.global_temp or tex.globaldefs
+    end
+  }%
+}
+
+
 %%%% unhbox and unvbox
 \let\ltj@@orig@unhbox=\unhbox
 \let\ltj@@orig@unvbox=\unvbox
@@ -578,6 +595,8 @@
 \protected\def\ltj@@unvbox{%
   \directlua{luatexja.direction.check_dir(\the\ltj@tempcnta)}%
   \ltj@@orig@unvbox\ltj@tempcnta\endgroup}
+
+
 %%%% lastbox
 \let\ltj@@orig@lastbox=\lastbox
 \protected\def\lastbox{%