cinzel (12may19)

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

1 files changed, 21 insertions, 6 deletions

diff --git a/Master/texmf-dist/tex/latex/cinzel/cinzel.sty b/Master/texmf-dist/tex/latex/cinzel/cinzel.sty
index 7dbb3ef5a44..0509bdbe877 100644
--- a/Master/texmf-dist/tex/latex/cinzel/cinzel.sty
+++ b/Master/texmf-dist/tex/latex/cinzel/cinzel.sty
@@ -1,6 +1,6 @@
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{cinzel}
-    [2014/05/24  (Bob Tennent)  Supports Cinzel and CinzelDecorative for all LaTeX engines.]
+    [2019/05/12  (Bob Tennent)  Supports Cinzel and CinzelDecorative for all LaTeX engines.]
 
 \RequirePackage{ifxetex,ifluatex,xkeyval,textcomp}
 
@@ -14,9 +14,11 @@
 \fi\fi
 
 \newif\ifcinzel@black \cinzel@blackfalse
+\newif\ifcinzel@default \cinzel@defaultfalse
 
 \DeclareOptionX{type1}{\cinzel@ttffalse}
 \DeclareOptionX{black}{\cinzel@blacktrue}
+\DeclareOptionX{default}{\cinzel@defaulttrue}
 \ProcessOptionsX\relax
 
 \ifcinzel@ttf
@@ -41,12 +43,14 @@
   \defaultfontfeatures{
         Ligatures = TeX ,
         Extension = .ttf }
-  \setmainfont
+  \ifcinzel@default
+      \setmainfont
       [ UprightFont    = *-Regular ,
         ItalicFont     = *Decorative-Regular ,
         BoldFont       = *-\cinzel@boldstyle , 
         BoldItalicFont = *Decorative-\cinzel@boldstyle ]
       {Cinzel}
+  \fi
   \newfontfamily\cinzel
       [ UprightFont    = *-Regular ,
         ItalicFont     = *Decorative-Regular ,
@@ -60,13 +64,24 @@
 
 \else % type1
   \def\cinzelfamily{Cinzel-LF}
-  \newcommand*\cinzel{\fontfamily{\cinzelfamily}\def\itshape{\fontfamily{CinzelDecorative-LF}\fontshape{n}\selectfont}\selectfont}
-  \def\rmdefault{\cinzelfamily}
-  \def\itshape{\fontfamily{CinzelDecorative-LF}\fontshape{n}\selectfont}
-  \newcommand*\cinzelblack{\fontfamily{\cinzelfamily}\fontseries{k}\def\itshape{\fontfamily{CinzelDecorative-LF}\fontshape{n}\selectfont}\selectfont}
+  \newcommand*\cinzel{%
+    \fontfamily{\cinzelfamily}\selectfont
+    \def\itshape{\ifx\f@family\cinzelfamily\fontfamily{CinzelDecorative-LF}\fontshape{n}\else\fontshape{\itdefault}\fi\selectfont}
+  }
+  \ifcinzel@default
+     \def\rmdefault{\cinzelfamily}
+     \def\itshape{\ifx\f@family\cinzelfamily\fontfamily{CinzelDecorative-LF}\fontshape{n}\else\fontshape{\itdefault}\fi\selectfont}
+  \fi
+  \newcommand*\cinzelblack{%
+    \fontfamily{\cinzelfamily}\fontseries{k}\selectfont
+    \def\itshape{\ifx\f@family\cinzelfamily\fontfamily{CinzelDecorative-LF}\fontseries{k}\else\fontshape{\itdefault}\fi\selectfont}
+  }
 
 \fi
 
+\DeclareTextFontCommand{\textcinzel}{\cinzel}
+\DeclareTextFontCommand{\textcinzelblack}{\cinzelblack}
+
 \ifcinzel@ttf
 % turn off defaults in case other fonts are selected:
   \defaultfontfeatures{}