summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/luatex/luatexja/ltj-latex.sty
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2017-02-21 00:35:20 +0000
committerKarl Berry <karl@freefriends.org>2017-02-21 00:35:20 +0000
commit3bbc63d38cf997ca6f9ca5700f4f9f98b014e0d9 (patch)
treef97d4d0a3999b87a34cfee47958c778979bf8eaa /Master/texmf-dist/tex/luatex/luatexja/ltj-latex.sty
parent6e8dfd310421201e3ac8847d1e8b8fa98e81c4d8 (diff)
luatexja (19feb17)
git-svn-id: svn://tug.org/texlive/trunk@43283 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/luatex/luatexja/ltj-latex.sty')
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltj-latex.sty9
1 files changed, 7 insertions, 2 deletions
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltj-latex.sty b/Master/texmf-dist/tex/luatex/luatexja/ltj-latex.sty
index 092b7e171b4..1a3c54a0553 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltj-latex.sty
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltj-latex.sty
@@ -12,7 +12,7 @@
\def\luatexjalatexLoaded{\endinput}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{ltj-latex}[2016/08/21 LaTeX support of LuaTeX-ja]
+\ProvidesPackage{ltj-latex}[2017/01/28 LaTeX support of LuaTeX-ja]
% cleanup at end of the document
%\let\ltj@@orig@end=\@@end
@@ -62,7 +62,6 @@
\ltj@pkgpatch{unicode-math}
\ltj@pkgpatch{xunicode}
\ltj@pkgpatch{fontspec}
-\ltj@pkgpatch{stfloats}
\ltj@pkgpatch{footmisc}
\ltj@pkgpatch{tascmac}
\ltj@AtBeginDocument{\@ifpackageloaded{ascmac}{%
@@ -70,8 +69,14 @@
\makeatletter\input{lltjp-tascmac.sty}%
\ltj@asc@temp\let\ltj@asc@temp=\relax
}{}}% ascmac
+\ltj@pkgpatch{stfloats}
\RequirePackage{lltjp-geometry}
+\RequirePackage{filehook}
+\AtEndOfPackageFile*{fontspec}{%
+ \input{lltjp-fontspec-immediate.sty}
+ % \RequirePackage だと fontspec にオプション指定したときにエラー出る
+}
%%------------------ all done