baskervillef

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

4 files changed, 16 insertions, 12 deletions

diff --git a/Master/texmf-dist/doc/fonts/baskervillef/README b/Master/texmf-dist/doc/fonts/baskervillef/README
index 1f208d0ecfc..746388da203 100644
--- a/Master/texmf-dist/doc/fonts/baskervillef/README
+++ b/Master/texmf-dist/doc/fonts/baskervillef/README
@@ -19,7 +19,10 @@ Files provided "as is", with no warranties.
 
 The support files are provided in encodings OT1, T1, TS1 and LY1 for users of Western scripts.
 
-Current version: 1.042 2017-03-08
+Current version: 1.043 2017-03-10
+
+Changes in version 1.043
+Modified the sty file so that BaskervilleF text figure styles are selected always in the \AtEndPreamble hook. (Formerly, using babel would prevent this.)
 
 Changes in version 1.042
 Added a Q_u ligature to the otf files, accessed through the hlig table.
diff --git a/Master/texmf-dist/doc/fonts/baskervillef/baskervillef-doc.pdf b/Master/texmf-dist/doc/fonts/baskervillef/baskervillef-doc.pdf
index f4ad9d0e08b..d481049d19d 100644
--- a/Master/texmf-dist/doc/fonts/baskervillef/baskervillef-doc.pdf
+++ b/Master/texmf-dist/doc/fonts/baskervillef/baskervillef-doc.pdf
diff --git a/Master/texmf-dist/doc/fonts/baskervillef/baskervillef-doc.tex b/Master/texmf-dist/doc/fonts/baskervillef/baskervillef-doc.tex
index df22ea09870..ecaf760c87b 100644
--- a/Master/texmf-dist/doc/fonts/baskervillef/baskervillef-doc.tex
+++ b/Master/texmf-dist/doc/fonts/baskervillef/baskervillef-doc.tex
@@ -56,8 +56,9 @@ The package defines two macros, \verb|\useosf| and \verb|\useproportional|, usea
 \useosf % use oldstyle figures throughout, not lining figures
 \useproportional % use proportional figures throughout, not tabular proportional
 \end{verbatim}
-There is a simpler way to achieve the same result though it conflicts with parts of the {\tt babel} package.
+There is a simpler way to achieve essentially the same result, but with the advantage that the figure styles are not loaded until after the math package (if any) is loaded, so that math always uses the default tabular lining figures. 
 \begin{verbatim}
+% If you use babel, load it here, before baskervillef
 \usepackage[p,osf]{baskervillef} % default figure style is proportional, oldstyle
 % load sans and typewriter fonts
 % load a math font---it will use tabular lining figures in math
diff --git a/Master/texmf-dist/tex/latex/baskervillef/baskervillef.sty b/Master/texmf-dist/tex/latex/baskervillef/baskervillef.sty
index 94c42f0fd46..f3123f3642c 100644
--- a/Master/texmf-dist/tex/latex/baskervillef/baskervillef.sty
+++ b/Master/texmf-dist/tex/latex/baskervillef/baskervillef.sty
@@ -1,7 +1,7 @@
 %%
 \NeedsTeXFormat{LaTeX2e}
-\def\fileversion{1.04}
-\def\filedate{2016/12/17}
+\def\fileversion{1.043}
+\def\filedate{2017/03/10}
 \ProvidesPackage{baskervillef}
     [\filedate\space v\fileversion.  Style file for BaskervilleF.]
 
@@ -74,8 +74,8 @@
 \@onlypreamble\useosf
 \def\useproportional{\edef\BaskervilleF@figurealign{}}
 \@onlypreamble\useproportional
-\newif\ifBaskervilleF@babel
-\ifdefined\bbl@tempa \BaskervilleF@babeltrue\fi
+%\newif\ifBaskervilleF@babel
+%\ifdefined\bbl@tempa \BaskervilleF@babeltrue\fi
 
 \def\BaskervilleF@sp{.26em}
 \def\BaskervilleF@stretch{.13em}
@@ -178,16 +178,16 @@ OsF}\fontshape{n}\selectfont #1}%
  \fi%
 \fi
 
-\ifBaskervilleF@babel
-    \renewcommand*{\rmdefault}{BaskervilleF-\BaskervilleF@figurealign%
-	\BaskervilleF@figurestyle}
-	\normalfont
-\else
+%\ifBaskervilleF@babel
+%    \renewcommand*{\rmdefault}{BaskervilleF-\BaskervilleF@figurealign%
+%	\BaskervilleF@figurestyle}
+%	\normalfont
+%\else
 	\AtEndPreamble{%
 	\renewcommand*{\rmdefault}{BaskervilleF-\BaskervilleF@figurealign%
 	\BaskervilleF@figurestyle}
 	\normalfont}
-\fi
+%\fi
 \renewcommand*{\familydefault}{\rmdefault}
 
 \endinput