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

diff --git a/test/test16-preset.tex b/test/test16-preset.tex
index f151ae9..19d1ee1 100644
--- a/test/test16-preset.tex
+++ b/test/test16-preset.tex
@@ -1,34 +1,51 @@
 %#!lualatex test16-preset && pdffonts test16-preset.pdf
-\documentclass{ltjsarticle}
-
-\usepackage[ipa-dx,jis2004,deluxe]{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
-  {\tt #1, #2: }あいうえおabc漢字，あ！い，辻
+  %\addjfontfeature {CJKShape=JIS1983}
+  {\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{sf}{md}
+\r{gt}{bf}
 
-\r{sf}{bf}
+\ifdefined\ebseries
+\r{gt}{eb}
+\fi
 
 \ifdefined\mgfamily
 \r{mg}{md}
 \fi
 
-\ifdefined\gtebfamily
-\r{gteb}{md}
-\fi
-
 \r{tt}{md}
 
 \r{tt}{bf}
 
+$あいう\mathgt{あいう}$
+
+\normalfont
+{あいうえおabc \sf あいうえおabc}
 
 \end{document}