summaryrefslogtreecommitdiff
path: root/fonts
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2021-09-27 03:01:47 +0000
committerNorbert Preining <norbert@preining.info>2021-09-27 03:01:47 +0000
commit30b8c834b941b4c6311906369ce5008fd2e72bf8 (patch)
treeb3c424c023951c9ef64844d8d9b99300e597a5a3 /fonts
parent1fdd813fb19929aee2dfa99b2d04cb16c9f9e902 (diff)
CTAN sync 202109270301
Diffstat (limited to 'fonts')
-rw-r--r--fonts/erewhon-math/Erewhon-Math.ltx113
-rw-r--r--fonts/erewhon-math/Erewhon-Math.otfbin365468 -> 367012 bytes
-rw-r--r--fonts/erewhon-math/Erewhon-Math.pdfbin166835 -> 169384 bytes
-rw-r--r--fonts/erewhon-math/README.md76
-rw-r--r--fonts/erewhon-math/fourier-otf.sty100
-rw-r--r--fonts/erewhon-math/unimath-erewhon.ltx66
-rw-r--r--fonts/erewhon-math/unimath-erewhon.pdfbin1341654 -> 1841313 bytes
7 files changed, 234 insertions, 121 deletions
diff --git a/fonts/erewhon-math/Erewhon-Math.ltx b/fonts/erewhon-math/Erewhon-Math.ltx
index b7af84f9b7..805a4ad782 100644
--- a/fonts/erewhon-math/Erewhon-Math.ltx
+++ b/fonts/erewhon-math/Erewhon-Math.ltx
@@ -8,6 +8,9 @@
\setsansfont{Cabin}[Scale=MatchLowercase]
\setmonofont{Inconsolatazi4}[Scale=MatchLowercase,
HyphenChar=None,StylisticSet={2,3}]
+\usepackage{subfig}
+\captionsetup[subtable]{position=top}
+\usepackage{realscripts}
\usepackage{microtype}
\usepackage{hyperref}
\hypersetup{pdftitle={Erewhon-Math User’s Guide},
@@ -22,8 +25,7 @@
\newcommand*{\pkg}[1]{\texttt{#1}}
\newcommand*{\file}[1]{\texttt{#1}}
\newcommand*{\opt}[1]{\texttt{#1}}
-\newcommand*{\cmd}[1]{\texttt{\textbackslash #1}}
-\newcommand*{\showtchar}[1]{\cmd{#1}~\csname #1\endcsname}
+\newcommand*{\cmd}[1]{\texttt{\textbackslash #1}}\newcommand*{\showtchar}[1]{\cmd{#1}~\csname #1\endcsname}
\newcommand*{\showmchar}[1]{\cmd{#1}~$(\csname #1\endcsname)$}
\newcommand*{\showmchardollar}[1]{\texttt{\$\cmd{#1}\$}~$(\csname #1\endcsname)$}
@@ -32,7 +34,7 @@
\title{\decofourleft\,\FOTF\,\decofourright}
\author{Daniel Flipo \\ \texttt{daniel.flipo@free.fr}}
-\newcommand*{\version}{0.46}
+\newcommand*{\version}{0.47}
\begin{document}
\maketitle
@@ -78,22 +80,21 @@ f.i.:
\end{verbatim}
otherwise you would get Latin Modern for text fonts.
-\subsection{Calling \pkg{fourier-otf.sty}}
+\subsection{Calling \pkg{fourier-otf.sty} (recommended)}
-As an alternative to load \FOTF{} --\emph{this is the recommended way}--
-you can type:\\[.5\baselineskip]
+As an alternative to load \FOTF{} you can type:\\[.5\baselineskip]
\verb+\usepackage[ +\textit{options}
-\footnote{Possible \textit{options} are \opt{loose} or any of the options
- described below for \cmd{setmathfont}.}%
+\footnote{Possible \textit{options} are \opt{loose}, \opt{no-text}, \opt{Scale=}
+ or any of the options described below for \cmd{setmathfont}.}%
\verb+ ]{fourier-otf}+\\[.5\baselineskip]
it also loads \pkg{unicode-math} with the default options and and sets
\file{Fourier Math} as Math font but does a bit more:
\begin{enumerate}
+\item it loads \pkg{fourier-orns.sty}, providing many text ornaments;
\item it checks at \verb+\begin{document}+ if packages \pkg{amssymb} or
\pkg{latexsym} are loaded and issues warnings in case they are;
\item it provides aliases for glyphs named differently in Unicode, so that
\pkg{latexsymb} or AMS names are also available;
-\item it loads \pkg{fourier-orns.sty}, providing many text ornaments;
\item it defines specific Math characters like \showmchar{Bbbbackslash},
\showmchar{varemptyset}, \linebreak[4]
\showmchar{parallelslant},
@@ -106,6 +107,11 @@ it also loads \pkg{unicode-math} with the default options and and sets
The option \opt{loose} disables these settings.
\end{enumerate}
+Apart from the \opt{loose} option mentionned above, \pkg{fourier-otf.sty}
+provides two options \opt{no-text} and \opt{Scale=}\textsl{<decimal>} meant to
+be used to load the \FOTF{} font together with textfonts other than Erewhon,
+while keeping the advantages 2. to 5. pointed in the preceeding list, f.i.\quad
+\verb+\usepackage[no-text,Scale=0.98]{fourier-otf.sty}+
\section{What is provided?}
@@ -188,6 +194,9 @@ while the default settings would print
\[\frac{\partial f}{\partial x} = \alpha \symbf{V} + a\nabla\Gamma +
\symbf{\beta}\symbf{M} \]
+Both shapes remain available anytime: \verb+$\uppi,\itpi$+
+prints $\uppi, \itpi$.
+
If your text editor is able to handle greek letters or math symbols, they can
be entered in the code instead control sequences (i.e.
$\symup{α}$, $\symup{β}$, $\symup{Γ}$,… for \cmd{alpha}, \cmd{beta},
@@ -262,11 +271,14 @@ glyphs for families of mathematical symbols.
\footnote{These \texttt{Style} aliases are provided by \file{fourier-otf.sty}.}
\verb+Style=leqslant+, converts (large) inequalites into their slanted
variants as shown by table~\vref{ss04}.
+
+\verb+StylisticSet=5+, alias \verb+Style=smaller+, converts some symbols into
+their smaller variants as shown by table~\vref{ss05}.
\begin{table}[ht]
\centering
- \caption{Stylistic Set 4 -- \texttt{leqslant} (slanted inequalities)}
- \hlabel{ss04}
- \begin{tabular}{@{}lcc@{}}
+ \caption{Stylistic Sets 4 and 5}
+ \subfloat[\texttt{Style=leqslant\quad (+ss04)}]{\hlabel{ss04}%
+ \begin{tabular}[t]{@{}lcc@{}}
\hline
Command & Default & Variant \\
\hline
@@ -284,15 +296,9 @@ variants as shown by table~\vref{ss04}.
\cmd{gtreqqless} & $\gtreqqless$ & $\gtreqqslantless$ \\
\hline
\end{tabular}
-\end{table}
-
-\verb+StylisticSet=5+, alias \verb+Style=smaller+, converts some symbols into
-their smaller variants as shown by table~\vref{ss05}.
-\begin{table}[ht]
- \centering
- \caption{Stylistic Set 5 -- \texttt{smaller} (smaller variants)}
- \hlabel{ss05}
- \begin{tabular}{@{}lcc@{}}
+ }\hspace{10mm} % eof subfloat
+ \subfloat[\texttt{Style=smaller\quad (+ss05)}]{\hlabel{ss05}%
+ \begin{tabular}[t]{@{}lcc@{}}
\hline
Command & Default & Variant \\
\hline
@@ -306,15 +312,20 @@ their smaller variants as shown by table~\vref{ss05}.
\cmd{nparallelslant} & $\nparallelslant$ & $\nshortparallelslant$ \\
\hline
\end{tabular}
+ }% eof subfloat
\end{table}
\verb+StylisticSet=6+, alias \verb+Style=subsetneq+, converts some inclusion
symbols as shown by table~\vref{ss06}.
+
+\enlargethispage{-2\baselineskip}
+\verb+StylisticSet=7+, alias \verb+Style=parallelslant+, converts
+``parallel’’ symbols into their slanted variants as shown by table~\vref{ss07}.
\begin{table}[ht]
\centering
- \caption{Stylistic Set 6 -- \texttt{subsetneq} (inclusion variants)}
- \hlabel{ss06}
- \begin{tabular}{@{}lcc@{}}
+ \caption{Stylistic Sets 6 and 7}
+ \subfloat[\texttt{Style=subsetneq\quad (+ss06)}]{\hlabel{ss06}%
+ \begin{tabular}[t]{@{}lcc@{}}
\hline
Command & Default & Variant \\
\hline
@@ -324,15 +335,9 @@ symbols as shown by table~\vref{ss06}.
\cmd{supsetneqq} & $\supsetneqq$ & $\varsupsetneqq$ \\
\hline
\end{tabular}
-\end{table}
-
-\verb+StylisticSet=7+, alias \verb+Style=parallelslant+, converts
-``parallel’’ symbols into their slanted variants as shown by table~\vref{ss07}.
-\begin{table}[ht]
- \centering
- \caption{Stylistic Set 7 -- \texttt{parallelslant} (slanted variants)}
- \hlabel{ss07}
- \begin{tabular}{@{}lcc@{}}
+ }\hspace{10mm} % eof subfloat
+ \subfloat[\texttt{Style=parallelslant\quad (+ss07)}]{\hlabel{ss07}%
+ \begin{tabular}[t]{@{}lcc@{}}
\hline
Command & Default & Variant \\
\hline
@@ -342,6 +347,7 @@ symbols as shown by table~\vref{ss06}.
\cmd{nshortparallel} & $\nshortparallel$ & $\nshortparallelslant$ \\
\hline
\end{tabular}
+ } % eof subfloat
\end{table}
To enable Stylistic Sets 4, 6 and 7 for \FOTF{}, you should enter
@@ -357,7 +363,6 @@ instead of
\setmathfont{Erewhon Math}
\[x\leq y \quad A \subsetneq B\quad D \parallel D' \]
-\clearpage
\subsection{Standard \LaTeX{} math commands}
\label{ssec-math-commands}
@@ -365,6 +370,7 @@ All standard \LaTeX{} math commands, all \pkg{amssymb} commands and all
\pkg{latexsym} commands are supported by \FOTF{}, for some of them loading
\pkg{fourier-otf.sty} is required.
+\pagebreak[4]
Various wide acccents are also supported:
\begin{itemize}
\item \cmd{widehat} and \cmd{widetilde}
@@ -435,7 +441,7 @@ Various wide acccents are also supported:
and \verb+\symbfit{}+ commands.
\item Calligraphic alphabet (\cmd{symscr} or \cmd{symcal} or
- \cmd{mathcal} command), uppercase only:
+ \cmd{mathcal} command), uppercase:
$\symscr{ABCDEFGHIJKLMNOPQRSTUVWXYZ}$
@@ -472,7 +478,7 @@ $\symsfup{ABCD...klm}\quad\symsfit{NOPQ...xyz}$
$\symsfup{ABCDEFGHIJKLM abcdefghijklm}\quad
\symsfit{NOPQRSTUVWXYZ nopqrstuvwxyz}$
-\item Typewriter alphabet is borrowed from Latin Modern,
+\item Typewriter alphabet is borrowed from Latin Modern,
$\symtt{ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz}$
@@ -485,6 +491,17 @@ $\symtt{ABCDE...XYZ abcde...xyz}$
$\symtt{ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz}$
\end{itemize}
+Like Latin Modern, Erewhon Math provides only four lowercase latin letters in
+script (or calligraphic) shape: $\mscre$, $\mscrg$, $\ell$, $\mscro$
+(\verb+\mscre+, \verb+\mscrg+, \verb+\ell+, \verb+\mscro+).
+
+All others (range \verb+"1D4B6+ to \verb+"1D4CF+) have to be borrowed
+from another Math font if needed, i.e.
+\begin{verbatim}
+\setmathfont{LibertinusMath-Regular.otf}%
+ [range="1D4B6-"1D4CF, Scale=MatchLowercase]
+\end{verbatim}
+
\subsection{Missing symbols}
\FOTF{} does not aim at being as complete as \file{STIXTwoMath-Regular} or
@@ -507,7 +524,7 @@ scaling is possible, multiple character ranges are separated with commas:\\
All logos and ornaments provided by \FGUT{} (\pkg{fourier-orns.sty}) are
available with \FOTF{} when loaded by \verb+\usepackage{fourier-otf}+.
-\pkg{fourier-orns.sty} as of v2.0 automatically fetches its glyphs in
+\pkg{fourier-orns.sty} as of v2.x automatically fetches its glyphs in
a specific OpenType font with LuaTeX or XeTeX engines and from
a Type\,1 font otherwise (pdfTeX).
@@ -515,20 +532,21 @@ a Type\,1 font otherwise (pdfTeX).
\begin{itemize}
\item \showtchar{textpertenthousand}, \textit{\textpertenthousand},
- \textbf{\textpertenthousand}, \textbf{\textit{\textpertenthousand}},
+ \textbf{\textpertenthousand}, \textbf{\textit{\textpertenthousand}}.
\item A variant of the euro symbol: \showtchar{eurologo}, \textit{\eurologo},
- \textbf{\eurologo}, \textbf{\textit{\eurologo}},
+ \textbf{\eurologo}, \textbf{\textit{\eurologo}}.
-\item A ``starred'' bullet: \showtchar{starredbullet},
+\item Two ``starred'' bullets: \showtchar{starredbullet}, \showtchar{decosix}.
\item Decos and logos: \showtchar{warning}, \showtchar{noway},
- \showtchar{textxswup}, \showtchar{textxswdown}, \showtchar{bomb},
+ \showtchar{caution}, \showtchar{bomb},\\
\showtchar{decoone}, \showtchar{decotwo}, \showtchar{decothreeleft},
\showtchar{decothreeright},
- \showtchar{decofourleft}, \showtchar{decofourright}, \showtchar{decosix},
- \showtchar{floweroneleft}, \showtchar{floweroneright}, \showtchar{lefthand},
- \showtchar{righthand}.
+ \showtchar{decofourleft}, \showtchar{decofourright},
+ \showtchar{floweroneleft}, \showtchar{floweroneright},\\
+ \showtchar{lefthand}, \showtchar{righthand},
+ \showtchar{textxswup}, \showtchar{textxswdown}.
\item Smileys: \showtchar{grimace}, \showtchar{textthing}.
@@ -545,6 +563,11 @@ a Type\,1 font otherwise (pdfTeX).
\end{itemize}
\end{raggedright}
+All these logos and ornaments are also available as described in the
+\pkg{fournier-orns} documentation: for instance, you could type
+\verb+{\FourierOrns E 2 F}+ to get {\FourierOrns E 2 F}.
+
+\vspace{\baselineskip}
Finally, some symbols are also provided in math mode, with other names:
\begin{itemize}
\item \showmchardollar{forbidden}, \showmchardollar{beware},
@@ -552,7 +575,7 @@ Finally, some symbols are also provided in math mode, with other names:
\item \showmchardollar{thething} is a \emph{QED symbol}
for a false proof. Of course, you don't need it!
\item \showmchardollar{xswordsup} and \showmchardollar{xswordsdown} may be used
- as tags for a debatted statement, or for anything else. $\xswordsdown$
+ as tags for a debatted statement, or for anything else.
\end{itemize}
\section{Acknowledgements}
diff --git a/fonts/erewhon-math/Erewhon-Math.otf b/fonts/erewhon-math/Erewhon-Math.otf
index 6e9b49c9c8..68b8f97fcc 100644
--- a/fonts/erewhon-math/Erewhon-Math.otf
+++ b/fonts/erewhon-math/Erewhon-Math.otf
Binary files differ
diff --git a/fonts/erewhon-math/Erewhon-Math.pdf b/fonts/erewhon-math/Erewhon-Math.pdf
index d66846181c..dca608fdfc 100644
--- a/fonts/erewhon-math/Erewhon-Math.pdf
+++ b/fonts/erewhon-math/Erewhon-Math.pdf
Binary files differ
diff --git a/fonts/erewhon-math/README.md b/fonts/erewhon-math/README.md
index d2f86445d6..98e3090ad9 100644
--- a/fonts/erewhon-math/README.md
+++ b/fonts/erewhon-math/README.md
@@ -25,12 +25,13 @@ Michael Shape’s Erewhon font.
This package is meant to be installed automatically by TeXLive, MikTeX, etc.
Otherwise, Erewhon-Math can be installed under TEXMFHOME or TEXMFLOCAL, f.i.
Erewhon-Math.otf in directory texmf-local/fonts/opentype/public/erewhon-math/
-and
-fourier-otf.sty in directory texmf-local/tex/latex/erewhon-math/
+and fourier-otf.sty in directory texmf-local/tex/latex/erewhon-math/.
Documentation files and their sources can go to directory
texmf-local/doc/fonts/public/erewhon-math/
+
Don't forget to rebuild the file database (mktexlsr or so) if you install
under TEXMFLOCAL.
+
Finally, make the system font database aware of the Erewhon Math font
(fontconfig under Linux).
@@ -46,29 +47,56 @@ Either version 1.3 or, at your option, any later version.
## Changes
* First public version: 0.40
-* v0.41: Added chars U+2AB1 to U+2AB4 (\precneq, \succneq, \preceqq, \succeqq).
- Fixed kerning between Italic/BoldItalic Latin and Greek letters
- and their subscript.
-* v0.42: Added thirty symbols U+00B0 (degree), U+01B5, U+214B, U+2232, U+2233,
- arrows U+2933 to U+2937 and some more.
- Improved kerning between roots and degrees.
- Improved kerning between arrows accents and parenthesis.
- Accents position above italic dans bold italic latin
+* v0.41:
+ - Added chars U+2AB1 to U+2AB4 (\precneq, \succneq, \preceqq, \succeqq).
+ - Fixed kerning between Italic/BoldItalic Latin and Greek letters
+ and their subscript.
+* v0.42:
+ - Added thirty symbols U+00B0 (degree), U+01B5, U+214B, U+2232, U+2233,
+ arrows U+2933 to U+2937 and some more.
+ - Improved kerning between roots and degrees.
+ - Improved kerning between arrows accents and parenthesis.
+ - Accents position above italic dans bold italic latin
and greek letters tuned.
-* v0.43 Corrected "IsExtended" flags.
- Improved kernings for differential elements.
- Changed \hbar, which now behaves as intended by unicode-math package.
- Glyph \Game (U+2141) corrected (it was upside down).
-* v0.44 Improved sub- and superscripts: glyphs redesigned bolder, size reduced
- (70%, 55%) instead of (76%, 60%).
- Fixed right kernings of "italic f".
- Fixed right bearings and italic corrections of mathscr capitals.
-* v0.45 Added stretchy accents \wideoverbar, \widebreve, \widecheck.
-* v0.46 Extensible \langle, \rangle, \lAngle and \rangle delimiters are now
- available in eight sizes (three bigger sizes added).
- Sub- and superscript reshaped: boldness slightly reduced.
+* v0.43
+ - Corrected "IsExtended" flags.
+ - Improved kernings for differential elements.
+ - Changed \hbar, which now behaves as intended by unicode-math package.
+ - Glyph \Game (U+2141) corrected (it was upside down).
+* v0.44
+ - Improved sub- and superscripts: glyphs redesigned bolder,
+ size reduced (70%, 55%) instead of (76%, 60%).
+ - Fixed right kernings of "italic f".
+ - Fixed right bearings and italic corrections of mathscr capitals.
+* v0.45
+ - Added stretchy accents \wideoverbar, \widebreve, \widecheck.
+* v0.46
+ - Extensible \langle, \rangle, \lAngle and \rangle delimiters
+ are now available in eight sizes (three bigger sizes added).
+ - Sub- and superscripts reshaped: boldness slightly reduced.
+* v0.47
+ - Added \mdsmwhtsquare (U+25FD), \mdsmblksquare (U+25FE),
+ \lgwhtsquare (U+02B1B), \lgblksquare U+02B1C).
+ - Tuned all "squares", "circles" and "triangles": the smaller ones
+ are centered on the math-axis, larger ones rest on the baseline.
+ - Redesigned symbols \angle, \measuredangle, \sphericalangle
+ (U+2220 to U+2222).
+ - Redesigned lowercase script letters \mscre, \mscrg, \mscro
+ (U+212F, U+210A, U+2134).
+ - Added symbols \inttop, \intbottom, \sumtop, \sumbottom
+ (U+2320, U+2321, U+23B2, U+23B3).
+ - Added symbols \hrectangleblack (U+025AC), \hrectangle (U+025AD),
+ \mdlgwhtlozenge (U+25CA) \mdlgblklozenge (U+29EB).
+ - Added symbols \enclosedcircle, \enclosedsquare, \encloseddiamond,
+ \enclosedtriangle (U+20DD, U+20DE, U+20DF, U+20E4).
+ - Added symbols \lozengeminus, \concavediamond, \concavediamondticketleft,
+ \concavediamondticketright (U+27E0 to U+27E3).
+ - Added symbols \mdblkdiamond, \mdwhtdiamond, \mdblklozenge,
+ \mdwhtlozenge, \smblkdiamond, \smblklozenge, \smwhtlozenge
+ (U+2B25 to U+2B2B).
+ - Added two options (no-text, Scale=) to fourier-otf.sty.
---
-Copyright 2019-2021 Michel Bovani, Daniel Flipo
-E-mail: michel (dot) bovani (at) icloud (dot) com
+Copyright 2019-2021 Michel Bovani, Daniel Flipo
+E-mail: michel (dot) bovani (at) icloud (dot) com
daniel (dot) flipo (at) free (dot) fr
diff --git a/fonts/erewhon-math/fourier-otf.sty b/fonts/erewhon-math/fourier-otf.sty
index b6df0ae57a..b43e11a0bf 100644
--- a/fonts/erewhon-math/fourier-otf.sty
+++ b/fonts/erewhon-math/fourier-otf.sty
@@ -1,7 +1,7 @@
\NeedsTeXFormat{LaTeX2e}[2018/01/01]
-\def\fileversion{0.45}%
-\def\filedate{2021/04/18}%
- \ProvidesPackage{fourier-otf}[\filedate\space\fileversion]
+\def\fileversion{0.47}
+\def\filedate{2021/09/16}
+\ProvidesPackage{fourier-otf}[\filedate\space\fileversion]
% Ensure luatex or xetex engine
\RequirePackage{iftex}[2019/10/24]
@@ -14,10 +14,14 @@
\newopentypefeature{Style}{subsetneq}{ss06}
\newopentypefeature{Style}{parallelslant}{ss07}
-% Options: forward them to \setmathfont except "tight" and "loose"
+% Options: forward them to \setmathfont except "tight", "loose" and "no-text".
\RequirePackage{xkeyval}
-\newtoks\FOTtoks
+\newtoks\FOTtoksT
+\newtoks\FOTtoksM
+
\newif\ifFOT@tight
+\newif\ifFOT@notext
+\DeclareOptionX{no-text}{\FOT@notexttrue}
\DeclareOptionX{tight}{\FOT@tighttrue}
\DeclareOptionX{loose}{\FOT@tightfalse}
\DeclareOptionX{math-style}{\Store@KV@Option{math-style}{#1}}
@@ -27,28 +31,63 @@
\DeclareOptionX{CharacterVariant}{\Store@KV@Option{CharacterVariant}{#1}}
\DeclareOptionX{StylisticSet}{\Store@KV@Option{StylisticSet}{#1}}
\DeclareOptionX{Style}{\Store@KV@Option{Style}{#1}}
+\DeclareOptionX{Scale}{\Store@KV@Option{Scale}{#1}}
\newcommand*{\Store@KV@Option}[2]{%
- \FOTtoks=\expandafter{\the\FOTtoks #1={#2},}}
+ \def\FOT@scale{Scale}\def\FOT@opt{#1}%
+ \ifx\FOT@opt\FOT@scale\FOTtoksT={Scale={#2}}\fi
+ \FOTtoksM=\expandafter{\the\FOTtoksM #1={#2},}}
\ExecuteOptionsX{tight}
\ProcessOptionsX
-\expandafter\setmathfont\expandafter[\the\FOTtoks]{Erewhon-Math.otf}
+% Math fonts: Erewhon-Math
+% Following Joseph Wright in https://tex.stackexchange.com/questions/451
+\begingroup
+ \edef\temp{%
+ \endgroup
+ \noexpand\setmathfont{Erewhon-Math.otf}%
+ [\unexpanded\expandafter{\the\FOTtoksM}]%
+ }
+ \temp
\ifFOT@tight
\thinmuskip=2mu
\medmuskip=2.5mu plus 1mu minus 2.5mu
\thickmuskip=3.5mu plus 2.5mu
\fi
-% Text Serif fonts: Erewhon
-\setmainfont{Erewhon}[
- Extension = .otf,
- UprightFont = *-Regular,
- BoldFont = *-Bold,
- ItalicFont = *-Italic,
- BoldItalicFont = *-BoldItalic,
- SlantedFont = *-RegularSlanted,
- BoldSlantedFont = *-BoldSlanted
- ]
-% Text Sans Serif fonts: lmss (default)
-% Text Typewriter fonts: lmtt (default)
+% Text Serif fonts.
+\ifFOT@notext
+\else
+ %Text Serif fonts: Erewhon
+ \begingroup
+ \defaultfontfeatures[Erewhon]
+ {Extension = .otf ,
+ UprightFont = *-Regular,
+ BoldFont = *-Bold,
+ ItalicFont = *-Italic,
+ BoldItalicFont = *-BoldItalic,
+ SlantedFont = *-RegularSlanted,
+ BoldSlantedFont = *-BoldSlanted}
+ \edef\temp{%
+ \endgroup
+ \noexpand\setmainfont{Erewhon}%
+ [\unexpanded\expandafter{\the\FOTtoksT}]%
+ }
+ \temp
+\fi
+% Enable FourierOrns' scaling anyway.
+\begingroup
+ \defaultfontfeatures[FourierOrns]
+ {Extension = .otf ,
+ UprightFont = *-Regular,
+ BoldFont = *-Bold,
+ ItalicFont = *-Italic,
+ BoldItalicFont = *-BoldItalic}
+ \edef\temp{%
+ \endgroup
+ \noexpand\renewfontfamily\FourierOrns{FourierOrns}%
+ [\unexpanded\expandafter{\the\FOTtoksT}]%
+ }
+ \temp
+% Text Sans Serif fonts: default (lmss unless specified)
+% Text Typewriter fonts: default (lmtt unless specified)
\AtBeginDocument{%
% Fourier specific math
@@ -60,9 +99,22 @@
\Umathchardef\mbfvarpartial = 0 0 "E040 \relax
\Umathchardef\mbfvarvarrho = 0 0 "E041 \relax
\Umathchardef\mbfvarvarpi = 0 0 "E042 \relax
+ \Umathchardef\mbfvec = 0 0 "E044 \relax
+ \Umathchardef\mbfwp = 0 0 "E045 \relax
+ \Umathchardef\mbfdotlessi = 0 0 "E046 \relax
+ \Umathchardef\mbfdotlessj = 0 0 "E047 \relax
+ \Umathchardef\mbfhbar = 0 0 "E048 \relax
+ \Umathchardef\mbfell = 0 0 "E049 \relax
+ \Umathchardef\mbftriangleleft = 0 0 "E04E \relax
+ \Umathchardef\mbftriangleright = 0 0 "E04F \relax
\Umathchardef\mbfitvarpartial = 0 0 "E060 \relax
\Umathchardef\mbfitvarvarrho = 0 0 "E061 \relax
\Umathchardef\mbfitvarvarpi = 0 0 "E062 \relax
+ \Umathchardef\mbfitwp = 0 0 "E065 \relax
+ \Umathchardef\mbfimath = 0 0 "E066 \relax
+ \Umathchardef\mbfjmath = 0 0 "E067 \relax
+ \Umathchardef\mbfithbar = 0 0 "E068 \relax
+ \Umathchardef\mbfitell = 0 0 "E069 \relax
\Umathchardef\mitvarpartial = 0 0 "E070 \relax
\Umathchardef\mitvarvarrho = 0 0 "E071 \relax
\Umathchardef\mitvarvarpi = 0 0 "E072 \relax
@@ -95,7 +147,7 @@
Reported}%
}%
{% AMS Symbols not referenced in unicode-math-table.tex
- % \Umathchardef\sum = <math type> <family> <slot>
+ % \Umathchardef\<cmd> = <math type> <family> <slot>
% <math type> : \mathord=0 \mathrel=3 ; <family>=0
\Umathchardef\circledR = 0 0 "24C7 \relax
\Umathchardef\circledS = 0 0 "24C8 \relax
@@ -117,7 +169,7 @@
\Umathchardef\ngeqq = 3 0 "E0AB \relax
\Umathchardef\npreceq = 3 0 "E098 \relax
\Umathchardef\nsucceq = 3 0 "E099 \relax
- \let\centerdot\cdotp % vysmblksquare ?
+ \let\centerdot\cdotp
\let\restriction\upharpoonright
\let\doteqdot\Doteq
\let\doublecup\Cup
@@ -126,8 +178,8 @@
\let\gggtr\ggg
\let\circlearrowleft\acwopencirclearrow
\let\circlearrowright\cwopencirclearrow
- \let\lozenge\diamondsuit
- \let\blacklozenge\vardiamondsuit
+ \let\lozenge\mdlgwhtlozenge
+ \let\blacklozenge\mdlgblklozenge
\let\square\mdlgwhtsquare
\let\blacksquare\mdlgblksquare
\let\dashleftarrow\leftdasharrow
@@ -152,7 +204,7 @@
\let\unlhd\trianglelefteq
\let\unrhd\trianglerighteq
\let\leadsto\rightcurvedarrow
- \let\Box\mdlgwhtsquare
+ \let\Box\lgwhtsquare
\let\Diamond\mdlgwhtdiamond
}%
}
diff --git a/fonts/erewhon-math/unimath-erewhon.ltx b/fonts/erewhon-math/unimath-erewhon.ltx
index 048a79a593..8708359552 100644
--- a/fonts/erewhon-math/unimath-erewhon.ltx
+++ b/fonts/erewhon-math/unimath-erewhon.ltx
@@ -1,20 +1,25 @@
%%^^A%% unimath-symbols.ltx -- part of UNICODE-MATH <wspr.io/unicode-math>
%%^^A%% Listing of Unicode mathematics symbols using a variety of fonts.
-%% Changes (df): XITS replaced by Erewhon.
+% !TEX TS-program = LuaLaTeX
-%!TEX TS-program = LuaLaTeX
+%% Changes (df): XITS replaced by Erewhon, Fira replaced by Libertinus,
+%% Garamond added.
+%% Changes by David Carlisle: https://github.com/wspr/unicode-math/issues/570
-%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% SYMBOLS DEFINED BY UNICODE-MATH
-%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\documentclass[final]{article}
\makeatletter
-\usepackage{ragged2e,setspace,booktabs,catchfile,shortvrb,geometry,metalogo,textcomp,longtable,tabu,hyperref}
+\usepackage{ragged2e,setspace,booktabs,catchfile,shortvrb,geometry,metalogo,textcomp,longtable,array,hyperref}
-\geometry{margin=3cm}
+\usepackage{ninecolors}
+\NineColors{saturation=high}
+
+\geometry{margin=24mm}
\hypersetup{colorlinks,linkcolor=black}
\def\cmd#1{\texttt{\textbackslash\expandafter\@gobble\string#1}}
@@ -22,7 +27,7 @@
\usepackage{fontspec}
\setmainfont{texgyrepagella}%
[
- Extension = .otf,
+ Extension = .otf ,
UprightFont = *-regular,
ItalicFont = *-italic,
BoldFont = *-bold,
@@ -52,31 +57,32 @@
}
\ExplSyntaxOff
-\defmathfont{lm}{latinmodern-math.otf}{CC6666}{L}
-%\defmathfont{xits}{XITSMath-Regular.otf}{6666CC}{X}
-\defmathfont{stix}{STIXTwoMath-Regular.otf}{66CC66}{S}
-\defmathfont{erewhon}{Erewhon-Math.otf}{AA6666}{E}
-\defmathfont{pagella}{texgyrepagella-math.otf}{66CCCC}{P}
-\defmathfont{dejavu}{texgyredejavu-math.otf}{AACC66}{D}
-%\defmathfont{fira}{FiraMath-Regular.otf}{AA66CC}{F}
+\defmathfont{lm}{latinmodern-math.otf}{red5}{M}
+\defmathfont{stix}{STIXTwoMath-Regular.otf}{green5}{S}
+\defmathfont{erewhon}{Erewhon-Math.otf}{brown5}{E}
+\defmathfont{pagella}{texgyrepagella-math.otf}{cyan5}{P}
+\defmathfont{dejavu}{texgyredejavu-math.otf}{violet5}{D}
+\defmathfont{libertinus}{LibertinusMath-Regular.otf}{yellow5}{L}
+\defmathfont{garamond}{Garamond-Math.otf}{magenta5}{G}
\def\INPUT{\input{unicode-math-table.tex}}
\def\TABLE{%
\par\noindent
-\begin{longtabu}[l]{@{}l *{\Nfonts}{c} lX[l]@{}}
+\setlength\tabcolsep{5pt}%
+\begin{longtable}[l]{@{}l *{\Nfonts}{c} lp{100pt}@{}}
\toprule
- \textsc{usv} & \Llm & \Lstix & \Lerewhon & \Lpagella & \Ldejavu %& \Lfira
- & Macro & Description \\
+ \textsc{usv} & \Llm & \Lstix & \Lerewhon & \Lpagella & \Ldejavu & \Llibertinus
+ & \Lgaramond & Macro & Description \\
\midrule \endhead
\INPUT\\
\bottomrule
-\end{longtabu}
+\end{longtable}
}
\makeatletter
\def\USV#1{\footnotesize\scshape\MakeLowercase{u+\@gobble#1}}
\makeatother
\def\CMD#1{\footnotesize\cmd#1}
-\def\DESC#1{%
+\def\DESC#1{\vspace{-6pt}%
\begin{spacing}{0.5}
\RaggedRight\scriptsize #1%
\end{spacing}
@@ -99,7 +105,8 @@
\SYMB{#2}{erewhon}{#1} &
\SYMB{#2}{pagella}{#1} &
\SYMB{#2}{dejavu}{#1} &
-% \SYMB{#2}{fira}{#1} &
+ \SYMB{#2}{libertinus}{#1} &
+ \SYMB{#2}{garamond}{#1} &
\CMD{#2}
\tl_if_in:NnT \PLAIN {#2}
{
@@ -171,15 +178,19 @@ to print every symbol defined by the \textsf{unicode-math}
package.
Use this document to find the command name or the Unicode glyph slot for
a symbol that you wish to use.
-The following fonts are shown: (with approximate symbol counts)
+The following fonts are shown: (with approximate symbol counts)%
+\footnote{Be aware that 48 lowercase latin letters are missing in
+ \textit{Script} and \textit{BoldScript} shapes for both Latin Modern Math
+ and Erewhon Math, compared to the other four fonts.}
\begin{itemize}
\item[\Llm] \mathversion{lm} $\mathup{Latin\ Modern\ Math}$ (\ref{count:lm})
%\item[\Lxits] \mathversion{xits} $\mathup{XITS\ Math}$ (\ref{count:xits})
-\item[\Lstix] \mathversion{stix} $\mathup{STIX\ Math\ Two}$ (\ref{count:stix})
+\item[\Lstix] \mathversion{stix} $\mathup{STIX\ Two\ Math}$ (\ref{count:stix})
\item[\Lerewhon] \mathversion{erewhon} $\mathup{Erewhon\ Math}$ (\ref{count:erewhon})
\item[\Lpagella] \mathversion{pagella} $\mathup{TeX\ Gyre\ Pagella\ Math}$ (\ref{count:pagella})
\item[\Ldejavu] \mathversion{dejavu} $\mathup{DejaVu\ Math\ TeX\ Gyre}$ (\ref{count:dejavu})
-%\item[\Lfira] \mathversion{fira} $\mathup{Fira\ Math}$ (\ref{count:fira})
+\item[\Llibertinus] \mathversion{libertinus} $\mathup{Libertinus\ Math}$ (\ref{count:libertinus})
+\item[\Lgaramond] \mathversion{garamond} $\mathup{Garamond\ Math}$ (\ref{count:garamond})
\end{itemize}
Symbols defined in Plain \TeX\ are indicated with {\color[gray]{0.6} \textsuperscript{\sffamily (p)}} after their macro name.
\LaTeX\ follows Plain \TeX, but defines a handful more, indicated with {\color[gray]{0.6} \textsuperscript{\sffamily (l)}}.
@@ -275,9 +286,7 @@ Note that accents will only be properly placed if used with an OpenType font wit
\SHOW\mathbotaccent
\endgroup
-
-%Added (df)
-\newpage
+% Added (df)
\section{Bottom accents wide, \cmd\mathbotaccentwide}
\begingroup
\def\SYMB#1#2#3{%
@@ -290,6 +299,7 @@ Note that accents will only be properly placed if used with an OpenType font wit
\SHOW\mathbotaccentwide
\endgroup
+\clearpage
\section{Big operators, \cmd\mathop}
Of the operators shown below, a subset need to be flagged by \textsf{unicode-math} for \cmd\nolimits\ adjustments.
@@ -305,7 +315,7 @@ The limits behaviour as specified by \textsf{unicode-math} are shown with grey s
\SHOW\mathop
\endgroup
-\clearpage
+%\clearpage
\section{Binary relations, \cmd\mathbin}
\SHOW\mathbin
@@ -481,7 +491,7 @@ The limits behaviour as specified by \textsf{unicode-math} are shown with grey s
\TABLE
\FINISH
-
+\mbox{}
\end{document}
\endinput
diff --git a/fonts/erewhon-math/unimath-erewhon.pdf b/fonts/erewhon-math/unimath-erewhon.pdf
index c75a741466..e8377be5cb 100644
--- a/fonts/erewhon-math/unimath-erewhon.pdf
+++ b/fonts/erewhon-math/unimath-erewhon.pdf
Binary files differ