diff options
Diffstat (limited to 'macros/latex/contrib/fontspec/fontspec-code-keyval.dtx')
-rw-r--r-- | macros/latex/contrib/fontspec/fontspec-code-keyval.dtx | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/macros/latex/contrib/fontspec/fontspec-code-keyval.dtx b/macros/latex/contrib/fontspec/fontspec-code-keyval.dtx index d7d0f15688..ad8e0629b5 100644 --- a/macros/latex/contrib/fontspec/fontspec-code-keyval.dtx +++ b/macros/latex/contrib/fontspec/fontspec-code-keyval.dtx @@ -99,7 +99,7 @@ \keys_define:nn {fontspec-renderer} { Renderer .choices:nn = - {AAT,ICU,OpenType,Graphite,Full,Basic,Node,Base,Harfbuzz} + {AAT,ICU,OpenType,Graphite,Full,Basic,Node,Base,HarfBuzz,Harfbuzz} { \int_compare:nTF {\l_keys_choice_int <= 4} { @@ -111,7 +111,7 @@ \tl_gset:Nx \g_@@_single_feat_tl { \l_@@_renderer_tl } } { - \@@_warning:nx {only-luatex-feature} {Renderer=Full/Basic/Node/Base/Harfbuzz} + \@@_warning:nx {only-luatex-feature} {Renderer=Full/Basic/Node/Base/HarfBuzz} } } } @@ -120,18 +120,18 @@ \keys_define:nn {fontspec-renderer} { Renderer .choices:nn = - {Full,Node,Basic,Base,Harfbuzz,OpenType,AAT,Graphite} + {Full,Node,Basic,Base,HarfBuzz,Harfbuzz,OpenType,AAT,Graphite} { \int_compare:nT {\l_keys_choice_int >= 5} { \bool_set_true:N \l_@@_harfbuzz_bool } \tl_set:Nx \l_@@_mode_tl { - \int_case:nn \l_keys_choice_int { 1 {node} 2 {node} 3 {base} 4 {base} 5 {harf} 6 {harf} 7 {harf} 8 {harf} } + \int_case:nn \l_keys_choice_int { 1 {node} 2 {node} 3 {base} 4 {base} 5 {harf} 6 {harf} 7 {harf} 8 {harf} 9 {harf}} } \tl_set:Nx \l_@@_shaper_tl { - \int_case:nn \l_keys_choice_int { 1 {} 2 {} 3 {} 4 {} 5 {} 6 {ot} 7 {coretext_aat} 8 {graphite2} } + \int_case:nn \l_keys_choice_int { 1 {} 2 {} 3 {} 4 {} 5 {} 6 {} 7 {ot} 8 {coretext_aat} 9 {graphite2} } } %<debug>\typeout{Mode:~"\l_@@_mode_tl"~/~Shaper:~"\l_@@_shaper_tl"} @@ -379,6 +379,15 @@ } % \end{macrocode} % +% A hack to fix a test, needs to be investigated why necessary! +% \begin{macrocode} +\@@_keys_define_code:nnn {fontspec-opentype} {UprightFont} {} +\@@_keys_define_code:nnn {fontspec-opentype} {ItalicFont} {} +\@@_keys_define_code:nnn {fontspec-opentype} {BoldFont} {} +\@@_keys_define_code:nnn {fontspec-opentype} {BoldItalicFont} {} +% \end{macrocode} + +% % % % \subsection{General font-independent features} @@ -883,7 +892,7 @@ % ------------------------------------------------ % The FONTSPEC package <wspr.io/fontspec> % ------------------------------------------------ -% Copyright 2004-2019 Will Robertson, LPPL "maintainer" +% Copyright 2004-2020 Will Robertson, LPPL "maintainer" % Copyright 2009-2015 Khaled Hosny % Copyright 2013 Philipp Gesang % Copyright 2013-2016 Joseph Wright |