From d79a721c345c9a2ced6c0640e88c10cc3378c1f0 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Wed, 1 Jul 2020 03:03:30 +0000 Subject: CTAN sync 202007010303 --- fonts/erewhon/README | 5 +++- fonts/erewhon/doc/erewhon-doc.pdf | Bin 862358 -> 863265 bytes fonts/erewhon/doc/erewhon-doc.tex | 4 ++-- fonts/erewhon/tex/erewhon.sty | 48 +++++++++++++++++++++++++++++++++----- 4 files changed, 48 insertions(+), 9 deletions(-) (limited to 'fonts') diff --git a/fonts/erewhon/README b/fonts/erewhon/README index 41bc194d20..7f4c54c08b 100644 --- a/fonts/erewhon/README +++ b/fonts/erewhon/README @@ -2,7 +2,10 @@ This package provides LaTeX support files for the Erewhon fonts, made up of font http://www.ctan.org/license/lppl1.3 for the details of that license. -Current version: 1.110, 2020-05-30 +Current version: 1.111, 2020-06-29 + +Changes in version 1.111 +Reworked the \textfrac macro to make better kerning around the solidus. Changes in version 1.110 1. Latest otf files now included---those in 1.109 were inadvertently copied from the wrong source. diff --git a/fonts/erewhon/doc/erewhon-doc.pdf b/fonts/erewhon/doc/erewhon-doc.pdf index bdaa70967d..1a27b13ecb 100644 Binary files a/fonts/erewhon/doc/erewhon-doc.pdf and b/fonts/erewhon/doc/erewhon-doc.pdf differ diff --git a/fonts/erewhon/doc/erewhon-doc.tex b/fonts/erewhon/doc/erewhon-doc.tex index 8ec4dc5709..0847b1fed8 100644 --- a/fonts/erewhon/doc/erewhon-doc.tex +++ b/fonts/erewhon/doc/erewhon-doc.tex @@ -43,7 +43,7 @@ \item full collections of superior lowercase letters (including \`e as \textsu{\`e} and \'e as \textsu{\'e}), mainly for the benefit of languages in which those are in common use---e.g., French, Spanish; \item size reduced by 6\% from Heuristica, which matched the old version of Utopia---the new size matches that of Adobe's commercial UtopiaStd; \item shapes of some oldstyle figures modified to have more of an oldstyle appearance; -\item fraction macros based on the new numerator and denominator figures; +\item fraction macros based on the new numerator and denominator figures: e.g., \verb|\textfrac{34}{73}| renders as \textfrac{34}{73} and \verb|\textfrac[2]{17}{43}| renders as \textfrac[2]{17}{43}; \item the bold upright face has been made less cramped. \item As of version $1.109$, a Russian ruble glyph from Heuristica was added but is accessible from LaTeX encodings. For LaTeX users, a \verb|\textruble| command has been added, built as a composite glyph built from a scaled down P and two rules, providing an approximation to the actual ruble glyph: \textruble. \end{itemize} @@ -122,7 +122,7 @@ The baseline for {\tt superior} letters and figures has been uniformized at 356 The baseline for {\tt numerator} figures has been uniformized at 256 {\tt units}. \item A substantial number of {\tt superior} letters and symbols have been added---see the table near the end of this document. \item -The TS$1$ encoded ({\tt textcomp}) has been enriched and is now essentially full. In particular, this permits macros like \verb|\textfractionsolidus| and \verb|\textcircled| render using {\tt erewhon} glyphs rather than CMR10 glyphs. (Recall that if \LaTeX\ thinks the TS$1$ font lacks enough glyphs, it tries to make substitutions fiorst from the OMS font, then from CRM10. As {\tt newtxmath} lacks an OMS encoded font, the substitutions are made only from CMR10.) +The TS$1$ encoded ({\tt textcomp}) has been enriched and is now essentially full. In particular, this permits macros like \verb|\textfractionsolidus| and \verb|\textcircled| render using {\tt erewhon} glyphs rather than Computer Modern glyphs. (Recall that if \LaTeX\ thinks the TS$1$ font lacks enough glyphs, it tries to make substitutions first from the OMS font, then from Computer Modern. As {\tt newtxmath} lacks an OMS encoded font, the substitutions are made only from Computer Modern.) \end{itemize} diff --git a/fonts/erewhon/tex/erewhon.sty b/fonts/erewhon/tex/erewhon.sty index 463351b24a..66ec18e221 100644 --- a/fonts/erewhon/tex/erewhon.sty +++ b/fonts/erewhon/tex/erewhon.sty @@ -1,8 +1,8 @@ %% erewhon.sty %% \NeedsTeXFormat{LaTeX2e} -\def\fileversion{1.110} -\def\filedate{2020/05/30} +\def\fileversion{1.111} +\def\filedate{2020/06/29} \ProvidesPackage{erewhon} [\filedate\space v\fileversion] @@ -13,7 +13,7 @@ \RequirePackage{textcomp} \RequirePackage{scalefnt} % only for \textruble \DeclareEncodingSubset{TS1}{erewhon-*}{0} -\RequirePackage{ifthen} +\RequirePackage{xstring,ifthen} % for \textfrac \IfFileExists{mweights.sty}{\RequirePackage{mweights}}{} \RequirePackage{etoolbox} \IfFileExists{fontaxes.sty}{ @@ -45,13 +45,47 @@ \DeclareTextFontCommand{\textde}{\defigures} \let\textdenominator\textde }{} -\providecommand*{\textfrac}[2]{% - \textnu{#1}\kern0em{\fontencoding{TS1}\selectfont\char"2F}\kern0em\textde{#2}} %\textfractionsolidus does not work here +%\providecommand*{\textfrac}[2]{% +% \textnu{#1}\kern0em{\fontencoding{TS1}\selectfont\char"2F}\kern0em\textde{#2}} %\textfractionsolidus does not work here +\newcommand{\textfrac}[3][]{% like \textfrac[1]{7}{8} + \mbox{% + \ifthenelse{\not\equal{#1}{}}%Test for integer portion [optional #1] + {\textlf{#1}\kern.05em}{}% + \textnu{#2}% numerator + \StrRight{#2}{1}[\@digit@]% + % look for 1, 2, 3, 4, 7 + \ifcase\@digit@% 0 + \or% 1 + \or\kern.02em% 2 + \or%\kern-.01em% 3 + \or%\kern-.01em% 4 + \or%\kern.01em% 5 + \or\kern.01em% 6 + \or\kern-.08em% 7 + \fi% + \kern\Erewhon@foresolidus{\fontencoding{TS1}\selectfont\char"2F}% + \kern\Erewhon@aftsolidus% + \StrLeft{#3}{1}[\@digit@]% + % look for 1, 4, 5, 7 + \ifcase\@digit@% 0 + \or%\kern -.02em% 1 + \or% 2 + \or% 3 + \or\kern -.03em% 4 + \or% 5 + \or% 6 + \or\kern .02em% 7 + \fi% + \textde{#3}% denominator [#3] + }% +} \def\erewhon@spc{.211em} \def\erewhon@stretch{.1055em} \def\erewhon@shrink{.0703em} \def\erewhon@spcf{} % a factor to multiply \fontdimen2 +\def\Erewhon@foresolidus{0em} +\def\Erewhon@aftsolidus{0em} \newcommand*{\erewhon@scale}{1} \RequirePackage{xkeyval} @@ -61,6 +95,8 @@ \DeclareOptionX{stretch}[.125em]{\gdef\erewhon@stretch{#1}} \DeclareOptionX{shrink}[.1em]{\gdef\erewhon@shrink{#1}} \DeclareOptionX{space}[1.23]{\gdef\erewhon@spcf{#1}} +\DeclareOptionX{foresolidus}{\gdef\Erewhon@foresolidus{#1}} +\DeclareOptionX{aftsolidus}{\gdef\Erewhon@aftsolidus{#1}} \let\orig@footnote=\thefootnote \let\orig@makefnmark=\@makefnmark @@ -141,7 +177,7 @@ OsF}\fontshape{sc}\selectfont #1}% \DeclareTextCommand{\textcircled}{TS1}[1]{\hmode@bgroup \ooalign{% \hfil \raise .37ex\hbox {\fontencoding{T1}\fontseries{m}\fontshape{sc}\fontsize{7.2}{7.2}\selectfont \lowercase{#1}}\hfil \crcr - \textbigcircle + \char 37 %\textbigcircle }% \egroup} -- cgit v1.2.3