X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=src%2Faddons%2Fluatexja-fontspec-24.sty;h=1aead90965d459e2393ec2b750c3a138a7118bcc;hb=c021eb16496d60822067a4eab35e2c1137edffd0;hp=19db2157a76b49a6b8dc98cbf71fcc1602ede7cc;hpb=ef9d01b3e5965876c5333b5365d014a024d13c2f;p=luatex-ja%2Fluatexja.git diff --git a/src/addons/luatexja-fontspec-24.sty b/src/addons/luatexja-fontspec-24.sty index 19db215..1aead90 100644 --- a/src/addons/luatexja-fontspec-24.sty +++ b/src/addons/luatexja-fontspec-24.sty @@ -3,13 +3,12 @@ % \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{luatexja-fontspec-24}[2014/06/25 fontspec support of LuaTeX-ja] +\ProvidesPackage{luatexja-fontspec-24}[2014/12/03 fontspec support of LuaTeX-ja] \RequirePackage{l3keys2e,luatexja} \ExplSyntaxOn %%%%%%%% Change Japanese font family by \rmfamily or not -\bool_if:NTF \ltj_fontspec_match -{ +\cs_new:Npn \ltj_fontspec_match_cmd { \renewcommand\jttdefault{\gtdefault} \DeclareRobustCommand\rmfamily {\not@math@alphabet\rmfamily\mathrm @@ -21,12 +20,11 @@ {\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 } -}{ } - +\bool_if:NT \ltj_fontspec_match_bool \ltj_fontspec_match_cmd %%%%%%%% Messages \msg_new:nnn {luatexja-fontspec} {addjfontfeatures-ignored} @@ -88,13 +86,21 @@ \ltj_fontspec_define_altfont_option:nn {Font} { \fontspec_complete_fontname:Nn \l_ltj_fontspec_altname_tl {#1} } - -\cs_new:Nn \__ltj_fontspec_altfont_key_code:n -{ - \clist_set:Nn \l_ltj_fontspec_altfont_clist {#1} +\__fontspec_keys_define_code:nnn {fontspec-ltjaltfont-reparse} {AltFont} { + \clist_put_right:Nn \l_ltj_fontspec_altfont_clist { #1 } } - -%% +\__fontspec_keys_define_code:nnn {fontspec-ltjaltfont-reparse} {YokoFeatures} { + \clist_put_right:Nn \l_ltj_fontspec_fontfeat_yoko_clist { #1 } +} +\__fontspec_keys_define_code:nnn {fontspec-ltjaltfont-reparse} {TateFeatures} { + \clist_put_right:Nn \l_ltj_fontspec_fontfeat_tate_clist { #1 } +} +\__fontspec_keys_define_code:nnn {fontspec-ltjaltfont-reparse} {TateFont} { + \tl_if_empty:nF {#1} { + \fontspec_complete_fontname:Nn \l_ltj_fontspec_fontname_tate_tl {#1} + } +} +%% \clist_new:N \l_ltj_fontspec_fontfeat_yoko_clist \clist_new:N \l_ltj_fontspec_fontfeat_tate_clist \tl_new:N \l_ltj_fontspec_fontname_tate_tl @@ -108,7 +114,7 @@ \cs_new:Nn \ltj_fontspec_select:nn { \group_begin: \ltj_fontspec_define_option:nn {AltFont} { - \__ltj_fontspec_altfont_key_code:n { ##1 } + \clist_put_right:Nn \l_ltj_fontspec_altfont_clist {##1} } \ltj_fontspec_define_option:nn {CID} { \__fontspec_update_featstr:n {cid=##1} @@ -118,7 +124,7 @@ } % vary by shape \ltj_fontspec_define_option:nn {YokoFeatures} { - \clist_set:Nn \l_ltj_fontspec_fontfeat_yoko_clist { ##1 } + \clist_put_right:Nn \l_ltj_fontspec_fontfeat_yoko_clist { ##1 } } \ltj_fontspec_define_option:nn {TateFeatures} { \clist_put_right:Nn \l_ltj_fontspec_fontfeat_tate_clist { ##1 } @@ -141,8 +147,8 @@ \__fontspec_update_featstr:n {-kern} } \clist_set:Nx \g__fontspec_default_fontopts_clist { - YokoFeatures = { JFM=ujis }, TateFeatures = { RawFeature=vrt2, JFM=ujisv }, - Scale=\fp_use:N \g_ltj_fontspec_scale_fp, Kerning=Off, + YokoFeatures = { JFM=ujis }, TateFeatures = { JFM=ujisv }, + Scale=\fp_use:N \g_ltj_fontspec_scale_fp, Kerning=Off, \g__ltj_fontspec_default_fontopts_clist } \prop_set_eq:NN \g__fontspec_fontopts_prop \g__ltj_fontspec_fontopts_prop @@ -154,10 +160,20 @@ } %% declare_shape + +\cs_new:Nn \ltj_fontspec_declare_shape_yoko:nnnn { + \ltj_fontspec_declare_shape_aux:nnnnnn {#1} {#2} {#3} {#4} { JY3 } { \l_ltj_fontspec_fontfeat_yoko_clist } +} +\cs_new:Nn \ltj_fontspec_declare_shape_tate:nnnn { + \ltj_fontspec_declare_shape_aux:nnnnnn {#1} {#2} {#3} {#4} { JT3 } { \l_ltj_fontspec_fontfeat_tate_clist } +} \cs_new:Nn \ltj_fontspec_declare_shape:nnnn { - \ltj_fontspec_declare_shape_aux:nnxxnn {#1} {#2} {#3} {#4} { JY3 } { \l_ltj_fontspec_fontfeat_yoko_clist } - \ltj_fontspec_declare_shape_aux:nnxxnn {#1} {#2} {#3} {#4} { JT3 } { \l_ltj_fontspec_fontfeat_tate_clist } + \ltj_fontspec_declare_shape_yoko:nnnn {#1} {#2} {#3} {#4} + \ltj_fontspec_declare_shape_tate:nnnn {#1} {#2} {#3} {#4} } +\cs_generate_variant:Nn \ltj_fontspec_declare_shape:nnnn {nnxx} +\cs_generate_variant:Nn \ltj_fontspec_declare_shape_yoko:nnnn {nnxx} +\cs_generate_variant:Nn \ltj_fontspec_declare_shape_tate:nnnn {nnxx} \cs_new:Nn \ltj_fontspec_declare_shape_aux:nnnnnn { @@ -189,8 +205,6 @@ \__fontspec_declare_shapes_normal:nn {#1} {#2} \__fontspec_declare_shape_slanted:nn {#1} {#2} } -\cs_generate_variant:Nn \ltj_fontspec_declare_shape:nnnn {nnxx} -\cs_generate_variant:Nn \ltj_fontspec_declare_shape_aux:nnnnnn {nnxxnn} \cs_new:Nn \ltj_fontspec_set_family:Nnn { \cs_set_eq:NN \fontspec_select:nn \ltj_fontspec_select:nn @@ -202,11 +216,28 @@ \cs_set_eq:NN \__ltj_fontspec_orig_DeclareFontShape \DeclareFontShape \cs_new:Nn \ltj_fontspec_make_font_shapes:Nnnnn { \group_begin: + %% 基底フォント \cs_set_eq:NN \__fontspec_font_set:Nnn \use_none:nnn \cs_set_eq:NN \__fontspec_font_if_null:NT \use_none:nn \cs_set_eq:NN \__fontspec_declare_shape:nnxx \ltj_fontspec_declare_shape:nnxx \__ltj_orig_fontspec_make_font_shapes:Nnnnn {#1} {#2} {#3} {#4} {#5} %% + \ltj_fontspec_make_font_shapes_alt:Nnnnnn {#1}{#2}{#3} + {#4, \l_ltj_fontspec_fontfeat_yoko_clist}{#5} {JY3 } + \ltj_fontspec_make_font_shapes_alt:Nnnnnn {#1}{#2}{#3} + {#4, \l_ltj_fontspec_fontfeat_tate_clist}{#5} {JT3} + \group_end: + } + +%%% Altfont 内部処理部 +\cs_new:Nn \ltj_fontspec_make_font_shapes_alt:Nnnnnn { + \group_begin: + \str_if_eq:nnTF { #6 } { JY3 } { + \cs_set_eq:NN \__fontspec_declare_shape:nnxx \ltj_fontspec_declare_shape_yoko:nnxx + }{ + \cs_set_eq:NN \__fontspec_declare_shape:nnxx \ltj_fontspec_declare_shape_tate:nnxx + } + \keys_set_known:nn {fontspec-ltjaltfont-reparse} { #4 } \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 { @@ -216,6 +247,7 @@ \keys_set_known:nxN {fontspec-ltjaltfont} { \exp_after:wN \use:n ##1 } \l_ltj_fontspec_altfont_leftover_clist + \keys_set_known:nn {fontspec-ltjaltfont-reparse} { \exp_after:wN \use:n ##1 } \tl_if_empty:NT \l_ltj_fontspec_altrange_tl { \msg_warning:nnn {luatexja-fontspec} {altfont-ignored-by-norange} { ##1 } @@ -227,19 +259,14 @@ } { \msg_warning:nnn {luatexja-fontspec} {altfont-ignored-by-rangeonly} { ##1 } } { - \__ltj_orig_fontspec_make_font_shapes:Nnnnn - { \l_ltj_fontspec_altname_tl } {#2} - {#3 _ alt \int_use:N \g_ltj_fontspec_altnumber_int } + \__ltj_orig_fontspec_make_font_shapes:Nnnnn + { \l_ltj_fontspec_altname_tl } {#2} + {#3 _ alt \int_use:N \g_ltj_fontspec_altnumber_int } {#4, \l_ltj_fontspec_altfont_leftover_clist } {#5} \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 } - \DeclareAlternateKanjiFont - {JT3}{ \l_fontspec_family_tl }{#2}{#3}% - {JT3}{ \l_fontspec_family_tl }{#2} + { #6 }{ \l_fontspec_family_tl }{#2}{#3}% + { #6 }{ \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 @@ -248,7 +275,8 @@ } } \group_end: - } +} + %%%%%%%% User commands \DeclareDocumentCommand \jfontspec { O{} m O{} } { @@ -329,56 +357,23 @@ } %%% CJKShape=JIS2004 -\__fontspec_define_feature_option:nnnnn{CJKShape}{JIS2004}{20}{5}{+jp04} +\__fontspec_define_feature_option:nnnnn{CJKShape}{JIS2004}{20}{100}{+jp04} +%%% CharacterWidth={VerticalAlternateProportional, VerticalAlternateHalf} +\__fontspec_define_feature_option:nnnnn{CharacterWidth}{VerticalAlternateProportional}{22}{100}{+vpal} +\__fontspec_define_feature_option:nnnnn{CharacterWidth}{VerticalAlternateHalf}{22}{101}{+vhal} +\__fontspec_define_feature_option:nnnnn{Kerning}{Vertical} {}{}{+vkrn} + \ExplSyntaxOff %%%%%%%% Now we completely ignore kanjifont definition file. - -\DeclareRobustCommand\fontfamily[1]{% - \@notkfamfalse\@notffamfalse - \edef\tmp@item{'\luatexluaescapestring{#1}'}% - \edef\tmp@enc{'\luatexluaescapestring{\f@encoding}'}% - \ifcsname \k@encoding+#1\endcsname % if \k@encoding+#1 is already defined - \edef\k@family{#1}% - \else\@notkfamtrue\fi - \ifcsname \f@encoding+#1\endcsname - \edef\f@family{#1}% - \else % search font definition file... - \directlua{luatexja.jfont.is_ffam(\tmp@enc, \tmp@item)}% - \ifin@\edef\k@family{#1}\else% - \directlua{luatexja.jfont.is_Nffam(\tmp@enc, \tmp@item)}% - \ifin@\@notffamtrue\else% - % filename of font definition file is always lowercase - \edef\@temp{\lowercase{\noexpand\IfFileExists{\f@encoding#1.fd}}}% - \message{(I search font definition file)}% - \@temp{\@tempswztrue}{\@tempswzfalse}% - \if@tempswz - \directlua{luatexja.jfont.add_ffam_list(\tmp@enc, \tmp@item)}% - \edef\f@family{#1}% - \else - \directlua{luatexja.jfont.add_Nffam_list(\tmp@enc, \tmp@item)}% - \@notffamtrue% - \fi - \fi - \fi - \fi - \if@notkfam\if@notffam - {\ifcsname D@\k@encoding\endcsname\@nameuse{D@\k@encoding}\fi - \xdef\@@temp{\default@family}}\edef\k@family{\@@temp}% - {\ifcsname D@\f@encoding\endcsname\@nameuse{D@\f@encoding}\fi - \xdef\@@temp{\default@family}}\edef\f@family{\@@temp}% - \fi\fi -} +\@ltj@use@fdfalse % We must redefine \try@load@fontshape to ignore kanjifont definitions at all. \def\try@load@fontshape{% \expandafter \ifx\csname \f@encoding+\f@family\endcsname\relax \directlua{luatexja.jfont.is_kenc('\luatexluaescapestring{\f@encoding}')}% -\ifin@ % Japanese font: we don't search fd. - \@font@warning{We don't search kanjifont definition - \MessageBreak for \f@encoding/\f@family}% -\else % Alphabetic font +\ifin@\else % Alphabetic font \@font@info{Try loading font information for \f@encoding+\f@family}% \global\expandafter\let \csname\f@encoding+\f@family\endcsname\@empty