From ef17fc663b90c21703aa9f0013478361b5ccb85e Mon Sep 17 00:00:00 2001
From: Karl Berry <karl@freefriends.org>
Date: Sat, 11 Mar 2017 23:07:01 +0000
Subject: cochineal (11mar17)

git-svn-id: svn://tug.org/texlive/trunk@43462 c570f23f-e606-0410-a88d-b1316a301751
---
 Master/texmf-dist/doc/fonts/cochineal/cochineal-doc.tex | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'Master/texmf-dist/doc/fonts/cochineal/cochineal-doc.tex')

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}}}
-- 
cgit v1.2.3

