X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=src%2Fluatexja-core.sty;h=6e8ce432072c24679a8315f5b6a13517da0a1d81;hb=88f77f07b3417cf5e16878b9b3490a1de430e6fe;hp=0352e1e55689197425211ba455df8999c5a00dd0;hpb=c004010f7a45f5e5c0d46556fe9065515d6bd60a;p=luatex-ja%2Fluatexja.git

diff --git a/src/luatexja-core.sty b/src/luatexja-core.sty
index 0352e1e..6e8ce43 100644
--- a/src/luatexja-core.sty
+++ b/src/luatexja-core.sty
@@ -70,7 +70,7 @@
 
 %% Load prerequisite packages.
 \endlinechar=13 %
-\newif\ifltj@everyhook@avail\ltj@everyhook@availfalse
+%%% \newif\ifltj@everyhook@avail\ltj@everyhook@availfalse
 %! 外部パッケージは普通の \endlinechar で読まないと危険.
 \ifltj@in@latex                 %<*LaTeX>
   \RequirePackage{luaotfload} [2013/05/10] % v2.2
@@ -78,7 +78,7 @@
   \RequirePackage{pdftexcmds} [2011/11/29] % v0.20
   \RequirePackage{xkeyval}    [2012/10/14] % v2.6b
   \RequirePackage{atbegshi}
-  \IfFileExists{everyhook.sty}{\RequirePackage{everyhook}\ltj@everyhook@availtrue}{}
+%%%  \IfFileExists{everyhook.sty}{\RequirePackage{everyhook}\ltj@everyhook@availtrue}{}
 \else                           %<*!LaTeX>
   \input luaotfload.sty
   \input ltxcmds.sty
@@ -146,7 +146,7 @@
 \newluatexattribute\jfam          % index for current jfam
 
 \newluatexattribute\ltj@dir
-
+\newlanguage\ltj@@japanese
 \ltj@dir=0
 \ltj@icflag=0
 \ltj@origchar=0
@@ -201,16 +201,17 @@
 
 %%%%%%%% \jfont\CS={...:...;jfm=metric;...}, \globaljfont
 \protected\def\jfont{%
-  \afterassignment\ltj@@jfont\directlua{luatexja.jfont.jfontdefX(false)}}
+  \afterassignment\ltj@@jfont\directlua{luatexja.jfont.jfontdefX(false, 'yoko')}}
 \protected\def\globaljfont{%
-  \afterassignment\ltj@@jfont\directlua{luatexja.jfont.jfontdefX(true)}}
-\def\ltj@@jfont{\directlua{luatexja.jfont.jfontdefY('yoko')}}
+  \afterassignment\ltj@@jfont\directlua{luatexja.jfont.jfontdefX(true,  'yoko')}}
+\def\ltj@@jfont{\directlua{luatexja.jfont.jfontdefY()}}
 
 %%%%%%%% \tfont\CS={...:...;jfm=metric;...}, \globaltfont
-\protected\def\tfont{\afterassignment\ltj@@tfont\directlua{luatexja.jfont.jfontdefX(false)}}
+\protected\def\tfont{%
+  \afterassignment\ltj@@tfont\directlua{luatexja.jfont.jfontdefX(false, 'tate')}}
 \protected\def\globaltfont{%
-  \afterassignment\ltj@@tfont\directlua{luatexja.jfont.jfontdefX(true)}}
-\def\ltj@@tfont{\directlua{luatexja.jfont.jfontdefY('tate')}}
+  \afterassignment\ltj@@tfont\directlua{luatexja.jfont.jfontdefX(true,  'tate')}}
+\def\ltj@@tfont{\directlua{luatexja.jfont.jfontdefY()}}
 
 
 %%%%%%%% \zw, \zh
@@ -438,6 +439,7 @@
 \ltj@@decl@array@param{boxdir}
 \def\ltjgetparameter#1{%
   \directlua{luatexja.base.start_time_measure('get_par')}%
+  % stop call is moved in luatexja.lua
   \ifcsname ltj@@array@param/#1\endcsname
     \expandafter\ltx@firstoftwo
   \else
