Test: use filehook package.

diff --git a/src/luatexja-ajmacros.sty b/src/addons/luatexja-ajmacros.sty
similarity index 100%
rename from src/luatexja-ajmacros.sty
rename to src/addons/luatexja-ajmacros.sty

diff --git a/src/luatexja-fontspec.sty b/src/addons/luatexja-fontspec.sty
similarity index 100%
rename from src/luatexja-fontspec.sty
rename to src/addons/luatexja-fontspec.sty

diff --git a/src/luatexja-otf.sty b/src/addons/luatexja-otf.sty
similarity index 100%
rename from src/luatexja-otf.sty
rename to src/addons/luatexja-otf.sty

diff --git a/src/luatexja-latex.sty b/src/luatexja-latex.sty
index 39143d7..3091eeb 100644 (file)
--- a/src/luatexja-latex.sty
+++ b/src/luatexja-latex.sty
@@ -12,18 +12,17 @@
 \def\luatexjalatexLoaded{\endinput}
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{luatexja-latex}[2011/08/01 v0.1]
+\ProvidesPackage{luatexja-latex}[2011/11/20 v0.2]
 
 \endlinechar=13
 
 
-%%% patch for LaTeX (similar to plfonts.dtx)
+%%% patch for LaTeX
 \input{lltjfont.sty}
 \input{lltjdefs.sty}
 \input{lltjcore.sty}
 
-%%% parameter
-
+%%% default parameters
 \ltjsetparameter{kanjiskip=0pt plus 0.4pt minus 0.4pt, 
   xkanjiskip=.25\zw plus 1pt minus 1pt,
   autospacing, autoxspacing, jacharrange={-1}, 
@@ -34,6 +33,40 @@
 \input luatexja-kinsoku.tex
 \expandafter\let\csname JY3/mc/m/n/10\endcsname\relax
 
+%%% patch for packages
+\RequirePackage{expl3}
+\ExplSyntaxOn
+\def\ltj@pkgpatch#1#2#3#4{\@ifpackageloaded{#1}{\typeout{#1: TRUE}#3#2}{\typeout{#1: FALSE}%
+  \@ifpackageloaded{filehook}{\bool_set_true:N \l_tmpa_bool} {\bool_set_false:N \l_tmpa_bool} %
+  \file_if_exist:nTF {filehook.sty} 
+    { \usepackage{filehook} \bool_set_true:N \l_tmpa_bool } 
+    {}%
+  \bool_if:NTF \l_tmpa_bool 
+    {\AtEndOfPackageFile*{#1}{#4#2}} 
+    {}
+  }%
+}
+
+\ltj@pkgpatch{fontspec}{\usepackage{luatexja-fontspec}}{}{}
+\ltj@pkgpatch{unicode-math}{%
+  \cs_set:Npn \um_set_mathcode:nnnn #1#2#3#4 {
+    \Umathcode \int_eval:n {#1} =
+      \mathchar@type#2 \csname sym#3\endcsname \int_eval:n {#4} \scan_stop:
+    \directlua{luatexja.math.is_math_letters[\int_eval:n {#4}]=true}
+  }
+  \cs_set:Npn \um_set_mathcode:nnn #1#2#3 {
+    \Umathcode \int_eval:n {#1} =
+      \mathchar@type#2 \csname sym#3\endcsname \int_eval:n {#1} \scan_stop:
+    \directlua{luatexja.math.is_math_letters[\int_eval:n {#1}]=true}
+  }
+  \cs_set:Npn \um_set_mathchar:NNnn #1#2#3#4 {
+    \Umathchardef #1 =
+      \mathchar@type#2 \csname sym#3\endcsname \int_eval:n {#4} \scan_stop:
+    \directlua{luatexja.math.is_math_letters[\int_eval:n {#4}]=true}
+  }
+}{}{}
+\ExplSyntaxOff
+
 %%------------------ all done
 \ltj@latex@AtEnd
 \endinput

diff --git a/test/test07-math-unicode.pdf b/test/test07-math-unicode.pdf
index b7a7f2e..2182018 100644 (file)
Binary files a/test/test07-math-unicode.pdf and b/test/test07-math-unicode.pdf differ

diff --git a/test/test07-math-unicode.tex b/test/test07-math-unicode.tex
index 3c675ca..5b0f0eb 100644 (file)
--- a/test/test07-math-unicode.tex
+++ b/test/test07-math-unicode.tex
@@ -1,36 +1,24 @@
 %#!lualatex
 \documentclass{article}
 \usepackage[a4paper]{geometry}
+
+\usepackage{fontspec}
+
 \usepackage{luatexja}
 \makeatletter\ltj@alljachar %←全部の（>=U+0080な）文字を和文文字扱いに！
 
-\usepackage{fontspec,unicode-math}
-\ExplSyntaxOn
-\cs_set:Npn \um_set_mathcode:nnnn #1#2#3#4 {
-  \Umathcode \int_eval:n {#1} =
-    \mathchar@type#2 \csname sym#3\endcsname \int_eval:n {#4} \scan_stop:
-  \directlua{luatexja.math.is_math_letters[\int_eval:n {#4}]=true}
-}
-\cs_set:Npn \um_set_mathcode:nnn #1#2#3 {
-  \Umathcode \int_eval:n {#1} =
-    \mathchar@type#2 \csname sym#3\endcsname \int_eval:n {#1} \scan_stop:
-  \directlua{luatexja.math.is_math_letters[\int_eval:n {#1}]=true}
-}
-\cs_set:Npn \um_set_mathchar:NNnn #1#2#3#4 {
-  \Umathchardef #1 =
-    \mathchar@type#2 \csname sym#3\endcsname \int_eval:n {#4} \scan_stop:
-  \directlua{luatexja.math.is_math_letters[\int_eval:n {#4}]=true}
-}
-\ExplSyntaxOff
-
+\usepackage{unicode-math}
 \setmathfont{XITSMath}
+\setmainjfont{IPAGothic}
 
 \begin{document}\makeatletter
 
 \[
  \frac1{1^2}+\frac1{2^2}+\cdots=
 \sum_{n=1}^\infty \frac1{n^s}=\zeta(2)=\frac{\pi^2}{6}
-=\frac16\cdot \pi\times\pi,\qquad a_1,\dots,a_n
+=\frac16\cdot \pi\times\pi,\qquad a_1,\dots,a_n.
 \]
-aaa○×○漢×漢\times \dots←数式外では和文文字扱いのままになっている．
+
+
+○×○漢×漢\times え\ltjjachar`\“え\ltjalchar`\“え\textquotedblleft え“え←数式外では和文文字扱いのままになっている．
 \end{document}