2 files changed, 47 insertions, 21 deletions
diff --git a/Master/texmf-dist/doc/fonts/fbb/README b/Master/texmf-dist/doc/fonts/fbb/README
index 7457131e862..c7aaf7ba84a 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.06
+Current version: 1.07
+
+Changes in version 1.07
+Brought fbb.sty more into conformity with newtxtext.sty with respect to handling babel, osf, \useosf, and figure macros such as \osfstyle.
 
 Changes in version 1.06
 1. Changes to accented small caps in fbb-Bold, plus addition of more symbols for use with small caps.
diff --git a/Master/texmf-dist/tex/latex/fbb/fbb.sty b/Master/texmf-dist/tex/latex/fbb/fbb.sty
index 09b37024184..fcc142f092f 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.06}
-\def\filedate{2014/09/09}
+\def\fileversion{1.07}
+\def\filedate{2015/04/06}
 \ProvidesPackage{fbb}[\filedate\space v\fileversion]
 
 \message{`fbb' v\fileversion, \filedate\space Text macros for fbb, a Bembo-like font family (msharpe)}
@@ -35,20 +35,24 @@
 
 \let\orig@footnote=\thefootnote
 \let\orig@makefnmark=\@makefnmark
+\def\bfseries@rm{b}
+\def\mdseries@rm{m}
+\def\useosf{\edef\fbb@figurestyle{OsF}}
+\@onlypreamble\useosf
+\newif\iffbb@babel
+\ifdefined\bbl@tempa \fbb@babeltrue\fi
 
 \newif\if@fbb@sups
 \newif\if@fbb@scosf
 \DeclareOptionX{lining}{\edef\fbb@figurestyle{LF}}
-\DeclareOptionX{oldstyle}{\edef\fbb@figurestyle{OsF}}
-\DeclareOptionX{osf}{\edef\fbb@figurestyle{OsF}}
+\DeclareOptionX{oldstyle}{\useosf}
+\DeclareOptionX{osf}{\useosf}
 \DeclareOptionX{tabular}{\edef\fbb@figurealign{T}}
 \DeclareOptionX{p}{\edef\fbb@figurealign{}}
 \DeclareOptionX{proportional}{\edef\fbb@figurealign{}}
-\DeclareOptionX{bold}{\edef\bfseries@rm{b}}
-\DeclareOptionX{regular}{\edef\mdseries@rm{m}}
 \DeclareOptionX{sups}{\@fbb@supstrue}
 \DeclareOptionX{scosf}{\@fbb@scosftrue}
-\ExecuteOptionsX{lining,tabular,bold,regular}
+\ExecuteOptionsX{lining,tabular}
 \ProcessOptionsX\relax
 
 \DeclareTextCommand{\textcircled}{TS1}[1]{\hmode@bgroup
@@ -59,32 +63,44 @@
  \egroup}
 
 \renewcommand*{\rmdefault}{fbb-TLF}
-\def\useosf{\edef\fbb@figurestyle{OsF}\edef\fbb@figurealign{}%
-%  \AtEndPreamble{\renewcommand*{\rmdefault}{fbb-OsF}}
-}
-\@onlypreamble\useosf
-\def\usetosf{\edef\fbb@figurestyle{OsF}\edef\fbb@figurealign{T}%
-%  \AtEndPreamble{\renewcommand*{\rmdefault}{fbb-TOsF}}
-}
-\@onlypreamble\usetosf
+%\def\usetosf{\edef\fbb@figurestyle{OsF}\edef\fbb@figurealign{T}%
+%%  \AtEndPreamble{\renewcommand*{\rmdefault}{fbb-TOsF}}
+%}
+%\@onlypreamble\usetosf
 
+\DeclareRobustCommand{\lfstyle}{%
+  \not@math@alphabet\lfstyle\relax
+  \fontfamily{fbb-LF}\selectfont %
+}% to get lf
+\DeclareRobustCommand{\tlfstyle}{%
+  \not@math@alphabet\tlfstyle\relax
+  \fontfamily{fbb-TLF}\selectfont %
+}% to get tlf
+\DeclareRobustCommand{\osfstyle}{%
+  \not@math@alphabet\osfstyle\relax
+  \fontfamily{fbb-OsF}\selectfont %
+}% to get osf
+\DeclareRobustCommand{\tosfstyle}{%
+  \not@math@alphabet\tosfstyle\relax
+  \fontfamily{fbb-TOsF}\selectfont %
+}% to get tosf
 \DeclareRobustCommand{\textlf}[1]{%
-  {\fontfamily{fbb-LF}\selectfont #1}%
+  {\lfstyle #1}%
 }% to get lf
 \DeclareRobustCommand{\texttlf}[1]{%
-  {\fontfamily{fbb-TLF}\selectfont #1}%
+  {\tlfstyle #1}%
 }% to get tlf
 \DeclareRobustCommand{\textosf}[1]{%
-  {\fontfamily{fbb-OsF}\selectfont #1}%
+  {\osfstyle #1}%
 }% to get osf
 \DeclareRobustCommand{\texttosf}[1]{%
-  {\fontfamily{fbb-TOsF}\selectfont #1}%
+  {\tosfstyle #1}%
 }% to get tosf
 \if@fbb@scosf %
 \DeclareRobustCommand{\textsc}[1]{%
 {\fontfamily{fbb-\fbb@figurealign OsF}\fontshape{sc}\selectfont #1}%
 }\fi
-\AtEndPreamble{\renewcommand*{\rmdefault}{fbb-\fbb@figurealign\fbb@figurestyle}}
+
 \renewcommand*{\familydefault}{\rmdefault}
 \if@fbb@sups %
  \ifdefined\sufigures
@@ -102,4 +118,11 @@
  \fi%
 \fi
 
+\iffbb@babel
+    \renewcommand*{\rmdefault}{fbb-\fbb@figurealign\fbb@figurestyle}
+	\normalfont
+\else
+    \AtEndPreamble{\renewcommand*{\rmdefault}{fbb-\fbb@figurealign\fbb@figurestyle}
+\normalfont}
+
 \endinput