From 95bf7f250dbac1d55df4f24bd88c21372a555774 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 3 Feb 2020 22:31:41 +0000 Subject: fontspec (3feb20) git-svn-id: svn://tug.org/texlive/trunk@53656 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/fontspec/CHANGES.md | 8 ++++ .../doc/latex/fontspec/fontspec-code.pdf | Bin 627145 -> 626791 bytes Master/texmf-dist/doc/latex/fontspec/fontspec.pdf | Bin 610857 -> 610880 bytes .../source/latex/fontspec/fontspec-code-enc.dtx | 1 - .../latex/fontspec/fontspec-code-feat-opentype.dtx | 4 +- .../latex/fontspec/fontspec-code-internal.dtx | 18 +------ .../source/latex/fontspec/fontspec-code-keyval.dtx | 3 +- .../latex/fontspec/fontspec-code-opentype.dtx | 32 ++++++------- .../texmf-dist/source/latex/fontspec/fontspec.dtx | 6 +-- .../tex/latex/fontspec/fontspec-luatex.sty | 14 +++--- .../tex/latex/fontspec/fontspec-xetex.sty | 53 +++++++++------------ Master/texmf-dist/tex/latex/fontspec/fontspec.lua | 4 +- Master/texmf-dist/tex/latex/fontspec/fontspec.sty | 2 +- 13 files changed, 66 insertions(+), 79 deletions(-) (limited to 'Master') diff --git a/Master/texmf-dist/doc/latex/fontspec/CHANGES.md b/Master/texmf-dist/doc/latex/fontspec/CHANGES.md index d65a8b1c01f..176a83b6c89 100644 --- a/Master/texmf-dist/doc/latex/fontspec/CHANGES.md +++ b/Master/texmf-dist/doc/latex/fontspec/CHANGES.md @@ -1,6 +1,14 @@ Change history ============== +## v2.7h (2020/02/03) + + * Eroneous uses of `language=DFLT` changed to `language=dflt`. + * Fix spurious error in some cases of `SlantedFont` and `BoldSlantedFont` + being specified in a `.fontspec` file. + * Fix regression with `unicode-math` related log files showing the wrong + NFSS-based font ‘identifier’. + ## v2.7g (2020/01/26) * Fix regression that broke changing the default encoding after `fontspec` was loaded diff --git a/Master/texmf-dist/doc/latex/fontspec/fontspec-code.pdf b/Master/texmf-dist/doc/latex/fontspec/fontspec-code.pdf index 8982d35be2f..9ca1bd34304 100644 Binary files a/Master/texmf-dist/doc/latex/fontspec/fontspec-code.pdf and b/Master/texmf-dist/doc/latex/fontspec/fontspec-code.pdf differ diff --git a/Master/texmf-dist/doc/latex/fontspec/fontspec.pdf b/Master/texmf-dist/doc/latex/fontspec/fontspec.pdf index b64f4417713..2003bddf9ce 100644 Binary files a/Master/texmf-dist/doc/latex/fontspec/fontspec.pdf and b/Master/texmf-dist/doc/latex/fontspec/fontspec.pdf differ diff --git a/Master/texmf-dist/source/latex/fontspec/fontspec-code-enc.dtx b/Master/texmf-dist/source/latex/fontspec/fontspec-code-enc.dtx index 8969c1be9cc..7d304480029 100644 --- a/Master/texmf-dist/source/latex/fontspec/fontspec-code-enc.dtx +++ b/Master/texmf-dist/source/latex/fontspec/fontspec-code-enc.dtx @@ -69,7 +69,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/source/latex/fontspec/fontspec-code-feat-opentype.dtx b/Master/texmf-dist/source/latex/fontspec/fontspec-code-feat-opentype.dtx index 935cf81a702..77d431ccf84 100644 --- a/Master/texmf-dist/source/latex/fontspec/fontspec-code-feat-opentype.dtx +++ b/Master/texmf-dist/source/latex/fontspec/fontspec-code-feat-opentype.dtx @@ -525,9 +525,9 @@ % \begin{macrocode} \@@_keys_define_code:nnn {fontspec-opentype} { Language / Default } { - \tl_set:Nn \l_@@_lang_tl {DFLT} + \tl_set:Nn \l_@@_lang_tl {dflt} \int_zero:N \l_@@_language_int - \tl_gset:Nn \g_@@_single_feat_tl { language=DFLT } + \tl_gset:Nn \g_@@_single_feat_tl { language=dflt } } % \end{macrocode} % diff --git a/Master/texmf-dist/source/latex/fontspec/fontspec-code-internal.dtx b/Master/texmf-dist/source/latex/fontspec/fontspec-code-internal.dtx index 432ae803f60..6282569a6f0 100644 --- a/Master/texmf-dist/source/latex/fontspec/fontspec-code-internal.dtx +++ b/Master/texmf-dist/source/latex/fontspec/fontspec-code-internal.dtx @@ -241,7 +241,7 @@ \@@_set_font_type:N \l_@@_test_font \@@_primitive_font_gset:Onn \l_@@_fontface_cs_tl { \@@_construct_font_call:nn { \l_@@_fontname_up_tl } { \l_@@_pre_feat_sclist } } - { \f@size pt } + { \f@size pt + 2sp } \l_@@_fontface_cs_tl % this is necessary for LuaLaTeX to check the scripts properly @@ -682,7 +682,7 @@ { \clist_clear:N \l_@@_fontopts_clist } \keys_set_groups:nnV {fontspec/fontname} {getfontname} \l_@@_fontopts_clist \@@_primitive_font_set:OnnF \l_@@_fontface_cs_tl - { \@@_construct_font_call:nn {#1} { \l_@@_pre_feat_sclist } } { \f@size pt } + { \@@_construct_font_call:nn {#1} { \l_@@_pre_feat_sclist } } { \f@size pt + 2sp } { \@@_error:nx {font-not-found} {#2} } } % \end{macrocode} @@ -1146,20 +1146,6 @@ % \end{macrocode} % \end{macro} % -% \begin{macro}{\@@_lang_dflt_correct:N} -% \begin{macrocode} -%<*XE> -\cs_new_protected:Nn \@@_lang_dflt_correct:N - { - \int_compare:nNnT {#1} = {1145457748} % "DFLT" - { - \int_zero:N #1 - } - } -% -% \end{macrocode} -% \end{macro} -% % % \iffalse % \begin{macrocode} diff --git a/Master/texmf-dist/source/latex/fontspec/fontspec-code-keyval.dtx b/Master/texmf-dist/source/latex/fontspec/fontspec-code-keyval.dtx index b7e660da0c5..87a93c176bd 100644 --- a/Master/texmf-dist/source/latex/fontspec/fontspec-code-keyval.dtx +++ b/Master/texmf-dist/source/latex/fontspec/fontspec-code-keyval.dtx @@ -383,10 +383,11 @@ % \begin{macrocode} \@@_keys_define_code:nnn {fontspec-opentype} {UprightFont} {} \@@_keys_define_code:nnn {fontspec-opentype} {ItalicFont} {} +\@@_keys_define_code:nnn {fontspec-opentype} {SlantedFont} {} \@@_keys_define_code:nnn {fontspec-opentype} {BoldFont} {} \@@_keys_define_code:nnn {fontspec-opentype} {BoldItalicFont} {} +\@@_keys_define_code:nnn {fontspec-opentype} {BoldSlantedFont} {} % \end{macrocode} - % % % diff --git a/Master/texmf-dist/source/latex/fontspec/fontspec-code-opentype.dtx b/Master/texmf-dist/source/latex/fontspec/fontspec-code-opentype.dtx index ad9413eca44..be0b8be7686 100644 --- a/Master/texmf-dist/source/latex/fontspec/fontspec-code-opentype.dtx +++ b/Master/texmf-dist/source/latex/fontspec/fontspec-code-opentype.dtx @@ -283,27 +283,27 @@ %<*XE> %\typeout{::~ fontspec_check_ot_feat:nnn~ {#2}{#3}{#4}} \@@_iv_str_to_num:Nx \l_@@_strnum_int {#2} - \@@_iv_str_to_num:Nx \l_@@_language_int {#3} - \@@_lang_dflt_correct:N \l_@@_language_int + + \str_if_eq:eeTF {#3} {dflt} + { \int_zero:N \l_@@_language_int } + { \@@_iv_str_to_num:Nx \l_@@_language_int {#3} } \@@_iv_str_to_num:Nx \l_@@_script_int {#4} + \int_set:Nn \l_tmpb_int - { - \XeTeXOTcountfeatures #1 - \l_@@_script_int - \l_@@_language_int - } + { \XeTeXOTcountfeatures #1 \l_@@_script_int \l_@@_language_int } + \int_zero:N \l_tmpa_int \bool_set_false:N \l_@@_check_bool \bool_until_do:nn { \int_compare_p:nNn \l_tmpa_int = \l_tmpb_int } - { - \ifnum\XeTeXOTfeaturetag #1 \l_@@_script_int \l_@@_language_int - \l_tmpa_int =\l_@@_strnum_int - \bool_set_true:N \l_@@_check_bool - \int_set:Nn \l_tmpa_int {\l_tmpb_int} - \else - \int_incr:N \l_tmpa_int - \fi - } + { + \ifnum\XeTeXOTfeaturetag #1 \l_@@_script_int \l_@@_language_int + \l_tmpa_int =\l_@@_strnum_int + \bool_set_true:N \l_@@_check_bool + \int_set:Nn \l_tmpa_int {\l_tmpb_int} + \else + \int_incr:N \l_tmpa_int + \fi + } \bool_if:NTF \l_@@_check_bool \prg_return_true: \prg_return_false: % %<*LU> diff --git a/Master/texmf-dist/source/latex/fontspec/fontspec.dtx b/Master/texmf-dist/source/latex/fontspec/fontspec.dtx index 826ad41ccee..e5a6f2f111b 100644 --- a/Master/texmf-dist/source/latex/fontspec/fontspec.dtx +++ b/Master/texmf-dist/source/latex/fontspec/fontspec.dtx @@ -70,7 +70,7 @@ \ProvidesExplFile{fontspec.dtx} % %<*fontspec> - {2020/01/26}{2.7g}{Font selection for XeLaTeX and LuaLaTeX} + {2020/02/03}{2.7h}{Font selection for XeLaTeX and LuaLaTeX} % % \end{macrocode} % @@ -89,8 +89,8 @@ %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-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 %%^^A%% fontspec-code-vars.dtx -- part of 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 %%^^A%% fontspec-code-vars.dtx -- part of 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 @@ -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 \sys_if_engine_luatex:T -- cgit v1.2.3