Merge branch 'master' into vert_vrt2

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

diff --git a/src/luatexja-compat.sty b/src/luatexja-compat.sty
index 687d395..a8d27a9 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/02/22 Compatibility with pTeX]
+  \ProvidesPackage{luatexja-compat}[2017/05/05 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,15 +100,14 @@
 \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}{%
-  \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,`一}}