summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2016-02-15 22:12:15 +0000
committerKarl Berry <karl@freefriends.org>2016-02-15 22:12:15 +0000
commitc83d372fcf897fdd6cda8a02c32295bed1bd5974 (patch)
treeceb6ccad6686f8e005f2ae1f336881f19458e099
parent02583fcfe69ff353b8f8eaf69cf340ed8edbb199 (diff)
fira (14feb16)
git-svn-id: svn://tug.org/texlive/trunk@39731 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/fonts/fira/README4
-rw-r--r--Master/texmf-dist/tex/latex/fira/FiraMono.sty23
2 files changed, 16 insertions, 11 deletions
diff --git a/Master/texmf-dist/doc/fonts/fira/README b/Master/texmf-dist/doc/fonts/fira/README
index 1a49130d8c4..39b84753895 100644
--- a/Master/texmf-dist/doc/fonts/fira/README
+++ b/Master/texmf-dist/doc/fonts/fira/README
@@ -1,4 +1,4 @@
-This is the README for the fira package, version 4.1-2016-02-12.
+This is the README for the fira package, version 4.1-2016-02-13.
This package provides LaTeX, pdfLaTeX, XeLaTeX and LuaLaTeX
support for the Fira Sans family of fonts (version 4.1)
@@ -40,7 +40,7 @@ LuaLaTeX and xeLaTeX users who might prefer type1 fonts or
who wish to avoid fontspec may use the type1 option.
The nomap option will suppress the tex-text mapping
of TeX "smart quotes" and other ligatures into unicode
-glyphs (for xeLaTeX).
+glyphs for xeLaTeX and luaLaTeX.
Options scaled=<number> or scale=<number> may be used to
scale the fonts.
diff --git a/Master/texmf-dist/tex/latex/fira/FiraMono.sty b/Master/texmf-dist/tex/latex/fira/FiraMono.sty
index 9b513358f28..5e84450d008 100644
--- a/Master/texmf-dist/tex/latex/fira/FiraMono.sty
+++ b/Master/texmf-dist/tex/latex/fira/FiraMono.sty
@@ -1,8 +1,8 @@
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{FiraMono}
- [2016/02/12 (Bob Tennent and autoinst) Style file for Fira Mono fonts.]
+ [2016/02/13 (Bob Tennent and autoinst) Style file for Fira Mono fonts.]
-% nomap option patch from Harlan Lieberman-Berg (hlieberm@akamai.com) 2016-02-11
+% nomap option suggested by Harlan Lieberman-Berg (hlieberm@akamai.com) 2016-02-11
\RequirePackage{ifxetex,ifluatex,xkeyval,textcomp}
@@ -18,9 +18,9 @@
\newif\iffiramono@lining \firamono@liningfalse
\newif\iffiramono@medium \firamono@mediumfalse
+\newif\iffiramono@ligatures \firamono@ligaturestrue
\newcommand*{\FiraMono@scale}{1}
-\newcommand*{\FiraMono@mapping}{tex-text}
\RequirePackage{xkeyval}
\DeclareOptionX{scaled}{\renewcommand*{\FiraMono@scale}{#1}}
\DeclareOptionX{scale}{\renewcommand*{\FiraMono@scale}{#1}}
@@ -29,7 +29,7 @@
\DeclareOptionX{lf}{\firamono@liningtrue}
\DeclareOptionX{oldstyle}{\firamono@liningfalse}
\DeclareOptionX{osf}{\firamono@liningfalse}
-\DeclareOptionX{nomap}{\renewcommand*{\FiraMono@mapping}{}}
+\DeclareOptionX{nomap}{\firamono@ligaturesfalse}
\DeclareOptionX{medium}{\firamono@mediumtrue}
\DeclareOptionX{mb}{\firamono@mediumtrue}
@@ -71,17 +71,22 @@
\iffiramono@otf
\ifxetex\XeTeXtracingfonts=1\fi
- \defaultfontfeatures{
- Ligatures = TeX ,
- Scale = \FiraMono@scale ,
- Extension = .otf }
+ \iffiramono@ligatures
+ \defaultfontfeatures{
+ Ligatures = TeX ,
+ Scale = \FiraMono@scale ,
+ Extension = .otf }
+ \else
+ \defaultfontfeatures{
+ Scale = \FiraMono@scale ,
+ Extension = .otf }
+ \fi
\setmonofont
[ Numbers = {Monospaced,\firamono@figurestyle},
UprightFont = *-\firamono@regstyle ,
ItalicFont = *-\firamono@regstyle ,
BoldFont = *-\firamono@boldstyle ,
BoldItalicFont = *-\firamono@boldstyle ,
- Mapping = \FiraMono@mapping
]
{FiraMono}
% grab current family in case of subsequent change: