summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/cochineal
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/latex/cochineal')
-rw-r--r--Master/texmf-dist/tex/latex/cochineal/LY1Cochineal-LF.fd6
-rw-r--r--Master/texmf-dist/tex/latex/cochineal/LY1Cochineal-OsF.fd6
-rw-r--r--Master/texmf-dist/tex/latex/cochineal/LY1Cochineal-TLF.fd6
-rw-r--r--Master/texmf-dist/tex/latex/cochineal/LY1Cochineal-TOsF.fd6
-rw-r--r--Master/texmf-dist/tex/latex/cochineal/OT1Cochineal-LF.fd6
-rw-r--r--Master/texmf-dist/tex/latex/cochineal/OT1Cochineal-OsF.fd6
-rw-r--r--Master/texmf-dist/tex/latex/cochineal/OT1Cochineal-TLF.fd6
-rw-r--r--Master/texmf-dist/tex/latex/cochineal/OT1Cochineal-TOsF.fd6
-rw-r--r--Master/texmf-dist/tex/latex/cochineal/T1Cochineal-LF.fd6
-rw-r--r--Master/texmf-dist/tex/latex/cochineal/T1Cochineal-OsF.fd6
-rw-r--r--Master/texmf-dist/tex/latex/cochineal/T1Cochineal-TLF.fd10
-rw-r--r--Master/texmf-dist/tex/latex/cochineal/T1Cochineal-TOsF.fd6
-rw-r--r--Master/texmf-dist/tex/latex/cochineal/cochineal.sty9
13 files changed, 31 insertions, 54 deletions
diff --git a/Master/texmf-dist/tex/latex/cochineal/LY1Cochineal-LF.fd b/Master/texmf-dist/tex/latex/cochineal/LY1Cochineal-LF.fd
index 6d37c72aa76..c929ee25792 100644
--- a/Master/texmf-dist/tex/latex/cochineal/LY1Cochineal-LF.fd
+++ b/Master/texmf-dist/tex/latex/cochineal/LY1Cochineal-LF.fd
@@ -3,10 +3,8 @@
\ProvidesFile{LY1Cochineal-LF.fd}
[2016/01/19 (msharpe) Font definitions for LY1/Cochineal-LF.]
-\let\Cochineal@@swashQ\@empty
-\expandafter\ifx\csname @Cochineal@swashQtrue\endcsname\relax%
-\else
- \if@Cochineal@swashQ\edef\Cochineal@@swashQ{-swash}\fi%
+\expandafter\ifx\csname Cochineal@@swashQ\endcsname\relax%
+ \let\Cochineal@@swashQ\@empty
\fi
\expandafter\ifx\csname Cochineal@scale\endcsname\relax
diff --git a/Master/texmf-dist/tex/latex/cochineal/LY1Cochineal-OsF.fd b/Master/texmf-dist/tex/latex/cochineal/LY1Cochineal-OsF.fd
index 6187e66fdb3..779e37f9266 100644
--- a/Master/texmf-dist/tex/latex/cochineal/LY1Cochineal-OsF.fd
+++ b/Master/texmf-dist/tex/latex/cochineal/LY1Cochineal-OsF.fd
@@ -3,10 +3,8 @@
\ProvidesFile{LY1Cochineal-OsF.fd}
[2016/01/19 (msharpe) Font definitions for LY1/Cochineal-OsF.]
-\let\Cochineal@@swashQ\@empty
-\expandafter\ifx\csname @Cochineal@swashQtrue\endcsname\relax%
-\else
- \if@Cochineal@swashQ\edef\Cochineal@@swashQ{-swash}\fi%
+\expandafter\ifx\csname Cochineal@@swashQ\endcsname\relax%
+ \let\Cochineal@@swashQ\@empty
\fi
\expandafter\ifx\csname Cochineal@scale\endcsname\relax
diff --git a/Master/texmf-dist/tex/latex/cochineal/LY1Cochineal-TLF.fd b/Master/texmf-dist/tex/latex/cochineal/LY1Cochineal-TLF.fd
index 3a7e18858af..6f909caca23 100644
--- a/Master/texmf-dist/tex/latex/cochineal/LY1Cochineal-TLF.fd
+++ b/Master/texmf-dist/tex/latex/cochineal/LY1Cochineal-TLF.fd
@@ -3,10 +3,8 @@
\ProvidesFile{LY1Cochineal-TLF.fd}
[2016/01/19 (msharpe) Font definitions for LY1/Cochineal-TLF.]
-\let\Cochineal@@swashQ\@empty
-\expandafter\ifx\csname @Cochineal@swashQtrue\endcsname\relax%
-\else
- \if@Cochineal@swashQ\edef\Cochineal@@swashQ{-swash}\fi%
+\expandafter\ifx\csname Cochineal@@swashQ\endcsname\relax%
+ \let\Cochineal@@swashQ\@empty
\fi
\expandafter\ifx\csname Cochineal@scale\endcsname\relax
diff --git a/Master/texmf-dist/tex/latex/cochineal/LY1Cochineal-TOsF.fd b/Master/texmf-dist/tex/latex/cochineal/LY1Cochineal-TOsF.fd
index f7d34720a29..0af9e9aeb99 100644
--- a/Master/texmf-dist/tex/latex/cochineal/LY1Cochineal-TOsF.fd
+++ b/Master/texmf-dist/tex/latex/cochineal/LY1Cochineal-TOsF.fd
@@ -3,10 +3,8 @@
\ProvidesFile{LY1Cochineal-TOsF.fd}
[2016/01/19 (msharpe) Font definitions for LY1/Cochineal-TOsF.]
-\let\Cochineal@@swashQ\@empty
-\expandafter\ifx\csname @Cochineal@swashQtrue\endcsname\relax%
-\else
- \if@Cochineal@swashQ\edef\Cochineal@@swashQ{-swash}\fi%
+\expandafter\ifx\csname Cochineal@@swashQ\endcsname\relax%
+ \let\Cochineal@@swashQ\@empty
\fi
\expandafter\ifx\csname Cochineal@scale\endcsname\relax
diff --git a/Master/texmf-dist/tex/latex/cochineal/OT1Cochineal-LF.fd b/Master/texmf-dist/tex/latex/cochineal/OT1Cochineal-LF.fd
index 2912f080b37..01698b069a7 100644
--- a/Master/texmf-dist/tex/latex/cochineal/OT1Cochineal-LF.fd
+++ b/Master/texmf-dist/tex/latex/cochineal/OT1Cochineal-LF.fd
@@ -3,10 +3,8 @@
\ProvidesFile{OT1Cochineal-LF.fd}
[2016/01/19 (msharpe) Font definitions for OT1/Cochineal-LF.]
-\let\Cochineal@@swashQ\@empty
-\expandafter\ifx\csname @Cochineal@swashQtrue\endcsname\relax%
-\else
- \if@Cochineal@swashQ\edef\Cochineal@@swashQ{-swash}\fi%
+\expandafter\ifx\csname Cochineal@@swashQ\endcsname\relax%
+ \let\Cochineal@@swashQ\@empty
\fi
\expandafter\ifx\csname Cochineal@scale\endcsname\relax
diff --git a/Master/texmf-dist/tex/latex/cochineal/OT1Cochineal-OsF.fd b/Master/texmf-dist/tex/latex/cochineal/OT1Cochineal-OsF.fd
index 415457a69e8..a3a8ebeced1 100644
--- a/Master/texmf-dist/tex/latex/cochineal/OT1Cochineal-OsF.fd
+++ b/Master/texmf-dist/tex/latex/cochineal/OT1Cochineal-OsF.fd
@@ -3,10 +3,8 @@
\ProvidesFile{OT1Cochineal-OsF.fd}
[2016/01/19 (msharpe) Font definitions for OT1/Cochineal-OsF.]
-\let\Cochineal@@swashQ\@empty
-\expandafter\ifx\csname @Cochineal@swashQtrue\endcsname\relax%
-\else
- \if@Cochineal@swashQ\edef\Cochineal@@swashQ{-swash}\fi%
+\expandafter\ifx\csname Cochineal@@swashQ\endcsname\relax%
+ \let\Cochineal@@swashQ\@empty
\fi
\expandafter\ifx\csname Cochineal@scale\endcsname\relax
diff --git a/Master/texmf-dist/tex/latex/cochineal/OT1Cochineal-TLF.fd b/Master/texmf-dist/tex/latex/cochineal/OT1Cochineal-TLF.fd
index fbfd49e101e..93c46a2a8c2 100644
--- a/Master/texmf-dist/tex/latex/cochineal/OT1Cochineal-TLF.fd
+++ b/Master/texmf-dist/tex/latex/cochineal/OT1Cochineal-TLF.fd
@@ -3,10 +3,8 @@
\ProvidesFile{OT1Cochineal-TLF.fd}
[2016/01/19 (msharpe) Font definitions for OT1/Cochineal-TLF.]
-\let\Cochineal@@swashQ\@empty
-\expandafter\ifx\csname @Cochineal@swashQtrue\endcsname\relax%
-\else
- \if@Cochineal@swashQ\edef\Cochineal@@swashQ{-swash}\fi%
+\expandafter\ifx\csname Cochineal@@swashQ\endcsname\relax%
+ \let\Cochineal@@swashQ\@empty
\fi
\expandafter\ifx\csname Cochineal@scale\endcsname\relax
diff --git a/Master/texmf-dist/tex/latex/cochineal/OT1Cochineal-TOsF.fd b/Master/texmf-dist/tex/latex/cochineal/OT1Cochineal-TOsF.fd
index afde18bb731..9b206324025 100644
--- a/Master/texmf-dist/tex/latex/cochineal/OT1Cochineal-TOsF.fd
+++ b/Master/texmf-dist/tex/latex/cochineal/OT1Cochineal-TOsF.fd
@@ -3,10 +3,8 @@
\ProvidesFile{OT1Cochineal-TOsF.fd}
[2016/01/19 (msharpe) Font definitions for OT1/Cochineal-TOsF.]
-\let\Cochineal@@swashQ\@empty
-\expandafter\ifx\csname @Cochineal@swashQtrue\endcsname\relax%
-\else
- \if@Cochineal@swashQ\edef\Cochineal@@swashQ{-swash}\fi%
+\expandafter\ifx\csname Cochineal@@swashQ\endcsname\relax%
+ \let\Cochineal@@swashQ\@empty
\fi
\expandafter\ifx\csname Cochineal@scale\endcsname\relax
diff --git a/Master/texmf-dist/tex/latex/cochineal/T1Cochineal-LF.fd b/Master/texmf-dist/tex/latex/cochineal/T1Cochineal-LF.fd
index 2105692e147..16760107d88 100644
--- a/Master/texmf-dist/tex/latex/cochineal/T1Cochineal-LF.fd
+++ b/Master/texmf-dist/tex/latex/cochineal/T1Cochineal-LF.fd
@@ -3,10 +3,8 @@
\ProvidesFile{T1Cochineal-LF.fd}
[2016/01/19 (msharpe) Font definitions for T1/Cochineal-LF.]
-\let\Cochineal@@swashQ\@empty
-\expandafter\ifx\csname @Cochineal@swashQtrue\endcsname\relax%
-\else
- \if@Cochineal@swashQ\edef\Cochineal@@swashQ{-swash}\fi%
+\expandafter\ifx\csname Cochineal@@swashQ\endcsname\relax%
+ \let\Cochineal@@swashQ\@empty
\fi
\expandafter\ifx\csname Cochineal@scale\endcsname\relax
diff --git a/Master/texmf-dist/tex/latex/cochineal/T1Cochineal-OsF.fd b/Master/texmf-dist/tex/latex/cochineal/T1Cochineal-OsF.fd
index 60c95aaf1b1..09340d311d5 100644
--- a/Master/texmf-dist/tex/latex/cochineal/T1Cochineal-OsF.fd
+++ b/Master/texmf-dist/tex/latex/cochineal/T1Cochineal-OsF.fd
@@ -3,10 +3,8 @@
\ProvidesFile{T1Cochineal-OsF.fd}
[2016/01/19 (msharpe) Font definitions for T1/Cochineal-OsF.]
-\let\Cochineal@@swashQ\@empty
-\expandafter\ifx\csname @Cochineal@swashQtrue\endcsname\relax%
-\else
- \if@Cochineal@swashQ\edef\Cochineal@@swashQ{-swash}\fi%
+\expandafter\ifx\csname Cochineal@@swashQ\endcsname\relax%
+ \let\Cochineal@@swashQ\@empty
\fi
\expandafter\ifx\csname Cochineal@scale\endcsname\relax
diff --git a/Master/texmf-dist/tex/latex/cochineal/T1Cochineal-TLF.fd b/Master/texmf-dist/tex/latex/cochineal/T1Cochineal-TLF.fd
index 2452f9802c7..222cb7ba935 100644
--- a/Master/texmf-dist/tex/latex/cochineal/T1Cochineal-TLF.fd
+++ b/Master/texmf-dist/tex/latex/cochineal/T1Cochineal-TLF.fd
@@ -1,12 +1,10 @@
-%% Generated by msharpe on 2016/01/19
+%% Generated by msharpe on 2019/05/07
%%
\ProvidesFile{T1Cochineal-TLF.fd}
- [2016/01/19 (msharpe) Font definitions for T1/Cochineal-TLF.]
+ [2019/05/07 (msharpe) Font definitions for T1/Cochineal-TLF.]
-\let\Cochineal@@swashQ\@empty
-\expandafter\ifx\csname @Cochineal@swashQtrue\endcsname\relax%
-\else
- \if@Cochineal@swashQ\edef\Cochineal@@swashQ{-swash}\fi%
+\expandafter\ifx\csname Cochineal@@swashQ\endcsname\relax%
+ \let\Cochineal@@swashQ\@empty
\fi
\expandafter\ifx\csname Cochineal@scale\endcsname\relax
diff --git a/Master/texmf-dist/tex/latex/cochineal/T1Cochineal-TOsF.fd b/Master/texmf-dist/tex/latex/cochineal/T1Cochineal-TOsF.fd
index 4ae04d3f096..620ed34ad27 100644
--- a/Master/texmf-dist/tex/latex/cochineal/T1Cochineal-TOsF.fd
+++ b/Master/texmf-dist/tex/latex/cochineal/T1Cochineal-TOsF.fd
@@ -3,10 +3,8 @@
\ProvidesFile{T1Cochineal-TOsF.fd}
[2016/01/19 (msharpe) Font definitions for T1/Cochineal-TOsF.]
-\let\Cochineal@@swashQ\@empty
-\expandafter\ifx\csname @Cochineal@swashQtrue\endcsname\relax%
-\else
- \if@Cochineal@swashQ\edef\Cochineal@@swashQ{-swash}\fi%
+\expandafter\ifx\csname Cochineal@@swashQ\endcsname\relax%
+ \let\Cochineal@@swashQ\@empty
\fi
\expandafter\ifx\csname Cochineal@scale\endcsname\relax
diff --git a/Master/texmf-dist/tex/latex/cochineal/cochineal.sty b/Master/texmf-dist/tex/latex/cochineal/cochineal.sty
index ba03c6a138c..8d603237191 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.042}
-\def\filedate{2017/03/10}
+\def\fileversion{1.050}
+\def\filedate{2019/05/12}
\ProvidesPackage{cochineal}
[\filedate\space v\fileversion.]
@@ -53,7 +53,8 @@
\def\bfseries@rm{b}
\def\mdseries@rm{m}
-\newif\if@Cochineal@swashQ
+%\newif\if@Cochineal@swashQ
+\def\Cochineal@@swashQ{}
\newif\if@Cochineal@thrm
\newif\if@Cochineal@sups
\newif\if@Cochineal@scosf
@@ -72,7 +73,7 @@
\DeclareOptionX{p}{\useproportional}
\DeclareOptionX{proportional}{\useproportional}
\DeclareOptionX{theoremfont}{\@Cochineal@thrmtrue}
-\DeclareOptionX{swashQ}{\@Cochineal@swashQtrue}
+\DeclareOptionX{swashQ}{\edef\Cochineal@@swashQ{-swash}}
\DeclareOptionX{sups}{\@Cochineal@supstrue}
\DeclareOptionX{scosf}{\@Cochineal@scosftrue}
\DeclareOptionX{bold}{\edef\bfseries@rm{b}}