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

diff --git a/src/luatexja-compat.sty b/src/luatexja-compat.sty
index 5132c06..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}[2012/04/20]
+    \RequirePackage{luatexja-core}
   \else                           %<*!LaTeX>
     \input luatexja-core.sty %
   \fi                             %</LaTeX>
@@ -104,11 +91,7 @@
 % not yet implemented.
 
 %%------------------
-
-\directlua{
-  luatexja.load_module('jisx0208');
-  luatexja.load_module('compat');
-}
+\RequireLuaTeXjaSubmodule{compat}
 
 \def\euc{\ltj@code@conv{euc}}
 \def\kuten{\ltj@code@conv{kuten}}
@@ -117,27 +100,14 @@
 \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{#1}) }%
+  \directlua{luatexja.compat.from_#1(token.scan_int())}%
 }
 
 \def\kansuji{%
-\tracingall
-  \expandafter\expandafter\expandafter
-   \ltj@kansujiA\ltj@grab@num
+  \directlua{luatexja.compat.to_kansuji(token.scan_int())}%
 }
-\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}}
+
+\define@key[ltj]{japaram}{kansujichar}{\ltj@@set@stack{KSJ}{0}{0x7FFFFFFF}#1 }
 
 \ltjsetparameter{kansujichar={0,`〇}}
 \ltjsetparameter{kansujichar={1,`一}}
@@ -149,12 +119,20 @@
 \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
-\newcount\hour
-\newcount\minute
 
 %%------------------ all done
 \ltj@compat@AtEnd