cochineal (11mar17)

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

4 files changed, 20 insertions, 14 deletions

diff --git a/Master/texmf-dist/doc/fonts/cochineal/README b/Master/texmf-dist/doc/fonts/cochineal/README
index bed70053a5b..f00bfe969ab 100644
--- a/Master/texmf-dist/doc/fonts/cochineal/README
+++ b/Master/texmf-dist/doc/fonts/cochineal/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, LGR for Greek scripts and T2A and OT2 for Cyrillic scripts.
 
-Current version: 1.041a 2016-12-31
+Current version: 1.042 2017-03-10
+
+Changes in version 1.042
+Modified the sty file so that Cochineal text figure styles are selected always in the \AtEndPreamble hook. (Formerly, using babel would prevent this.)
 
 Changes in version 1.041
 Added two entries to smcp table so that dotlessi and dotlessj map to correct small cap glyph.
diff --git a/Master/texmf-dist/doc/fonts/cochineal/cochineal-doc.pdf b/Master/texmf-dist/doc/fonts/cochineal/cochineal-doc.pdf
index 8f500c34f63..99e2820c8ee 100644
--- a/Master/texmf-dist/doc/fonts/cochineal/cochineal-doc.pdf
+++ b/Master/texmf-dist/doc/fonts/cochineal/cochineal-doc.pdf
diff --git a/Master/texmf-dist/doc/fonts/cochineal/cochineal-doc.tex b/Master/texmf-dist/doc/fonts/cochineal/cochineal-doc.tex
index 0737d48bbf6..0491e6ca3db 100644
--- a/Master/texmf-dist/doc/fonts/cochineal/cochineal-doc.tex
+++ b/Master/texmf-dist/doc/fonts/cochineal/cochineal-doc.tex
@@ -48,8 +48,9 @@ The package defines two macros, \verb|\useosf| and \verb|\useproportional|, usea
 \useosf % switch from lining figures to oldstyle figures
 \useproportional % switch from tabular to 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 cochineal
 \usepackage[p,osf]{cochineal} % default figure style is proportional, oldstyle
 % load sans and typewriter fonts
 % load a math font---it will use tabular lining figures in math
@@ -83,10 +84,11 @@ The package contains fonts for use as math letters that are derived from Cochine
 \begin{verbatim}
 % preamble should include, in this order:
 \usepackage[T1]{fontenc}
+% load babel here
 \usepackage[p,osf]{cochineal}
 \usepackage[varqu,varl,var0]{inconsolata}
 \usepackage[scale=.95,type1]{cabin}
-\usepackage[cochineal,bigdelims,cmintegrals,vvarbb]{newtxmath}
+\usepackage[cochineal,vvarbb]{newtxmath}
 \usepackage[cal=boondoxo]{mathalfa}
 \end{verbatim}
 \def\Pr{\ensuremath{\mathbb{P}}}
diff --git a/Master/texmf-dist/tex/latex/cochineal/cochineal.sty b/Master/texmf-dist/tex/latex/cochineal/cochineal.sty
index 27b562ced4c..ba03c6a138c 100644
--- a/Master/texmf-dist/tex/latex/cochineal/cochineal.sty
+++ b/Master/texmf-dist/tex/latex/cochineal/cochineal.sty
@@ -1,8 +1,8 @@
 %% cochineal.sty
 %%
 \NeedsTeXFormat{LaTeX2e}
-\def\fileversion{1.04}
-\def\filedate{2016/08/20}
+\def\fileversion{1.042}
+\def\filedate{2017/03/10}
 \ProvidesPackage{cochineal}
     [\filedate\space v\fileversion.]
 
@@ -61,8 +61,8 @@
 \@onlypreamble\useosf
 \def\useproportional{\edef\Cochineal@figurealign{}}
 \@onlypreamble\useproportional
-\newif\ifCochineal@babel
-\ifdefined\bbl@tempa \Cochineal@babeltrue\fi
+%\newif\ifCochineal@babel
+%\ifdefined\bbl@tempa \Cochineal@babeltrue\fi
 
 \DeclareOptionX{lining}{\edef\Cochineal@figurestyle{LF}}
 \DeclareOptionX{lf}{\edef\Cochineal@figurestyle{LF}}
@@ -92,7 +92,8 @@
     {5pt plus 1pt minus 1pt} % HEADSPACE
     {}          % CUSTOM-HEAD-SPEC\newtheorem{thm}{Theorem}[section]
     \fi%
-\fi\DeclareRobustCommand{\lfstyle}{%
+\fi
+\DeclareRobustCommand{\lfstyle}{%
   \not@math@alphabet\lfstyle\relax
   \fontfamily{Cochineal-LF}\selectfont %
 }% to get lf
@@ -146,16 +147,16 @@ OsF}\fontshape{sc}\selectfont #1}%
  \fi%
 \fi
 
-\ifCochineal@babel
-    \renewcommand*{\rmdefault}{Cochineal-\Cochineal@figurealign%
-	\Cochineal@figurestyle}
-	\normalfont
-\else
+%\ifCochineal@babel
+%    \renewcommand*{\rmdefault}{Cochineal-\Cochineal@figurealign%
+%	\Cochineal@figurestyle}
+%	\normalfont
+%\else
 	\AtEndPreamble{%
 	\renewcommand*{\rmdefault}{Cochineal-\Cochineal@figurealign%
 	\Cochineal@figurestyle}
 	\normalfont}
-\fi
+%\fi
 \renewcommand*{\familydefault}{\rmdefault}
 
 \endinput