summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/fbb
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2014-06-23 23:24:32 +0000
committerKarl Berry <karl@freefriends.org>2014-06-23 23:24:32 +0000
commit54d546a4891626936992e9cdf0b1cdf4e6cc0aeb (patch)
tree3a4469e794ca3346e0e9eda1c166b4fffd78e035 /Master/texmf-dist/tex/latex/fbb
parent9391c012c431ba65aaf02bc4abb6a678a50efb50 (diff)
fbb (23jun14)
git-svn-id: svn://tug.org/texlive/trunk@34359 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/fbb')
-rw-r--r--Master/texmf-dist/tex/latex/fbb/fbb.fontspec8
-rw-r--r--Master/texmf-dist/tex/latex/fbb/fbb.sty14
2 files changed, 17 insertions, 5 deletions
diff --git a/Master/texmf-dist/tex/latex/fbb/fbb.fontspec b/Master/texmf-dist/tex/latex/fbb/fbb.fontspec
new file mode 100644
index 00000000000..d4f57cf7ec9
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/fbb/fbb.fontspec
@@ -0,0 +1,8 @@
+\defaultfontfeatures[fbb]
+ {
+ Extension = .otf ,
+ UprightFont = fbb-Regular,
+ BoldFont = fbb-Bold,
+ ItalicFont = fbb-Italic,
+ BoldItalicFont = fbb-BoldItalic
+ }
diff --git a/Master/texmf-dist/tex/latex/fbb/fbb.sty b/Master/texmf-dist/tex/latex/fbb/fbb.sty
index 3028dbabbcd..aced8218260 100644
--- a/Master/texmf-dist/tex/latex/fbb/fbb.sty
+++ b/Master/texmf-dist/tex/latex/fbb/fbb.sty
@@ -3,13 +3,14 @@
\NeedsTeXFormat{LaTeX2e}
\def\fileversion{1.04}
-\def\filedate{2014/01/27}
+\def\filedate{2014/06/19}
\ProvidesPackage{fbb}[\filedate\space v\fileversion]
\message{`fbb' v\fileversion, \filedate\space Text macros for fbb, a Bembo-like font family (msharpe)}
\RequirePackage[LY1,T1]{fontenc}
\RequirePackage{textcomp}
+\RequirePackage{etoolbox}
\IfFileExists{mweights.sty}{\RequirePackage{mweights}}{}
\IfFileExists{fontaxes.sty}{
\RequirePackage{fontaxes}
@@ -21,7 +22,6 @@
\let\textsuperior\textsu
% \def\@makefnmark{\hbox{\textsu{\@thefnmark}}}
}{}
-
\newcommand*{\fbb@scale}{1}
\IfFileExists{xkeyval.sty}{
\RequirePackage{xkeyval}
@@ -39,6 +39,7 @@
\newif\if@fbb@sups
\DeclareOptionX{lining}{\edef\fbb@figurestyle{LF}}
\DeclareOptionX{oldstyle}{\edef\fbb@figurestyle{OsF}}
+\DeclareOptionX{osf}{\edef\fbb@figurestyle{OsF}}
\DeclareOptionX{tabular}{\edef\fbb@figurealign{T}}
\DeclareOptionX{proportional}{\edef\fbb@figurealign{}}
\DeclareOptionX{bold}{\edef\bfseries@rm{b}}
@@ -54,11 +55,14 @@
}%
\egroup}
+\renewcommand*{\rmdefault}{fbb-TLF}
\def\useosf{\edef\fbb@figurestyle{OsF}\edef\fbb@figurealign{}%
- \renewcommand*{\rmdefault}{fbb-OsF}}
+% \AtEndPreamble{\renewcommand*{\rmdefault}{fbb-OsF}}
+}
\@onlypreamble\useosf
\def\usetosf{\edef\fbb@figurestyle{OsF}\edef\fbb@figurealign{T}%
- \renewcommand*{\rmdefault}{fbb-TOsF}}
+% \AtEndPreamble{\renewcommand*{\rmdefault}{fbb-TOsF}}
+}
\@onlypreamble\usetosf
\DeclareRobustCommand{\textlf}[1]{%
@@ -74,7 +78,7 @@
{\fontfamily{fbb-TOsF}\selectfont #1}%
}% to get tosf
-\renewcommand*{\rmdefault}{fbb-\fbb@figurealign\fbb@figurestyle}
+\AtEndPreamble{\renewcommand*{\rmdefault}{fbb-\fbb@figurealign\fbb@figurestyle}}
\renewcommand*{\familydefault}{\rmdefault}
\if@fbb@sups %
\ifdefined\sufigures