X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=test%2Ftest16-preset.tex;h=19d1ee1c006f96119eb257b8a7982640742382d9;hb=0f0921ced2b53537326ad20ce546020b3cae2670;hp=f5b4e91ead12f1b22af2ea1bac54dbedb1795774;hpb=867f406b4f1004857c3d4da9bcb25638c46dbf0c;p=luatex-ja%2Fluatexja.git

diff --git a/test/test16-preset.tex b/test/test16-preset.tex
index f5b4e91..19d1ee1 100644
--- a/test/test16-preset.tex
+++ b/test/test16-preset.tex
@@ -1,44 +1,51 @@
 %#!lualatex test16-preset && pdffonts test16-preset.pdf
-\documentclass{ltjsarticle}
-\usepackage[hiragino-pron,jis2004,deluxe,expert,nfssonly]{luatexja-preset}
+\documentclass{ltjtarticle}
+\makeatletter
+\let\ltj@orig@DeclareFontShape@=\DeclareFontShape@
+\def\DeclareFontShape@#1#2#3#4#5#6{%
+      \immediate\typeout{DFS |#1|#2|#3|#4|#5|#6|}%
+      \ltj@orig@DeclareFontShape@{#1}{#2}{#3}{#4}{#5}{#6}%
+      }
+\makeatother
+\usepackage[sourcehan, 90jis,deluxe,expert, match,nfssonly]{luatexja-preset}
 \begin{document}
 \makeatletter
 \def\r#1#2{ \csname #1family \endcsname \csname #2series \endcsname
   %\addjfontfeature {CJKShape=JIS1983}
-  \texttt{<\k@family><\k@series><\k@shape>}\\
-  {\tt#1, #2\ \ \ \ \ }: あいうえおabc漢字，あ！い，辻\\
-  {\tt#1, #2 (rb)}: {\rubyfamily あいうえおabc漢字，あ！い，辻}
+  {\romanfamily{\ttdefault}\selectfont<\k@family><\k@series><\k@shape>}\\
+  {\tt#1, #2\ \ \ \ \ }: あーいうえおabc漢字，あ！い，辻ぁが\\
+  {\tt#1, #2 (rb)}: {\rubyfamily あーいうえおabc漢字，あ！い，辻ぁが}
 }
+\@namedef{..series}{\relax}
 
+\ifdefined\ltseries
+\r{mc}{lt}
+\fi
 
 \r{mc}{md}
 
 \r{mc}{bf}
 
 
-
 \r{gt}{md}
 
 \r{gt}{bf}
 
-\ifdefined\mgfamily
-\r{mg}{md}
+\ifdefined\ebseries
+\r{gt}{eb}
 \fi
 
-\ifdefined\gtebfamily
-\r{gteb}{md}
+\ifdefined\mgfamily
+\r{mg}{md}
 \fi
 
 \r{tt}{md}
 
 \r{tt}{bf}
-%\jfontspec{IPAexMincho}
-
-JIS~X~0213:2004: {\LARGE è¾»}
 
-%\jfontspec[CJKShape=JIS1990]{IPAexMincho}
-JIS~X~0208:1990: {\LARGE è¾»}
+$あいう\mathgt{あいう}$
 
+\normalfont
+{あいうえおabc \sf あいうえおabc}
 
-$あいう\mathgt{あいう}$
 \end{document}