fbb (11mar17)

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

4 files changed, 20 insertions, 20 deletions

diff --git a/Master/texmf-dist/doc/fonts/fbb/README b/Master/texmf-dist/doc/fonts/fbb/README
index d61498934b1..045addc6d56 100644
--- a/Master/texmf-dist/doc/fonts/fbb/README
+++ b/Master/texmf-dist/doc/fonts/fbb/README
@@ -2,7 +2,10 @@ This package, derived from David Perry's Cardo, provides a Bembo-like font famil
 http://www.ctan.org/license/lppl1.3
 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: 1.112/ 2017-03-08
+Current version: 1.12/ 2017-03-11
+
+Changes in version 1.12
+Modified the sty file so that fbb text figure styles are selected always in the \AtEndPreamble hook. (Formerly, using babel would prevent this.)
 
 Changes in version 1.112
 Modified some metadata in the otf files, correcting some misbehaviors in some programs and platforms.
diff --git a/Master/texmf-dist/doc/fonts/fbb/fbb-doc.pdf b/Master/texmf-dist/doc/fonts/fbb/fbb-doc.pdf
index e871dc2851d..c0ee7bcdd17 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 a6ee354a981..c064cea3078 100644
--- a/Master/texmf-dist/doc/fonts/fbb/fbb-doc.tex
+++ b/Master/texmf-dist/doc/fonts/fbb/fbb-doc.tex
@@ -2,7 +2,7 @@
 \documentclass{article}
 \usepackage[margin=1in]{geometry} 
 \usepackage[parfill]{parskip}% Begin paragraphs with an empty line, no indent
-\pdfmapfile{=fbb.map}
+%\pdfmapfile{=fbb.map}
 \usepackage{enumitem}
 \setlist[description]{style=sameline,font=\mdseries\scshape}
 \setlength\unitlength{1pt}% for picture
@@ -17,15 +17,14 @@
 %SetFonts
 %fbb plus newtxmath
 \usepackage[full]{textcomp} % to get the right copyright, etc.
-\usepackage[sups]{fbb}
+\usepackage[sups,osf,p]{fbb}
 \usepackage[scaled=.95,type1]{cabin}
 \usepackage[varqu,varl]{zi4}% typewriter
-\usepackage[libertine,bigdelims]{newtxmath}
+\usepackage[libertine]{newtxmath}
 \usepackage[bb=boondox,frak=boondox]{mathalfa}
 %SetFonts
 \font\altp=fbbP-Regular-lf-t1
 \usepackage[T1]{fontenc}
-\useosf
 \usepackage{fonttable}
 \usepackage{url,hyperref}
 \title{The \textbf{fbb} package---a Bembo--like font}
@@ -64,16 +63,14 @@ Option {\tt sups} changes the form of footnote markers to use {\tt fbb}'s superi
 
 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}
+% load babel package and options here
 \usepackage[full]{textcomp} % to get the right copyright, etc.
-\usepackage[lining,tabular]{fbb} % so math uses tabular lining figures
+\usepackage[p,osf]{fbb} % osf in text, tabular lining figures in math
 \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,bigdelims]{newtxmath}
+\usepackage[libertine]{newtxmath}
 \usepackage[cal=boondoxo,bb=boondox,frak=boondox]{mathalfa}
-\useosf % change normal text to use oldstyle figures
-\useproportional
-% can also set option proportional (or p) for proportionally spaced figures
 \end{verbatim}
 Here is a short sample based on this preamble:\\[4pt]
 \def\Pr{\ensuremath{\mathbb{P}}}
diff --git a/Master/texmf-dist/tex/latex/fbb/fbb.sty b/Master/texmf-dist/tex/latex/fbb/fbb.sty
index 113d909eab5..835d1c1fe4a 100644
--- a/Master/texmf-dist/tex/latex/fbb/fbb.sty
+++ b/Master/texmf-dist/tex/latex/fbb/fbb.sty
@@ -2,8 +2,8 @@
 %%
 \NeedsTeXFormat{LaTeX2e}
 
-\def\fileversion{1.11}
-\def\filedate{2016/05/22}
+\def\fileversion{1.12}
+\def\filedate{2017/03/11}
 \ProvidesPackage{fbb}[\filedate\space v\fileversion]
 
 \message{`fbb' v\fileversion, \filedate\space Text macros for fbb, a Bembo-like font family (msharpe)}
@@ -48,9 +48,9 @@
 \@onlypreamble\useosf
 \def\useproportional{\edef\fbb@figurealign{}}
 \@onlypreamble\useproportional
-\newif\iffbb@babel
-\ifdefined\bbl@tempa \fbb@babeltrue\fi
-\ifetex\else\fbb@babeltrue\fi
+%\newif\iffbb@babel
+%\ifdefined\bbl@tempa \fbb@babeltrue\fi
+%\ifetex\else\fbb@babeltrue\fi
 \newif\if@fbb@sups
 \newif\if@fbb@scosf
 \def\fbb@altP{} % should be empty or P
@@ -129,11 +129,11 @@
  \fi%
 \fi
 
-\iffbb@babel
-    \renewcommand*{\rmdefault}{fbb-\fbb@figurealign\fbb@figurestyle}
-	\normalfont
-\else
+%\iffbb@babel
+%    \renewcommand*{\rmdefault}{fbb-\fbb@figurealign\fbb@figurestyle}
+%	\normalfont
+%\else
     \AtEndPreamble{\renewcommand*{\rmdefault}{fbb-\fbb@figurealign\fbb@figurestyle}
 \normalfont}
-\fi
+%\fi
 \endinput