Temporarily removed \ifydir from the definition of \strut in lltjfont.sty.

diff --git a/src/lltjfont.sty b/src/lltjfont.sty
index 9f2a0da..b330f2d 100644 (file)
--- a/src/lltjfont.sty
+++ b/src/lltjfont.sty
@@ -44,11 +44,12 @@
 \newbox\tstrutbox
 \newbox\zstrutbox
 \def\strut{\relax
-  \ifydir
+%  \ifydir
     \ifmmode\copy\strutbox\else\unhcopy\strutbox\fi
-  \else
-    \ifmmode\copy\tstrutbox\else\unhcopy\tstrutbox\fi
-  \fi}
+%  \else
+%    \ifmmode\copy\tstrutbox\else\unhcopy\tstrutbox\fi
+%  \fi
+}
 \def\tstrut{\relax\hbox{\tate
    \ifmmode\copy\tstrutbox\else\unhcopy\tstrutbox\fi}}
 \def\zstrut{\relax\hbox{\tate

diff --git a/src/luatexja-fontspec.sty b/src/luatexja-fontspec.sty
index 962db02..74e4503 100644 (file)
--- a/src/luatexja-fontspec.sty
+++ b/src/luatexja-fontspec.sty
@@ -19,36 +19,35 @@
   \tl_set:Nn \zf@enc {JY3}
   \fontspec_select:nn{JFM=ujis,#1}{#2}
   \group_end:
+  \DeclareKanjiFamily{JY3}{\zf@family}{}
 }
 
-\cs_new:Nn \ltj_fontspec_set_newjfamily:Nnn {
+\cs_new:Nn \ltj_fontspec_set_jfamily:Nnn {
   \ltj_fontspec_select:nn{#2}{#3}
   \tl_set_eq:NN #1 \zf@family
 }
 
 \DeclareDocumentCommand \jfontspec { O{} m } {
-  \ltj_fontspec_set_newjfamily:Nnn \k@family {#1}{#2}
+  \ltj_fontspec_set_jfamily:Nnn \k@family {#1}{#2}
   \selectfont
   \ignorespaces
 }
 
 \DeclareDocumentCommand \setmainjfont { O{} m } {
-  \ltj_fontspec_set_newjfamily:Nnn \mcdefault {#1}{#2}
+  \ltj_fontspec_set_jfamily:Nnn \mcdefault {#1}{#2}
   \normalfont
 }
 
 \DeclareDocumentCommand \setsansjfont { O{} m } {
-  \ltj_fontspec_set_newjfamily:Nnn \gtdefault {#1}{#2}
+  \ltj_fontspec_set_jfamily:Nnn \gtdefault {#1}{#2}
   \normalfont
 }
 
-\DeclareRobustCommand\jfontfamily[1]{\edef\k@family{#1}}
-
 \DeclareDocumentCommand \newjfontfamily { m O{} m } {
   \ltj_fontspec_select:nn{#2}{#3}
   \use:x {
     \exp_not:N \DeclareRobustCommand \exp_not:N #1 {
-      \exp_not:N \jfontfamily {\zf@family} \exp_not:N \selectfont
+      \exp_not:N \kanjifamily {\zf@family} \exp_not:N \selectfont
     }
   }
 }

diff --git a/test/test02-latex.pdf b/test/test02-latex.pdf
index de1a4db..a60f6bf 100644 (file)
Binary files a/test/test02-latex.pdf and b/test/test02-latex.pdf differ

diff --git a/test/test02-latex.tex b/test/test02-latex.tex
index b5ad813..3f1b257 100644 (file)
--- a/test/test02-latex.tex
+++ b/test/test02-latex.tex
@@ -18,15 +18,8 @@
   \ifdim\@tempskipa>\z@
     \ltjsetparameter{xkanjiskip={0.25em plus 0.15em minus 0.06em}}%
   \fi}
-\makeatother
 
-\setmainfont{TeXGyreTermes}
-\setsansfont{TeXGyreHeros}
-
-\setmainjfont[Scale=.95,BoldFont=IPAexGothic]{IPAexMincho} % default: JFM=ujis
-\setsansjfont[Scale=.95]{IPAexGothic}
-
-\newjfontfamily\ipajisninety[Scale=.95,CJKShape=JIS1990]{IPAexMincho}
+\makeatother
 
 \begin{document}
 \section{NFSS2}
@@ -39,27 +32,31 @@
 \DeclareFixedFont{\dr}{JY3}{gt}{m}{n}{12}
 あいうえおpqr{\dr かaiu}きく）{\bf （漢字}
 
-{\tiny ◆あいうえおabcかきく{\gt かきくa{\bf uyあ}いう}}
+\noindent{\tiny ◆あいうえおabcかきく{\gt かきくa{\bf uyあ}いう}}
 
-{\scriptsize ◆あいうえおabcかきく{\gt かきくa{\bf uyあ}いう}}
+\noindent{\scriptsize ◆あいうえおabcかきく{\gt かきくa{\bf uyあ}いう}}
 
-{\footnotesize ◆あいうえおabcかきく{\gt かきくa{\bf uyあ}いう}}
+\noindent{\footnotesize ◆あいうえおabcかきく{\gt かきくa{\bf uyあ}いう}}
 
-{\small ◆あいうえおabcかきく{\gt かきくa{\bf uyあ}いう}}
+\noindent{\small ◆あいうえおabcかきく{\gt かきくa{\bf uyあ}いう}}
 
-{\normalsize ◆あいうえおabcかきく{\gt かきくa{\bf uyあ}いう}}
+\noindent{\normalsize ◆あいうえおabcかきく{\gt かきくa{\bf uyあ}いう}}
 
-{\large ◆あいうえおabcかきく{\gt かきくa{\bf uyあ}いう}}
+\noindent{\large ◆あいうえおabcかきく{\gt かきくa{\bf uyあ}いう}}
 
-{\Large ◆あいうえおabcかきく{\gt かきくa{\bf uyあ}いう}}
+\noindent{\Large ◆あいうえおabcかきく{\gt かきくa{\bf uyあ}いう}}
 
-{\LARGE ◆あいうえおabcかきく{\gt かきくa{\bf uyあ}いう}}
+\noindent{\LARGE ◆あいうえおabcかきく{\gt かきくa{\bf uyあ}いう}}
 
-{\huge ◆あいうえおabcかきく{\gt かきくa{\bf uyあ}いう}}
+\section{fontspec}
 
-{\Huge ◆あいうえおabcかきく{\gt かきくa{\bf uyあ}いう}}
+\setmainfont{TeXGyreTermes}
+\setsansfont{TeXGyreHeros}
 
-\section{fontspec}
+\setmainjfont[Scale=.95,BoldFont=IPAexGothic]{IPAexMincho} % default: JFM=ujis
+\setsansjfont[Scale=.95]{IPAexGothic}
+
+\newjfontfamily\ipajisninety[Scale=.95,CJKShape=JIS1990]{IPAexMincho}
 
 通常：「あいうえお」、（かきくけこ）。