luatexja-preset.sty: add jis90 and 2004jis options

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

diff --git a/test/test16-preset.tex b/test/test16-preset.tex
index 478c018..5bde666 100644 (file)
--- a/test/test16-preset.tex
+++ b/test/test16-preset.tex
@@ -1,33 +1,56 @@
-%#!luajitlatex test16-preset && pdffonts test16-preset.pdf
-\documentclass{ltjsarticle}
-\usepackage{fontspec}
-\usepackage[hiragino-pron,jis2004,deluxe,expert,nfssonly]{luatexja-preset}
+%#!lualatex test16-preset && pdffonts test16-preset.pdf
+\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[deluxe,expert,jis2004, match,nfssonly]{luatexja-preset}
+\ltjnewpreset{mc}{} % error
+\ltjnewpreset{kozuka-pro}{} % error
+
+\ltjnewpreset{hoge}{ms}
+\ltjnewpreset{hoge}{} % error
+\ltjnewpreset*{hoge}{
+  kozuka-pr6n,
+  mc=SourceHanSerif-Regular,
+  mc-l=SourceHanSerif-Bold,
+  mc-m=KozMinPr6N-Regular,
+  mg-m=HGSeikaishotaiPRO,
+}
+
+\ltjapplypreset{hoge}
 \begin{document}
 \makeatletter
 \def\r#1#2{ \csname #1family \endcsname \csname #2series \endcsname
   %\addjfontfeature {CJKShape=JIS1983}
   {\romanfamily{\ttdefault}\selectfont<\k@family><\k@series><\k@shape>}\\
-  {\tt#1, #2\ \ \ \ \ }: ã\81\82ã\81\84ã\81\86ã\81\88ã\81\8aabcæ¼¢å­\97ï¼\8cã\81\82ï¼\81ã\81\84ï¼\8cè¾»\\
-  {\tt#1, #2 (rb)}: {\rubyfamily ã\81\82ã\81\84ã\81\86ã\81\88ã\81\8aabcæ¼¢å­\97ï¼\8cã\81\82ï¼\81ã\81\84ï¼\8cè¾»}
+  {\tt#1, #2\ \ \ \ \ }: ã\81\82ã\83¼ã\81\84ã\81\86ã\81\88ã\81\8aabcæ¼¢å­\97ï¼\8cã\81\82ï¼\81ã\81\84ï¼\8cè¾»ã\81\81ã\81\8c\\
+  {\tt#1, #2 (rb)}: {\rubyfamily ã\81\82ã\83¼ã\81\84ã\81\86ã\81\88ã\81\8aabcæ¼¢å­\97ï¼\8cã\81\82ï¼\81ã\81\84ï¼\8cè¾»ã\81\81ã\81\8c}
 }
 \@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}{..}
+\ifdefined\mgfamily
+\r{mg}{md}
 \fi
 
 \r{tt}{md}
@@ -35,6 +58,8 @@
 \r{tt}{bf}
 
 $あいう\mathgt{あいう}$
-\end{document}
 
-3.88
+\normalfont
+{あいうえおabc \sf あいうえおabc}
+
+\end{document}