fbb (2nov13)

git-svn-id: svn://tug.org/texlive/trunk@32040 c570f23f-e606-0410-a88d-b1316a301751

4 files changed, 43 insertions, 12 deletions

diff --git a/Master/texmf-dist/doc/fonts/fbb/README b/Master/texmf-dist/doc/fonts/fbb/README
index 266ca715687..bc056b1b474 100644
--- a/Master/texmf-dist/doc/fonts/fbb/README
+++ b/Master/texmf-dist/doc/fonts/fbb/README
@@ -1,6 +1,9 @@
 This package, derived from Cardo, provides a Bembo-like font family in otf and pfb format plus LaTeX font support files. As Cardo is licensed under the SIL OFL, so are the font files in this package. All other support files are subject to the LaTeX Project Public License. See http://www.ctan.org/tex-archive/help/Catalogue/licenses.lppl.html for the details of that license. Note that Bembo is a name trademarked by Monotype, and Cardo is a reserved name under the OFL, hence the strange name for this package, drawn from the Berry id for the Bembo font family.
 
-Current version: 0.93
+Current version: 1.00
+
+Changes in version 1.00
+Additions to sty file, bringing its capabilities in line with those of garamondx.
 
 Changes in version 0.93:
 Many additions and changes to glyphs, especially in bold and bold-italic, and those needed by textcomp.
diff --git a/Master/texmf-dist/doc/fonts/fbb/fbb-doc.pdf b/Master/texmf-dist/doc/fonts/fbb/fbb-doc.pdf
index fceb1b73a7c..038ada5127e 100644
--- a/Master/texmf-dist/doc/fonts/fbb/fbb-doc.pdf
+++ b/Master/texmf-dist/doc/fonts/fbb/fbb-doc.pdf
diff --git a/Master/texmf-dist/doc/fonts/fbb/fbb-doc.tex b/Master/texmf-dist/doc/fonts/fbb/fbb-doc.tex
index 1f6a6faee17..6f300ae0f04 100644
--- a/Master/texmf-dist/doc/fonts/fbb/fbb-doc.tex
+++ b/Master/texmf-dist/doc/fonts/fbb/fbb-doc.tex
@@ -13,14 +13,13 @@
 \def\yellow#1{\setlength{\fboxrule}{0pt}%
 \setlength{\fboxsep}{0pt}%
 \colorbox{yellow}{#1}}
-\pdfmapfile{+fbb.map}
 %SetFonts
 %fbb plus newtxmath
 \usepackage[full]{textcomp} % to get the right copyright, etc.
-\usepackage{fbb}
-\usepackage[scaled=.95]{cabin}
+\usepackage[sups]{fbb}
+\usepackage[scaled=.95,type1]{cabin}
 \usepackage[varqu,varl]{zi4}% typewriter
-\usepackage[libertine,cmbraces]{newtxmath}
+\usepackage[libertine,bigdelims]{newtxmath}
 \usepackage[bb=boondox,frak=boondox]{mathalfa}
 %\renewcommand*{\rmdefault}{zgmj}
 \usepackage[T1]{fontenc}
@@ -51,15 +50,20 @@ The package also defines five macros that allow you use alternate figure styles
 \texttosf{97} % print 97 in tabular oldstyle figures
 \textsu{97} % print 97 in superior figures
 \end{verbatim}
+Option {\tt sups} changes the form of footnote markers to use {\tt fbb}'s superior figures, unless you have redefined the meaning of \verb|\thefootnote| prior to loading {\tt fbb}. For more control over size, spacing and position of footnote markers, use the \textsf{superiors} package: Eg,
+\begin{verbatim}
+\usepackage[supstfm=fbb-Regular-sup-t1]{superiors}
+\end{verbatim}
+
 
 There is a {\tt scaled} option (\emph{e.g.}, {\tt scaled=.97}) that allow you to adjust the text size against, say, a math package. This text package works well with {\tt newtxmath} with the {\tt libertine} option, because the latter has italics of the same italic angle as {\tt fbb} and of very similar xheight and weight. The suggested invocation is:
 \begin{verbatim}
 \usepackage[full]{textcomp} % to get the right copyright, etc.
 \usepackage[lining,tabular]{fbb} % so math uses tabular lining figures
-\usepackage[scaled=.95]{cabin} % a nice sans serif
-\usepackage[varqu,varl]{zi4}% typewriter
+\usepackage[scaled=.95,type1]{cabin} % sans serif in style of Gill Sans
+\usepackage[varqu,varl]{zi4}% inconsolata typewriter
 \usepackage[T1]{fontenc} % LY1 also works
-\usepackage[libertine,cmbraces]{newtxmath}
+\usepackage[libertine,bigdelims]{newtxmath}
 \usepackage[cal=boondoxo,bb=boondox,frak=boondox]{mathalfa}
 \useosf % change normal text to use proportional oldstyle figures
 %\usetosf would provide tabular oldstyle figures in text
diff --git a/Master/texmf-dist/tex/latex/fbb/fbb.sty b/Master/texmf-dist/tex/latex/fbb/fbb.sty
index 5ada3e0b393..2668ccdb162 100644
--- a/Master/texmf-dist/tex/latex/fbb/fbb.sty
+++ b/Master/texmf-dist/tex/latex/fbb/fbb.sty
@@ -1,8 +1,12 @@
 %% fbb.sty
 %%
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{fbb}
-    [2013/10/08 (Michael Sharpe)  Style file for fbb.]
+
+\def\fileversion{1.00}
+\def\filedate{2013/11/01}
+\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}
@@ -15,11 +19,11 @@
         \fontfigurestyle{superior}\selectfont}
     \DeclareTextFontCommand{\textsu}{\sufigures}
     \let\textsuperior\textsu
