X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=src%2Fltj-latex.sty;h=0176d446a700eab75f8721401965342cd30fc545;hb=0f0921ced2b53537326ad20ce546020b3cae2670;hp=afc724b5f4c57fcc9eab43a5cfa6bb592bedce39;hpb=b5ab697d1aae997f505f3f8f048ee23d352de943;p=luatex-ja%2Fluatexja.git

diff --git a/src/ltj-latex.sty b/src/ltj-latex.sty
index afc724b..0176d44 100644
--- a/src/ltj-latex.sty
+++ b/src/ltj-latex.sty
@@ -8,14 +8,28 @@
 \edef\ltj@latex@AtEnd{%
 \endlinechar=\the\endlinechar
 \relax}
-\endlinechar=-1 %
+\endlinechar\m@ne%
 \def\luatexjalatexLoaded{\endinput}
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{ltj-latex}[2013/04/02 LuaLaTeX-ja]
+\ProvidesPackage{ltj-latex}[2017/06/18 LaTeX support of LuaTeX-ja]
+
+% LaTeX2e 2017/05/01 で行われる対策
+% 本 sty からは 2018/05/01 削除予定
+\ifx\document@default@language \@undefined
+  \let\document@default@language\m@ne
+\fi
+\ifx\l@nohyphenation \@undefined
+  \newlanguage\l@nohyphenation
+\fi
+
+% cleanup at end of the document
+%\let\ltj@@orig@end=\@@end
+%\protected\def\@@end{%
+%  \directlua{luatexja.ext_cleanup()}\ltj@@orig@end}
 
 % Globally add to the head of a macro (cf. LaTeX2e's \g@addto@macro)
-\long\def\ltj@g@addto@macro#1#2{
+\long\def\ltj@g@addto@macro#1#2{%
   \begingroup
     \def\ltj@tmpa{#2}
     \toks@\expandafter\expandafter\expandafter{\expandafter\ltj@tmpa#1}
@@ -39,15 +53,14 @@
 
 %%% default parameters
 \directlua{
-  luatexja.stack.charprop_stack_table[0] 
-    = dofile(assert(kpse.find_file('ltj-kinsoku.lua', 'tex'),
-      "File `ltj-kinsoku.lua' not found"))
+  local s = kpse.find_file('ltj-kinsoku.lua', 'tex')
+  luatexja.stack.charprop_stack_table[0] = s and dofile(s) or {}
 }
 
-\ltjsetparameter{kanjiskip=0pt plus 0.4pt minus 0.4pt,
+\ltjsetparameter{kanjiskip=\z@ plus .4pt minus .5pt,
   xkanjiskip=.25\zw plus 1pt minus 1pt,
   autospacing, autoxspacing, jacharrange={-1},
-  yalbaselineshift=0pt, yjabaselineshift=0pt,
+  yalbaselineshift=\z@, yjabaselineshift=\z@,
   jcharwidowpenalty=500, differentjfm=paverage
 }
 
@@ -58,6 +71,23 @@
 \ltj@pkgpatch{unicode-math}
 \ltj@pkgpatch{xunicode}
 \ltj@pkgpatch{fontspec}
+\ltj@pkgpatch{footmisc}
+\ltj@pkgpatch{tascmac}
+\ltj@AtBeginDocument{\@ifpackageloaded{ascmac}{%
+  \edef\ltj@asc@temp{\noexpand\catcode`\noexpand\@=\the\catcode`\@}%
+  \makeatletter\input{lltjp-tascmac.sty}%
+  \ltj@asc@temp\let\ltj@asc@temp=\relax
+}{}}% ascmac
+\ltj@pkgpatch{stfloats}
+\ltj@pkgpatch{preview}
+\ltj@pkgpatch{array}
+
+\RequirePackage{lltjp-geometry}
+\RequirePackage{filehook}
+\AtEndOfPackageFile*{fontspec}{%
+  \input{lltjp-fontspec-immediate.sty}
+  % \RequirePackage だと fontspec にオプション指定したときにエラー出る
+}
 
 
 %%------------------ all done