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

diff --git a/src/luatexja-compat.sty b/src/luatexja-compat.sty
index 4191ddb..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,19 +104,36 @@
 % not yet implemented.
 
 %%------------------
-%! これ以降に LuaTeX 用の compat の内容を入れる.
-\RequireLuaModule{luatexja.jisx0213} %% JISX0213 => unicode のテーブル
-\RequireLuaModule{luatexja.compat}
+\RequireLuaTeXjaSubmodule{jisx0208}
+\RequireLuaTeXjaSubmodule{compat}
 
-\def\euc#1{\directlua{luatexja.compat.from_euc(\ltj@safe@num{#1})}}
-\def\kuten#1{\directlua{luatexja.compat.from_kuten(\ltj@safe@num{#1})}}
-\def\jis#1{\directlua{luatexja.compat.from_jis(\ltj@safe@num{#1})}}
-\def\sjis#1{\directlua{luatexja.compat.from_sjis(\ltj@safe@num{#1})}}
-\def\ucs#1{\directlua{luatexja.compat.from_ucs(\ltj@safe@num{#1})}}
+\def\euc{\ltj@code@conv{euc}}
+\def\kuten{\ltj@code@conv{kuten}}
+\def\jis{\ltj@code@conv{jis}}
+\def\sjis{\ltj@code@conv{sjis}}
+\def\ucs{\ltj@code@conv{ucs}}
 
+\def\ltj@code@conv#1{%
+  \directlua{luatexja._cc_next = luatexja.compat.from_#1 }%
+  \ltj@code@convA
+}
+\def\ltj@code@convA{%
+  \expandafter\expandafter\expandafter
+   \ltj@code@convB\ltj@grab@num
+}
+\def\ltj@code@convB#1{%
+  \directlua{luatexja._cc_next(\ltj@safe@num@or{nil}{#1}) }%
+}
+
+\def\kansuji{%
+  \expandafter\expandafter\expandafter
+   \ltj@kansujiA\ltj@grab@num
+}
+\def\ltj@kansujiA#1{%
+  \directlua{luatexja.compat.to_kansuji(\ltj@safe@num{#1}) }%
+}
 \define@key[ltj]{japaram}{kansujichar}{%
   \expandafter\ltj@@set@stack#1:{ksj}{0}{0x7FFFFFFF}}
-\def\kansuji#1{\directlua{luatexja.compat.to_kansuji(\ltj@safe@num{#1})}}
 
 \ltjsetparameter{kansujichar={0,`〇}}
 \ltjsetparameter{kansujichar={1,`一}}
@@ -129,6 +146,12 @@
 \ltjsetparameter{kansujichar={8,`八}}
 \ltjsetparameter{kansujichar={9,`九}}
 
+\ifltj@in@latex
+  \newcommand\printglossary{\@input@{\jobname.gls}}
+\fi
+\newcount\hour
+\newcount\minute
+
 %%------------------ all done
 \ltj@compat@AtEnd
 \endinput