lltjp-unicode-math.sty-immediate: renamed to lltjp-unicode-math.sty.

This supports \usepackage{luatexja} after \usepackage{unicode-math}.
WARNING: \setmathfont{} before \usepackage{luatexja} is still unsupported.

diff --git a/src/ltj-latex.sty b/src/ltj-latex.sty
index 26258ba..0514636 100644 (file)
--- a/src/ltj-latex.sty
+++ b/src/ltj-latex.sty
@@ -12,16 +12,7 @@
 \def\luatexjalatexLoaded{\endinput}
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{ltj-latex}[2018/06/15 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
+\ProvidesPackage{ltj-latex}[2018/08/23 LaTeX support of LuaTeX-ja]
 
 % cleanup at end of the document
 %\let\ltj@@orig@end=\@@end
@@ -68,7 +59,6 @@
 
 %%% patch for packages
 \ltj@pkgpatch{listings}
-\ltj@pkgpatch{unicode-math}
 \ltj@pkgpatch{xunicode}
 \ltj@pkgpatch{fontspec}
 \ltj@pkgpatch{footmisc}
@@ -88,6 +78,9 @@
   \input{lltjp-fontspec-immediate.sty}
   % \RequirePackage だと fontspec にオプション指定したときにエラー出る
 }
+\AtEndOfPackageFile*{unicode-math}{%
+  \input{lltjp-unicode-math-immediate.sty}
+}
 
 \@ifpackageloaded{siunitx}{%
   \chardef\ltj@patch@siunitx@execute\z@\input{lltjp-siunitx.sty}%

diff --git a/src/patches/lltjp-unicode-math.sty b/src/patches/lltjp-unicode-math-immediate.sty
similarity index 97%
rename from src/patches/lltjp-unicode-math.sty
rename to src/patches/lltjp-unicode-math-immediate.sty
index 85524c0..e0ce052 100644 (file)
--- a/src/patches/lltjp-unicode-math.sty
+++ b/src/patches/lltjp-unicode-math-immediate.sty
@@ -3,7 +3,7 @@
 %
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{lltjp-unicode-math}[2018/08/21 Patch to unicode-math for LuaTeX-ja]
+\ProvidesPackage{lltjp-unicode-math-immediate}[2018/08/23 Patch to unicode-math for LuaTeX-ja]
 
 \RequirePackage{unicode-math,luatexja,etoolbox}