summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/fira/FiraSans.sty
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2018-05-24 21:29:44 +0000
committerKarl Berry <karl@freefriends.org>2018-05-24 21:29:44 +0000
commit02c7b1553e2e3ea2657ff01c3a87c5b27da2bb6a (patch)
tree527cbdcc295af819497d57365332697a8199234d /Master/texmf-dist/tex/latex/fira/FiraSans.sty
parent7895df6ab5d011bd09484b5aba16db682a2621e9 (diff)
fira (24may18)
git-svn-id: svn://tug.org/texlive/trunk@47824 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/fira/FiraSans.sty')
-rw-r--r--Master/texmf-dist/tex/latex/fira/FiraSans.sty76
1 files changed, 40 insertions, 36 deletions
diff --git a/Master/texmf-dist/tex/latex/fira/FiraSans.sty b/Master/texmf-dist/tex/latex/fira/FiraSans.sty
index 9d8c84ca8dc..1eeb7f7ee98 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}
- [2018/01/09 (Bob Tennent and autoinst) Style file for Fira Sans fonts.]
+ [2018/05/23 (Bob Tennent and autoinst) Style file for Fira Sans fonts.]
\RequirePackage{ifxetex,ifluatex,xkeyval,textcomp}
@@ -61,28 +61,28 @@
\iffira@otf
\iffira@lining
- \def\fira@figurestyle{Lining}
+ \def\fira@otffigurestyle{Lining}
\else
- \def\fira@figurestyle{OldStyle}
+ \def\fira@otffigurestyle{OldStyle}
\fi
\iffira@tabular
- \def\fira@figurealign{Monospaced}
+ \def\fira@otffigurealign{Monospaced}
\else
- \def\fira@figurealign{Proportional}
- \fi
-\else % type1
- \iffira@lining
- \def\fira@figurestyle{LF}
- \else
- \def\fira@figurestyle{OsF}
- \fi
- \iffira@tabular
- \def\fira@figurealign{T}
- \else
- \def\fira@figurealign{}
+ \def\fira@otffigurealign{Proportional}
\fi
\fi
+\iffira@lining
+ \def\fira@figurestyle{LF}
+\else
+ \def\fira@figurestyle{OsF}
+\fi
+\iffira@tabular
+ \def\fira@figurealign{T}
+\else
+ \def\fira@figurealign{}
+\fi
+
\iffira@otf
\def\fira@boldstyle{Bold}
\iffira@semibold\def\fira@boldstyle{SemiBold}\fi
@@ -117,19 +117,20 @@
\iffira@otf
\RequirePackage{fontspec}
\else
- \RequirePackage{fontenc,mweights,fontaxes}
+ \RequirePackage{mweights,fontaxes}
\fi
\iffira@otf
+ \def\fira@regular{Regular}
\ifxetex\XeTeXtracingfonts=1\fi
\defaultfontfeatures{
Ligatures = TeX ,
Scale = \FiraSans@scale ,
Extension = .otf }
\setsansfont
- [ Numbers = {\fira@figurealign,\fira@figurestyle},
+ [ Numbers = {\fira@otffigurealign,\fira@otffigurestyle},
UprightFont = *-\fira@regstyle ,
- ItalicFont = *-\fira@regstyle Italic ,
+ ItalicFont = *-\ifx\fira@regstyle\fira@regular\else\fira@regstyle\fi Italic,
BoldFont = *-\fira@boldstyle ,
BoldItalicFont = *-\fira@boldstyle Italic ,
]
@@ -140,39 +141,39 @@
\providecommand\sufigures{\addfontfeatures{VerticalPosition=Superior}}
\newfontfamily\firaoldstyle
- [ Numbers = {\fira@figurealign,OldStyle},
+ [ Numbers = {\fira@otffigurealign,OldStyle},
UprightFont = *-\fira@regstyle ,
- ItalicFont = *-\fira@regstyle Italic ,
+ ItalicFont = *-\ifx\fira@regstyle\fira@regular\else\fira@regstyle\fi Italic,
BoldFont = *-\fira@boldstyle ,
BoldItalicFont = *-\fira@boldstyle Italic ,
]
{FiraSans}
\newfontfamily\firalining
- [ Numbers = {\fira@figurealign,Lining},
+ [ Numbers = {\fira@otffigurealign,Lining},
UprightFont = *-\fira@regstyle ,
- ItalicFont = *-\fira@regstyle Italic ,
+ ItalicFont = *-\ifx\fira@regstyle\fira@regular\else\fira@regstyle\fi Italic,
BoldFont = *-\fira@boldstyle ,
BoldItalicFont = *-\fira@boldstyle Italic ,
]
{FiraSans}
\newfontfamily\firatabular
- [ Numbers = {Monospaced,\fira@figurestyle},
+ [ Numbers = {Monospaced,\fira@otffigurestyle},
UprightFont = *-\fira@regstyle ,
- ItalicFont = *-\fira@regstyle Italic ,
+ ItalicFont = *-\ifx\fira@regstyle\fira@regular\else\fira@regstyle\fi Italic,
BoldFont = *-\fira@boldstyle ,
BoldItalicFont = *-\fira@boldstyle Italic ,
]
{FiraSans}
\newfontfamily\firaproportional
- [ Numbers = {Proportional,\fira@figurestyle},
+ [ Numbers = {Proportional,\fira@otffigurestyle},
UprightFont = *-\fira@regstyle ,
- ItalicFont = *-\fira@regstyle Italic ,
+ ItalicFont = *-\ifx\fira@regstyle\fira@regular\else\fira@regstyle\fi Italic,
BoldFont = *-\fira@boldstyle ,
BoldItalicFont = *-\fira@boldstyle Italic ,
]
{FiraSans}
\newfontfamily\firathin
- [ Numbers = {\fira@figurealign,\fira@figurestyle},
+ [ Numbers = {\fira@otffigurealign,\fira@otffigurestyle},
UprightFont = *-Thin ,
ItalicFont = *-ThinItalic ,
BoldFont = *-\fira@boldstyle ,
@@ -180,7 +181,7 @@
]
{FiraSans}
\newfontfamily\firalight
- [ Numbers = {\fira@figurealign,\fira@figurestyle},
+ [ Numbers = {\fira@otffigurealign,\fira@otffigurestyle},
UprightFont = *-Light ,
ItalicFont = *-LightItalic ,
BoldFont = *-\fira@boldstyle ,
@@ -188,7 +189,7 @@
]
{FiraSans}
\newfontfamily\firaextralight
- [ Numbers = {\fira@figurealign,\fira@figurestyle},
+ [ Numbers = {\fira@otffigurealign,\fira@otffigurestyle},
UprightFont = *-ExtraLight ,
ItalicFont = *-ExtraLightItalic ,
BoldFont = *-\fira@boldstyle ,
@@ -196,7 +197,7 @@
]
{FiraSans}
\newfontfamily\firaultralight
- [ Numbers = {\fira@figurealign,\fira@figurestyle},
+ [ Numbers = {\fira@otffigurealign,\fira@otffigurestyle},
UprightFont = *-UltraLight ,
ItalicFont = *-UltraLightItalic ,
BoldFont = *-\fira@boldstyle ,
@@ -204,7 +205,7 @@
]
{FiraSans}
\newfontfamily\firamedium
- [ Numbers = {\fira@figurealign,\fira@figurestyle},
+ [ Numbers = {\fira@otffigurealign,\fira@otffigurestyle},
UprightFont = *-Medium ,
ItalicFont = *-MediumItalic ,
BoldFont = *-\fira@boldstyle ,
@@ -212,7 +213,7 @@
]
{FiraSans}
\newfontfamily\firabook
- [ Numbers = {\fira@figurealign,\fira@figurestyle},
+ [ Numbers = {\fira@otffigurealign,\fira@otffigurestyle},
UprightFont = *-Book ,
ItalicFont = *-BookItalic ,
BoldFont = *-\fira@boldstyle ,
@@ -220,19 +221,19 @@
]
{FiraSans}
\newfontfamily\firasemibold
- [ Numbers = {\fira@figurealign,\fira@figurestyle},
+ [ Numbers = {\fira@otffigurealign,\fira@otffigurestyle},
UprightFont = *-SemiBold ,
ItalicFont = *-SemiBoldItalic ,
]
{FiraSans}
\newfontfamily\firaextrabold
- [ Numbers = {\fira@figurealign,\fira@figurestyle},
+ [ Numbers = {\fira@otffigurealign,\fira@otffigurestyle},
UprightFont = *-ExtraBold ,
ItalicFont = *-ExtraBoldItalic ,
]
{FiraSans}
\newfontfamily\firaheavy
- [ Numbers = {\fira@figurealign,\fira@figurestyle},
+ [ Numbers = {\fira@otffigurealign,\fira@otffigurestyle},
UprightFont = *-Heavy ,
ItalicFont = *-HeavyItalic ,
]
@@ -240,6 +241,7 @@
\else % type1
+
\def\fira@family{FiraSans-\fira@figurealign\fira@figurestyle}
\renewcommand*\sfdefault{\fira@family}
\iffira@default\edef\familydefault{\sfdefault}\edef\seriesdefault{\mdseries@sf}\fi
@@ -265,6 +267,8 @@
\fi
+% Use FireSans-... as the family, even for otf.
+\def\firalgr{\fontencoding{LGR}\fontfamily{FiraSans-\fira@figurealign\fira@figurestyle}\selectfont}
\iffira@otf
\defaultfontfeatures{}