summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Master/texmf-dist/doc/fonts/cormorantgaramond/README2
-rw-r--r--Master/texmf-dist/tex/latex/cormorantgaramond/CormorantGaramond.sty224
2 files changed, 174 insertions, 52 deletions
diff --git a/Master/texmf-dist/doc/fonts/cormorantgaramond/README b/Master/texmf-dist/doc/fonts/cormorantgaramond/README
index 49ac60fedc9..70cc1c3233b 100644
--- a/Master/texmf-dist/doc/fonts/cormorantgaramond/README
+++ b/Master/texmf-dist/doc/fonts/cormorantgaramond/README
@@ -1,5 +1,5 @@
This is the README for the cormorantgaramond package,
-version 3.601 (2019-12-11).
+version 3.601 (2020-01-06).
This package provides LaTeX, pdfLaTeX, XeLaTeX and LuaLaTeX
support for the Cormorant Garamond family of fonts, designed by
diff --git a/Master/texmf-dist/tex/latex/cormorantgaramond/CormorantGaramond.sty b/Master/texmf-dist/tex/latex/cormorantgaramond/CormorantGaramond.sty
index 91fc7c8c336..40e40806dfa 100644
--- a/Master/texmf-dist/tex/latex/cormorantgaramond/CormorantGaramond.sty
+++ b/Master/texmf-dist/tex/latex/cormorantgaramond/CormorantGaramond.sty
@@ -1,57 +1,179 @@
-%% Generated by autoinst on 2019/12/11
-%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{CormorantGaramond}
- [2019/12/11 (autoinst) Style file for CormorantGaramond.]
-
-\RequirePackage[T1,LY1,T2A,T2B,T2C]{fontenc}
-\RequirePackage{textcomp}
-\IfFileExists{mweights.sty}{\RequirePackage{mweights}}{}
-\IfFileExists{fontaxes.sty}{
- \RequirePackage{fontaxes}
- \fa@naming@exception{figures}{{superior}{proportional}}{Sup}
- \fa@naming@exception{figures}{{superior}{tabular}}{Sup}
- \def\sufigures{\@nomath\sufigures
- \fontfigurestyle{superior}\selectfont}
- \DeclareTextFontCommand{\textsu}{\sufigures}
- \let\textsuperior\textsu
-
- \fa@naming@exception{figures}{{inferior}{proportional}}{Inf}
- \fa@naming@exception{figures}{{inferior}{tabular}}{Inf}
- \def\infigures{\@nomath\infigures
- \fontfigurestyle{inferior}\selectfont}
- \DeclareTextFontCommand{\textin}{\infigures}
- \let\textinferior\textin
-
-}{}
-
-\IfFileExists{xkeyval.sty}{
- \newcommand*{\CormorantGaramond@scale}{1}
- \RequirePackage{xkeyval}
- \DeclareOptionX{scale}{\renewcommand*{\CormorantGaramond@scale}{##1}}
- \DeclareOptionX{scaled}{\renewcommand*{\CormorantGaramond@scale}{##1}}
-}{
- \let\DeclareOptionX\DeclareOption
- \let\ExecuteOptionsX\ExecuteOptions
- \let\ProcessOptionsX\ProcessOptions
-}
-
-\DeclareOptionX{lining}{\edef\CormorantGaramond@figurestyle{LF}}
-\DeclareOptionX{oldstyle}{\edef\CormorantGaramond@figurestyle{OsF}}
-\DeclareOptionX{tabular}{\edef\CormorantGaramond@figurealign{T}}
-\DeclareOptionX{proportional}{\edef\CormorantGaramond@figurealign{}}
-\DeclareOptionX{mainfont}{
- \renewcommand{\familydefault}{\rmdefault}
-}
-\DeclareOptionX{semibold}{\edef\bfseries@rm{semibold}}
-\DeclareOptionX{bold}{\edef\bfseries@rm{bold}}
-\DeclareOptionX{medium}{\edef\mdseries@rm{medium}}
-\DeclareOptionX{regular}{\edef\mdseries@rm{regular}}
-\ExecuteOptionsX{oldstyle,proportional,bold,regular}
+ [2020/01/06 (Bob Tennent and autoinst) Style file for Cormorant Garamond fonts.]
+
+\RequirePackage{ifxetex,ifluatex,xkeyval,textcomp}
+
+\newif\ifcormorantgaramond@ttf
+\ifxetex
+ \cormorantgaramond@ttftrue
+\else\ifluatex
+ \cormorantgaramond@ttftrue
+\else % [pdf]LaTeX
+ \cormorantgaramond@ttffalse
+\fi\fi
+
+\newif\ifcormorantgaramond@lining \cormorantgaramond@liningtrue
+\newif\ifcormorantgaramond@tabular \cormorantgaramond@tabularfalse
+\newif\ifcormorantgaramond@semibold \cormorantgaramond@semiboldfalse
+\newif\ifcormorantgaramond@medium \cormorantgaramond@mediumfalse
+\newif\ifcormorantgaramond@light \cormorantgaramond@lightfalse
+
+\newcommand*{\CormorantGaramond@scale}{1}
+\RequirePackage{xkeyval}
+\DeclareOptionX{scaled}{\renewcommand*{\CormorantGaramond@scale}{#1}}
+\DeclareOptionX{scale}{\renewcommand*{\CormorantGaramond@scale}{#1}}
+\DeclareOptionX{type1}{\cormorantgaramond@ttffalse}
+\DeclareOptionX{lining}{\cormorantgaramond@liningtrue}
+\DeclareOptionX{nf}{\cormorantgaramond@liningtrue}
+\DeclareOptionX{lf}{\cormorantgaramond@liningtrue}
+\DeclareOptionX{oldstyle}{\cormorantgaramond@liningfalse}
+\DeclareOptionX{osf}{\cormorantgaramond@liningfalse}
+\DeclareOptionX{tabular}{\cormorantgaramond@tabulartrue}
+\DeclareOptionX{t}{\cormorantgaramond@tabulartrue}
+\DeclareOptionX{proportional}{\cormorantgaramond@tabularfalse}
+\DeclareOptionX{p}{\cormorantgaramond@tabularfalse}
+\DeclareOptionX{semibold}{\cormorantgaramond@semiboldtrue}
+\DeclareOptionX{sb}{\cormorantgaramond@semiboldtrue}
+\DeclareOptionX{medium}{\cormorantgaramond@mediumtrue}
+\DeclareOptionX{light}{\cormorantgaramond@lighttrue}
+
+
\ProcessOptionsX\relax
-\renewcommand*
- {\rmdefault}
- {CormorantGaramond-\CormorantGaramond@figurealign\CormorantGaramond@figurestyle}
+\ifcormorantgaramond@ttf
+ \ifcormorantgaramond@lining
+ \def\cormorantgaramond@figurestyle{Lining}
+ \else
+ \def\cormorantgaramond@figurestyle{OldStyle}
+ \fi
+ \ifcormorantgaramond@tabular
+ \def\cormorantgaramond@figurealign{Monospaced}
+ \else
+ \def\cormorantgaramond@figurealign{}
+ \fi
+\else % type1
+ \ifcormorantgaramond@lining
+ \def\cormorantgaramond@figurestyle{LF}
+ \else
+ \def\cormorantgaramond@figurestyle{OsF}
+ \fi
+ \ifcormorantgaramond@tabular
+ \def\cormorantgaramond@figurealign{T}
+ \else
+ \def\cormorantgaramond@figurealign{}
+ \fi
+\fi
+
+\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{medium}\fi
+ \def\mdseries@rm{m}
+ \ifcormorantgaramond@light\def\mdseries@rm{l}\fi
+\fi
+
+\ifcormorantgaramond@ttf
+ \RequirePackage{fontspec}
+\else
+ \RequirePackage{fontenc,fontaxes,mweights}
+\fi
+
+\ifcormorantgaramond@ttf
+ \ifxetex\XeTeXtracingfonts=1\fi
+ \defaultfontfeatures{
+ Ligatures = TeX ,
+ Scale = \CormorantGaramond@scale ,
+ Extension = .ttf }
+ \def\cormorantgaramond@regular{Regular}
+ \setmainfont
+ [ Numbers = {\cormorantgaramond@figurealign,\cormorantgaramond@figurestyle},
+ UprightFont = *-\cormorantgaramond@regstyle ,
+ ItalicFont = *-\ifx\cormorantgaramond@regstyle\cormorantgaramond@regular Italic\else\cormorantgaramond@regstyle Italic\fi ,
+ BoldFont = *-\cormorantgaramond@boldstyle ,
+ BoldItalicFont = *-\cormorantgaramond@boldstyle Italic ,
+ ]
+ {CormorantGaramond}
+ \newfontfamily\cormorantgaramond
+ [ Numbers = {\cormorantgaramond@figurealign,\cormorantgaramond@figurestyle},
+ UprightFont = *-\cormorantgaramond@regstyle ,
+ ItalicFont = *-\ifx\cormorantgaramond@regstyle\cormorantgaramond@regular Italic\else\cormorantgaramond@regstyle Italic\fi ,
+ BoldFont = *-\cormorantgaramond@boldstyle ,
+ BoldItalicFont = *-\cormorantgaramond@boldstyle Italic ,
+ ]
+ {CormorantGaramond}
+ \providecommand\sufigures{\addfontfeatures{VerticalPosition=Superior}}
+ \providecommand\infigures{\addfontfeatures{VerticalPosition=ScientificInferior}}
+ \newfontfamily\cormorantgaramondOsF
+ [ Numbers = {\cormorantgaramond@figurealign,OldStyle},
+ UprightFont = *-\cormorantgaramond@regstyle ,
+ ItalicFont = *-\ifx\cormorantgaramond@regstyle\cormorantgaramond@regular Italic\else\cormorantgaramond@regstyle Italic\fi ,
+ BoldFont = *-\cormorantgaramond@boldstyle ,
+ BoldItalicFont = *-\cormorantgaramond@boldstyle Italic ,
+ ]
+ {CormorantGaramond}
+ \newfontfamily\cormorantgaramondLF
+ [ Numbers = {\cormorantgaramond@figurealign,Lining},
+ UprightFont = *-\cormorantgaramond@regstyle ,
+ ItalicFont = *-\ifx\cormorantgaramond@regstyle\cormorantgaramond@regular Italic\else\cormorantgaramond@regstyle Italic\fi ,
+ BoldFont = *-\cormorantgaramond@boldstyle ,
+ BoldItalicFont = *-\cormorantgaramond@boldstyle Italic ,
+ ]
+ {CormorantGaramond}
+ \newfontfamily\cormorantgaramondtabular
+ [ Numbers = {Monospaced,\cormorantgaramond@figurestyle},
+ UprightFont = *-\cormorantgaramond@regstyle ,
+ ItalicFont = *-\ifx\cormorantgaramond@regstyle\cormorantgaramond@regular Italic\else\cormorantgaramond@regstyle Italic\fi ,
+ BoldFont = *-\cormorantgaramond@boldstyle ,
+ BoldItalicFont = *-\cormorantgaramond@boldstyle Italic ,
+ ]
+ {CormorantGaramond}
+ \newfontfamily\cormorantgaramondproportional
+ [ Numbers = {\cormorantgaramond@figurestyle},
+ UprightFont = *-\cormorantgaramond@regstyle ,
+ ItalicFont = *-\ifx\cormorantgaramond@regstyle\cormorantgaramond@regular Italic\else\cormorantgaramond@regstyle Italic\fi ,
+ BoldFont = *-\cormorantgaramond@boldstyle ,
+ BoldItalicFont = *-\cormorantgaramond@boldstyle Italic ,
+ ]
+ {CormorantGaramond}
+ \DeclareTextFontCommand{\oldstylenums}{\cormorantgaramondOsF}
+ \DeclareTextFontCommand{\liningnums}{\cormorantgaramondLF}
+ \DeclareTextFontCommand{\tabularnums}{\cormorantgaramondtabular}
+ \DeclareTextFontCommand{\proportionalnums}{\cormorantgaramondproportional}
+
+\else % type1
+
+ \def\cormorantgaramond@family{CormorantGaramond-\cormorantgaramond@figurealign\cormorantgaramond@figurestyle}
+ \renewcommand*\rmdefault{\cormorantgaramond@family}
+ \newcommand*\cormorantgaramond{\fontfamily{\cormorantgaramond@family}\selectfont}
+ \edef\seriesdefault{\mdseries@rm}
+
+ \fa@naming@exception{figures}{{superior}{proportional}}{Sup}
+ \fa@naming@exception{figures}{{superior}{tabular}}{Sup}
+ \def\sufigures{\@nomath\sufigures\fontfigurestyle{superior}\selectfont}
+
+ \fa@naming@exception{figures}{{inferior}{proportional}}{Inf}
+ \fa@naming@exception{figures}{{inferior}{tabular}}{Inf}
+ \def\infigures{\@nomath\infigures\fontfigurestyle{inferior}\selectfont}
+
+ \DeclareTextFontCommand{\oldstylenums}{\fontfamily{CormorantGaramond-\cormorantgaramond@figurealign OsF}\selectfont}
+ \DeclareTextFontCommand{\liningnums}{\fontfamily{CormorantGaramond-\cormorantgaramond@figurealign LF}\selectfont}
+ \DeclareTextFontCommand{\tabularnums}{\fontfamily{CormorantGaramond-T\cormorantgaramond@figurestyle}\selectfont}
+ \DeclareTextFontCommand{\proportionalnums}{\fontfamily{CormorantGaramond-\cormorantgaramond@figurestyle}\selectfont}
+
+\fi
+
+\DeclareTextFontCommand{\textsu}{\sufigures}
+\DeclareTextFontCommand{\textinf}{\infigures}
+
+\ifcormorantgaramond@ttf
+ \defaultfontfeatures{}
+\fi
\endinput