ebgaramond (28feb20)

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

1 files changed, 10 insertions, 14 deletions

diff --git a/Master/texmf-dist/tex/latex/ebgaramond/ebgaramond.sty b/Master/texmf-dist/tex/latex/ebgaramond/ebgaramond.sty
index a8bb5e7a8f3..3f4de8d785e 100644
--- a/Master/texmf-dist/tex/latex/ebgaramond/ebgaramond.sty
+++ b/Master/texmf-dist/tex/latex/ebgaramond/ebgaramond.sty
@@ -1,6 +1,6 @@
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{ebgaramond}
-    [2019/10/22 (Bob Tennent and autoinst)  Style file for EB Garamond fonts.]
+    [2020/02/27 (Bob Tennent and autoinst)  Style file for EB Garamond fonts.]
 
 \RequirePackage{ifxetex,ifluatex,xkeyval,textcomp}
 
@@ -105,6 +105,7 @@
 \ifebgaramond@otf
   \ifxetex\XeTeXtracingfonts=1\fi
   \def\ebgaramond@regular{Regular}
+
   \defaultfontfeatures{
         Ligatures = TeX ,
         Scale     = \EBGaramond@scale ,
@@ -116,6 +117,8 @@
         ItalicFont     = *-\ifx\ebgaramond@regularstyle\ebgaramond@regular Italic\else\ebgaramond@regularstyle Italic\fi,
         BoldFont    = *-\ebgaramond@boldstyle ,
         BoldItalicFont     = *-\ebgaramond@boldstyle Italic ,
+        FontFace={m}{sw}{Font=*-\ifx\ebgaramond@regularstyle\ebgaramond@regular Italic\else\ebgaramond@regularstyle Italic\fi,Style=Swash},
+        FontFace={b}{sw}{Font=*-\ebgaramond@boldstyle Italic,Style=Swash},
       ]
       {EBGaramond}
   \newfontfamily\ebgaramond
@@ -128,15 +131,6 @@
       {EBGaramond}
   \providecommand\sufigures{\addfontfeatures{VerticalPosition=Superior}}
   \providecommand\infigures{\addfontfeatures{VerticalPosition=ScientificInferior}}
-  \newfontfamily\swshape
-      [ Style={Swash},
-        Numbers = {\ebgaramond@figurealign,\ebgaramond@figurestyle},
-        UprightFont     = *-\ifx\ebgaramond@regularstyle\ebgaramond@regular Italic\else\ebgaramond@regularstyle Italic\fi ,
-        ItalicFont     = *-\ifx\ebgaramond@regularstyle\ebgaramond@regular Italic\else\ebgaramond@regularstyle Italic\fi ,
-        BoldFont    = *-\ebgaramond@boldstyle Italic,
-        BoldItalicFont     = *-\ebgaramond@boldstyle Italic ,
-      ]
-      {EBGaramond}
   \newfontfamily\ebgaramondOsF
       [ Numbers = {\ebgaramond@figurealign,OldStyle},
         UprightFont    = *-\ebgaramond@regularstyle ,
@@ -173,10 +167,12 @@
   \fa@naming@exception{figures}{{inferior}{tabular}}{Inf}
   \def\infigures{\@nomath\infigures\fontfigurestyle{inferior}\selectfont}
 
-  \DeclareRobustCommand\swshape{\not@math@alphabet\swshape\relax
-      \fontprimaryshape\itdefault\fontsecondaryshape\swdefault\selectfont}
-  \fa@naming@exception{shape}{{n}{sw}}{nw}
-  \fa@naming@exception{shape}{{it}{sw}}{sw}
+  \ifx\swshape\@undefined
+    \DeclareRobustCommand\swshape{\not@math@alphabet\swshape\relax
+        \fontprimaryshape\itdefault\fontsecondaryshape\swdefault\selectfont}
+     \fa@naming@exception{shape}{{n}{sw}}{nw}
+    \fa@naming@exception{shape}{{it}{sw}}{sw}
+  \fi
 
 
   \def\initials{\fontfamily{EBGaramondInitials-TLF}\fontseries{m}\selectfont}