From 926a641b7207115964a7dec7895970c380cb0af4 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 23 Jun 2019 20:56:12 +0000 Subject: cochineal (23jun19) git-svn-id: svn://tug.org/texlive/trunk@51429 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/cochineal/LY1Cochineal-LF.fd | 9 ++++++++- Master/texmf-dist/tex/latex/cochineal/LY1Cochineal-OsF.fd | 14 +++++++++++++- Master/texmf-dist/tex/latex/cochineal/LY1Cochineal-TLF.fd | 4 ++-- .../texmf-dist/tex/latex/cochineal/LY1Cochineal-TOsF.fd | 14 +++++++++++++- Master/texmf-dist/tex/latex/cochineal/OT1Cochineal-LF.fd | 10 ++++++++-- Master/texmf-dist/tex/latex/cochineal/OT1Cochineal-OsF.fd | 14 +++++++++++++- Master/texmf-dist/tex/latex/cochineal/OT1Cochineal-TLF.fd | 4 ++-- .../texmf-dist/tex/latex/cochineal/OT1Cochineal-TOsF.fd | 15 +++++++++++++-- Master/texmf-dist/tex/latex/cochineal/T1Cochineal-LF.fd | 12 +++++++++--- Master/texmf-dist/tex/latex/cochineal/T1Cochineal-OsF.fd | 14 +++++++++++++- Master/texmf-dist/tex/latex/cochineal/T1Cochineal-TLF.fd | 6 +++--- Master/texmf-dist/tex/latex/cochineal/T1Cochineal-TOsF.fd | 14 +++++++++++++- Master/texmf-dist/tex/latex/cochineal/cochineal.sty | 8 ++++++-- 13 files changed, 116 insertions(+), 22 deletions(-) (limited to 'Master/texmf-dist/tex/latex/cochineal') diff --git a/Master/texmf-dist/tex/latex/cochineal/LY1Cochineal-LF.fd b/Master/texmf-dist/tex/latex/cochineal/LY1Cochineal-LF.fd index 3c3f7024312..e675a53a697 100644 --- a/Master/texmf-dist/tex/latex/cochineal/LY1Cochineal-LF.fd +++ b/Master/texmf-dist/tex/latex/cochineal/LY1Cochineal-LF.fd @@ -7,6 +7,12 @@ \global\let\Cochineal@@swashQ\@empty \fi +\expandafter\ifx\csname Cochineal@@thmtab\endcsname\relax% + \global\let\Cochineal@@thmtab\@empty % empty or t + \global\let\Cochineal@@thmlin\@empty % empty or l +\fi +\def\coch@prefix{\Cochineal@@thmtab lf} + \expandafter\ifx\csname Cochineal@scale\endcsname\relax \let\Cochineal@@scale\@empty \else @@ -39,8 +45,9 @@ <-> \Cochineal@@scale Cochineal-Roman-lf\Cochineal@@swashQ-ly1 }{} +% changed 2019-06-21 for theorem fonts \DeclareFontShape{LY1}{Cochineal-LF}{m}{sl}{ - <-> ssub * Cochineal-LF/m/it + <-> \Cochineal@@scale Cochineal-Italic-\coch@prefix-th-ly1 }{} \DeclareFontShape{LY1}{Cochineal-LF}{m}{scsl}{ diff --git a/Master/texmf-dist/tex/latex/cochineal/LY1Cochineal-OsF.fd b/Master/texmf-dist/tex/latex/cochineal/LY1Cochineal-OsF.fd index ff98a637c69..9c06458c5f6 100644 --- a/Master/texmf-dist/tex/latex/cochineal/LY1Cochineal-OsF.fd +++ b/Master/texmf-dist/tex/latex/cochineal/LY1Cochineal-OsF.fd @@ -7,6 +7,17 @@ \global\let\Cochineal@@swashQ\@empty \fi +\expandafter\ifx\csname Cochineal@@thmtab\endcsname\relax% + \global\let\Cochineal@@thmtab\@empty % empty or t + \xdef\Cochineal@@thmlin{X} % X or l +\fi +\if l\Cochineal@@thmlin + \def\coch@tmp{lf} +\else + \def\coch@tmp{osf} +\fi +\xdef\coch@prefix{\Cochineal@@thmtab\coch@tmp} + \expandafter\ifx\csname Cochineal@scale\endcsname\relax \let\Cochineal@@scale\@empty \else @@ -39,8 +50,9 @@ <-> \Cochineal@@scale Cochineal-Italic-osf\Cochineal@@swashQ-ly1 }{} +% changed 2019-06-21 for theorem fonts \DeclareFontShape{LY1}{Cochineal-OsF}{m}{sl}{ - <-> ssub * Cochineal-OsF/m/it + <-> \Cochineal@@scale Cochineal-Italic-\coch@prefix-th-ly1 }{} \DeclareFontShape{LY1}{Cochineal-OsF}{m}{scsl}{ diff --git a/Master/texmf-dist/tex/latex/cochineal/LY1Cochineal-TLF.fd b/Master/texmf-dist/tex/latex/cochineal/LY1Cochineal-TLF.fd index a0df0805b5b..2be1efa20fe 100644 --- a/Master/texmf-dist/tex/latex/cochineal/LY1Cochineal-TLF.fd +++ b/Master/texmf-dist/tex/latex/cochineal/LY1Cochineal-TLF.fd @@ -70,9 +70,9 @@ \DeclareFontShape{LY1}{Cochineal-TLF}{m}{nw}{ <-> \Cochineal@@scale Cochineal-Roman-tlf-swash-ly1 }{} - +% changed 2019-06-21 to enable theorem font \DeclareFontShape{LY1}{Cochineal-TLF}{m}{sl}{ - <-> ssub * Cochineal-TLF/m/it + <-> \Cochineal@@scale Cochineal-Italic-tlf-th-ly1 }{} \DeclareFontShape{LY1}{Cochineal-TLF}{m}{scsl}{ diff --git a/Master/texmf-dist/tex/latex/cochineal/LY1Cochineal-TOsF.fd b/Master/texmf-dist/tex/latex/cochineal/LY1Cochineal-TOsF.fd index 34bb15a3145..1d0fa80520e 100644 --- a/Master/texmf-dist/tex/latex/cochineal/LY1Cochineal-TOsF.fd +++ b/Master/texmf-dist/tex/latex/cochineal/LY1Cochineal-TOsF.fd @@ -7,6 +7,17 @@ \global\let\Cochineal@@swashQ\@empty \fi +\expandafter\ifx\csname Cochineal@@thmtab\endcsname\relax% + \global\let\Cochineal@@thmtab\@empty % empty or t + \xdef\Cochineal@@thmlin{X} % X or l +\fi +\if l\Cochineal@@thmlin + \def\coch@tmp{lf} +\else + \def\coch@tmp{osf} +\fi +\xdef\coch@prefix{\Cochineal@@thmtab\coch@tmp} + \expandafter\ifx\csname Cochineal@scale\endcsname\relax \let\Cochineal@@scale\@empty \else @@ -39,8 +50,9 @@ <-> \Cochineal@@scale Cochineal-Roman-tosf-swash-ly1 }{} +% changed 2019-06-21 for theorem fonts \DeclareFontShape{LY1}{Cochineal-TOsF}{m}{sl}{ - <-> ssub * Cochineal-TOsF/m/it + <-> \Cochineal@@scale Cochineal-Italic-\coch@prefix-th-ly1 }{} \DeclareFontShape{LY1}{Cochineal-TOsF}{m}{scsl}{ diff --git a/Master/texmf-dist/tex/latex/cochineal/OT1Cochineal-LF.fd b/Master/texmf-dist/tex/latex/cochineal/OT1Cochineal-LF.fd index a8f136a5a1f..7824c041bb6 100644 --- a/Master/texmf-dist/tex/latex/cochineal/OT1Cochineal-LF.fd +++ b/Master/texmf-dist/tex/latex/cochineal/OT1Cochineal-LF.fd @@ -7,6 +7,12 @@ \global\let\Cochineal@@swashQ\@empty \fi +\expandafter\ifx\csname Cochineal@@thmtab\endcsname\relax% + \global\let\Cochineal@@thmtab\@empty % empty or t + \xdef\Cochineal@@thmlin{X} % X or l +\fi +\def\coch@prefix{\Cochineal@@thmtab lf} + \expandafter\ifx\csname Cochineal@scale\endcsname\relax \let\Cochineal@@scale\@empty \else @@ -38,9 +44,9 @@ \DeclareFontShape{OT1}{Cochineal-LF}{m}{sw}{ <-> \Cochineal@@scale Cochineal-Italic-lf-swash-ot1 }{} - +% changed 2019-06-21 for theorem fonts \DeclareFontShape{OT1}{Cochineal-LF}{m}{sl}{ - <-> ssub * Cochineal-LF/m/it + <-> \Cochineal@@scale Cochineal-Italic-\coch@prefix-th-ot1 }{} \DeclareFontShape{OT1}{Cochineal-LF}{m}{scsl}{ diff --git a/Master/texmf-dist/tex/latex/cochineal/OT1Cochineal-OsF.fd b/Master/texmf-dist/tex/latex/cochineal/OT1Cochineal-OsF.fd index eecb9ab48be..7af903d8e2d 100644 --- a/Master/texmf-dist/tex/latex/cochineal/OT1Cochineal-OsF.fd +++ b/Master/texmf-dist/tex/latex/cochineal/OT1Cochineal-OsF.fd @@ -7,6 +7,17 @@ \global\let\Cochineal@@swashQ\@empty \fi +\expandafter\ifx\csname Cochineal@@thmtab\endcsname\relax% + \global\let\Cochineal@@thmtab\@empty % empty or t + \xdef\Cochineal@@thmlin{X} % X or l +\fi +\if l\Cochineal@@thmlin + \def\coch@tmp{lf} +\else + \def\coch@tmp{osf} +\fi +\xdef\coch@prefix{\Cochineal@@thmtab\coch@tmp} + \expandafter\ifx\csname Cochineal@scale\endcsname\relax \let\Cochineal@@scale\@empty \else @@ -39,8 +50,9 @@ <-> \Cochineal@@scale Cochineal-Italic-osf-swash-ot1 }{} +% changed 2019-06-21 for theorem fonts \DeclareFontShape{OT1}{Cochineal-OsF}{m}{sl}{ - <-> ssub * Cochineal-OsF/m/it + <-> \Cochineal@@scale Cochineal-Italic-\coch@prefix-th-ot1 }{} \DeclareFontShape{OT1}{Cochineal-OsF}{m}{scsl}{ diff --git a/Master/texmf-dist/tex/latex/cochineal/OT1Cochineal-TLF.fd b/Master/texmf-dist/tex/latex/cochineal/OT1Cochineal-TLF.fd index 92871298ae4..461925f8ade 100644 --- a/Master/texmf-dist/tex/latex/cochineal/OT1Cochineal-TLF.fd +++ b/Master/texmf-dist/tex/latex/cochineal/OT1Cochineal-TLF.fd @@ -38,9 +38,9 @@ \DeclareFontShape{OT1}{Cochineal-TLF}{m}{scit}{ <-> \Cochineal@@scale Cochineal-Italic-tlf-sc-ot1 }{} - +% changed 2019-06-21 to enable theorem font \DeclareFontShape{OT1}{Cochineal-TLF}{m}{sl}{ - <-> ssub * Cochineal-TLF/m/it + <-> \Cochineal@@scale Cochineal-Italic-tlf-th-ot1 }{} \DeclareFontShape{OT1}{Cochineal-TLF}{m}{scsl}{ diff --git a/Master/texmf-dist/tex/latex/cochineal/OT1Cochineal-TOsF.fd b/Master/texmf-dist/tex/latex/cochineal/OT1Cochineal-TOsF.fd index 61e96608c25..2899db6c89b 100644 --- a/Master/texmf-dist/tex/latex/cochineal/OT1Cochineal-TOsF.fd +++ b/Master/texmf-dist/tex/latex/cochineal/OT1Cochineal-TOsF.fd @@ -7,6 +7,17 @@ \global\let\Cochineal@@swashQ\@empty \fi +\expandafter\ifx\csname Cochineal@@thmtab\endcsname\relax% + \global\let\Cochineal@@thmtab\@empty % empty or t + \xdef\Cochineal@@thmlin{\@empty}X} % X or l +\fi +\if l\Cochineal@@thmlin + \def\coch@tmp{tlf} +\else + \def\coch@tmp{tosf} +\fi +\global\let\coch@prefix\coch@tmp + \expandafter\ifx\csname Cochineal@scale\endcsname\relax \let\Cochineal@@scale\@empty \else @@ -70,9 +81,9 @@ \DeclareFontShape{OT1}{Cochineal-TOsF}{m}{nw}{ <-> \Cochineal@@scale Cochineal-Roman-tosf-swash-ot1 }{} - +% changed 2019-06-21 for theorem fonts \DeclareFontShape{OT1}{Cochineal-TOsF}{m}{sl}{ - <-> ssub * Cochineal-TOsF/m/it + <-> \Cochineal@@scale Cochineal-Italic-\coch@prefix-th-ot1 }{} \DeclareFontShape{OT1}{Cochineal-TOsF}{m}{scsl}{ diff --git a/Master/texmf-dist/tex/latex/cochineal/T1Cochineal-LF.fd b/Master/texmf-dist/tex/latex/cochineal/T1Cochineal-LF.fd index eefa37e7bb4..5634cd75c07 100644 --- a/Master/texmf-dist/tex/latex/cochineal/T1Cochineal-LF.fd +++ b/Master/texmf-dist/tex/latex/cochineal/T1Cochineal-LF.fd @@ -1,4 +1,4 @@ -%% Generated by msharpe on 2016/01/19 +%% Generated by msharpe on 2019/06/21 %% \ProvidesFile{T1Cochineal-LF.fd} [2016/01/19 (msharpe) Font definitions for T1/Cochineal-LF.] @@ -6,6 +6,12 @@ \expandafter\ifx\csname Cochineal@@swashQ\endcsname\relax% \global\let\Cochineal@@swashQ\@empty \fi +\expandafter\ifx\csname Cochineal@@thmtab\endcsname\relax% + \global\let\Cochineal@@thmtab\@empty % empty or t + \global\let\Cochineal@@thmlin\@empty % empty or l +\fi + +\def\coch@prefix{\Cochineal@@thmtab lf} \expandafter\ifx\csname Cochineal@scale\endcsname\relax \let\Cochineal@@scale\@empty @@ -70,9 +76,9 @@ \DeclareFontShape{T1}{Cochineal-LF}{m}{sw}{ <-> \Cochineal@@scale Cochineal-Italic-lf-swash-t1 }{} - +% changed 2019-06-21 for theorem fonts \DeclareFontShape{T1}{Cochineal-LF}{m}{sl}{ - <-> ssub * Cochineal-LF/m/it + <-> \Cochineal@@scale Cochineal-Italic-\coch@prefix-th-t1 }{} \DeclareFontShape{T1}{Cochineal-LF}{m}{scsl}{ diff --git a/Master/texmf-dist/tex/latex/cochineal/T1Cochineal-OsF.fd b/Master/texmf-dist/tex/latex/cochineal/T1Cochineal-OsF.fd index 0cb7caff64f..2170d20d96e 100644 --- a/Master/texmf-dist/tex/latex/cochineal/T1Cochineal-OsF.fd +++ b/Master/texmf-dist/tex/latex/cochineal/T1Cochineal-OsF.fd @@ -7,6 +7,17 @@ \global\let\Cochineal@@swashQ\@empty \fi +\expandafter\ifx\csname Cochineal@@thmtab\endcsname\relax% + \global\let\Cochineal@@thmtab\@empty % empty or t + \xdef\Cochineal@@thmlin{X} % X or l +\fi +\if l\Cochineal@@thmlin + \def\coch@tmp{lf} +\else + \def\coch@tmp{osf} +\fi +\xdef\coch@prefix{\Cochineal@@thmtab\coch@tmp} + \expandafter\ifx\csname Cochineal@scale\endcsname\relax \let\Cochineal@@scale\@empty \else @@ -71,8 +82,9 @@ <-> \Cochineal@@scale Cochineal-Italic-osf-sc-t1 }{} +% changed 2019-06-21 for theorem fonts \DeclareFontShape{T1}{Cochineal-OsF}{m}{sl}{ - <-> ssub * Cochineal-OsF/m/it + <-> \Cochineal@@scale Cochineal-Italic-\coch@prefix-th-t1 }{} \DeclareFontShape{T1}{Cochineal-OsF}{m}{scsl}{ diff --git a/Master/texmf-dist/tex/latex/cochineal/T1Cochineal-TLF.fd b/Master/texmf-dist/tex/latex/cochineal/T1Cochineal-TLF.fd index cb12d68fd4d..4253fcfda47 100644 --- a/Master/texmf-dist/tex/latex/cochineal/T1Cochineal-TLF.fd +++ b/Master/texmf-dist/tex/latex/cochineal/T1Cochineal-TLF.fd @@ -1,7 +1,7 @@ %% Generated by msharpe on 2019/05/07 %% \ProvidesFile{T1Cochineal-TLF.fd} - [2019/05/07 (msharpe) Font definitions for T1/Cochineal-TLF.] + [2019/06/21 (msharpe) Font definitions for T1/Cochineal-TLF.] \expandafter\ifx\csname Cochineal@@swashQ\endcsname\relax% \global\let\Cochineal@@swashQ\@empty @@ -70,9 +70,9 @@ \DeclareFontShape{T1}{Cochineal-TLF}{m}{sw}{ <-> \Cochineal@@scale Cochineal-Italic-tlf-swash-t1 }{} - +% changed 2019-06-21 to enable theorem font \DeclareFontShape{T1}{Cochineal-TLF}{m}{sl}{ - <-> ssub * Cochineal-TLF/m/it + <-> \Cochineal@@scale Cochineal-Italic-tlf-th-t1 }{} \DeclareFontShape{T1}{Cochineal-TLF}{m}{scsl}{ diff --git a/Master/texmf-dist/tex/latex/cochineal/T1Cochineal-TOsF.fd b/Master/texmf-dist/tex/latex/cochineal/T1Cochineal-TOsF.fd index 09b160d5732..d0ad719d801 100644 --- a/Master/texmf-dist/tex/latex/cochineal/T1Cochineal-TOsF.fd +++ b/Master/texmf-dist/tex/latex/cochineal/T1Cochineal-TOsF.fd @@ -7,6 +7,17 @@ \global\let\Cochineal@@swashQ\@empty \fi +\expandafter\ifx\csname Cochineal@@thmtab\endcsname\relax% + \global\let\Cochineal@@thmtab\@empty % empty or t + \xdef\Cochineal@@thmlin{X} % X or l +\fi +\if l\Cochineal@@thmlin + \def\coch@tmp{lf} +\else + \def\coch@tmp{osf} +\fi +\xdef\coch@prefix{\Cochineal@@thmtab\coch@tmp} + \expandafter\ifx\csname Cochineal@scale\endcsname\relax \let\Cochineal@@scale\@empty \else @@ -39,8 +50,9 @@ <-> \Cochineal@@scale Cochineal-Italic-tosf-swash-t1 }{} +% changed 2019-06-21 for theorem fonts \DeclareFontShape{T1}{Cochineal-TOsF}{m}{sl}{ - <-> ssub * Cochineal-TOsF/m/it + <-> \Cochineal@@scale Cochineal-Italic-\coch@prefix-th-t1 }{} \DeclareFontShape{T1}{Cochineal-TOsF}{m}{scsl}{ diff --git a/Master/texmf-dist/tex/latex/cochineal/cochineal.sty b/Master/texmf-dist/tex/latex/cochineal/cochineal.sty index 8d603237191..7ae4d339a8a 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.050} -\def\filedate{2019/05/12} +\def\fileversion{1.054} +\def\filedate{2019/06/22} \ProvidesPackage{cochineal} [\filedate\space v\fileversion.] @@ -55,6 +55,8 @@ %\newif\if@Cochineal@swashQ \def\Cochineal@@swashQ{} +\def\Cochineal@@thmtab{} % default is to not change to tabular +\def\Cochineal@@thmlin{X} % default is to not change to lining \newif\if@Cochineal@thrm \newif\if@Cochineal@sups \newif\if@Cochineal@scosf @@ -73,6 +75,8 @@ \DeclareOptionX{p}{\useproportional} \DeclareOptionX{proportional}{\useproportional} \DeclareOptionX{theoremfont}{\@Cochineal@thrmtrue} +\DeclareOptionX{thmtabular}{\edef\Cochineal@@thmtab{t}} +\DeclareOptionX{thmlining}{\edef\Cochineal@@thmlin{l}} \DeclareOptionX{swashQ}{\edef\Cochineal@@swashQ{-swash}} \DeclareOptionX{sups}{\@Cochineal@supstrue} \DeclareOptionX{scosf}{\@Cochineal@scosftrue} -- cgit v1.2.3