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

diff --git a/src/luatexja-compat.sty b/src/luatexja-compat.sty
index 69a8622..f55bf51 100644
--- 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}[2018/03/29 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}
   \else                           %<*!LaTeX>
     \input luatexja-core.sty %
   \fi                             %</LaTeX>
@@ -96,13 +83,56 @@
 \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{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.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,`一}}
+\ltjsetparameter{kansujichar={2,`二}}
+\ltjsetparameter{kansujichar={3,`三}}
+\ltjsetparameter{kansujichar={4,`四}}
+\ltjsetparameter{kansujichar={5,`五}}
+\ltjsetparameter{kansujichar={6,`六}}
+\ltjsetparameter{kansujichar={7,`七}}
+\ltjsetparameter{kansujichar={8,`八}}
+\ltjsetparameter{kansujichar={9,`九}}
+\ltj@@decl@array@param{kansujichar}
+
+\ifltj@in@latex
+% \pltx@next@inhibitglue (pLaTeX 2018-03-09)
+\protected\def\pltx@next@inhibitglue{%
+  \ifhmode\inhibitglue\else
+  \edef\@tempa{\everypar{%
+    \everypar{\unexpanded\expandafter{\the\everypar}}%
+    \unexpanded\expandafter{\the\everypar}\inhibitglue}}%
+\@tempa\fi}
+  \newcommand\printglossary{\@input@{\jobname.gls}}
+\csname newcount\endcsname\hour
+\csname newcount\endcsname\minute
+\fi
 
 %%------------------ all done
 \ltj@compat@AtEnd