From 6f319b1aa69b15f0e00b308b0cb611a8b7740d45 Mon Sep 17 00:00:00 2001 From: Hironori Kitagawa Date: Wed, 16 Apr 2014 08:42:38 +0900 Subject: [PATCH] Added warning messages for AltFont. --- src/addons/luatexja-fontspec.sty | 109 ++++++++++++++++++++++++--------------- 1 file changed, 67 insertions(+), 42 deletions(-) diff --git a/src/addons/luatexja-fontspec.sty b/src/addons/luatexja-fontspec.sty index f902f99..43666d3 100644 --- a/src/addons/luatexja-fontspec.sty +++ b/src/addons/luatexja-fontspec.sty @@ -3,7 +3,7 @@ % \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{luatexja-fontspec}[2014/03/25 fontspec support of LuaTeX-ja] +\ProvidesPackage{luatexja-fontspec}[2014/04/16 fontspec support of LuaTeX-ja] \RequirePackage{l3keys2e,luatexja} \ExplSyntaxOn @@ -32,25 +32,35 @@ {\not@math@alphabet\ttfamily\mathtt \romanfamily\ttdefault\kanjifamily\jttdefault\selectfont} \DeclareDocumentCommand \setmonojfont { O{} m } { - \ltj_fontspec_set_family:Nnn \jttdefault {#1}{#2} + \__ltj_fontspec_set_family:Nnn \jttdefault {#1}{#2} \normalfont } }{ } %%%%%%%% Messages -\cs_new:Npn \ltj_fontspec_warning:n { \msg_warning:nn {ltj-fontspec} } -\msg_new:nnn {ltj-fontspec} {addjfontfeatures-ignored} +\msg_new:nnn {luatexja-fontspec} {addjfontfeatures-ignored} { \string\addjfontfeature (s)~ ignored;\\ it~ cannot~ be~ used~ with~ a~ font~ that~ wasn't~ selected~ by~ luatexja-fontspec. } +\msg_new:nnn {luatexja-fontspec} {altfont-ignored-by-norange} +{ + ignored~ sublist~ `#1'~ in~ AltFont~ (no~ range~ is~ specified). +} + +\msg_new:nnn {luatexja-fontspec} {altfont-ignored-by-rangeonly} +{ + ignored~ sublist~ `#1'~ in~ AltFont~ (only~ range~ is~ specified). +} + \cs_generate_variant:Nn \prg_new_conditional:Nnn {Nnx} %%%%%%%% \g_ltj_fontspec_scale_fp %% Default scale value for jfont. +\fp_new:N \g_ltj_fontspec_scale_fp \group_begin: \fontsize{10}{10}\selectfont \fp_gset:Nn \g_ltj_fontspec_scale_fp {\zw / 10} @@ -78,26 +88,27 @@ %% { Range = , Font = }, %% ... %% } -\tl_new:N \ltj_fontspec_altrange_tl -\tl_new:N \ltj_fontspec_altfont_clist -\tl_new:N \ltj_fontspec_altfont_leftover_clist +\tl_new:N \l_ltj_fontspec_altname_tl +\tl_new:N \l_ltj_fontspec_altrange_tl +\clist_new:N \l_ltj_fontspec_altfont_clist +\clist_new:N \l_ltj_fontspec_altfont_leftover_clist +\int_new:N \g_ltj_fontspec_altnumber_int \ltj_fontspec_define_altfont_option:nn {Range} { - \tl_set:Nn \ltj_fontspec_altrange_tl {#1} + \tl_set:Nn \l_ltj_fontspec_altrange_tl {#1} } \ltj_fontspec_define_altfont_option:nn {Font} { - \fontspec_complete_fontname:Nn \ltj_fontspec_altname_tl {#1} + \fontspec_complete_fontname:Nn \l_ltj_fontspec_altname_tl {#1} } \cs_new:Nn \__ltj_fontspec_altfont_key_code:n { - \clist_set:Nn \ltj_fontspec_altfont_clist {#1} + \clist_set:Nn \l_ltj_fontspec_altfont_clist {#1} \fontspec_update_fontid:n {alt:#1} } \cs_new:Nn \ltj_fontspec_select:nn { \group_begin: - \bool_set_false:N \ltj_fontspec_alt_bool \ltj_fontspec_define_option:nn {AltFont} { \__ltj_fontspec_altfont_key_code:n { ##1 } } @@ -133,45 +144,59 @@ \group_end: } -\cs_new:Nn \ltj_fontspec_set_family:Nnn { +\cs_new:Nn \__ltj_fontspec_set_family:Nnn { \ltj_fontspec_select:nn{#2}{#3} \tl_set_eq:NN #1 \l_fontspec_family_tl } -\cs_set_eq:NN \ltj_orig_fontspec_make_font_shapes:nnnn \fontspec_make_font_shapes:nnnn -\cs_set_eq:NN \ltj_fontspec_orig_DeclareFontShape \DeclareFontShape -\def \ltj_fontspec_dummy_DeclareFontShape #1#2#3#4#5#6 {} +\cs_set_eq:NN \__ltj_orig_fontspec_make_font_shapes:nnnn \fontspec_make_font_shapes:nnnn +\cs_set_eq:NN \__ltj_fontspec_orig_DeclareFontShape \DeclareFontShape \cs_new:Nn \ltj_fontspec_make_font_shapes:nnnn { - \ltj_orig_fontspec_make_font_shapes:nnnn {#1} {#2} {#3} {#4} + \__ltj_orig_fontspec_make_font_shapes:nnnn {#1} {#2} {#3} {#4} \group_begin: %% Parse font features. However, we have to avoid redefine already defined shape. \__fontspec_load_fontname:n {#1} - \cs_set_eq:NN \DeclareFontShape \ltj_fontspec_dummy_DeclareFontShape + \cs_set_eq:NN \DeclareFontShape \use_none:nnnnnn \fontspec_declare_shape:nnn {#2}{#3} { \quark_if_no_value:NF \l__fontspec_fontopts_clist {\l__fontspec_fontopts_clist,} #4 } - \cs_set_eq:NN \DeclareFontShape \ltj_fontspec_orig_DeclareFontShape + \cs_set_eq:NN \DeclareFontShape \__ltj_fontspec_orig_DeclareFontShape %% - \clist_if_empty:NF \ltj_fontspec_altfont_clist { - \int_zero:N \l_tmpa_int - \clist_map_inline:Nn \ltj_fontspec_altfont_clist { - \tl_clear:N \ltj_fontspec_altrange_tl - \tl_set:Nn \ltj_fontspec_altname_tl { #1 } + \clist_if_empty:NF \l_ltj_fontspec_altfont_clist { + \int_gzero:N \g_ltj_fontspec_altnumber_int + \clist_map_inline:Nn \l_ltj_fontspec_altfont_clist { + \tl_clear:N \l_ltj_fontspec_altrange_tl + \tl_set:Nn \l_ltj_fontspec_altname_tl { #1 } + \tl_set:Nn \l_tmpa_tl { #1 } \keys_set_known:nxN {fontspec-ltjaltfont} { \exp_after:wN \use:n ##1 } - \ltj_fontspec_altfont_leftover_clist - - %\tl_if_empty:NT \ltj_fontspec_altrange_tl { ... }% 警告 - \group_begin: - \__fontspec_load_fontname:n { \ltj_fontspec_altname_tl } - \fontspec_declare_shape:nnn {#2}{#3 _ alt \int_use:N \l_tmpa_int } { - \quark_if_no_value:NF \l__fontspec_fontopts_clist {\l__fontspec_fontopts_clist,} - #4 , \ltj_fontspec_altfont_leftover_clist - } - \group_end: - \DeclareAlternateKanjiFont - {JY3}{ \l_fontspec_family_tl }{#2}{#3}% - {JY3}{ \l_fontspec_family_tl }{#2}{ #3 _alt\int_use:N \l_tmpa_int } - { \ltj_fontspec_altrange_tl } - \int_incr:N \l_tmpa_int + \l_ltj_fontspec_altfont_leftover_clist + + \tl_if_empty:NT \l_ltj_fontspec_altrange_tl { + \msg_warning:nnn {luatexja-fontspec} {altfont-ignored-by-norange} { ##1 } + } { + \bool_if:nTF { + \tl_if_eq_p:NN \l_ltj_fontspec_altname_tl \l_tmpa_tl + && + \tl_if_empty_p:N \l_ltj_fontspec_altfont_leftover_clist + } { + \msg_warning:nnn {luatexja-fontspec} {altfont-ignored-by-rangeonly} { ##1 } + } { + \group_begin: + \__fontspec_load_fontname:n { \l_ltj_fontspec_altname_tl } + \fontspec_declare_shape:nnn {#2} + {#3 _ alt \int_use:N \g_ltj_fontspec_altnumber_int } + { + \quark_if_no_value:NF \l__fontspec_fontopts_clist {\l__fontspec_fontopts_clist,} + #4 , \l_ltj_fontspec_altfont_leftover_clist + } + \group_end: + \DeclareAlternateKanjiFont + {JY3}{ \l_fontspec_family_tl }{#2}{#3}% + {JY3}{ \l_fontspec_family_tl }{#2} + { #3 _alt \int_use:N \g_ltj_fontspec_altnumber_int } + { \l_ltj_fontspec_altrange_tl } + \int_gincr:N \g_ltj_fontspec_altnumber_int + } + } } } \group_end: @@ -179,20 +204,20 @@ %%%%%%%% User commands \DeclareDocumentCommand \jfontspec { O{} m } { - \ltj_fontspec_set_family:Nnn \k@family {#1}{#2} + \__ltj_fontspec_set_family:Nnn \k@family {#1}{#2} \selectfont \ignorespaces } \DeclareDocumentCommand \setmainjfont { O{} m } { - \ltj_fontspec_set_family:Nnn \mcdefault {#1}{#2} + \__ltj_fontspec_set_family:Nnn \mcdefault {#1}{#2} \DeclareSymbolFont{mincho}{JY3}{\l_fontspec_family_tl}{m}{n} \SetSymbolFont{mincho}{bold}{JY3}{\l_fontspec_family_tl}{bx}{n} \normalfont } \DeclareDocumentCommand \setsansjfont { O{} m } { - \ltj_fontspec_set_family:Nnn \gtdefault {#1}{#2} + \__ltj_fontspec_set_family:Nnn \gtdefault {#1}{#2} \DeclareMathAlphabet{\mathgt}{JY3}{\l_fontspec_family_tl}{m}{n} \normalfont } @@ -242,7 +267,7 @@ \group_end: \fontfamily\l_fontspec_family_tl\selectfont \else - \ltj_fontspec_warning:n {addjfontfeatures-ignored} + \msg_warning:nn {luatexja-fontspec} {addjfontfeatures-ignored} \fi \ignorespaces } -- 2.11.0