summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/alegreya/AlegreyaSans.sty
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/latex/alegreya/AlegreyaSans.sty')
-rw-r--r--Master/texmf-dist/tex/latex/alegreya/AlegreyaSans.sty62
1 files changed, 49 insertions, 13 deletions
diff --git a/Master/texmf-dist/tex/latex/alegreya/AlegreyaSans.sty b/Master/texmf-dist/tex/latex/alegreya/AlegreyaSans.sty
index 3e184b5ee01..68159d41f64 100644
--- a/Master/texmf-dist/tex/latex/alegreya/AlegreyaSans.sty
+++ b/Master/texmf-dist/tex/latex/alegreya/AlegreyaSans.sty
@@ -1,5 +1,5 @@
\ProvidesPackage{AlegreyaSans}[%
- 2019/03/07 (Bob Tennent) Supports AlegreyaSans fonts for all LaTeX engines. ]
+ 2019/10/08 (Bob Tennent) Supports AlegreyaSans fonts for all LaTeX engines. ]
\RequirePackage{ifxetex,ifluatex,textcomp}
@@ -14,7 +14,12 @@
\newif\ifAlegreyaSans@lining \AlegreyaSans@liningtrue
\newif\ifAlegreyaSans@tabular \AlegreyaSans@tabularfalse
+
\newif\ifAlegreyaSans@black \AlegreyaSans@blackfalse
+\newif\ifAlegreyaSans@extrabold \AlegreyaSans@extraboldfalse
+\newif\ifAlegreyaSans@medium \AlegreyaSans@mediumfalse
+\newif\ifAlegreyaSans@thin \AlegreyaSans@thinfalse
+\newif\ifAlegreyaSans@light \AlegreyaSans@lightfalse
\newcommand*{\AlegreyaSans@scale}{1}
\RequirePackage{xkeyval}
@@ -86,14 +91,12 @@
\fi
}
-\def\bfseries@sf{b}\def\AlegreyaSans@boldstyle{Bold}
-\DeclareOptionX{black}{\edef\bfseries@sf{k}\edef\AlegreyaSans@boldstyle{Black}}
-\DeclareOptionX{extrabold}{\edef\bfseries@sf{eb}\edef\AlegreyaSans@boldstyle{ExtraBold}}
+\DeclareOptionX{black}{\AlegreyaSans@blacktrue}
+\DeclareOptionX{extrabold}{\AlegreyaSans@extraboldtrue}
-\def\mdseries@sf{m}\def\AlegreyaSans@regularstyle{Regular}
-\DeclareOptionX{thin}{\edef\mdseries@sf{t}\edef\AlegreyaSans@regularstyle{Thin}}
-\DeclareOptionX{light}{\edef\mdseries@sf{l}\edef\AlegreyaSans@regularstyle{Light}}
-\DeclareOptionX{medium}{\edef\mdseries@sf{mb}\edef\AlegreyaSans@regularstyle{Medium}}
+\DeclareOptionX{thin}{\AlegreyaSans@thintrue}
+\DeclareOptionX{light}{\AlegreyaSans@lighttrue}
+\DeclareOptionX{medium}{\AlegreyaSans@mediumtrue}
\ProcessOptionsX\relax
@@ -109,6 +112,22 @@
\def\AlegreyaSans@figurealign{Proportional}
\fi
+ \def\AlegreyaSans@regularstyle{Regular}
+ \ifAlegreyaSans@medium
+ \def\AlegreyaSans@regularstyle{Medium}
+ \else\ifAlegreyaSans@thin
+ \def\AlegreyaSans@regularstyle{Thin}
+ \else\ifAlegreyaSans@light
+ \def\AlegreyaSans@regularstyle{Light}
+ \fi\fi\fi
+
+ \def\AlegreyaSans@boldstyle{Bold}
+ \ifAlegreyaSans@extrabold
+ \def\AlegreyaSans@boldstyle{ExtraBold}
+ \else\ifAlegreyaSans@black
+ \def\AlegreyaSans@boldstyle{Black}
+ \fi\fi
+
\else % type1
\ifAlegreyaSans@lining
@@ -121,6 +140,23 @@
\else
\def\AlegreyaSans@figurealign{}
\fi
+
+ \def\bfseries@sf{bold}
+ \ifAlegreyaSans@extrabold
+ \def\bfseries@sf{extrabold}
+ \else\ifAlegreyaSans@black
+ \def\bfseries@sf{black}
+ \fi\fi
+
+ \def\mdseries@sf{regular}
+ \ifAlegreyaSans@medium
+ \def\mdseries@sf{medium}
+ \else\ifAlegreyaSans@light
+ \def\mdseries@sf{light}
+ \else\ifAlegreyaSans@thin
+ \def\mdseries@sf{thin}
+ \fi\fi\fi
+
\fi
@@ -273,11 +309,11 @@
\def\AlegreyaSansOsF{\fontfamily{AlegreyaSans-OsF}\selectfont}
\def\AlegreyaSansTLF{\fontfamily{AlegreyaSans-TLF}\selectfont}
\def\AlegreyaSansTOsF{\fontfamily{AlegreyaSans-TOsF}\selectfont}
- \def\AlegreyaSansThin{\fontfamily{\AlegreyaSansfamily}\fontseries{i}\selectfont}
- \def\AlegreyaSansLight{\fontfamily{\AlegreyaSansfamily}\fontseries{l}\selectfont}
- \def\AlegreyaSansMedium{\fontfamily{\AlegreyaSansfamily}\fontseries{mb}\selectfont}
- \def\AlegreyaSansExtraBold{\fontfamily{\AlegreyaSansfamily}\fontseries{eb}\selectfont}
- \def\AlegreyaSansBlack{\fontfamily{\AlegreyaSansfamily}\fontseries{k}\selectfont}
+ \def\AlegreyaSansThin{\fontfamily{\AlegreyaSansfamily}\fontseries{thin}\selectfont}
+ \def\AlegreyaSansLight{\fontfamily{\AlegreyaSansfamily}\fontseries{light}\selectfont}
+ \def\AlegreyaSansMedium{\fontfamily{\AlegreyaSansfamily}\fontseries{medium}\selectfont}
+ \def\AlegreyaSansExtraBold{\fontfamily{\AlegreyaSansfamily}\fontseries{extrabold}\selectfont}
+ \def\AlegreyaSansBlack{\fontfamily{\AlegreyaSansfamily}\fontseries{black}\selectfont}
\fa@naming@exception{figures}{{superior}{proportional}}{Sup}
\fa@naming@exception{figures}{{superior}{tabular}}{Sup}