Merge commit '5219ca4' into kitagawa_lt20201001

diff --cc src/ltj-latex.sty
index db50c2b,7518898..3e18eb6
--- 1/src/ltj-latex.sty
--- 2/src/ltj-latex.sty
+++ b/src/ltj-latex.sty
@@@ -59,31 -43,15 +59,17 @@@
    }%
  }
  
 -\def\ltj@pkgpatch#1{%
 -  \@ifnextchar[{\ltj@pkgpatch@@{#1}}{\ltj@pkgpatch@@{#1}[lltjp-#1]}}%]
 -\def\ltj@pkgpatch@@#1[#2]{%
 -  \gpreto\@begindocumenthook{%
 -    \@ifpackageloaded{#1}{%
 -        \@ifpackageloaded{#2}{}{\RequirePackage{#2}}%
 -      }{}%
 +\def\ltj@pkgpatch#1{\@ifnextchar[{\ltj@pkgpatch@{#1}}{\ltj@pkgpatch@{#1}[lltjp-#1]}}%]
 +\ifltj@ltfilehook@avail
 +  \def\ltj@pkgpatch@@{\AddToHook{env/document/before}[luatexja.autopatch]}
 +\else
 +  \def\ltj@pkgpatch@@{\gpreto\@begindocumenthook}
 +\fi
 +\def\ltj@pkgpatch@#1[#2]{%
 +  \ltj@pkgpatch@@{%
 +    \@ifpackageloaded{#1}{\@ifpackageloaded{#2}{}{\RequirePackage{#2}}}{}%
    }%
  }
- 
- %%% default parameters
- \directlua{
-   local s = kpse.find_file('ltj-kinsoku.lua', 'tex')
-   luatexja.stack.charprop_stack_table[0] = s and dofile(s) or {}
- }
- 
- \ltjsetparameter{kanjiskip=\z@ plus .4pt minus .5pt,
-   xkanjiskip=.25\zw plus 1pt minus 1pt,
-   autospacing, autoxspacing, jacharrange={-1},
-   yalbaselineshift=\z@, yjabaselineshift=\z@,
-   jcharwidowpenalty=500, differentjfm=paverage
- }
- 
  \expandafter\let\csname JY3/mc/m/n/10\endcsname\relax
  
  %%% patch for packages

diff --cc src/luatexja-core.sty
Simple merge

diff --cc src/luatexja.lua
Simple merge