diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/cormorantgaramond/CormorantGaramond.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/cormorantgaramond/CormorantGaramond.sty | 47 |
1 files changed, 24 insertions, 23 deletions
diff --git a/Master/texmf-dist/tex/latex/cormorantgaramond/CormorantGaramond.sty b/Master/texmf-dist/tex/latex/cormorantgaramond/CormorantGaramond.sty index 8465db3f84d..aeab02828f0 100644 --- a/Master/texmf-dist/tex/latex/cormorantgaramond/CormorantGaramond.sty +++ b/Master/texmf-dist/tex/latex/cormorantgaramond/CormorantGaramond.sty @@ -1,16 +1,16 @@ \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{CormorantGaramond} - [2016/08/15 (Bob Tennent and autoinst) Style file for Cormorant Garamond fonts.] + [2019/06/24 (Bob Tennent and autoinst) Style file for Cormorant Garamond fonts.] \RequirePackage{ifxetex,ifluatex,xkeyval,textcomp} -\newif\ifcormorantgaramond@otf +\newif\ifcormorantgaramond@ttf \ifxetex - \cormorantgaramond@otftrue + \cormorantgaramond@ttftrue \else\ifluatex - \cormorantgaramond@otftrue + \cormorantgaramond@ttftrue \else % [pdf]LaTeX - \cormorantgaramond@otffalse + \cormorantgaramond@ttffalse \fi\fi \newif\ifcormorantgaramond@lining \cormorantgaramond@liningtrue @@ -23,7 +23,7 @@ \RequirePackage{xkeyval} \DeclareOptionX{scaled}{\renewcommand*{\CormorantGaramond@scale}{#1}} \DeclareOptionX{scale}{\renewcommand*{\CormorantGaramond@scale}{#1}} -\DeclareOptionX{type1}{\cormorantgaramond@otffalse} +\DeclareOptionX{type1}{\cormorantgaramond@ttffalse} \DeclareOptionX{lining}{\cormorantgaramond@liningtrue} \DeclareOptionX{nf}{\cormorantgaramond@liningtrue} \DeclareOptionX{lf}{\cormorantgaramond@liningtrue} @@ -41,7 +41,7 @@ \ProcessOptionsX\relax -\ifcormorantgaramond@otf +\ifcormorantgaramond@ttf \ifcormorantgaramond@lining \def\cormorantgaramond@figurestyle{Lining} \else @@ -65,36 +65,37 @@ \fi \fi -\ifcormorantgaramond@otf +\ifcormorantgaramond@ttf \def\cormorantgaramond@boldstyle{Bold} \ifcormorantgaramond@semibold\def\cormorantgaramond@boldstyle{SemiBold}\fi \ifcormorantgaramond@medium\def\cormorantgaramond@boldstyle{Medium}\fi \def\cormorantgaramond@regstyle{Regular} \ifcormorantgaramond@light\def\cormorantgaramond@regstyle{Light}\fi \else - \def\bfseries@rm{b} - \ifcormorantgaramond@semibold\def\bfseries@rm{sb}\fi - \ifcormorantgaramond@medium\def\bfseries@rm{mb}\fi - \def\mdseries@rm{m} - \ifcormorantgaramond@light\def\mdseries@rm{l}\fi + \def\bfseries@rm{bold} + \ifcormorantgaramond@semibold\def\bfseries@rm{semibold}\fi + \ifcormorantgaramond@medium\def\bfseries@rm{medium}\fi + \def\mdseries@rm{regular} + \ifcormorantgaramond@light\def\mdseries@rm{light}\fi \fi -\ifcormorantgaramond@otf +\ifcormorantgaramond@ttf \RequirePackage{fontspec} \else \RequirePackage{fontenc,fontaxes,mweights} \fi -\ifcormorantgaramond@otf +\ifcormorantgaramond@ttf \ifxetex\XeTeXtracingfonts=1\fi \defaultfontfeatures{ Ligatures = TeX , Scale = \CormorantGaramond@scale , - Extension = .otf } + Extension = .ttf } + \def\cormorantgaramond@regular{Regular} \setmainfont [ Numbers = {\cormorantgaramond@figurealign,\cormorantgaramond@figurestyle}, UprightFont = *-\cormorantgaramond@regstyle , - ItalicFont = *-\cormorantgaramond@regstyle Italic , + ItalicFont = *-\ifx\cormorantgaramond@regstyle\cormorantgaramond@regular Italic\else\cormorantgaramond@regstyle Italic\fi , BoldFont = *-\cormorantgaramond@boldstyle , BoldItalicFont = *-\cormorantgaramond@boldstyle Italic , ] @@ -102,7 +103,7 @@ \newfontfamily\cormorantgaramond [ Numbers = {\cormorantgaramond@figurealign,\cormorantgaramond@figurestyle}, UprightFont = *-\cormorantgaramond@regstyle , - ItalicFont = *-\cormorantgaramond@regstyle Italic , + ItalicFont = *-\ifx\cormorantgaramond@regstyle\cormorantgaramond@regular Italic\else\cormorantgaramond@regstyle Italic\fi , BoldFont = *-\cormorantgaramond@boldstyle , BoldItalicFont = *-\cormorantgaramond@boldstyle Italic , ] @@ -112,7 +113,7 @@ \newfontfamily\cormorantgaramondOsF [ Numbers = {\cormorantgaramond@figurealign,OldStyle}, UprightFont = *-\cormorantgaramond@regstyle , - ItalicFont = *-\cormorantgaramond@regstyle Italic , + ItalicFont = *-\ifx\cormorantgaramond@regstyle\cormorantgaramond@regular Italic\else\cormorantgaramond@regstyle Italic\fi , BoldFont = *-\cormorantgaramond@boldstyle , BoldItalicFont = *-\cormorantgaramond@boldstyle Italic , ] @@ -120,7 +121,7 @@ \newfontfamily\cormorantgaramondLF [ Numbers = {\cormorantgaramond@figurealign,Lining}, UprightFont = *-\cormorantgaramond@regstyle , - ItalicFont = *-\cormorantgaramond@regstyle Italic , + ItalicFont = *-\ifx\cormorantgaramond@regstyle\cormorantgaramond@regular Italic\else\cormorantgaramond@regstyle Italic\fi , BoldFont = *-\cormorantgaramond@boldstyle , BoldItalicFont = *-\cormorantgaramond@boldstyle Italic , ] @@ -128,7 +129,7 @@ \newfontfamily\cormorantgaramondtabular [ Numbers = {Monospaced,\cormorantgaramond@figurestyle}, UprightFont = *-\cormorantgaramond@regstyle , - ItalicFont = *-\cormorantgaramond@regstyle Italic , + ItalicFont = *-\ifx\cormorantgaramond@regstyle\cormorantgaramond@regular Italic\else\cormorantgaramond@regstyle Italic\fi , BoldFont = *-\cormorantgaramond@boldstyle , BoldItalicFont = *-\cormorantgaramond@boldstyle Italic , ] @@ -136,7 +137,7 @@ \newfontfamily\cormorantgaramondproportional [ Numbers = {\cormorantgaramond@figurestyle}, UprightFont = *-\cormorantgaramond@regstyle , - ItalicFont = *-\cormorantgaramond@regstyle Italic , + ItalicFont = *-\ifx\cormorantgaramond@regstyle\cormorantgaramond@regular Italic\else\cormorantgaramond@regstyle Italic\fi , BoldFont = *-\cormorantgaramond@boldstyle , BoldItalicFont = *-\cormorantgaramond@boldstyle Italic , ] @@ -171,7 +172,7 @@ \DeclareTextFontCommand{\textsu}{\sufigures} \DeclareTextFontCommand{\textinf}{\infigures} -\ifcormorantgaramond@otf +\ifcormorantgaramond@ttf \defaultfontfeatures{} \fi |