cleanup

[luatex-ja/luatexja.git] / src / luatexja-compat.sty

diff --git a/src/luatexja-compat.sty b/src/luatexja-compat.sty
index 4191ddb..a179013 100644 (file)
--- a/src/luatexja-compat.sty
+++ b/src/luatexja-compat.sty
@@ -65,26 +65,13 @@
   \expandafter\let\csname ifltj@in@latex\expandafter\endcsname
     \csname iftrue\endcsname
   \NeedsTeXFormat{LaTeX2e}
-  \ProvidesPackage{luatexja-compat}[2011/04/01 v0.1]
+  \ProvidesPackage{luatexja-compat}[2015/05/09 Compatibility with pTeX]
 \fi                             %</LaTeX>
 
-%% If the engine is pTeX, then load the module for it and exit.
-\edef\ltj@@tempa{\string\kansuji}
-\edef\ltj@@tempb{\meaning\kansuji}
-\ifx\ltj@@tempa\ltj@@tempb      %<*pTeX>
-  \let\ltj@@compat@pTeX=t
-  \ifltj@in@latex                 %<*LaTeX>
-    \RequirePackage{luatexja-compat-ptex}[2011/04/01]
-  \else                           %<*!LaTeX>
-    \input luatexja-compat-ptex.sty %
-  \fi                             %</LaTeX>
-  \ltj@compat@AtEnd
-\expandafter\endinput\fi\relax  %</pTeX>
-
 % Load core module if not yet.
 \ifx\luatexjacoreLoaded\@undefined
   \ifltj@in@latex                 %<*LaTeX>
-    \RequirePackage{luatexja-core}[2011/04/01]
+    \RequirePackage{luatexja-core}[2013/05/14]
   \else                           %<*!LaTeX>
     \input luatexja-core.sty %
   \fi                             %</LaTeX>
@@ -104,19 +91,23 @@
 % not yet implemented.
 
 %%------------------
-%! これ以降に LuaTeX 用の compat の内容を入れる.
-\RequireLuaModule{luatexja.jisx0213} %% JISX0213 => unicode のテーブル
-\RequireLuaModule{luatexja.compat}
+\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}}
 
-\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})}}
+\def\ltj@code@conv#1{%
+  \directlua{luatexja.compat.from_#1(token.scan_int())}%
+}
+
+\def\kansuji{%
+  \directlua{luatexja.compat.to_kansuji(token.scan_int())}%
+}
+
+\define@key[ltj]{japaram}{kansujichar}{\ltj@@set@stack{KSJ}{0}{0x7FFFFFFF}#1 }
 
 \ltjsetparameter{kansujichar={0,`〇}}
 \ltjsetparameter{kansujichar={1,`一}}
@@ -128,6 +119,13 @@
 \ltjsetparameter{kansujichar={7,`七}}
 \ltjsetparameter{kansujichar={8,`八}}
 \ltjsetparameter{kansujichar={9,`九}}
+\ltj@@decl@array@param{kansujichar}
+
+\ifltj@in@latex
+  \newcommand\printglossary{\@input@{\jobname.gls}}
+\fi
+\newcount\hour
+\newcount\minute
 
 %%------------------ all done
 \ltj@compat@AtEnd