updated documents, avoid errors in non-embedded fonts

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

diff --git a/test/test16-preset.tex b/test/test16-preset.tex
index a012452..71b2c76 100644 (file)
--- a/test/test16-preset.tex
+++ b/test/test16-preset.tex
@@ -1,32 +1,88 @@
 %#!lualatex test16-preset && pdffonts test16-preset.pdf
-\documentclass{ltjarticle}
-\usepackage[moga-mobo,deluxe,expert, nfssonly, jis2004, match]{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}%
+%      }
+\usepackage[deluxe,expert,jis2004, match]{luatexja-preset}
+
+\ExplSyntaxOn
+\cs_new:Nn \__my_ltjpreset_kana_color: {FF00FF}
+\cs_new:Nn \__my_ltjpreset_kana_range: {"30A0-"30AF}
+\cs_new:Nn \ltjpreset_define_family_hook_nfssonly:nnn
+{
+    \__ltjpreset_declare_font_shape:nnnnnnn { JY3 }
+      { ltjp #1 \int_to_arabic:n { \g__ltjpreset_applycount_int }} { #2 } { nk }
+      { "#3" : jfm=\tl_use:N \__ltjpreset_use_jfm_yoko_tl }
+      { script=hani \bool_if:NT \g__ltjpreset_expert_bool { ;+hkna }
+               ; color=\__my_ltjpreset_kana_color: }
+      { \Cjascale }
+    \DeclareAlternateKanjiFont
+      { JY3 } { ltjp #1 \int_to_arabic:n { \g__ltjpreset_applycount_int }} { #2 } { n }
+      { JY3 } { ltjp #1 \int_to_arabic:n { \g__ltjpreset_applycount_int }} { #2 } { nk }
+      { \__my_ltjpreset_kana_range: }
+    \__ltjpreset_declare_font_shape:nnnnnnn { JT3 }
+      { ltjp #1 \int_to_arabic:n { \g__ltjpreset_applycount_int }} { #2 } { nk }
+      { "#3" : jfm=\tl_use:N \__ltjpreset_use_jfm_tate_tl }
+      { script=hani \bool_if:NT \g__ltjpreset_expert_bool { ;+vkna }
+               ; color=\__my_ltjpreset_kana_color: }
+      { \Cjascale }
+    \DeclareAlternateKanjiFont
+      { JT3 } { ltjp #1 \int_to_arabic:n { \g__ltjpreset_applycount_int }} { #2 } { n }
+      { JT3 } { ltjp #1 \int_to_arabic:n { \g__ltjpreset_applycount_int }} { #2 } { nk }
+      { \__my_ltjpreset_kana_range: }
+}
+\cs_new:Nn \ltjpreset_define_family_hook_fontspec:nnn {
+    AltFont={ { Range=\__my_ltjpreset_kana_range:, Color=\__my_ltjpreset_kana_color: } }
+}
+\ExplSyntaxOff
+\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=KozMinPr6N-Light,
+}
+
+\makeatother
+
+\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ã\82¢ã\82¤æ¼¢å­\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ã\82¢ã\82¤æ¼¢å­\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}
@@ -37,6 +93,12 @@ $あいう\mathgt{あいう}$
 
 \normalfont
 {あいうえおabc \sf あいうえおabc}
-\end{document}
 
-3.88
+\newpage
+あーいうえおabc漢字，あ！い，辻ぁが\\
+{\fontseries{bx}\selectfont あーいうえおabc漢字，あ！い，辻ぁが}\\
+{\fontseries{b}\selectfont あーいうえおabc漢字，あ！い，辻ぁが}
+
+\bfdefault
+
+\end{document}