diff options
author | Karl Berry <karl@freefriends.org> | 2019-10-09 21:53:03 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2019-10-09 21:53:03 +0000 |
commit | 461518c0a33cdd8e65c4e49037af105edb127f66 (patch) | |
tree | 630a449989d713506c88a260d8340b54662ff267 /Master/texmf-dist/tex/latex/alegreya/Alegreya.sty | |
parent | 079365ff677a063ffb332667e9bdcb534c4a4c11 (diff) |
alegreya (9oct19)
git-svn-id: svn://tug.org/texlive/trunk@52320 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/alegreya/Alegreya.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/alegreya/Alegreya.sty | 55 |
1 files changed, 43 insertions, 12 deletions
diff --git a/Master/texmf-dist/tex/latex/alegreya/Alegreya.sty b/Master/texmf-dist/tex/latex/alegreya/Alegreya.sty index 92e4a386c91..ac7e0508061 100644 --- a/Master/texmf-dist/tex/latex/alegreya/Alegreya.sty +++ b/Master/texmf-dist/tex/latex/alegreya/Alegreya.sty @@ -1,5 +1,5 @@ \ProvidesPackage{Alegreya}[% - 2018/08/02 (Bob Tennent) Supports Alegreya and AlegreyaSC fonts for all LaTeX engines. ] + 2019/10/08 (Bob Tennent) Supports Alegreya and AlegreyaSC fonts for all LaTeX engines. ] \RequirePackage{ifxetex,ifluatex,textcomp} @@ -15,6 +15,8 @@ \newif\ifAlegreya@lining \Alegreya@liningtrue \newif\ifAlegreya@tabular \Alegreya@tabularfalse \newif\ifAlegreya@black \Alegreya@blackfalse +\newif\ifAlegreya@extrabold \Alegreya@extraboldfalse +\newif\ifAlegreya@medium \Alegreya@mediumfalse \newcommand*{\Alegreya@scale}{1} \RequirePackage{xkeyval} @@ -83,13 +85,9 @@ \fi } -\def\bfseries@rm{b}\def\Alegreya@boldstyle{Bold} -\DeclareOptionX{black}{\edef\bfseries@rm{k}\edef\Alegreya@boldstyle{Black}} -\DeclareOptionX{extrabold}{\edef\bfseries@rm{eb}\edef\Alegreya@boldstyle{ExtraBold}} - -\def\mdseries@rm{m}\def\Alegreya@regstyle{Regular} -\DeclareOptionX{medium}{\edef\mdseries@rm{mb}\edef\Alegreya@regstyle{Medium}} -\def\seriesdefault{\mdseries@rm} +\DeclareOptionX{black}{\Alegreya@blacktrue} +\DeclareOptionX{extrabold}{\Alegreya@extraboldtrue} +\DeclareOptionX{medium}{\Alegreya@mediumtrue} \ProcessOptionsX\relax @@ -104,6 +102,16 @@ \else \def\Alegreya@figurealign{Proportional} \fi + \def\Alegreya@boldstyle{Bold} + \ifAlegreya@extrabold + \def\Alegreya@boldstyle{ExtraBold} + \else\ifAlegreya@black + \def\Alegreya@boldstyle{Black} + \fi\fi + \def\Alegreya@regstyle{Regular} + \ifAlegreya@medium + \def\Alegreya@regstyle{Medium} + \fi \else % type1 @@ -117,6 +125,20 @@ \else \def\Alegreya@figurealign{} \fi + + \def\bfseries@rm{bold} + \ifAlegreya@extrabold + \def\bfseries@rm{extrabold} + \else\ifAlegreya@black + \def\bfseries@rm{black} + \fi\fi + + \def\mdseries@rm{regular} + \ifAlegreya@medium + \def\mdseries@rm{medium} + \fi + \def\seriesdefault{\mdseries@rm} + \fi @@ -137,7 +159,8 @@ \setmainfont [ Numbers = {\Alegreya@figurealign,\Alegreya@figurestyle}, UprightFont = *-\Alegreya@regstyle , - ItalicFont = *-\ifx\Alegreya@regstyle\Alegreya@regular Italic\else\Alegreya@regstyle Italic\fi , + ItalicFont = *-Italic, +%*-\ifx\Alegreya@regstyle\Alegreya@regular Italic\else\Alegreya@regstyle Italic\fi , BoldFont = *-\Alegreya@boldstyle , BoldItalicFont = *-\Alegreya@boldstyle Italic , ] @@ -212,6 +235,14 @@ BoldItalicFont = *-\Alegreya@boldstyle Italic , ] {Alegreya} + \newfontfamily\AlegreyaExtraBold + [ Numbers = {\Alegreya@figurealign,\Alegreya@figurestyle}, + UprightFont = *-ExtraBold , + ItalicFont = *-ExtraBoldItalic , + BoldFont = *-ExtraBold , + BoldItalicFont = *-ExtraBoldItalic , + ] + {Alegreya} \newfontfamily\AlegreyaBlack [ Numbers = {\Alegreya@figurealign,\Alegreya@figurestyle}, UprightFont = *-Black , @@ -220,7 +251,6 @@ BoldItalicFont = *-BlackItalic , ] {Alegreya} - \newfontfamily\AlegreyaMedium [ Numbers = {\Alegreya@figurealign,\Alegreya@figurestyle}, UprightFont = *-Medium , @@ -243,8 +273,9 @@ \def\AlegreyaOsF{\fontfamily{Alegreya-OsF}\selectfont} \def\AlegreyaTLF{\fontfamily{Alegreya-TLF}\selectfont} \def\AlegreyaTOsF{\fontfamily{Alegreya-TOsF}\selectfont} - \def\AlegreyaBlack{\fontfamily{\Alegreyafamily}\fontseries{k}\selectfont} - \def\AlegreyaMedium{\fontfamily{\Alegreyafamily}\fontseries{mb}\selectfont} + \def\AlegreyaExtraBold{\fontfamily{\Alegreyafamily}\fontseries{extrabold}\selectfont} + \def\AlegreyaBlack{\fontfamily{\Alegreyafamily}\fontseries{black}\selectfont} + \def\AlegreyaMedium{\fontfamily{\Alegreyafamily}\fontseries{medium}\selectfont} \fa@naming@exception{figures}{{superior}{proportional}}{Sup} \fa@naming@exception{figures}{{superior}{tabular}}{Sup} |