From fc358ce7332053945afe16ced2a271556cdccfb7 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Tue, 4 Feb 2020 03:01:28 +0000 Subject: CTAN sync 202002040301 --- macros/latex/contrib/fontspec/CHANGES.md | 8 ++++++ .../latex/contrib/fontspec/fontspec-code-enc.dtx | 1 - .../fontspec/fontspec-code-feat-opentype.dtx | 4 +-- .../contrib/fontspec/fontspec-code-internal.dtx | 18 ++---------- .../contrib/fontspec/fontspec-code-keyval.dtx | 3 +- .../contrib/fontspec/fontspec-code-opentype.dtx | 32 ++++++++++----------- macros/latex/contrib/fontspec/fontspec-code.pdf | Bin 627145 -> 626791 bytes macros/latex/contrib/fontspec/fontspec.dtx | 6 ++-- macros/latex/contrib/fontspec/fontspec.pdf | Bin 610857 -> 610880 bytes 9 files changed, 33 insertions(+), 39 deletions(-) (limited to 'macros/latex/contrib/fontspec') diff --git a/macros/latex/contrib/fontspec/CHANGES.md b/macros/latex/contrib/fontspec/CHANGES.md index d65a8b1c01..176a83b6c8 100644 --- a/macros/latex/contrib/fontspec/CHANGES.md +++ b/macros/latex/contrib/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/macros/latex/contrib/fontspec/fontspec-code-enc.dtx b/macros/latex/contrib/fontspec/fontspec-code-enc.dtx index 8969c1be9c..7d30448002 100644 --- a/macros/latex/contrib/fontspec/fontspec-code-enc.dtx +++ b/macros/latex/contrib/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/macros/latex/contrib/fontspec/fontspec-code-feat-opentype.dtx b/macros/latex/contrib/fontspec/fontspec-code-feat-opentype.dtx index 935cf81a70..77d431ccf8 100644 --- a/macros/latex/contrib/fontspec/fontspec-code-feat-opentype.dtx +++ b/macros/latex/contrib/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/macros/latex/contrib/fontspec/fontspec-code-internal.dtx b/macros/latex/contrib/fontspec/fontspec-code-internal.dtx index 432ae803f6..6282569a6f 100644 --- a/macros/latex/contrib/fontspec/fontspec-code-internal.dtx +++ b/macros/latex/contrib/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/macros/latex/contrib/fontspec/fontspec-code-keyval.dtx b/macros/latex/contrib/fontspec/fontspec-code-keyval.dtx index b7e660da0c..87a93c176b 100644 --- a/macros/latex/contrib/fontspec/fontspec-code-keyval.dtx +++ b/macros/latex/contrib/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/macros/latex/contrib/fontspec/fontspec-code-opentype.dtx b/macros/latex/contrib/fontspec/fontspec-code-opentype.dtx index ad9413eca4..be0b8be768 100644 --- a/macros/latex/contrib/fontspec/fontspec-code-opentype.dtx +++ b/macros/latex/contrib/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/macros/latex/contrib/fontspec/fontspec-code.pdf b/macros/latex/contrib/fontspec/fontspec-code.pdf index 8982d35be2..9ca1bd3430 100644 Binary files a/macros/latex/contrib/fontspec/fontspec-code.pdf and b/macros/latex/contrib/fontspec/fontspec-code.pdf differ diff --git a/macros/latex/contrib/fontspec/fontspec.dtx b/macros/latex/contrib/fontspec/fontspec.dtx index 826ad41cce..e5a6f2f111 100644 --- a/macros/latex/contrib/fontspec/fontspec.dtx +++ b/macros/latex/contrib/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/macros/latex/contrib/fontspec/fontspec.pdf b/macros/latex/contrib/fontspec/fontspec.pdf index b64f441771..2003bddf9c 100644 Binary files a/macros/latex/contrib/fontspec/fontspec.pdf and b/macros/latex/contrib/fontspec/fontspec.pdf differ -- cgit v1.2.3