X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=test%2Ftest16-preset.tex;h=478c018757c9522900b3e9b61d76457ec82a45e6;hb=eb118f3e5ea0852407b5261817700401699528b9;hp=5c9c3568ffab8aab91ec926ecd1dad1ef922ca74;hpb=afbb2516bf129f9f3a48e277ef1dc9b86327c897;p=luatex-ja%2Fluatexja.git

diff --git a/test/test16-preset.tex b/test/test16-preset.tex
index 5c9c356..478c018 100644
--- a/test/test16-preset.tex
+++ b/test/test16-preset.tex
@@ -1,12 +1,16 @@
-%#!lualatex test16-preset && pdffonts test16-preset.pdf
+%#!luajitlatex test16-preset && pdffonts test16-preset.pdf
 \documentclass{ltjsarticle}
-
-\usepackage[kozuka-pr6n,jis2004,deluxe]{luatexja-preset}
-
+\usepackage{fontspec}
+\usepackage[hiragino-pron,jis2004,deluxe,expert,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}
 
 \r{mc}{md}
 
@@ -14,26 +18,23 @@
 
 
 
-\r{sf}{md}
+\r{gt}{md}
 
-\r{sf}{bf}
+\r{gt}{bf}
 
 \ifdefined\mgfamily
 \r{mg}{md}
 \fi
 
 \ifdefined\gtebfamily
-\r{gteb}{md}
+\r{gteb}{..}
 \fi
 
 \r{tt}{md}
 
 \r{tt}{bf}
 
-\jfontspec{IPAexMincho}
-JIS~X~0213:2004: {\LARGE è¾»}
-
-\jfontspec[CJKShape=JIS1990]{IPAexMincho}
-JIS~X~0208:1990: {\LARGE è¾»}
-
+$あいう\mathgt{あいう}$
 \end{document}
+
+3.88