X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=src%2Fluatexja-compat.sty;h=77befdff81184fd1074b03649dbaff02586b8b19;hb=79acad85e3b942cd4fe555c40886ad295b487fce;hp=69a86228a648c945db606ba1765508357759b69c;hpb=32c8d5b4bbee2a59f9c4c85b4400d966e8e58e84;p=luatex-ja%2Fluatexja.git

diff --git a/src/luatexja-compat.sty b/src/luatexja-compat.sty
index 69a8622..77befdf 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>
@@ -96,13 +96,61 @@
 \expandafter\endinput\fi\relax
 
 %% Load Lua modules.
-\RequireLuaModule{luatexja.infomute}
+%\RequireLuaModule{luatexja.infomute}
+% not yet implemented.
 
 %% Silence info messages of luatexbase-mcb
-\directlua{ luatexja.infomute.add_mute("luatexbase-mcb") }
+%\directlua{ luatexja.infomute.add_mute("luatexbase-mcb") }
+% not yet implemented.
 
 %%------------------
-%! これ以降に LuaTeX 用の compat の内容を入れる.
+\RequireLuaTeXjaSubmodule{jisx0208}
+\RequireLuaTeXjaSubmodule{compat}
+
+\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}}
+
+\ltjsetparameter{kansujichar={0,`〇}}
+\ltjsetparameter{kansujichar={1,`一}}
+\ltjsetparameter{kansujichar={2,`二}}
+\ltjsetparameter{kansujichar={3,`三}}
+\ltjsetparameter{kansujichar={4,`四}}
+\ltjsetparameter{kansujichar={5,`五}}
+\ltjsetparameter{kansujichar={6,`六}}
+\ltjsetparameter{kansujichar={7,`七}}
+\ltjsetparameter{kansujichar={8,`八}}
+\ltjsetparameter{kansujichar={9,`九}}
+
+\ifltj@in@latex
+  \newcommand\printglossary{\@input@{\jobname.gls}}
+\fi
+\newcount\hour
+\newcount\minute
 
 %%------------------ all done
 \ltj@compat@AtEnd