Fix errors: ltjb.package_error() is called with a table argument in ltj-charrange...

[luatex-ja/luatexja.git] / src / ltj-latex.sty

diff --git a/src/ltj-latex.sty b/src/ltj-latex.sty
index 2582dd5..cdd84be 100644 (file)
--- a/src/ltj-latex.sty
+++ b/src/ltj-latex.sty
@@ -14,11 +14,21 @@
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{ltj-latex}[2012/04/21 LuaLaTeX-ja]
 
-\def\ltj@pkgpatch#1{\AtBeginDocument{\@ifpackageloaded{#1}{\usepackage{lltjp-#1}}{}}}
+% Globally add to the head of a macro (cf. LaTeX2e's \g@addto@macro)
+\long\def\ltj@g@addto@macro#1#2{
+  \begingroup
+    \def\ltj@tmpa{#2}
+    \toks@\expandafter\expandafter\expandafter{\expandafter\ltj@tmpa#1}
+    \xdef#1{\the\toks@}
+  \endgroup}
+
+\def\ltj@AtBeginDocument{\ltj@g@addto@macro\@begindocumenthook}
+
+\def\ltj@pkgpatch#1{\ltj@AtBeginDocument{\@ifpackageloaded{#1}{\usepackage{lltjp-#1}}{}}}
 
 % similar to \ltj@pkgpatch, but this is used .sty which
 % can be reloaded inside the document by \input.
-\def\ltj@pkgpatchA#1{\AtBeginDocument{\@ifpackageloaded{#1}{\input{lltjp-#1.sty}}{}}}
+\def\ltj@pkgpatchA#1{\ltj@AtBeginDocument{\@ifpackageloaded{#1}{\input{lltjp-#1.sty}}{}}}
 
 \endlinechar=13
 
@@ -32,7 +42,7 @@
   xkanjiskip=.25\zw plus 1pt minus 1pt,
   autospacing, autoxspacing, jacharrange={-1},
   yalbaselineshift=0pt, yjabaselineshift=0pt,
-  jcharwidowpenalty=500, differentjfm=average
+  jcharwidowpenalty=500, differentjfm=paverage
 }
 
 \input luatexja-kinsoku.tex