texlive[53339] Master/texmf-dist: cormorantgaramond (6jan20)

commits+karl at tug.org commits+karl at tug.org
Mon Jan 6 22:55:57 CET 2020


Revision: 53339
          http://tug.org/svn/texlive?view=revision&revision=53339
Author:   karl
Date:     2020-01-06 22:55:57 +0100 (Mon, 06 Jan 2020)
Log Message:
-----------
cormorantgaramond (6jan20)

Modified Paths:
--------------
    trunk/Master/texmf-dist/doc/fonts/cormorantgaramond/README
    trunk/Master/texmf-dist/tex/latex/cormorantgaramond/CormorantGaramond.sty

Modified: trunk/Master/texmf-dist/doc/fonts/cormorantgaramond/README
===================================================================
--- trunk/Master/texmf-dist/doc/fonts/cormorantgaramond/README	2020-01-06 10:17:52 UTC (rev 53338)
+++ trunk/Master/texmf-dist/doc/fonts/cormorantgaramond/README	2020-01-06 21:55:57 UTC (rev 53339)
@@ -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

Modified: trunk/Master/texmf-dist/tex/latex/cormorantgaramond/CormorantGaramond.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/cormorantgaramond/CormorantGaramond.sty	2020-01-06 10:17:52 UTC (rev 53338)
+++ trunk/Master/texmf-dist/tex/latex/cormorantgaramond/CormorantGaramond.sty	2020-01-06 21:55:57 UTC (rev 53339)
@@ -1,57 +1,179 @@
-%% Generated by autoinst on 2019/12/11
-%%
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{CormorantGaramond}
-    [2019/12/11 (autoinst)  Style file for CormorantGaramond.]
+    [2020/01/06 (Bob Tennent and autoinst)  Style file for Cormorant Garamond fonts.]
 
-\RequirePackage[T1,LY1,T2A,T2B,T2C]{fontenc}
-\RequirePackage{textcomp}
-\IfFileExists{mweights.sty}{\RequirePackage{mweights}}{}
-\IfFileExists{fontaxes.sty}{
-    \RequirePackage{fontaxes}
-    \fa at naming@exception{figures}{{superior}{proportional}}{Sup}
-    \fa at naming@exception{figures}{{superior}{tabular}}{Sup}
-    \def\sufigures{\@nomath\sufigures
-        \fontfigurestyle{superior}\selectfont}
-    \DeclareTextFontCommand{\textsu}{\sufigures}
-    \let\textsuperior\textsu
+\RequirePackage{ifxetex,ifluatex,xkeyval,textcomp}
 
-    \fa at naming@exception{figures}{{inferior}{proportional}}{Inf}
-    \fa at naming@exception{figures}{{inferior}{tabular}}{Inf}
-    \def\infigures{\@nomath\infigures
-        \fontfigurestyle{inferior}\selectfont}
-    \DeclareTextFontCommand{\textin}{\infigures}
-    \let\textinferior\textin
+\newif\ifcormorantgaramond at ttf 
+\ifxetex
+  \cormorantgaramond at ttftrue
+\else\ifluatex
+  \cormorantgaramond at ttftrue
+\else  % [pdf]LaTeX
+  \cormorantgaramond at ttffalse
+\fi\fi
 
-}{}
+\newif\ifcormorantgaramond at lining \cormorantgaramond at liningtrue
+\newif\ifcormorantgaramond at tabular \cormorantgaramond at tabularfalse
+\newif\ifcormorantgaramond at semibold \cormorantgaramond at semiboldfalse
+\newif\ifcormorantgaramond at medium \cormorantgaramond at mediumfalse
+\newif\ifcormorantgaramond at light \cormorantgaramond at lightfalse
 