@@ -448,11 +450,9 @@
 }
 \def\ltj@@getparam@one#1{%
   \directlua{luatexja.ext_get_parameter_unary('#1')}%
-  \directlua{luatexja.base.stop_time_measure('get_par')}%
 }%
 \def\ltj@@getparam@two#1#2{%
   \directlua{luatexja.ext_get_parameter_binary('#1', \ltj@safe@num@or{nil}{#2})}%
-  \directlua{luatexja.base.stop_time_measure('get_par')}%
 }
 
 %%%%%%%% \ltjalchar<number>, \ltjjachar<number>
@@ -553,9 +553,12 @@
 \yoko
 
 %%%% insert
-%\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\endgroup\let\next}
+\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}
+\protected\def\ltj@@insert@B{\directlua{luatexja.direction.populate_insertion_dir_whatsit()}\endgroup}
+
 %%%% vadjust
 \let\ltj@@orig@vadjust=\vadjust
 \protected\def\vadjust{%
@@ -572,30 +575,41 @@
     luatexja.stack.mmode = -tex.nest[tex.nest.ptr].mode
   }$%
 }
-\ifltj@everyhook@avail
-  \PushPreHook{hbox}{%
-    \directlua{luatexja.direction.set_list_direction_hook()}%
-    \aftergroup\ltj@@reset@badness
-  }
-  \PushPreHook{vbox}{%
-    \directlua{luatexja.direction.set_list_direction_hook()}%
-    \aftergroup\ltj@@reset@badness
-  }
-\else
-  {\catcode`\!=0\catcode`\\=12
-  !@PackageWarningNoLine{luatexja-core}{%
-  I will use \everyhbox and \everyvbox directly !MessageBreak
-  for  supporting multiple directions, !MessageBreak
-  since everyhook.sty is not available}}
-  \everyhbox{%
-    \directlua{luatexja.direction.set_list_direction_hook()}%
-    \aftergroup\ltj@@reset@badness
-  }
-  \everyvbox{%
-    \directlua{luatexja.direction.set_list_direction_hook()}%
-    \aftergroup\ltj@@reset@badness
-  }
-\fi
+% \ifltj@everyhook@avail
+%   \PushPreHook{hbox}{%
+%     \directlua{luatexja.direction.set_list_direction_hook()}%
+%     \aftergroup\ltj@@reset@badness
+%   }
+%   \PushPreHook{vbox}{%
+%     \directlua{luatexja.direction.set_list_direction_hook()}%
+%     \aftergroup\ltj@@reset@badness
+%   }
+% \else
+%   {\catcode`\!=0\catcode`\\=12
+%   !@PackageWarningNoLine{luatexja-core}{%
+%   I will use \everyhbox and \everyvbox directly !MessageBreak
+%   for  supporting multiple directions, !MessageBreak
+%   since everyhook.sty is not available}}
+%   \everyhbox{%
+%     \directlua{luatexja.direction.set_list_direction_hook()}%
+%     \aftergroup\ltj@@reset@badness
+%   }
+%   \everyvbox{%
+%     \directlua{luatexja.direction.set_list_direction_hook()}%
+%     \aftergroup\ltj@@reset@badness
+%   }
+% \fi
+
+\let\ltj@@everyhbox=\everyhbox\let\ltj@@everyvbox=\everyvbox
+\newtoks\ltj@@i@everyhbox\newtoks\ltj@@i@everyvbox
+\let\everyhbox=\ltj@@i@everyhbox\let\everyvbox=\ltj@@i@everyvbox
+\ltj@@everyhbox{%
+  \directlua{luatexja.direction.set_list_direction_hook()}%
+  \aftergroup\ltj@@reset@badness\the\ltj@@i@everyhbox}
+\ltj@@everyvbox{%
+  \directlua{luatexja.direction.set_list_direction_hook()}%
+  \aftergroup\ltj@@reset@badness\the\ltj@@i@everyvbox}
+
 \protected\def\ltj@@reset@badness{%
   \directlua{%
     if luatexja.global_temp then