summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/fira/FiraSans.sty
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/latex/fira/FiraSans.sty')
-rw-r--r--Master/texmf-dist/tex/latex/fira/FiraSans.sty128
1 files changed, 109 insertions, 19 deletions
diff --git a/Master/texmf-dist/tex/latex/fira/FiraSans.sty b/Master/texmf-dist/tex/latex/fira/FiraSans.sty
index c793f3c00f7..6999a345803 100644
--- a/Master/texmf-dist/tex/latex/fira/FiraSans.sty
+++ b/Master/texmf-dist/tex/latex/fira/FiraSans.sty
@@ -1,6 +1,6 @@
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{FiraSans}
- [2014/03/16 (Bob Tennent and autoinst) Style file for Fira Sans fonts.]
+ [2014/11/19 (Bob Tennent and autoinst) Style file for Fira Sans fonts.]
\RequirePackage{ifxetex,ifluatex,xkeyval,textcomp}
@@ -15,14 +15,22 @@
\newif\iffira@lining \fira@liningfalse
\newif\iffira@tabular \fira@tabularfalse
+
\newif\iffira@medium \fira@mediumfalse
+\newif\iffira@semibold \fira@semiboldfalse
+\newif\iffira@extrabold \fira@extraboldfalse
+\newif\iffira@heavy \fira@heavyfalse
\newif\iffira@light \fira@lightfalse
+\newif\iffira@extralight \fira@extralightfalse
+\newif\iffira@ultralight \fira@ultralightfalse
+\newif\iffira@book \fira@bookfalse
+\newif\iffira@thin \fira@thinfalse
\newif\iffira@default \fira@defaultfalse
-\newcommand*{\FiraSansOT@scale}{1}
+\newcommand*{\FiraSans@scale}{1}
\RequirePackage{xkeyval}
-\DeclareOptionX{scaled}{\renewcommand*{\FiraSansOT@scale}{#1}}
-\DeclareOptionX{scale}{\renewcommand*{\FiraSansOT@scale}{#1}}
+\DeclareOptionX{scaled}{\renewcommand*{\FiraSans@scale}{#1}}
+\DeclareOptionX{scale}{\renewcommand*{\FiraSans@scale}{#1}}
\DeclareOptionX{type1}{\fira@otffalse}
\DeclareOptionX{lining}{\fira@liningtrue}
\DeclareOptionX{lf}{\fira@liningtrue}
@@ -32,10 +40,19 @@
\DeclareOptionX{t}{\fira@tabulartrue}
\DeclareOptionX{proportional}{\fira@tabularfalse}
\DeclareOptionX{p}{\fira@tabularfalse}
+
+\DeclareOptionX{book}{\fira@booktrue}
\DeclareOptionX{medium}{\fira@mediumtrue}
\DeclareOptionX{mb}{\fira@mediumtrue}
+\DeclareOptionX{semibold}{\fira@semiboldtrue}
+\DeclareOptionX{sb}{\fira@semiboldtrue}
\DeclareOptionX{light}{\fira@lighttrue}
\DeclareOptionX{l}{\fira@lighttrue}
+\DeclareOptionX{extralight}{\fira@extralighttrue}
+\DeclareOptionX{ultralight}{\fira@ultralighttrue}
+\DeclareOptionX{thin}{\fira@thintrue}
+\DeclareOptionX{extrabold}{\fira@extraboldtrue}
+\DeclareOptionX{heavy}{\fira@heavytrue}
\DeclareOptionX{default}{\fira@defaulttrue}
\DeclareOptionX{sfdefault}{\fira@defaulttrue}
@@ -68,16 +85,32 @@
\iffira@otf
\def\fira@boldstyle{Bold}
- \iffira@medium\def\fira@boldstyle{Medium}\fi
+ \iffira@semibold\def\fira@boldstyle{SemiBold}\fi
+ \iffira@extrabold\def\fira@boldstyle{ExtraBold}\fi
+ \iffira@heavy\def\fira@boldstyle{Heavy}\fi
+
\def\fira@regstyle{Regular}
+ \iffira@book\def\fira@regstyle{Book}\fi
+ \iffira@medium\def\fira@regstyle{Medium}\fi
\iffira@light\def\fira@regstyle{Light}\fi
+ \iffira@extralight\def\fira@regstyle{ExtraLight}\fi
+ \iffira@ultralight\def\fira@regstyle{UltraLight}\fi
+ \iffira@thin\def\fira@regstyle{Thin}\fi
\else % type1
\def\bfseries@sf{b}
- \iffira@medium\def\bfseries@sf{mb}\fi
+ \iffira@semibold\def\bfseries@sf{sb}\fi
+ \iffira@extrabold\def\bfseries@sf{eb}\fi
+ \iffira@heavy\def\bfseries@sf{h}\fi
+
\def\mdseries@sf{m}
+ \iffira@book\def\mdseries@sf{k}\fi
+ \iffira@medium\def\mdseries@sf{mb}\fi
\iffira@light\def\mdseries@sf{l}\fi
+ \iffira@extralight\def\mdseries@sf{el}\fi
+ \iffira@ultralight\def\mdseries@sf{ul}\fi
+ \iffira@thin\def\mdseries@sf{t}\fi
\fi
@@ -91,7 +124,7 @@
\ifxetex\XeTeXtracingfonts=1\fi
\defaultfontfeatures{
Ligatures = TeX ,
- Scale = \FiraSansOT@scale ,
+ Scale = \FiraSans@scale ,
Extension = .otf }
\setsansfont
[ Numbers = {\fira@figurealign,\fira@figurestyle},
@@ -100,7 +133,7 @@
BoldFont = *-\fira@boldstyle ,
BoldItalicFont = *-\fira@boldstyle Italic ,
]
- {FiraSansOT}
+ {FiraSans}
% grab current family in case of subsequent change:
\let\firafamily\sfdefault
\iffira@default\renewcommand*\familydefault{\firafamily}\fi
@@ -113,7 +146,7 @@
BoldFont = *-\fira@boldstyle ,
BoldItalicFont = *-\fira@boldstyle Italic ,
]
- {FiraSansOT}
+ {FiraSans}
\newfontfamily\firalining
[ Numbers = {\fira@figurealign,Lining},
UprightFont = *-\fira@regstyle ,
@@ -121,7 +154,7 @@
BoldFont = *-\fira@boldstyle ,
BoldItalicFont = *-\fira@boldstyle Italic ,
]
- {FiraSansOT}
+ {FiraSans}
\newfontfamily\firatabular
[ Numbers = {Monospaced,\fira@figurestyle},
UprightFont = *-\fira@regstyle ,
@@ -129,7 +162,7 @@
BoldFont = *-\fira@boldstyle ,
BoldItalicFont = *-\fira@boldstyle Italic ,
]
- {FiraSansOT}
+ {FiraSans}
\newfontfamily\firaproportional
[ Numbers = {Proportional,\fira@figurestyle},
UprightFont = *-\fira@regstyle ,
@@ -137,7 +170,15 @@
BoldFont = *-\fira@boldstyle ,
BoldItalicFont = *-\fira@boldstyle Italic ,
]
- {FiraSansOT}
+ {FiraSans}
+ \newfontfamily\firathin
+ [ Numbers = {\fira@figurealign,\fira@figurestyle},
+ UprightFont = *-Thin ,
+ ItalicFont = *-ThinItalic ,
+ BoldFont = *-\fira@boldstyle ,
+ BoldItalicFont = *-\fira@boldstyle Italic ,
+ ]
+ {FiraSans}
\newfontfamily\firalight
[ Numbers = {\fira@figurealign,\fira@figurestyle},
UprightFont = *-Light ,
@@ -145,7 +186,23 @@
BoldFont = *-\fira@boldstyle ,
BoldItalicFont = *-\fira@boldstyle Italic ,
]
- {FiraSansOT}
+ {FiraSans}
+ \newfontfamily\firaextralight
+ [ Numbers = {\fira@figurealign,\fira@figurestyle},
+ UprightFont = *-ExtraLight ,
+ ItalicFont = *-ExtraLightItalic ,
+ BoldFont = *-\fira@boldstyle ,
+ BoldItalicFont = *-\fira@boldstyle Italic ,
+ ]
+ {FiraSans}
+ \newfontfamily\firaultralight
+ [ Numbers = {\fira@figurealign,\fira@figurestyle},
+ UprightFont = *-UltraLight ,
+ ItalicFont = *-UltraLightItalic ,
+ BoldFont = *-\fira@boldstyle ,
+ BoldItalicFont = *-\fira@boldstyle Italic ,
+ ]
+ {FiraSans}
\newfontfamily\firamedium
[ Numbers = {\fira@figurealign,\fira@figurestyle},
UprightFont = *-Medium ,
@@ -153,11 +210,37 @@
BoldFont = *-\fira@boldstyle ,
BoldItalicFont = *-\fira@boldstyle Italic ,
]
- {FiraSansOT}
+ {FiraSans}
+ \newfontfamily\firabook
+ [ Numbers = {\fira@figurealign,\fira@figurestyle},
+ UprightFont = *-Book ,
+ ItalicFont = *-BookItalic ,
+ BoldFont = *-\fira@boldstyle ,
+ BoldItalicFont = *-\fira@boldstyle Italic ,
+ ]
+ {FiraSans}
+ \newfontfamily\firasemibold
+ [ Numbers = {\fira@figurealign,\fira@figurestyle},
+ UprightFont = *-SemiBold ,
+ ItalicFont = *-SemiBoldItalic ,
+ ]
+ {FiraSans}
+ \newfontfamily\firaextrabold
+ [ Numbers = {\fira@figurealign,\fira@figurestyle},
+ UprightFont = *-ExtraBold ,
+ ItalicFont = *-ExtraBoldItalic ,
+ ]
+ {FiraSans}
+ \newfontfamily\firaheavy
+ [ Numbers = {\fira@figurealign,\fira@figurestyle},
+ UprightFont = *-Heavy ,
+ ItalicFont = *-HeavyItalic ,
+ ]
+ {FiraSans}
\else % type1
- \def\fira@family{FiraSansOT-\fira@figurealign\fira@figurestyle}
+ \def\fira@family{FiraSans-\fira@figurealign\fira@figurestyle}
\renewcommand*\sfdefault{\fira@family}
\iffira@default\edef\familydefault{\sfdefault}\edef\seriesdefault{\mdseries@sf}\fi
@@ -165,13 +248,20 @@
\fa@naming@exception{figures}{{superior}{tabular}}{Sup}
\def\sufigures{\@nomath\sufigures\fontfigurestyle{superior}\selectfont}
- \def\firaoldstyle{\fontfamily{FiraSansOT-\fira@figurealign OsF}\selectfont}
- \def\firalining{\fontfamily{FiraSansOT-\fira@figurealign LF}\selectfont}
- \def\firatabular{\fontfamily{FiraSansOT-T\fira@figurestyle}\selectfont}
- \def\firaproportional{\fontfamily{FiraSansOT-\fira@figurestyle}\selectfont}
+ \def\firaoldstyle{\fontfamily{FiraSans-\fira@figurealign OsF}\selectfont}
+ \def\firalining{\fontfamily{FiraSans-\fira@figurealign LF}\selectfont}
+ \def\firatabular{\fontfamily{FiraSans-T\fira@figurestyle}\selectfont}
+ \def\firaproportional{\fontfamily{FiraSans-\fira@figurestyle}\selectfont}
+ \def\firathin{\fontfamily{\fira@family}\fontseries{t}\selectfont}
\def\firalight{\fontfamily{\fira@family}\fontseries{l}\selectfont}
+ \def\firaextralight{\fontfamily{\fira@family}\fontseries{el}\selectfont}
+ \def\firaultralight{\fontfamily{\fira@family}\fontseries{ul}\selectfont}
\def\firamedium{\fontfamily{\fira@family}\fontseries{mb}\selectfont}
+ \def\firabook{\fontfamily{\fira@family}\fontseries{k}\selectfont}
+ \def\firasemibold{\fontfamily{\fira@family}\fontseries{sb}\selectfont}
+ \def\firaextrabold{\fontfamily{\fira@family}\fontseries{eb}\selectfont}
+ \def\firaheavy{\fontfamily{\fira@family}\fontseries{h}\selectfont}
\fi