X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=src%2Fltj-latex.sty;h=0176d446a700eab75f8721401965342cd30fc545;hb=d177010c46e52e722b4752eded1ae4a6807953df;hp=9a9c837411f7fcc4c5be02dc326f206c65934197;hpb=78c40fe0795cf45ccc8adea98862684bdeb2e9f1;p=luatex-ja%2Fluatexja.git

diff --git a/src/ltj-latex.sty b/src/ltj-latex.sty
index 9a9c837..0176d44 100644
--- a/src/ltj-latex.sty
+++ b/src/ltj-latex.sty
@@ -12,7 +12,16 @@
 \def\luatexjalatexLoaded{\endinput}
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{ltj-latex}[2016/05/15 LaTeX support of LuaTeX-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
@@ -48,7 +57,7 @@
   luatexja.stack.charprop_stack_table[0] = s and dofile(s) or {}
 }
 
-\ltjsetparameter{kanjiskip=\z@ plus .4pt minus .4pt,
+\ltjsetparameter{kanjiskip=\z@ plus .4pt minus .5pt,
   xkanjiskip=.25\zw plus 1pt minus 1pt,
   autospacing, autoxspacing, jacharrange={-1},
   yalbaselineshift=\z@, yjabaselineshift=\z@,
@@ -62,12 +71,23 @@
 \ltj@pkgpatch{unicode-math}
 \ltj@pkgpatch{xunicode}
 \ltj@pkgpatch{fontspec}
-\ltj@pkgpatch{stfloats}
 \ltj@pkgpatch{footmisc}
 \ltj@pkgpatch{tascmac}
-\ltj@AtBeginDocument{\@ifpackageloaded{ascmac}{\input{lltjp-tascmac.sty}}{}}% ascmac
+\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