diff options
author | Karl Berry <karl@freefriends.org> | 2020-02-03 22:31:41 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2020-02-03 22:31:41 +0000 |
commit | 95bf7f250dbac1d55df4f24bd88c21372a555774 (patch) | |
tree | 78a24c234bcdfaa8255420892c4e518dda394422 /Master/texmf-dist/tex | |
parent | 09db320caf1490e42da924b8386dcf8ef4a04af0 (diff) |
fontspec (3feb20)
git-svn-id: svn://tug.org/texlive/trunk@53656 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
4 files changed, 33 insertions, 40 deletions
diff --git a/Master/texmf-dist/tex/latex/fontspec/fontspec-luatex.sty b/Master/texmf-dist/tex/latex/fontspec/fontspec-luatex.sty index 619ec56d998..2b3abb32f9b 100644 --- a/Master/texmf-dist/tex/latex/fontspec/fontspec-luatex.sty +++ b/Master/texmf-dist/tex/latex/fontspec/fontspec-luatex.sty @@ -40,7 +40,7 @@ \RequirePackage{xparse} \ProvidesExplPackage{fontspec-luatex}% - {2020/01/26}{2.7g}{Font selection for XeLaTeX and LuaLaTeX} + {2020/02/03}{2.7h}{Font selection for XeLaTeX and LuaLaTeX} %%^^A%% fontspec-code-load.dtx -- part of FONTSPEC <wspr.io/fontspec> %%^^A%% fontspec-code-vars.dtx -- part of FONTSPEC <wspr.io/fontspec> @@ -1351,7 +1351,7 @@ \__fontspec_set_font_type:N \l__fontspec_test_font \__fontspec_primitive_font_gset:Onn \l__fontspec_fontface_cs_tl { \__fontspec_construct_font_call:nn { \l__fontspec_fontname_up_tl } { \l__fontspec_pre_feat_sclist } } - { \f@size pt } + { \f@size pt + 2sp } \l__fontspec_fontface_cs_tl % this is necessary for LuaLaTeX to check the scripts properly @@ -1565,7 +1565,7 @@ { \clist_clear:N \l__fontspec_fontopts_clist } \keys_set_groups:nnV {fontspec/fontname} {getfontname} \l__fontspec_fontopts_clist \__fontspec_primitive_font_set:OnnF \l__fontspec_fontface_cs_tl - { \__fontspec_construct_font_call:nn {#1} { \l__fontspec_pre_feat_sclist } } { \f@size pt } + { \__fontspec_construct_font_call:nn {#1} { \l__fontspec_pre_feat_sclist } } { \f@size pt + 2sp } { \__fontspec_error:nx {font-not-found} {#2} } } \keys_define:nn {fontspec/fontname} @@ -2285,9 +2285,10 @@ } \__fontspec_keys_define_code:nnn {fontspec-opentype} {UprightFont} {} \__fontspec_keys_define_code:nnn {fontspec-opentype} {ItalicFont} {} +\__fontspec_keys_define_code:nnn {fontspec-opentype} {SlantedFont} {} \__fontspec_keys_define_code:nnn {fontspec-opentype} {BoldFont} {} \__fontspec_keys_define_code:nnn {fontspec-opentype} {BoldItalicFont} {} - +\__fontspec_keys_define_code:nnn {fontspec-opentype} {BoldSlantedFont} {} \__fontspec_keys_define_code:nnn {fontspec-preparse} {NFSSEncoding} { \tl_gset:Nx \g__fontspec_nfss_enc_tl { #1 } @@ -2933,9 +2934,9 @@ } \__fontspec_keys_define_code:nnn {fontspec-opentype} { Language / Default } { - \tl_set:Nn \l__fontspec_lang_tl {DFLT} + \tl_set:Nn \l__fontspec_lang_tl {dflt} \int_zero:N \l__fontspec_language_int - \tl_gset:Nn \g__fontspec_single_feat_tl { language=DFLT } + \tl_gset:Nn \g__fontspec_single_feat_tl { language=dflt } } \cs_new:Nn \__fontspec_ot_compat:nn { @@ -3541,7 +3542,6 @@ \DeclareDocumentCommand \DeclareUnicodeEncoding {mm} { \DeclareFontEncoding{#1}{}{} - \DeclareErrorFont{#1}{lmr}{m}{n}{10} \DeclareFontSubstitution{#1}{lmr}{m}{n} \DeclareFontFamily{#1}{lmr}{} diff --git a/Master/texmf-dist/tex/latex/fontspec/fontspec-xetex.sty b/Master/texmf-dist/tex/latex/fontspec/fontspec-xetex.sty index 1f99dfcf5a2..808b8ebbd15 100644 --- a/Master/texmf-dist/tex/latex/fontspec/fontspec-xetex.sty +++ b/Master/texmf-dist/tex/latex/fontspec/fontspec-xetex.sty @@ -40,7 +40,7 @@ \RequirePackage{xparse} \ProvidesExplPackage{fontspec-xetex}% - {2020/01/26}{2.7g}{Font selection for XeLaTeX and LuaLaTeX} + {2020/02/03}{2.7h}{Font selection for XeLaTeX and LuaLaTeX} %%^^A%% fontspec-code-load.dtx -- part of FONTSPEC <wspr.io/fontspec> %%^^A%% fontspec-code-vars.dtx -- part of FONTSPEC <wspr.io/fontspec> @@ -1343,7 +1343,7 @@ \__fontspec_set_font_type:N \l__fontspec_test_font \__fontspec_primitive_font_gset:Onn \l__fontspec_fontface_cs_tl { \__fontspec_construct_font_call:nn { \l__fontspec_fontname_up_tl } { \l__fontspec_pre_feat_sclist } } - { \f@size pt } + { \f@size pt + 2sp } \l__fontspec_fontface_cs_tl % this is necessary for LuaLaTeX to check the scripts properly @@ -1582,7 +1582,7 @@ { \clist_clear:N \l__fontspec_fontopts_clist } \keys_set_groups:nnV {fontspec/fontname} {getfontname} \l__fontspec_fontopts_clist \__fontspec_primitive_font_set:OnnF \l__fontspec_fontface_cs_tl - { \__fontspec_construct_font_call:nn {#1} { \l__fontspec_pre_feat_sclist } } { \f@size pt } + { \__fontspec_construct_font_call:nn {#1} { \l__fontspec_pre_feat_sclist } } { \f@size pt + 2sp } { \__fontspec_error:nx {font-not-found} {#2} } } \keys_define:nn {fontspec/fontname} @@ -1823,13 +1823,6 @@ + \ifx \c_empty_tl #5 32 \else `#5 \fi } } -\cs_new_protected:Nn \__fontspec_lang_dflt_correct:N - { - \int_compare:nNnT {#1} = {1145457748} % "DFLT" - { - \int_zero:N #1 - } - } %%^^A%% fontspec-code-opentype.dtx -- part of FONTSPEC <wspr.io/fontspec> @@ -1980,27 +1973,27 @@ { \prg_return_false: } { \__fontspec_iv_str_to_num:Nx \l__fontspec_strnum_int {#2} - \__fontspec_iv_str_to_num:Nx \l__fontspec_language_int {#3} - \__fontspec_lang_dflt_correct:N \l__fontspec_language_int + + \str_if_eq:eeTF {#3} {dflt} + { \int_zero:N \l__fontspec_language_int } + { \__fontspec_iv_str_to_num:Nx \l__fontspec_language_int {#3} } \__fontspec_iv_str_to_num:Nx \l__fontspec_script_int {#4} + \int_set:Nn \l_tmpb_int - { - \XeTeXOTcountfeatures #1 - \l__fontspec_script_int - \l__fontspec_language_int - } + { \XeTeXOTcountfeatures #1 \l__fontspec_script_int \l__fontspec_language_int } + \int_zero:N \l_tmpa_int \bool_set_false:N \l__fontspec_check_bool \bool_until_do:nn { \int_compare_p:nNn \l_tmpa_int = \l_tmpb_int } - { - \ifnum\XeTeXOTfeaturetag #1 \l__fontspec_script_int \l__fontspec_language_int - \l_tmpa_int =\l__fontspec_strnum_int - \bool_set_true:N \l__fontspec_check_bool - \int_set:Nn \l_tmpa_int {\l_tmpb_int} - \else - \int_incr:N \l_tmpa_int - \fi - } + { + \ifnum\XeTeXOTfeaturetag #1 \l__fontspec_script_int \l__fontspec_language_int + \l_tmpa_int =\l__fontspec_strnum_int + \bool_set_true:N \l__fontspec_check_bool + \int_set:Nn \l_tmpa_int {\l_tmpb_int} + \else + \int_incr:N \l_tmpa_int + \fi + } \bool_if:NTF \l__fontspec_check_bool \prg_return_true: \prg_return_false: } } @@ -2403,9 +2396,10 @@ } \__fontspec_keys_define_code:nnn {fontspec-opentype} {UprightFont} {} \__fontspec_keys_define_code:nnn {fontspec-opentype} {ItalicFont} {} +\__fontspec_keys_define_code:nnn {fontspec-opentype} {SlantedFont} {} \__fontspec_keys_define_code:nnn {fontspec-opentype} {BoldFont} {} \__fontspec_keys_define_code:nnn {fontspec-opentype} {BoldItalicFont} {} - +\__fontspec_keys_define_code:nnn {fontspec-opentype} {BoldSlantedFont} {} \__fontspec_keys_define_code:nnn {fontspec-preparse} {NFSSEncoding} { \tl_gset:Nx \g__fontspec_nfss_enc_tl { #1 } @@ -3061,9 +3055,9 @@ } \__fontspec_keys_define_code:nnn {fontspec-opentype} { Language / Default } { - \tl_set:Nn \l__fontspec_lang_tl {DFLT} + \tl_set:Nn \l__fontspec_lang_tl {dflt} \int_zero:N \l__fontspec_language_int - \tl_gset:Nn \g__fontspec_single_feat_tl { language=DFLT } + \tl_gset:Nn \g__fontspec_single_feat_tl { language=dflt } } \cs_new:Nn \__fontspec_ot_compat:nn { @@ -3807,7 +3801,6 @@ \DeclareDocumentCommand \DeclareUnicodeEncoding {mm} { \DeclareFontEncoding{#1}{}{} - \DeclareErrorFont{#1}{lmr}{m}{n}{10} \DeclareFontSubstitution{#1}{lmr}{m}{n} \DeclareFontFamily{#1}{lmr}{} diff --git a/Master/texmf-dist/tex/latex/fontspec/fontspec.lua b/Master/texmf-dist/tex/latex/fontspec/fontspec.lua index 85797603ca2..4a9592992bd 100644 --- a/Master/texmf-dist/tex/latex/fontspec/fontspec.lua +++ b/Master/texmf-dist/tex/latex/fontspec/fontspec.lua @@ -23,8 +23,8 @@ fontspec = fontspec or {} local fontspec = fontspec fontspec.module = { name = "fontspec", - version = "2.7g", - date = "2020/01/26", + version = "2.7h", + date = "2020/02/03", description = "Font selection for XeLaTeX and LuaLaTeX", author = "Khaled Hosny, Philipp Gesang, Will Robertson", copyright = "Khaled Hosny, Philipp Gesang, Will Robertson", diff --git a/Master/texmf-dist/tex/latex/fontspec/fontspec.sty b/Master/texmf-dist/tex/latex/fontspec/fontspec.sty index 325fdf2456c..0ff5a4e850f 100644 --- a/Master/texmf-dist/tex/latex/fontspec/fontspec.sty +++ b/Master/texmf-dist/tex/latex/fontspec/fontspec.sty @@ -21,7 +21,7 @@ \RequirePackage{xparse} \ProvidesExplPackage{fontspec}% - {2020/01/26}{2.7g}{Font selection for XeLaTeX and LuaLaTeX} + {2020/02/03}{2.7h}{Font selection for XeLaTeX and LuaLaTeX} %%^^A%% fontspec-code-load.dtx -- part of FONTSPEC <wspr.io/fontspec> \sys_if_engine_luatex:T |