texlive[43462] Master/texmf-dist: cochineal (11mar17)

[commits+karl at tug.org]

Revision: 43462
          http://tug.org/svn/texlive?view=revision&revision=43462
Author:   karl
Date:     2017-03-12 00:07:01 +0100 (Sun, 12 Mar 2017)
Log Message:
-----------
cochineal (11mar17)

Modified Paths:
--------------
    trunk/Master/texmf-dist/doc/fonts/cochineal/README
    trunk/Master/texmf-dist/doc/fonts/cochineal/cochineal-doc.pdf
    trunk/Master/texmf-dist/doc/fonts/cochineal/cochineal-doc.tex
    trunk/Master/texmf-dist/tex/latex/cochineal/cochineal.sty

Modified: trunk/Master/texmf-dist/doc/fonts/cochineal/README
===================================================================
--- trunk/Master/texmf-dist/doc/fonts/cochineal/README	2017-03-11 23:06:26 UTC (rev 43461)
+++ trunk/Master/texmf-dist/doc/fonts/cochineal/README	2017-03-11 23:07:01 UTC (rev 43462)
@@ -19,8 +19,11 @@
 
 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.
 

Modified: trunk/Master/texmf-dist/doc/fonts/cochineal/cochineal-doc.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/doc/fonts/cochineal/cochineal-doc.tex
===================================================================
--- trunk/Master/texmf-dist/doc/fonts/cochineal/cochineal-doc.tex	2017-03-11 23:06:26 UTC (rev 43461)
+++ trunk/Master/texmf-dist/doc/fonts/cochineal/cochineal-doc.tex	2017-03-11 23:07:01 UTC (rev 43462)
@@ -48,8 +48,9 @@
 \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 @@
 \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}}}

Modified: trunk/Master/texmf-dist/tex/latex/cochineal/cochineal.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/cochineal/cochineal.sty	2017-03-11 23:06:26 UTC (rev 43461)
+++ trunk/Master/texmf-dist/tex/latex/cochineal/cochineal.sty	2017-03-11 23:07:01 UTC (rev 43462)
@@ -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 at figurealign{}}
 \@onlypreamble\useproportional
-\newif\ifCochineal at babel
-\ifdefined\bbl at tempa \Cochineal at babeltrue\fi
+%\newif\ifCochineal at babel
+%\ifdefined\bbl at tempa \Cochineal at babeltrue\fi
 
 \DeclareOptionX{lining}{\edef\Cochineal at figurestyle{LF}}
 \DeclareOptionX{lf}{\edef\Cochineal at 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 at math@alphabet\lfstyle\relax
   \fontfamily{Cochineal-LF}\selectfont %
 }% to get lf
@@ -146,16 +147,16 @@
  \fi%
 \fi
 
-\ifCochineal at babel
-    \renewcommand*{\rmdefault}{Cochineal-\Cochineal at figurealign%
-	\Cochineal at figurestyle}
-	\normalfont
-\else
+%\ifCochineal at babel
+%    \renewcommand*{\rmdefault}{Cochineal-\Cochineal at figurealign%
+%	\Cochineal at figurestyle}
+%	\normalfont
+%\else
 	\AtEndPreamble{%
 	\renewcommand*{\rmdefault}{Cochineal-\Cochineal at figurealign%
 	\Cochineal at figurestyle}
 	\normalfont}
-\fi
+%\fi
 \renewcommand*{\familydefault}{\rmdefault}
 
 \endinput