changed default of luatexja-preset to haranoaji

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

diff --git a/src/luatexja-compat.sty b/src/luatexja-compat.sty
index 3bba582..f55bf51 100644 (file)
--- a/src/luatexja-compat.sty
+++ b/src/luatexja-compat.sty
@@ -65,13 +65,13 @@
   \expandafter\let\csname ifltj@in@latex\expandafter\endcsname
     \csname iftrue\endcsname
   \NeedsTeXFormat{LaTeX2e}
-  \ProvidesPackage{luatexja-compat}[2015/05/09 Compatibility with pTeX]
+  \ProvidesPackage{luatexja-compat}[2018/03/29 Compatibility with pTeX]
 \fi                             %</LaTeX>
 
 % Load core module if not yet.
 \ifx\luatexjacoreLoaded\@undefined
   \ifltj@in@latex                 %<*LaTeX>
-    \RequirePackage{luatexja-core}[2013/05/14]
+    \RequirePackage{luatexja-core}
   \else                           %<*!LaTeX>
     \input luatexja-core.sty %
   \fi                             %</LaTeX>
@@ -100,11 +100,11 @@
 \def\ucs{\ltj@code@conv{ucs}}
 
 \def\ltj@code@conv#1{%
-  \directlua{luatexja.compat.from_#1(luatexja.token.scan_int())}%
+  \directlua{luatexja.compat.from_#1(token.scan_int())}%
 }
 
 \def\kansuji{%
-  \directlua{luatexja.compat.to_kansuji(luatexja.token.scan_int())}%
+  \directlua{luatexja.compat.to_kansuji(token.scan_int())}%
 }
 
 \define@key[ltj]{japaram}{kansujichar}{\ltj@@set@stack{KSJ}{0}{0x7FFFFFFF}#1 }
@@ -122,10 +122,17 @@
 \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