cochineal (14nov21)

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

9 files changed, 139 insertions, 114 deletions

diff --git a/Master/texmf-dist/doc/fonts/cochineal/OFL.txt b/Master/texmf-dist/doc/fonts/cochineal/OFL.txt
index 5043f806cbd..f7b34381bdb 100644
--- a/Master/texmf-dist/doc/fonts/cochineal/OFL.txt
+++ b/Master/texmf-dist/doc/fonts/cochineal/OFL.txt
@@ -1,6 +1,6 @@
 Copyright (c) 2010-2014 Sebastian Kosch, with Reserved Font Name Crimson.
 
-Copyright (c) 2016, Michael Sharpe (msharpe@ucsd.edu),
+Copyright (c) 2016--2021, Michael Sharpe (msharpe@ucsd.edu),
 with Reserved Font Name Cochineal.
 
 This Font Software is licensed under the SIL Open Font License, Version 1.1.
diff --git a/Master/texmf-dist/doc/fonts/cochineal/README b/Master/texmf-dist/doc/fonts/cochineal/README
index 7fddca0ee65..5e2463dc3bd 100644
--- a/Master/texmf-dist/doc/fonts/cochineal/README
+++ b/Master/texmf-dist/doc/fonts/cochineal/README
@@ -19,7 +19,21 @@ 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.067 (2021-10-17)
+Current version: 1.07 (2021-11-13)
+
+Changes in version 1.07
+Many of the corrections below were spurred by reports from Bernhard Hermes, to whom I offer thanks.
+1. Corrected bug in ss01, which was not making correct substitutions of German sharp S.
+2. Fixed misshaped numeral 1 in oldstyle BoldItalic.
+3. Corrected the ordn lookup misbehavior. It now works in all cuts, not just Roman.
+4. Removed the fraction related items from the liga table.
+5. Corrected dlig behavior in Italic.
+6. Corrected sups lookup in Italic.
+7. Added a bit of kerning to the oldstyle numerals.
+8. Added frac lookups to all cuts. 
+9. Added alternate shapes of Q and Q.swash to all cuts and an alternate shaped J to Italic and BoldItalic. Also added small cap versions of the new Q shapes. At the moment, these are available only to opentype users.
+10. Reordered the lookup tables so that the behavior in sups, sinf, denom and ordn no longer depends on the initial text font settings.
+11. Serious modifications to sty file, which now works with both pdflatex, xelatex and lualatex.
 
 Changes in version 1.067
 Removed ligatures like 1 slash 4 --> onequarter from the liga table. (These affect only unicode tex users.)
@@ -37,7 +51,6 @@ Changes in version 1.063
 1. Further modifications to the ts1 encoded fonts, simplifying the organization a bit.
 2. Corrected the \textcircled macro so that it scales as expected.
 
-
 Changes in version 1.062
 1. Added close to 60 new glyphs so that TS1 coverage is now essentially full.
 2. Added \textcircled and \textfrac macros.
