X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=src%2Fluatexja-compat.sty;h=bc298286c808bd82bc479d9db1cb26b6da27f58b;hb=80bbcf52bf096105cf1797a4422a38d400b3fa05;hp=e066ad3cc9ac178d8172e41ec0fc47b7178d130f;hpb=3fbaacbd0d7e2a955605e113cdb04ff752a0f416;p=luatex-ja%2Fluatexja.git

diff --git a/src/luatexja-compat.sty b/src/luatexja-compat.sty
index e066ad3..bc29828 100644
--- a/src/luatexja-compat.sty
+++ b/src/luatexja-compat.sty
@@ -74,9 +74,9 @@
 \ifx\ltj@@tempa\ltj@@tempb      %<*pTeX>
   \let\ltj@@compat@pTeX=t
   \ifltj@in@latex                 %<*LaTeX>
-    \RequirePackage{luatexja-compat-ptex}[2011/04/01]
+    \RequirePackage{ltj-compat-ptex}[2012/04/21]
   \else                           %<*!LaTeX>
-    \input luatexja-compat-ptex.sty %
+    \input ltj-compat-ptex.sty %
   \fi                             %</LaTeX>
   \ltj@compat@AtEnd
 \expandafter\endinput\fi\relax  %</pTeX>
@@ -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,8 @@
 % not yet implemented.
 
 %%------------------
-%! これ以降に LuaTeX 用の compat の内容を入れる.
-\RequireLuaModule{luatexja.jisx0208} %% JIS X 0208 => unicode のテーブル
-\RequireLuaModule{luatexja.compat}
+\RequireLuaTeXjaSubmodule{jisx0208}
+\RequireLuaTeXjaSubmodule{compat}
 
 \def\euc{\ltj@code@conv{euc}}
 \def\kuten{\ltj@code@conv{kuten}}
@@ -115,7 +114,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,7 +122,7 @@
    \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@or{nil}{#1}) }%
 }
 
 \def\kansuji{%
@@ -131,7 +130,7 @@
    \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}}