X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=test%2Ftest16-preset.tex;h=71b2c766f4f0f3b50817d671f452169571dc68f3;hb=62f3f5ea15ca7a093fb852ea7f04d8e13daa6531;hp=5bde6669cb70a450ade1267921165d14d99a97f9;hpb=35154aa2b77b7b5aa778b86419c182d43e45e2f5;p=luatex-ja%2Fluatexja.git

diff --git a/test/test16-preset.tex b/test/test16-preset.tex
index 5bde666..71b2c76 100644
--- a/test/test16-preset.tex
+++ b/test/test16-preset.tex
@@ -1,13 +1,43 @@
 %#!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}
+%\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
 
@@ -18,17 +48,19 @@
   mc=SourceHanSerif-Regular,
   mc-l=SourceHanSerif-Bold,
   mc-m=KozMinPr6N-Regular,
-  mg-m=HGSeikaishotaiPRO,
+  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\ \ \ \ \ }: あーいうえおabc漢字，あ！い，辻ぁが\\
-  {\tt#1, #2 (rb)}: {\rubyfamily あーいうえおabc漢字，あ！い，辻ぁが}
+  {\tt#1, #2\ \ \ \ \ }: あーいうえおabcアイ漢字，あ！い，辻ぁが\\
+  {\tt#1, #2 (rb)}: {\rubyfamily あーいうえおabcアイ漢字，あ！い，辻ぁが}
 }
 \@namedef{..series}{\relax}
 
@@ -62,4 +94,11 @@ $あいう\mathgt{あいう}$
 \normalfont
 {あいうえおabc \sf あいうえおabc}
 
+\newpage
+あーいうえおabc漢字，あ！い，辻ぁが\\
+{\fontseries{bx}\selectfont あーいうえおabc漢字，あ！い，辻ぁが}\\
+{\fontseries{b}\selectfont あーいうえおabc漢字，あ！い，辻ぁが}
+
+\bfdefault
+
 \end{document}