Merge branch 'kitagawa_test' of git.sourceforge.jp:/gitroot/luatex-ja/luatexja into...

[luatex-ja/luatexja.git] / test / test16-preset.tex

diff --git a/test/test16-preset.tex b/test/test16-preset.tex
index f151ae9..478c018 100644 (file)
--- 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[ipa-dx,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,21 +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}
 
-
+$あいう\mathgt{あいう}$
 \end{document}
+
+3.88