X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=src%2Fluatexja-compat.sty;h=5132c062bbedb3f9b4b17ed3cfe1caa3e7c2f6ce;hb=2388b858f1f2cb1c58cb2fcd79b165fb7f513183;hp=e066ad3cc9ac178d8172e41ec0fc47b7178d130f;hpb=c36425a3ea5339ba23e2fd8fe650a6fc76acf23b;p=luatex-ja%2Fluatexja.git

diff --git a/src/luatexja-compat.sty b/src/luatexja-compat.sty
index e066ad3..5132c06 100644
--- a/src/luatexja-compat.sty
+++ b/src/luatexja-compat.sty
@@ -84,7 +84,7 @@
 % Load core module if not yet.
 \ifx\luatexjacoreLoaded\@undefined
   \ifltj@in@latex                 %<*LaTeX>
-    \RequirePackage{luatexja-core}[2011/04/01]
+    \RequirePackage{luatexja-core}[2012/04/20]
   \else                           %<*!LaTeX>
     \input luatexja-core.sty %
   \fi                             %</LaTeX>
@@ -104,9 +104,11 @@
 % not yet implemented.
 
 %%------------------
-%! これ以降に LuaTeX 用の compat の内容を入れる.
-\RequireLuaModule{luatexja.jisx0208} %% JIS X 0208 => unicode のテーブル
-\RequireLuaModule{luatexja.compat}
+
+\directlua{
+  luatexja.load_module('jisx0208');
+  luatexja.load_module('compat');
+}
 
 \def\euc{\ltj@code@conv{euc}}
 \def\kuten{\ltj@code@conv{kuten}}
@@ -115,7 +117,7 @@
 \def\ucs{\ltj@code@conv{ucs}}
 
 \def\ltj@code@conv#1{%
-  \directlua{ luatexja._cc_next = luatexja.compat.from_#1 }%
+  \directlua{luatexja._cc_next = luatexja.compat.from_#1 }%
   \ltj@code@convA
 }
 \def\ltj@code@convA{%
@@ -123,15 +125,16 @@
    \ltj@code@convB\ltj@grab@num
 }
 \def\ltj@code@convB#1{%
-  \directlua{ luatexja._cc_next(\ltj@safe@num{#1}) }%
+  \directlua{luatexja._cc_next(\ltj@safe@num{#1}) }%
 }
 
 \def\kansuji{%
+\tracingall
   \expandafter\expandafter\expandafter
    \ltj@kansujiA\ltj@grab@num
 }
 \def\ltj@kansujiA#1{%
-  \directlua{ luatexja.compat.to_kansuji(\ltj@safe@num{#1}) }%
+  \directlua{luatexja.compat.to_kansuji(\ltj@safe@num{#1}) }%
 }
 \define@key[ltj]{japaram}{kansujichar}{%
   \expandafter\ltj@@set@stack#1:{ksj}{0}{0x7FFFFFFF}}