diff --git a/Master/texmf-dist/doc/fonts/cochineal/cochineal-doc.pdf b/Master/texmf-dist/doc/fonts/cochineal/cochineal-doc.pdf
index 9566409e941..1460e82409b 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 3c97a6fc45b..cb4358d60a9 100644
--- a/Master/texmf-dist/doc/fonts/cochineal/cochineal-doc.tex
+++ b/Master/texmf-dist/doc/fonts/cochineal/cochineal-doc.tex
@@ -30,18 +30,18 @@ Cochineal is a fork of Crimson, a remarkable creation of Sebastian Kosch inspire
 Cochineal provides {\tt Roman}, {\tt Bold}, {\tt Italic} and {\tt BoldItalic}. (Crimson provided semibold weights but with only limited coverage, which I did not wish to extend as this would have required the creation of about 2000 additional glyphs. Bob Tennent's {\tt Crimson} package does support semibold and the other styles, though  without my glyph additions.)
 
 \textsc{Package Features:}\\
-In addition to the encodings {\tt OT1}, {\tt T1}, {\tt TS1}, {\tt LY1} in general use by Western European (and some Eastern European) scripts, the package also offers {\tt LGR} with full support for monotonic, polytonic and some ancient Greek, and {\tt T2A} and {\tt OT2} Cyrillic support. All allow a choice from four figure styles---{\tt TLF} (tabular lining figures, monospaced and uppercase), {\tt LF} (proportional lining figures, uppercase), {\tt TOsF} (tabular oldstyle figures, monospaced and lowercase) and {\tt OsF} (proportional oldstyle figures, lowercase). The encodings {\tt OT1}, {\tt T1}, {\tt TS1}, {\tt LY1} offer \textsc{Small Caps}, even \textsc{\textit{Italics Small Caps}}, and additional figure styles---superiors, inferiors and denominators. These features are available from either \verb|fontspec| or from [pdf]\LaTeX. In \LaTeX, you access these through the macros \verb|\textsu|, \verb|\textin| and  \verb|\textde|, or through their font-switching equivalents \verb|\sufigures|, \verb|\infigures| and  \verb|\defigures|. For example:
+In addition to the encodings {\tt OT1}, {\tt T1}, {\tt TS1}, {\tt LY1} in general use by Western European (and some Eastern European) scripts, the package also offers {\tt LGR} with full support for monotonic, polytonic and some ancient Greek, and {\tt T2A} and {\tt OT2} Cyrillic support. All allow a choice from four figure styles---{\tt TLF} (tabular lining figures, monospaced and uppercase), {\tt LF} (proportional lining figures, uppercase), {\tt TOsF} (tabular oldstyle figures, monospaced and lowercase) and {\tt OsF} (proportional oldstyle figures, lowercase). The encodings {\tt OT1}, {\tt T1}, {\tt TS1}, {\tt LY1} offer \textsc{Small Caps}, even \textsc{\textit{Italics Small Caps}}, and additional figure styles---superiors, inferiors and denominators. These features are available from either \verb|fontspec| or from [pdf]\LaTeX. In \LaTeX, you access these through the macros \verb|\textsu|, \verb|\textinf| and  \verb|\textde|, or through their font-switching equivalents \verb|\sufigures|, \verb|\infigures| and  \verb|\defigures|. For example:
 \begin{itemize}
 \item
 \verb|M\textsu{lle} Dupont| and \verb|M{\sufigures lle} Dupont| both produce M\textsu{lle} Dupont.
-\item \verb|{\infigures 12345}| and \verb|\textin{12345}| render as \textin{12345}, dipping noticeably below the baseline,  while \verb|{\defigures 12345}| and \verb|\textde{12345}| render as \textde{12345}, aligned with the baseline.
+\item \verb|{\infigures 12345}| and \verb|\textinf{12345}| render as \textinf{12345}, dipping noticeably below the baseline,  while \verb|{\defigures 12345}| and \verb|\textde{12345}| render as \textde{12345}, aligned with the baseline.
 \end{itemize}
 As of version $1.062$ ($2020$), there is a new \verb|\textfrac| macro that works as in the following examples:
 \begin{itemize}
 \item
 (two arguments) \verb|\textfrac{31}{32}| renders as \textfrac{31}{32};
 \item
-(two arguments) \verb|\textfrac[2]{63}{64}| renders as \textfrac[2]{63}{64}.
+(three arguments) \verb|\textfrac[2]{63}{64}| renders as \textfrac[2]{63}{64}.
 \end{itemize}
 In addition, there is a \verb|\textcircled| macro that makes \verb|\textcircled{W}| render as \textcircled{W}. Numerals can also be circled: \verb|\textcircled{2}| renders as \textcircled{2}.
 
@@ -141,6 +141,7 @@ With T$2$A encoding, the process is the same as with other T$2$A-encoded fonts,
 \newpage
 The OT$2$ encoding (supposedly obsolete, but still useful) is intended for limited use in producing Russian characters with a Western keyboard, making by means of \TeX\ a transliteration of ASCII for most characters in the range 33--122, and providing ligatures to generate the rest. See the documentation of {\tt nimbus15} for further details.
 \fonttable{Cochineal-Roman-tlf-ot2}
+\end{document}
 \newpage
 \section*{Additional glyphs for use in German orthography}
 Prior to version {\tt1.050}, {\tt cochineal} offered basic support for German orthography, having all required accented glyphs and the lower case \ss, as well as a small caps \textsc{\ss}. Under LaTeX, the T$1$ encoding contained \verb|S_S|, but only as a synthesized character in the {\tt tfm}. Unicode users could not make use of \verb|S_S| as it was not present in the~{\tt otf}. So, with unicode tex processing:
diff --git a/Master/texmf-dist/doc/fonts/cochineal/cochineal-otf-doc.pdf b/Master/texmf-dist/doc/fonts/cochineal/cochineal-otf-doc.pdf
new file mode 100644
index 00000000000..021784bce40
--- /dev/null
+++ b/Master/texmf-dist/doc/fonts/cochineal/cochineal-otf-doc.pdf
diff --git a/Master/texmf-dist/doc/fonts/cochineal/cochineal-otf-doc.tex b/Master/texmf-dist/doc/fonts/cochineal/cochineal-otf-doc.tex
new file mode 100644
index 00000000000..abecf29a8d2
--- /dev/null
+++ b/Master/texmf-dist/doc/fonts/cochineal/cochineal-otf-doc.tex
@@ -0,0 +1,119 @@
+% !TEX TS-program = xelatex
+\documentclass[11pt]{article} 
+\usepackage[margin=1in]{geometry} 
+\usepackage[parfill]{parskip}% Begin paragraphs with an empty line rather than an indent
+\usepackage{graphicx}
+%\pdfmapfile{=Cochineal.map}
+%\pdfmapfile{=newtx.map}
+%\usepackage{amssymb}% don't use with newtxmath
+%SetFonts
+% cochineal+newtxmath
+%\usepackage{fontspec}
+%\setmainfont{erewhon}
+%\setmainfont{cochineal}
+\usepackage[p,osf]{cochineal} % use proportional osf
+\setmonofont{Inconsolatazi4-Regular.otf}[Scale=MatchLowercase]
+%\usepackage[OT2,LGR,T2A,T1]{fontenc}
+%\usepackage{textcomp}
+%\usepackage[varqu,varl]{zi4}% inconsolata
+%\usepackage{amsmath,amsthm}
+%\usepackage[cochineal,vvarbb]{newtxmath}
+% option vvarbb gives you stix blackboard bold
+%\usepackage[cal=boondoxo]{mathalfa}% less slanted than STIX cal
+%\usepackage{bm}
+%SetFonts
+\usepackage{fonttable}
+%\title{The Cochineal Font Package}
+%\author{Michael Sharpe}
+%\date{\today}  % Activate to display a given date or no date
+
+\begin{document}
+\expandafter\show\csname normalfont \endcsname
+\setcounter{page}{8}
+\section*{Running {\tt cochineal} in XeLaTeX or LuaLaTeX}
+The preceding pages of this document were processed using {\tt pdflatex}, which was the only engine supported by {\tt cochineal.sty}. As of version $1.07$, XeLaTeX and LuaLaTeX are also supported. All {\tt cochineal} options and macros formerly limited to {\tt pdflatex} have been modified and now work essentially the same under bother unicode engines, though the output may not always be precisely the same as with {\tt pdflatex}. There are some macros and options available under unicode engines that go beyond what can be done under {\tt pdflatex}.
+
+\textsc{Modified Macros and Options:}
+\begin{itemize}
+\item
+\verb|\textfrac| works better under unicode tex because it is possible to adjust kerning between all characters. The effect should not be very noticable, at least in regular style.
+\item {\tt sups}:  the package treats this differently in unicode LaTeX and pdflatex, with handling in the unicode case passed off to the {\tt realscripts} package where the footnote marker font is set to \verb|\normalfont|, meaning that superiors from the current (Cochineal) text font are employed.
+\item {\tt theoremfont}, {\tt thmtabular}, {\tt thmlining} all function in a similar manner to {\tt pdflatex}.
+\item {\tt swashQ} operates as before.
+\item {\tt foresolidus, aftsolidus} are not used in unicode tex.
+\item {\tt scosf} operates without change.
+%you have the choice of font to render footnote markers. The differences are as follows.
+%\begin{itemize}
+%\item
+%{\bfseries Unicode latex:}
+%\begin{itemize}
+%\item
+%if you include the option {\tt sups} to {\tt cochineal} and there is no {\tt fnmarkerfont=} option set, then  footnote markers are taken from the Cochineal-Roman superiors.
+%\item if there is a {\tt fnmarkerfont=} option set, then, whether or not there iss a {\tt sups} option set, then, if available, footnote markers will be taken from the superiors in the font family that {\tt fnmarkerfont=} is set to. (When trying a font family, try this in your preamble:
+%\begin{verbatim}
+%\newfontfamily\mysu{EBGaramond}{\addfontfeatures{RawFeature=+sups}}
+%\end{verbatim}
+%and then, in the body of your document, try typesetting
+%\begin{verbatim}
+%X{\mysu 123}X
+%\end{verbatim}
+
+%\end{itemize}
+%\item
+%{\bfseries pdflatex:}
+%\end{itemize}•
+%if you do not include the {\tt fnmarkerfont=} option but you do include {\tt sups}, then footnote markers are taken from {\tt Cochineal-Roman-sups}. There is a new option, {\tt fnmarkerfont} that you can use to specify the font to use for footnote markers. It is ignored when using {\tt pdflatex}.
+\item \verb|\textcircled| works the same as under {\tt pdflatex}.\textcircled{X}
+\end{itemize}
+\textsc{New Macros and Options:}
+\begin{itemize}
+\item
+An alternate version of Q, 
+\Qswash\space (\verb|\Qswash|) and their small cap versions is available using option {\tt altQ}, which sets {\tt StylisticSet=3}. The alternate versions are {\addfontfeatures{RawFeature=+ss03}Q}, {\addfontfeatures{Style=Swash,RawFeature=+ss03}Q}.
+\item
+An alternate version of J is available in italic shapes only using option {\tt altJ}, which sets {\tt StylisticSet=2}. The alternate version of \textit{J} is {\itshape {\addfontfeatures{RawFeature=+ss02}\textit{J}}}.
+%.\textit{J} {\textbf{Bold}} \textsc{SmallCap}
+\item {\tt oldSS} controls whether the new German capital sharp S is used or whether the old SS is retained. The former is the default but the option {\tt oldSS} forces the latter by setting {\tt StylisticSet=1}. The effects are summarized in the following tables.
+\begin{center}
+  \begin{tabular}{@{} lcl @{}}
+    \hline
+    Glyph name & glyph & macro\\ 
+    \hline
+    {\tt uni1E9E} & \symbol{"1E9E} &\verb|\symbol{"1E9E}| or \verb|\SS|\\ 
+    {\tt uni1E9E.ss01} & {\addfontfeature{StylisticSet=1}\symbol{"1E9E}} & \verb|{\addfontfeature{StylisticSet=1}\symbol{"1E9E}}| \\ 
+    {\tt germandbls.sc} & \textsc{\ss} & \verb|{\textsc{\ss}}| \\ 
+    {\tt germandbls.sc.ss01} & {\addfontfeature{StylisticSet=1,RawFeature=+smcp}\ss} & \verb|{\addfontfeature{StylisticSet=1}\textsc{\ss}}| \\ 
+    \hline
+  \end{tabular}
+\end{center}  
+\end{itemize}
+%{\bfseries
+%\begin{center}
+%  \begin{tabular}{@{} lcl @{}}
+%    \hline
+%    Glyph name & glyph & macro\\ 
+%    \hline
+%    {\tt uni1E9E} & \symbol{"1E9E} &\verb|\symbol{"1E9E}|\\ 
+%    {\tt uni1E9E.alt} & {\addfontfeature{StylisticSet=1}\symbol{"1E9E}} & \verb|{\addfontfeature{StylisticSet=1}\symbol{"1E9E}}| \\ 
+%    {\tt germandbls.sc.ss01} & {\addfontfeature{StylisticSet=1}\textsc{\ss}} & \verb|{\addfontfeature{StylisticSet=1}\textsc{\ss}}| \\ 
+%    \hline
+%  \end{tabular}
+%\end{center}
+%}
+ \noindent Effect of choice of {\tt StylisticSet}:
+ 
+\begin{center}
+  \begin{tabular}{@{} ccccc @{}}
+    \hline
+    StylisticSet & \verb|\ss| & \verb|\SS| & \verb|\MakeUppercase{\ss}| & \verb|\textsc{\ss}| \\ 
+    \hline
+    None & \ss & \SS & \MakeUppercase{\ss} & \textsc{\ss}\\ 
+    
+    =1 & {\addfontfeature{StylisticSet=1}\ss} & {\addfontfeature{StylisticSet=1}\SS} & {\addfontfeature{StylisticSet=1}\MakeUppercase{\ss}} & {\addfontfeature{StylisticSet=1}\textsc{\ss}}\\ 
+    \hline
+  \end{tabular}
+\end{center}
+
+\end{document}
+
+
diff --git a/Master/texmf-dist/doc/fonts/cochineal/newgermanglyphs-crop.pdf b/Master/texmf-dist/doc/fonts/cochineal/newgermanglyphs-crop.pdf
deleted file mode 100644
index eb384ca92f1..00000000000
--- a/Master/texmf-dist/doc/fonts/cochineal/newgermanglyphs-crop.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/doc/fonts/cochineal/newgermanglyphs.pdf b/Master/texmf-dist/doc/fonts/cochineal/newgermanglyphs.pdf
deleted file mode 100644
index 729c2f0e72e..00000000000
--- a/Master/texmf-dist/doc/fonts/cochineal/newgermanglyphs.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/doc/fonts/cochineal/newgermanglyphs.tex b/Master/texmf-dist/doc/fonts/cochineal/newgermanglyphs.tex
deleted file mode 100644
index ec11cf56d99..00000000000
--- a/Master/texmf-dist/doc/fonts/cochineal/newgermanglyphs.tex
+++ /dev/null
@@ -1,108 +0,0 @@
-% !TEX TS-program = XeLaTeX
-\documentclass[11pt]{article}
-\usepackage{geometry} 
-\usepackage{fontspec}
-%\uccode`ß=\SS
-%\renewcommand{\SS}{{\addfontfeature{RawFeature=+ss01}\symbol{"1E9E}}}
-\defaultfontfeatures{Mapping=tex-text}
-\setromanfont{cochineal}
-\pagestyle{empty}
-%\setromanfont{cochineal}[StylisticSet=1]
-%\setromanfont{cochineal}[StylisticSet=2]
-%\setsansfont[Scale=MatchLowercase,Mapping=tex-text]{LMSans}
-%\setmonofont[Scale=MatchLowercase]{courierN}
-%\newunicodechar{ß}{\ss}
-%\usepackage{fonttable}
-%\usepackage[ngerman]{babel}
-%\usepackage{polyglossia}
-%\setmainlanguage{german}
-%\def\longs{\symbol{"017F}}
-\begin{document}
-\noindent New symbols:
-\begin{center}
-  \begin{tabular}{@{} lcl @{}}
-    \hline
-    Glyph name & glyph & macro\\ 
-    \hline
-    {\tt uni1E9E} & \symbol{"1E9E} &\verb|\symbol{"1E9E}|\\ 
-    {\tt uni1E9E.ss01} & {\addfontfeature{StylisticSet=1}\symbol{"1E9E}} & \verb|{\addfontfeature{StylisticSet=1}\symbol{"1E9E}}| \\ 
-    {\tt germandbls.sc} & \textsc{\ss} & \verb|{\textsc{\ss}}| \\ 
-    {\tt germandbls.sc.ss01} & {\addfontfeature{StylisticSet=1}\textsc{\ss}} & \verb|{\addfontfeature{StylisticSet=1}\textsc{\ss}}| \\ 
-    \hline
-  \end{tabular}
-\end{center}  
- 
-%{\bfseries
-%\begin{center}
-%  \begin{tabular}{@{} lcl @{}}
-%    \hline
-%    Glyph name & glyph & macro\\ 
-%    \hline
-%    {\tt uni1E9E} & \symbol{"1E9E} &\verb|\symbol{"1E9E}|\\ 
-%    {\tt uni1E9E.alt} & {\addfontfeature{StylisticSet=1}\symbol{"1E9E}} & \verb|{\addfontfeature{StylisticSet=1}\symbol{"1E9E}}| \\ 
-%    {\tt germandbls.sc.ss01} & {\addfontfeature{StylisticSet=1}\textsc{\ss}} & \verb|{\addfontfeature{StylisticSet=1}\textsc{\ss}}| \\ 
-%    \hline
-%  \end{tabular}
-%\end{center}
-%}
- \noindent Effect of choice of {\tt StylisticSet}:
- 
-\begin{center}
-  \begin{tabular}{@{} ccccc @{}}
-    \hline
-    StylisticSet & \verb|\ss| & \verb|\SS| & \verb|\MakeUppercase{\ss}| & \verb|\textsc{\ss}| \\ 
-    \hline
-    None & \ss & \SS & \MakeUppercase{\ss} & \textsc{\ss}\\ 
-    
-    =1 & {\addfontfeature{StylisticSet=1}\ss} & {\addfontfeature{StylisticSet=1}\SS} & {\addfontfeature{StylisticSet=1}\MakeUppercase{\ss}} & {\addfontfeature{StylisticSet=1}\textsc{\ss}}\\ 
-    \hline
-  \end{tabular}
-\end{center}
-
-%{\itshape
-%\begin{center}
-%  \begin{tabular}{@{} ccccc @{}}
-%    \hline
-%    StylisticSet & \verb|\ss| & \verb|\SS| & \verb|\MakeUppercase{\ss}| & \verb|\textsc{\ss}| \\ 
-%    \hline
-%    None & \ss & \SS & \MakeUppercase{\ss} & \textsc{\ss}\\ 
-%    
-%    =1 & {\addfontfeature{StylisticSet=1}\ss} & {\addfontfeature{StylisticSet=1}\SS} & {\addfontfeature{StylisticSet=1}\MakeUppercase{\ss}} & {\addfontfeature{StylisticSet=1}\textsc{\ss}}\\ 
-%    \hline
-%  \end{tabular}
-%\end{center}
-%}
-%
-%\bfseries
-%\begin{center}
-%  \begin{tabular}{@{} ccccc @{}}
-%    \hline
-%    StylisticSet & \verb|\ss| & \verb|\SS| & \verb|\MakeUppercase{\ss}| & \verb|\textsc{\ss}| \\ 
-%    \hline
-%    None & \ss & \SS & \MakeUppercase{\ss} & \textsc{\ss}\\ 
-%    
-%    =1 & {\addfontfeature{StylisticSet=1}\ss} & {\addfontfeature{StylisticSet=1}\SS} & {\addfontfeature{StylisticSet=1}\MakeUppercase{\ss}} & {\addfontfeature{StylisticSet=1}\textsc{\ss}}\\ 
-%    \hline
-%  \end{tabular}
-%\end{center}
-%
-%\itshape
-%\begin{center}
-%  \begin{tabular}{@{} ccccc @{}}
-%    \hline
-%    StylisticSet & \verb|\ss| & \verb|\SS| & \verb|\MakeUppercase{\ss}| & \verb|\textsc{\ss}| \\ 
-%    \hline
-%    None & \ss & \SS & \MakeUppercase{\ss} & \textsc{\ss}\\ 
-%    
-%    =1 & {\addfontfeature{StylisticSet=1}\ss} & {\addfontfeature{StylisticSet=1}\SS} & {\addfontfeature{StylisticSet=1}\MakeUppercase{\ss}} & {\addfontfeature{StylisticSet=1}\textsc{\ss}}\\ 
-%    \hline
-%  \end{tabular}
-%\end{center}
-
-%{\addfontfeature{StylisticSet=2}
-%
-%\ss\ \MakeUppercase{\ss} \SS\ \textsc{\ss}
-%
-%}
-%\expandafter\show\csname SS\endcsname
-\end{document}
\ No newline at end of file