fontspec (3feb20)

git-svn-id: svn://tug.org/texlive/trunk@53656 c570f23f-e606-0410-a88d-b1316a301751

6 files changed, 25 insertions, 39 deletions

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
-      }
-  }
-%</XE>
-%    \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>
 %<debug>\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:
 %</XE>
 %<*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}
 %</dtx>
 %<*fontspec>
-  {2020/01/26}{2.7g}{Font selection for XeLaTeX and LuaLaTeX}
+  {2020/02/03}{2.7h}{Font selection for XeLaTeX and LuaLaTeX}
 %</fontspec>
 %    \end{macrocode}
 %
@@ -89,8 +89,8 @@
 %<lua>local fontspec    = fontspec
 %<lua>fontspec.module   = {
 %<lua>    name          = "fontspec",
-%<lua>    version       = "2.7g",
-%<lua>    date          = "2020/01/26",
+%<lua>    version       = "2.7h",
+%<lua>    date          = "2020/02/03",
 %<lua>    description   = "Font selection for XeLaTeX and LuaLaTeX",
 %<lua>    author        = "Khaled Hosny, Philipp Gesang, Will Robertson",
 %<lua>    copyright     = "Khaled Hosny, Philipp Gesang, Will Robertson",