-\IfFileExists{xkeyval.sty}{
-    \newcommand*{\CormorantGaramond at scale}{1}
-    \RequirePackage{xkeyval}
-    \DeclareOptionX{scale}{\renewcommand*{\CormorantGaramond at scale}{##1}}
-    \DeclareOptionX{scaled}{\renewcommand*{\CormorantGaramond at scale}{##1}}
-}{
-    \let\DeclareOptionX\DeclareOption
-    \let\ExecuteOptionsX\ExecuteOptions
-    \let\ProcessOptionsX\ProcessOptions
-}
+\newcommand*{\CormorantGaramond at scale}{1}
+\RequirePackage{xkeyval}
+\DeclareOptionX{scaled}{\renewcommand*{\CormorantGaramond at scale}{#1}}
+\DeclareOptionX{scale}{\renewcommand*{\CormorantGaramond at scale}{#1}}
+\DeclareOptionX{type1}{\cormorantgaramond at ttffalse}
+\DeclareOptionX{lining}{\cormorantgaramond at liningtrue}
+\DeclareOptionX{nf}{\cormorantgaramond at liningtrue}
+\DeclareOptionX{lf}{\cormorantgaramond at liningtrue}
+\DeclareOptionX{oldstyle}{\cormorantgaramond at liningfalse}
+\DeclareOptionX{osf}{\cormorantgaramond at liningfalse}
+\DeclareOptionX{tabular}{\cormorantgaramond at tabulartrue}
+\DeclareOptionX{t}{\cormorantgaramond at tabulartrue}
+\DeclareOptionX{proportional}{\cormorantgaramond at tabularfalse}
+\DeclareOptionX{p}{\cormorantgaramond at tabularfalse}
+\DeclareOptionX{semibold}{\cormorantgaramond at semiboldtrue}
+\DeclareOptionX{sb}{\cormorantgaramond at semiboldtrue}
+\DeclareOptionX{medium}{\cormorantgaramond at mediumtrue}
+\DeclareOptionX{light}{\cormorantgaramond at lighttrue}
 
-\DeclareOptionX{lining}{\edef\CormorantGaramond at figurestyle{LF}}
-\DeclareOptionX{oldstyle}{\edef\CormorantGaramond at figurestyle{OsF}}
-\DeclareOptionX{tabular}{\edef\CormorantGaramond at figurealign{T}}
-\DeclareOptionX{proportional}{\edef\CormorantGaramond at figurealign{}}
-\DeclareOptionX{mainfont}{
-    \renewcommand{\familydefault}{\rmdefault}
-}
-\DeclareOptionX{semibold}{\edef\bfseries at rm{semibold}}
-\DeclareOptionX{bold}{\edef\bfseries at rm{bold}}
-\DeclareOptionX{medium}{\edef\mdseries at rm{medium}}
-\DeclareOptionX{regular}{\edef\mdseries at rm{regular}}
-\ExecuteOptionsX{oldstyle,proportional,bold,regular}
+
 \ProcessOptionsX\relax
 
-\renewcommand*
-    {\rmdefault}
-    {CormorantGaramond-\CormorantGaramond at figurealign\CormorantGaramond at figurestyle}
+\ifcormorantgaramond at ttf
+  \ifcormorantgaramond at lining
+    \def\cormorantgaramond at figurestyle{Lining}
+  \else
+    \def\cormorantgaramond at figurestyle{OldStyle} 
+  \fi
+  \ifcormorantgaramond at tabular
+    \def\cormorantgaramond at figurealign{Monospaced} 
+  \else
+    \def\cormorantgaramond at figurealign{} 
+  \fi
+\else % type1
+  \ifcormorantgaramond at lining
+    \def\cormorantgaramond at figurestyle{LF}
+  \else
+    \def\cormorantgaramond at figurestyle{OsF}
+  \fi
+  \ifcormorantgaramond at tabular
+    \def\cormorantgaramond at figurealign{T}
+  \else
+    \def\cormorantgaramond at figurealign{}
+  \fi
+\fi
 
+\ifcormorantgaramond at ttf
+  \def\cormorantgaramond at boldstyle{Bold}
+  \ifcormorantgaramond at semibold\def\cormorantgaramond at boldstyle{SemiBold}\fi
+  \ifcormorantgaramond at medium\def\cormorantgaramond at boldstyle{Medium}\fi
+  \def\cormorantgaramond at regstyle{Regular}
+  \ifcormorantgaramond at light\def\cormorantgaramond at regstyle{Light}\fi
+\else
+  \def\bfseries at rm{b}
+  \ifcormorantgaramond at semibold\def\bfseries at rm{sb}\fi
+  \ifcormorantgaramond at medium\def\bfseries at rm{medium}\fi
+  \def\mdseries at rm{m}
+  \ifcormorantgaramond at light\def\mdseries at rm{l}\fi
+\fi
+
+\ifcormorantgaramond at ttf
+  \RequirePackage{fontspec}
+\else
+  \RequirePackage{fontenc,fontaxes,mweights}
+\fi
+
+\ifcormorantgaramond at ttf
+  \ifxetex\XeTeXtracingfonts=1\fi
+  \defaultfontfeatures{
+        Ligatures = TeX ,
+        Scale     = \CormorantGaramond at scale ,
+        Extension = .ttf }
+  \def\cormorantgaramond at regular{Regular}
+  \setmainfont
+      [ Numbers = {\cormorantgaramond at figurealign,\cormorantgaramond at figurestyle},
+        UprightFont    = *-\cormorantgaramond at regstyle ,
+        ItalicFont     = *-\ifx\cormorantgaramond at regstyle\cormorantgaramond at regular Italic\else\cormorantgaramond at regstyle Italic\fi ,
+        BoldFont    = *-\cormorantgaramond at boldstyle ,
+        BoldItalicFont     = *-\cormorantgaramond at boldstyle Italic ,
+      ]
+      {CormorantGaramond}
+  \newfontfamily\cormorantgaramond
+      [ Numbers = {\cormorantgaramond at figurealign,\cormorantgaramond at figurestyle},
+        UprightFont    = *-\cormorantgaramond at regstyle ,
+        ItalicFont     = *-\ifx\cormorantgaramond at regstyle\cormorantgaramond at regular Italic\else\cormorantgaramond at regstyle Italic\fi ,
+        BoldFont    = *-\cormorantgaramond at boldstyle ,
+        BoldItalicFont     = *-\cormorantgaramond at boldstyle Italic ,
+      ]
+      {CormorantGaramond}
+  \providecommand\sufigures{\addfontfeatures{VerticalPosition=Superior}}
+  \providecommand\infigures{\addfontfeatures{VerticalPosition=ScientificInferior}}
+  \newfontfamily\cormorantgaramondOsF
+      [ Numbers = {\cormorantgaramond at figurealign,OldStyle},
+        UprightFont    = *-\cormorantgaramond at regstyle ,
+        ItalicFont     = *-\ifx\cormorantgaramond at regstyle\cormorantgaramond at regular Italic\else\cormorantgaramond at regstyle Italic\fi ,
+        BoldFont    = *-\cormorantgaramond at boldstyle ,
+        BoldItalicFont     = *-\cormorantgaramond at boldstyle Italic ,
+      ]
+      {CormorantGaramond}
+  \newfontfamily\cormorantgaramondLF
+      [ Numbers = {\cormorantgaramond at figurealign,Lining},
+        UprightFont    = *-\cormorantgaramond at regstyle ,
+        ItalicFont     = *-\ifx\cormorantgaramond at regstyle\cormorantgaramond at regular Italic\else\cormorantgaramond at regstyle Italic\fi ,
+        BoldFont    = *-\cormorantgaramond at boldstyle ,
+        BoldItalicFont     = *-\cormorantgaramond at boldstyle Italic ,
+      ]
+      {CormorantGaramond}
+  \newfontfamily\cormorantgaramondtabular
+    [ Numbers = {Monospaced,\cormorantgaramond at figurestyle},
+        UprightFont    = *-\cormorantgaramond at regstyle ,
+        ItalicFont     = *-\ifx\cormorantgaramond at regstyle\cormorantgaramond at regular Italic\else\cormorantgaramond at regstyle Italic\fi ,
+        BoldFont    = *-\cormorantgaramond at boldstyle ,
+        BoldItalicFont     = *-\cormorantgaramond at boldstyle Italic ,
+    ]
+    {CormorantGaramond}
+  \newfontfamily\cormorantgaramondproportional
+    [ Numbers = {\cormorantgaramond at figurestyle},
+        UprightFont    = *-\cormorantgaramond at regstyle ,
+        ItalicFont     = *-\ifx\cormorantgaramond at regstyle\cormorantgaramond at regular Italic\else\cormorantgaramond at regstyle Italic\fi ,
+        BoldFont    = *-\cormorantgaramond at boldstyle ,
+        BoldItalicFont     = *-\cormorantgaramond at boldstyle Italic ,
+    ]
+    {CormorantGaramond}
+  \DeclareTextFontCommand{\oldstylenums}{\cormorantgaramondOsF}
+  \DeclareTextFontCommand{\liningnums}{\cormorantgaramondLF}
+  \DeclareTextFontCommand{\tabularnums}{\cormorantgaramondtabular}
+  \DeclareTextFontCommand{\proportionalnums}{\cormorantgaramondproportional}
+
+\else % type1
+
+  \def\cormorantgaramond at family{CormorantGaramond-\cormorantgaramond at figurealign\cormorantgaramond at figurestyle}
+  \renewcommand*\rmdefault{\cormorantgaramond at family}
+  \newcommand*\cormorantgaramond{\fontfamily{\cormorantgaramond at family}\selectfont}
+  \edef\seriesdefault{\mdseries at rm}
+
+  \fa at naming@exception{figures}{{superior}{proportional}}{Sup}
+  \fa at naming@exception{figures}{{superior}{tabular}}{Sup}
+  \def\sufigures{\@nomath\sufigures\fontfigurestyle{superior}\selectfont}
+
+  \fa at naming@exception{figures}{{inferior}{proportional}}{Inf}
+  \fa at naming@exception{figures}{{inferior}{tabular}}{Inf}
+  \def\infigures{\@nomath\infigures\fontfigurestyle{inferior}\selectfont}
+
+  \DeclareTextFontCommand{\oldstylenums}{\fontfamily{CormorantGaramond-\cormorantgaramond at figurealign OsF}\selectfont}
+  \DeclareTextFontCommand{\liningnums}{\fontfamily{CormorantGaramond-\cormorantgaramond at figurealign LF}\selectfont}
+  \DeclareTextFontCommand{\tabularnums}{\fontfamily{CormorantGaramond-T\cormorantgaramond at figurestyle}\selectfont}
+  \DeclareTextFontCommand{\proportionalnums}{\fontfamily{CormorantGaramond-\cormorantgaramond at figurestyle}\selectfont}
+
+\fi
+
+\DeclareTextFontCommand{\textsu}{\sufigures}
+\DeclareTextFontCommand{\textinf}{\infigures}
+
+\ifcormorantgaramond at ttf
+  \defaultfontfeatures{}
+\fi
+
 \endinput



More information about the tex-live-commits mailing list