\expandafter\let\csname ifltj@in@latex\expandafter\endcsname
\csname iftrue\endcsname
\NeedsTeXFormat{LaTeX2e}
- \ProvidesPackage{luatexja-compat}[2015/02/22 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>
\def\sjis{\ltj@code@conv{sjis}}
\def\ucs{\ltj@code@conv{ucs}}
-\ifltj@token@avail@scan %%%%%%%%%%%%%%%%%%%%%%%% new tokenlib
\def\ltj@code@conv#1{%
- \directlua{luatexja.compat.from_#1(luatexja.token.scan_int())}%
+ \directlua{luatexja.compat.from_#1(token.scan_int())}%
}
-\else %%%%%%%%%%%%%%%%%%%%%%%% old tokenlib
-\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}) }%
-}
-\fi %%%%%%%%%%%%%%%%%%%%%%%%
-
-\ifltj@token@avail@scan %%%%%%%%%%%%%%%%%%%%%%%% new tokenlib
-\def\kansuji{%
- \directlua{luatexja.compat.to_kansuji(luatexja.token.scan_int())}%
-}
-\else %%%%%%%%%%%%%%%%%%%%%%%% old tokenlib
\def\kansuji{%
- \expandafter\expandafter\expandafter
- \ltj@kansujiA\ltj@grab@num
-}
-\def\ltj@kansujiA#1{%
- \directlua{luatexja.compat.to_kansuji(\ltj@safe@num{#1}) }%
+ \directlua{luatexja.compat.to_kansuji(token.scan_int())}%
}
-\fi %%%%%%%%%%%%%%%%%%%%%%%%
-\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,`一}}
\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