-    \def\@makefnmark{\hbox{\textsu{\@thefnmark}}}
+%    \def\@makefnmark{\hbox{\textsu{\@thefnmark}}}
 }{}
 
+\newcommand*{\fbb@scale}{1}
 \IfFileExists{xkeyval.sty}{
-    \newcommand*{\fbb@scale}{1}
     \RequirePackage{xkeyval}
     \DeclareOptionX{scale}{\renewcommand*{\fbb@scale}{##1}}
     \DeclareOptionX{scaled}{\renewcommand*{\fbb@scale}{##1}}
@@ -29,12 +33,17 @@
     \let\ProcessOptionsX\ProcessOptions
 }
 
+\let\orig@footnote=\thefootnote
+\let\orig@makefnmark=\@makefnmark
+
+\newif\if@fbb@sups
 \DeclareOptionX{lining}{\edef\fbb@figurestyle{LF}}
 \DeclareOptionX{oldstyle}{\edef\fbb@figurestyle{OsF}}
 \DeclareOptionX{tabular}{\edef\fbb@figurealign{T}}
 \DeclareOptionX{proportional}{\edef\fbb@figurealign{}}
 \DeclareOptionX{bold}{\edef\bfseries@rm{b}}
 \DeclareOptionX{regular}{\edef\mdseries@rm{m}}
+\DeclareOptionX{sups}{\@fbb@supstrue}
 \ExecuteOptionsX{lining,tabular,bold,regular}
 \ProcessOptionsX\relax
 
@@ -67,5 +76,20 @@
 
 \renewcommand*{\rmdefault}{fbb-\fbb@figurealign\fbb@figurestyle}
 \renewcommand*{\familydefault}{\rmdefault}
+\if@fbb@sups %
+ \ifdefined\sufigures
+  \def\f@@tn@te{footnote}
+  \def\@makefnmark{%
+    \ifx\@mpfn\f@@tn@te%
+      \ifx\thefootnote\orig@footnote%
+        \hbox{\sufigures\hspace*{.04em}\@thefnmark}
+      \else%
+        \orig@makefnmark
+      \fi
+    \else%
+      \orig@makefnmark
+    \fi}%
+ \fi
+\fi
 
 \endinput