summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2017-03-15 21:17:18 +0000
committerKarl Berry <karl@freefriends.org>2017-03-15 21:17:18 +0000
commitc13e14e345023b2b80e41d62a8c5f0b4a1c9007d (patch)
treeeae43d89379cd1b2f4721fca874a9c7a0ea84b4e
parent1f8fea5444c47ab259d5ea7dfe2a03c662c09f14 (diff)
heuristica (15mar17)
git-svn-id: svn://tug.org/texlive/trunk@43507 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/fonts/heuristica/README5
-rw-r--r--Master/texmf-dist/doc/fonts/heuristica/heuristica-doc.pdfbin180471 -> 203162 bytes
-rw-r--r--Master/texmf-dist/doc/fonts/heuristica/heuristica-doc.tex28
-rw-r--r--Master/texmf-dist/tex/latex/heuristica/LY1Heuristica-Inf.fd3
-rw-r--r--Master/texmf-dist/tex/latex/heuristica/LY1Heuristica-Sup.fd3
-rw-r--r--Master/texmf-dist/tex/latex/heuristica/LY1Heuristica-TLF.fd3
-rw-r--r--Master/texmf-dist/tex/latex/heuristica/LY1Heuristica-TOsF.fd3
-rw-r--r--Master/texmf-dist/tex/latex/heuristica/T1Heuristica-Inf.fd3
-rw-r--r--Master/texmf-dist/tex/latex/heuristica/T1Heuristica-Sup.fd3
-rw-r--r--Master/texmf-dist/tex/latex/heuristica/T1Heuristica-TLF.fd3
-rw-r--r--Master/texmf-dist/tex/latex/heuristica/T1Heuristica-TOsF.fd3
-rw-r--r--Master/texmf-dist/tex/latex/heuristica/T2AHeuristica-Inf.fd3
-rw-r--r--Master/texmf-dist/tex/latex/heuristica/T2AHeuristica-Sup.fd3
-rw-r--r--Master/texmf-dist/tex/latex/heuristica/T2AHeuristica-TLF.fd3
-rw-r--r--Master/texmf-dist/tex/latex/heuristica/T2AHeuristica-TOsF.fd3
-rw-r--r--Master/texmf-dist/tex/latex/heuristica/T2BHeuristica-Inf.fd3
-rw-r--r--Master/texmf-dist/tex/latex/heuristica/T2BHeuristica-Sup.fd3
-rw-r--r--Master/texmf-dist/tex/latex/heuristica/T2BHeuristica-TLF.fd3
-rw-r--r--Master/texmf-dist/tex/latex/heuristica/T2BHeuristica-TOsF.fd3
-rw-r--r--Master/texmf-dist/tex/latex/heuristica/T2CHeuristica-Inf.fd3
-rw-r--r--Master/texmf-dist/tex/latex/heuristica/T2CHeuristica-Sup.fd3
-rw-r--r--Master/texmf-dist/tex/latex/heuristica/T2CHeuristica-TLF.fd3
-rw-r--r--Master/texmf-dist/tex/latex/heuristica/T2CHeuristica-TOsF.fd3
-rw-r--r--Master/texmf-dist/tex/latex/heuristica/TS1Heuristica-TLF.fd3
-rw-r--r--Master/texmf-dist/tex/latex/heuristica/TS1Heuristica-TOsF.fd3
-rw-r--r--Master/texmf-dist/tex/latex/heuristica/heuristica.sty79
26 files changed, 120 insertions, 58 deletions
diff --git a/Master/texmf-dist/doc/fonts/heuristica/README b/Master/texmf-dist/doc/fonts/heuristica/README
index 3a0ab3d7838..8ed6562d109 100644
--- a/Master/texmf-dist/doc/fonts/heuristica/README
+++ b/Master/texmf-dist/doc/fonts/heuristica/README
@@ -2,7 +2,10 @@ With update 1.08 to Heuristica, the package reverts to the otf fonts as distribu
http://www.ctan.org/license/lppl1.3
for the details of that license.
-Current version: 1.08
+Current version: 1.09 2017-03-14
+
+Changes in version 1.09
+Added options to give the user complete control of all word-spacing parameters.
Changes in version 1.08
Reversion to Panov's glyphs, version 1.0.2, so that this and future updates are easier to manage. Those wishing to use the other, newer features (e.g., small caps in all styles) should look to Erewhon, which forks from Heuristica 1.0.1.
diff --git a/Master/texmf-dist/doc/fonts/heuristica/heuristica-doc.pdf b/Master/texmf-dist/doc/fonts/heuristica/heuristica-doc.pdf
index 5522fba5088..6e4ba11f1e4 100644
--- a/Master/texmf-dist/doc/fonts/heuristica/heuristica-doc.pdf
+++ b/Master/texmf-dist/doc/fonts/heuristica/heuristica-doc.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/fonts/heuristica/heuristica-doc.tex b/Master/texmf-dist/doc/fonts/heuristica/heuristica-doc.tex
index 760b49e8ff9..94783d037da 100644
--- a/Master/texmf-dist/doc/fonts/heuristica/heuristica-doc.tex
+++ b/Master/texmf-dist/doc/fonts/heuristica/heuristica-doc.tex
@@ -6,7 +6,7 @@
\pdfmapfile{=heuristica.map}
%SetFonts
% heuristica+newtxmath
-\usepackage[sups,osf,scaled=.92]{heuristica}
+\usepackage[sups,osf,scaled=.92,space]{heuristica}
\usepackage[T1]{fontenc}
\usepackage{textcomp}
\usepackage[varqu,varl]{zi4}% inconsolata
@@ -33,8 +33,30 @@ The effect of the option {\tt osf} is to force the default figure style in {\tt
\usepackage{zlmtt} % serifed typewriter font extending cmtt
\end{verbatim}
-As I find Utopia text rather cramped, I suggest applying a small amount of letterspacing (tracking) and increasing the interword spacing by means of the {\tt microtype} package.
-
+As I find Utopia text rather cramped, I suggest applying a small amount of letterspacing (tracking) and increasing the interword spacing by means of the {\tt microtype} package. Alternatively, as of version $1.09$, this package offers complete control over word-spacing by specifying the options described below. Heuristica word-spacing is governed by three quantities:
+\begin{itemize}
+\item
+{\tt spacing} (default value {\tt .211em}), \verb|\fontdimen2| of the main text font.
+\item
+{\tt stretch} (default value {\tt 1.055em}), \verb|\fontdimen3| of the main text font.
+\item
+{\tt shrink} (default value {\tt .0703em}), \verb|\fontdimen4| of the main text font.
+\end{itemize}
+(Note the use of {\tt em} values rather than absolute values so that word spacing responds to scale changes.) You may modify these values individually or by setting a value for the option {\tt space} or by specifying {\tt looser} or {\tt loosest}.
+\begin{itemize}
+\item
+Option {\tt spacing=.24em} would change the spacing from {\tt.211em} to {\tt.24em}.
+\item
+Option {\tt stretch=.14em} would change the stretch from {\tt.1055em} to {\tt.14em}.
+\item
+Option {\tt shrink=.1em} would change the shrink from {\tt.0703em} to {\tt.1em}.
+\item
+Option {\tt space=1.2} would multiply each word-spacing parameter by the factor {\tt1.2}. (The option {\tt space} with no value would result in a factor of {\tt 1.23}, leading to a spacing value of close to {\tt.26em}. This documentation uses option {\tt space} with no value specified.)
+\item
+Option {\tt looser} would change the three parameters to {\tt.25em, .125em,.1em} respectively.
+\item
+Option {\tt loosest} would change the three parameters to {\tt.28em, .125em,.13em} respectively.
+\end{itemize}
\textsc{Macros:}
\begin{itemize}
\item
diff --git a/Master/texmf-dist/tex/latex/heuristica/LY1Heuristica-Inf.fd b/Master/texmf-dist/tex/latex/heuristica/LY1Heuristica-Inf.fd
index 3e597976d6b..1b44cbb23dc 100644
--- a/Master/texmf-dist/tex/latex/heuristica/LY1Heuristica-Inf.fd
+++ b/Master/texmf-dist/tex/latex/heuristica/LY1Heuristica-Inf.fd
@@ -9,7 +9,8 @@
\edef\Heuristica@@scale{s*[\csname Heuristica@scale\endcsname]}%
\fi
-\DeclareFontFamily{LY1}{Heuristica-Inf}{}
+\providecommand{\Heuristica@sf}{}
+\DeclareFontFamily{LY1}{Heuristica-Inf}{\Heuristica@sf}
\DeclareFontShape{LY1}{Heuristica-Inf}{m}{it}{
<-> \Heuristica@@scale Heuristica-Italic-inf-ly1
diff --git a/Master/texmf-dist/tex/latex/heuristica/LY1Heuristica-Sup.fd b/Master/texmf-dist/tex/latex/heuristica/LY1Heuristica-Sup.fd
index 7c94c3898bb..7f66ae33c68 100644
--- a/Master/texmf-dist/tex/latex/heuristica/LY1Heuristica-Sup.fd
+++ b/Master/texmf-dist/tex/latex/heuristica/LY1Heuristica-Sup.fd
@@ -9,7 +9,8 @@
\edef\Heuristica@@scale{s*[\csname Heuristica@scale\endcsname]}%
\fi
-\DeclareFontFamily{LY1}{Heuristica-Sup}{}
+\providecommand{\Heuristica@sf}{}
+\DeclareFontFamily{LY1}{Heuristica-Sup}{\Heuristica@sf}
\DeclareFontShape{LY1}{Heuristica-Sup}{b}{it}{
<-> \Heuristica@@scale Heuristica-BoldItalic-sup-ly1
diff --git a/Master/texmf-dist/tex/latex/heuristica/LY1Heuristica-TLF.fd b/Master/texmf-dist/tex/latex/heuristica/LY1Heuristica-TLF.fd
index f18474e5a42..69e7c256180 100644
--- a/Master/texmf-dist/tex/latex/heuristica/LY1Heuristica-TLF.fd
+++ b/Master/texmf-dist/tex/latex/heuristica/LY1Heuristica-TLF.fd
@@ -9,7 +9,8 @@
\edef\Heuristica@@scale{s*[\csname Heuristica@scale\endcsname]}%
\fi
-\DeclareFontFamily{LY1}{Heuristica-TLF}{}
+\providecommand{\Heuristica@sf}{}
+\DeclareFontFamily{LY1}{Heuristica-TLF}{\Heuristica@sf}
\DeclareFontShape{LY1}{Heuristica-TLF}{m}{sc}{
<-> \Heuristica@@scale Heuristica-Regular-tlf-sc-ly1
diff --git a/Master/texmf-dist/tex/latex/heuristica/LY1Heuristica-TOsF.fd b/Master/texmf-dist/tex/latex/heuristica/LY1Heuristica-TOsF.fd
index 156c70fba20..183745aa1b2 100644
--- a/Master/texmf-dist/tex/latex/heuristica/LY1Heuristica-TOsF.fd
+++ b/Master/texmf-dist/tex/latex/heuristica/LY1Heuristica-TOsF.fd
@@ -9,7 +9,8 @@
\edef\Heuristica@@scale{s*[\csname Heuristica@scale\endcsname]}%
\fi
-\DeclareFontFamily{LY1}{Heuristica-TOsF}{}
+\providecommand{\Heuristica@sf}{}
+\DeclareFontFamily{LY1}{Heuristica-TOsF}{\Heuristica@sf}
\DeclareFontShape{LY1}{Heuristica-TOsF}{m}{n}{
<-> \Heuristica@@scale Heuristica-Regular-tosf-ly1
diff --git a/Master/texmf-dist/tex/latex/heuristica/T1Heuristica-Inf.fd b/Master/texmf-dist/tex/latex/heuristica/T1Heuristica-Inf.fd
index 0e38f51d2b2..60d640fb87d 100644
--- a/Master/texmf-dist/tex/latex/heuristica/T1Heuristica-Inf.fd
+++ b/Master/texmf-dist/tex/latex/heuristica/T1Heuristica-Inf.fd
@@ -9,7 +9,8 @@
\edef\Heuristica@@scale{s*[\csname Heuristica@scale\endcsname]}%
\fi
-\DeclareFontFamily{T1}{Heuristica-Inf}{}
+\providecommand{\Heuristica@sf}{}
+\DeclareFontFamily{T1}{Heuristica-Inf}{\Heuristica@sf}
\DeclareFontShape{T1}{Heuristica-Inf}{m}{n}{
<-> \Heuristica@@scale Heuristica-Regular-inf-t1
diff --git a/Master/texmf-dist/tex/latex/heuristica/T1Heuristica-Sup.fd b/Master/texmf-dist/tex/latex/heuristica/T1Heuristica-Sup.fd
index c591325e899..ab558cf970c 100644
--- a/Master/texmf-dist/tex/latex/heuristica/T1Heuristica-Sup.fd
+++ b/Master/texmf-dist/tex/latex/heuristica/T1Heuristica-Sup.fd
@@ -9,7 +9,8 @@
\edef\Heuristica@@scale{s*[\csname Heuristica@scale\endcsname]}%
\fi
-\DeclareFontFamily{T1}{Heuristica-Sup}{}
+\providecommand{\Heuristica@sf}{}
+\DeclareFontFamily{T1}{Heuristica-Sup}{\Heuristica@sf}
\DeclareFontShape{T1}{Heuristica-Sup}{b}{it}{
<-> \Heuristica@@scale Heuristica-BoldItalic-sup-t1
diff --git a/Master/texmf-dist/tex/latex/heuristica/T1Heuristica-TLF.fd b/Master/texmf-dist/tex/latex/heuristica/T1Heuristica-TLF.fd
index 2711291039a..e212e362e77 100644
--- a/Master/texmf-dist/tex/latex/heuristica/T1Heuristica-TLF.fd
+++ b/Master/texmf-dist/tex/latex/heuristica/T1Heuristica-TLF.fd
@@ -9,7 +9,8 @@
\edef\Heuristica@@scale{s*[\csname Heuristica@scale\endcsname]}%
\fi
-\DeclareFontFamily{T1}{Heuristica-TLF}{}
+\providecommand{\Heuristica@sf}{}
+\DeclareFontFamily{T1}{Heuristica-TLF}{\Heuristica@sf}
\DeclareFontShape{T1}{Heuristica-TLF}{m}{n}{
<-> \Heuristica@@scale Heuristica-Regular-tlf-t1
diff --git a/Master/texmf-dist/tex/latex/heuristica/T1Heuristica-TOsF.fd b/Master/texmf-dist/tex/latex/heuristica/T1Heuristica-TOsF.fd
index 9d3c3f58306..9665a0aedd6 100644
--- a/Master/texmf-dist/tex/latex/heuristica/T1Heuristica-TOsF.fd
+++ b/Master/texmf-dist/tex/latex/heuristica/T1Heuristica-TOsF.fd
@@ -9,7 +9,8 @@
\edef\Heuristica@@scale{s*[\csname Heuristica@scale\endcsname]}%
\fi
-\DeclareFontFamily{T1}{Heuristica-TOsF}{}
+\providecommand{\Heuristica@sf}{}
+\DeclareFontFamily{T1}{Heuristica-TOsF}{\Heuristica@sf}
\DeclareFontShape{T1}{Heuristica-TOsF}{b}{it}{
<-> \Heuristica@@scale Heuristica-BoldItalic-tosf-t1
diff --git a/Master/texmf-dist/tex/latex/heuristica/T2AHeuristica-Inf.fd b/Master/texmf-dist/tex/latex/heuristica/T2AHeuristica-Inf.fd
index 414ea4c5f0c..fec9d81656a 100644
--- a/Master/texmf-dist/tex/latex/heuristica/T2AHeuristica-Inf.fd
+++ b/Master/texmf-dist/tex/latex/heuristica/T2AHeuristica-Inf.fd
@@ -9,7 +9,8 @@
\edef\Heuristica@@scale{s*[\csname Heuristica@scale\endcsname]}%
\fi
-\DeclareFontFamily{T2A}{Heuristica-Inf}{}
+\providecommand{\Heuristica@sf}{}
+\DeclareFontFamily{T2A}{Heuristica-Inf}{\Heuristica@sf}
\DeclareFontShape{T2A}{Heuristica-Inf}{b}{n}{
<-> \Heuristica@@scale Heuristica-Bold-inf-t2a
diff --git a/Master/texmf-dist/tex/latex/heuristica/T2AHeuristica-Sup.fd b/Master/texmf-dist/tex/latex/heuristica/T2AHeuristica-Sup.fd
index 40f6e715d32..05240e16255 100644
--- a/Master/texmf-dist/tex/latex/heuristica/T2AHeuristica-Sup.fd
+++ b/Master/texmf-dist/tex/latex/heuristica/T2AHeuristica-Sup.fd
@@ -9,7 +9,8 @@
\edef\Heuristica@@scale{s*[\csname Heuristica@scale\endcsname]}%
\fi
-\DeclareFontFamily{T2A}{Heuristica-Sup}{}
+\providecommand{\Heuristica@sf}{}
+\DeclareFontFamily{T2A}{Heuristica-Sup}{\Heuristica@sf}
\DeclareFontShape{T2A}{Heuristica-Sup}{m}{n}{
<-> \Heuristica@@scale Heuristica-Regular-sup-t2a
diff --git a/Master/texmf-dist/tex/latex/heuristica/T2AHeuristica-TLF.fd b/Master/texmf-dist/tex/latex/heuristica/T2AHeuristica-TLF.fd
index 7396fcc37b6..a5953796994 100644
--- a/Master/texmf-dist/tex/latex/heuristica/T2AHeuristica-TLF.fd
+++ b/Master/texmf-dist/tex/latex/heuristica/T2AHeuristica-TLF.fd
@@ -9,7 +9,8 @@
\edef\Heuristica@@scale{s*[\csname Heuristica@scale\endcsname]}%
\fi
-\DeclareFontFamily{T2A}{Heuristica-TLF}{}
+\providecommand{\Heuristica@sf}{}
+\DeclareFontFamily{T2A}{Heuristica-TLF}{\Heuristica@sf}
\DeclareFontShape{T2A}{Heuristica-TLF}{b}{n}{
<-> \Heuristica@@scale Heuristica-Bold-tlf-t2a
diff --git a/Master/texmf-dist/tex/latex/heuristica/T2AHeuristica-TOsF.fd b/Master/texmf-dist/tex/latex/heuristica/T2AHeuristica-TOsF.fd
index eaf5035d028..5ec34cc2a8c 100644
--- a/Master/texmf-dist/tex/latex/heuristica/T2AHeuristica-TOsF.fd
+++ b/Master/texmf-dist/tex/latex/heuristica/T2AHeuristica-TOsF.fd
@@ -9,7 +9,8 @@
\edef\Heuristica@@scale{s*[\csname Heuristica@scale\endcsname]}%
\fi
-\DeclareFontFamily{T2A}{Heuristica-TOsF}{}
+\providecommand{\Heuristica@sf}{}
+\DeclareFontFamily{T2A}{Heuristica-TOsF}{\Heuristica@sf}
\DeclareFontShape{T2A}{Heuristica-TOsF}{m}{sc}{
<-> \Heuristica@@scale Heuristica-Regular-tosf-sc-t2a
diff --git a/Master/texmf-dist/tex/latex/heuristica/T2BHeuristica-Inf.fd b/Master/texmf-dist/tex/latex/heuristica/T2BHeuristica-Inf.fd
index b74b26c4953..e2e6f2cd08c 100644
--- a/Master/texmf-dist/tex/latex/heuristica/T2BHeuristica-Inf.fd
+++ b/Master/texmf-dist/tex/latex/heuristica/T2BHeuristica-Inf.fd
@@ -9,7 +9,8 @@
\edef\Heuristica@@scale{s*[\csname Heuristica@scale\endcsname]}%
\fi
-\DeclareFontFamily{T2B}{Heuristica-Inf}{}
+\providecommand{\Heuristica@sf}{}
+\DeclareFontFamily{T2B}{Heuristica-Inf}{\Heuristica@sf}
\DeclareFontShape{T2B}{Heuristica-Inf}{b}{n}{
<-> \Heuristica@@scale Heuristica-Bold-inf-t2b
diff --git a/Master/texmf-dist/tex/latex/heuristica/T2BHeuristica-Sup.fd b/Master/texmf-dist/tex/latex/heuristica/T2BHeuristica-Sup.fd
index 9c67bc1e86c..65628a49ed8 100644
--- a/Master/texmf-dist/tex/latex/heuristica/T2BHeuristica-Sup.fd
+++ b/Master/texmf-dist/tex/latex/heuristica/T2BHeuristica-Sup.fd
@@ -9,7 +9,8 @@
\edef\Heuristica@@scale{s*[\csname Heuristica@scale\endcsname]}%
\fi
-\DeclareFontFamily{T2B}{Heuristica-Sup}{}
+\providecommand{\Heuristica@sf}{}
+\DeclareFontFamily{T2B}{Heuristica-Sup}{\Heuristica@sf}
\DeclareFontShape{T2B}{Heuristica-Sup}{m}{it}{
<-> \Heuristica@@scale Heuristica-Italic-sup-t2b
diff --git a/Master/texmf-dist/tex/latex/heuristica/T2BHeuristica-TLF.fd b/Master/texmf-dist/tex/latex/heuristica/T2BHeuristica-TLF.fd
index 45cef9fa165..8e6165378f1 100644
--- a/Master/texmf-dist/tex/latex/heuristica/T2BHeuristica-TLF.fd
+++ b/Master/texmf-dist/tex/latex/heuristica/T2BHeuristica-TLF.fd
@@ -9,7 +9,8 @@
\edef\Heuristica@@scale{s*[\csname Heuristica@scale\endcsname]}%
\fi
-\DeclareFontFamily{T2B}{Heuristica-TLF}{}
+\providecommand{\Heuristica@sf}{}
+\DeclareFontFamily{T2B}{Heuristica-TLF}{\Heuristica@sf}
\DeclareFontShape{T2B}{Heuristica-TLF}{m}{n}{
<-> \Heuristica@@scale Heuristica-Regular-tlf-t2b
diff --git a/Master/texmf-dist/tex/latex/heuristica/T2BHeuristica-TOsF.fd b/Master/texmf-dist/tex/latex/heuristica/T2BHeuristica-TOsF.fd
index 41f3522ccf4..1f296d7c75f 100644
--- a/Master/texmf-dist/tex/latex/heuristica/T2BHeuristica-TOsF.fd
+++ b/Master/texmf-dist/tex/latex/heuristica/T2BHeuristica-TOsF.fd
@@ -9,7 +9,8 @@
\edef\Heuristica@@scale{s*[\csname Heuristica@scale\endcsname]}%
\fi
-\DeclareFontFamily{T2B}{Heuristica-TOsF}{}
+\providecommand{\Heuristica@sf}{}
+\DeclareFontFamily{T2B}{Heuristica-TOsF}{\Heuristica@sf}
\DeclareFontShape{T2B}{Heuristica-TOsF}{b}{n}{
<-> \Heuristica@@scale Heuristica-Bold-tosf-t2b
diff --git a/Master/texmf-dist/tex/latex/heuristica/T2CHeuristica-Inf.fd b/Master/texmf-dist/tex/latex/heuristica/T2CHeuristica-Inf.fd
index b25e601335b..44a15a2646a 100644
--- a/Master/texmf-dist/tex/latex/heuristica/T2CHeuristica-Inf.fd
+++ b/Master/texmf-dist/tex/latex/heuristica/T2CHeuristica-Inf.fd
@@ -9,7 +9,8 @@
\edef\Heuristica@@scale{s*[\csname Heuristica@scale\endcsname]}%
\fi
-\DeclareFontFamily{T2C}{Heuristica-Inf}{}
+\providecommand{\Heuristica@sf}{}
+\DeclareFontFamily{T2C}{Heuristica-Inf}{\Heuristica@sf}
\DeclareFontShape{T2C}{Heuristica-Inf}{b}{n}{
<-> \Heuristica@@scale Heuristica-Bold-inf-t2c
diff --git a/Master/texmf-dist/tex/latex/heuristica/T2CHeuristica-Sup.fd b/Master/texmf-dist/tex/latex/heuristica/T2CHeuristica-Sup.fd
index c7ec3e2cae5..5cc362aa5c5 100644
--- a/Master/texmf-dist/tex/latex/heuristica/T2CHeuristica-Sup.fd
+++ b/Master/texmf-dist/tex/latex/heuristica/T2CHeuristica-Sup.fd
@@ -9,7 +9,8 @@
\edef\Heuristica@@scale{s*[\csname Heuristica@scale\endcsname]}%
\fi
-\DeclareFontFamily{T2C}{Heuristica-Sup}{}
+\providecommand{\Heuristica@sf}{}
+\DeclareFontFamily{T2C}{Heuristica-Sup}{\Heuristica@sf}
\DeclareFontShape{T2C}{Heuristica-Sup}{b}{it}{
<-> \Heuristica@@scale Heuristica-BoldItalic-sup-t2c
diff --git a/Master/texmf-dist/tex/latex/heuristica/T2CHeuristica-TLF.fd b/Master/texmf-dist/tex/latex/heuristica/T2CHeuristica-TLF.fd
index 0c423efefa3..36b96585206 100644
--- a/Master/texmf-dist/tex/latex/heuristica/T2CHeuristica-TLF.fd
+++ b/Master/texmf-dist/tex/latex/heuristica/T2CHeuristica-TLF.fd
@@ -9,7 +9,8 @@
\edef\Heuristica@@scale{s*[\csname Heuristica@scale\endcsname]}%
\fi
-\DeclareFontFamily{T2C}{Heuristica-TLF}{}
+\providecommand{\Heuristica@sf}{}
+\DeclareFontFamily{T2C}{Heuristica-TLF}{\Heuristica@sf}
\DeclareFontShape{T2C}{Heuristica-TLF}{b}{n}{
<-> \Heuristica@@scale Heuristica-Bold-tlf-t2c
diff --git a/Master/texmf-dist/tex/latex/heuristica/T2CHeuristica-TOsF.fd b/Master/texmf-dist/tex/latex/heuristica/T2CHeuristica-TOsF.fd
index 6a6b740c37c..b3ccfad2b29 100644
--- a/Master/texmf-dist/tex/latex/heuristica/T2CHeuristica-TOsF.fd
+++ b/Master/texmf-dist/tex/latex/heuristica/T2CHeuristica-TOsF.fd
@@ -9,7 +9,8 @@
\edef\Heuristica@@scale{s*[\csname Heuristica@scale\endcsname]}%
\fi
-\DeclareFontFamily{T2C}{Heuristica-TOsF}{}
+\providecommand{\Heuristica@sf}{}
+\DeclareFontFamily{T2C}{Heuristica-TOsF}{\Heuristica@sf}
\DeclareFontShape{T2C}{Heuristica-TOsF}{b}{n}{
<-> \Heuristica@@scale Heuristica-Bold-tosf-t2c
diff --git a/Master/texmf-dist/tex/latex/heuristica/TS1Heuristica-TLF.fd b/Master/texmf-dist/tex/latex/heuristica/TS1Heuristica-TLF.fd
index f7293861121..892bdba2119 100644
--- a/Master/texmf-dist/tex/latex/heuristica/TS1Heuristica-TLF.fd
+++ b/Master/texmf-dist/tex/latex/heuristica/TS1Heuristica-TLF.fd
@@ -9,7 +9,8 @@
\edef\Heuristica@@scale{s*[\csname Heuristica@scale\endcsname]}%
\fi
-\DeclareFontFamily{TS1}{Heuristica-TLF}{}
+\providecommand{\Heuristica@sf}{}
+\DeclareFontFamily{TS1}{Heuristica-TLF}{\Heuristica@sf}
\DeclareFontShape{TS1}{Heuristica-TLF}{m}{n}{
<-> \Heuristica@@scale Heuristica-Regular-tlf-ts1
diff --git a/Master/texmf-dist/tex/latex/heuristica/TS1Heuristica-TOsF.fd b/Master/texmf-dist/tex/latex/heuristica/TS1Heuristica-TOsF.fd
index b8c22c48162..35b433c096e 100644
--- a/Master/texmf-dist/tex/latex/heuristica/TS1Heuristica-TOsF.fd
+++ b/Master/texmf-dist/tex/latex/heuristica/TS1Heuristica-TOsF.fd
@@ -9,7 +9,8 @@
\edef\Heuristica@@scale{s*[\csname Heuristica@scale\endcsname]}%
\fi
-\DeclareFontFamily{TS1}{Heuristica-TOsF}{}
+\providecommand{\Heuristica@sf}{}
+\DeclareFontFamily{TS1}{Heuristica-TOsF}{\Heuristica@sf}
\DeclareFontShape{TS1}{Heuristica-TOsF}{b}{it}{
<-> \Heuristica@@scale Heuristica-BoldItalic-tosf-ts1
diff --git a/Master/texmf-dist/tex/latex/heuristica/heuristica.sty b/Master/texmf-dist/tex/latex/heuristica/heuristica.sty
index 71109219bee..6a1575c47e9 100644
--- a/Master/texmf-dist/tex/latex/heuristica/heuristica.sty
+++ b/Master/texmf-dist/tex/latex/heuristica/heuristica.sty
@@ -1,8 +1,8 @@
%% heuristica.sty
%%
\NeedsTeXFormat{LaTeX2e}
-\def\fileversion{1.08}
-\def\filedate{2015/01/04}
+\def\fileversion{1.09}
+\def\filedate{2017/03/14}
\ProvidesPackage{heuristica}
[\filedate\space v\fileversion]
@@ -10,41 +10,46 @@
\RequirePackage[T2A,T2B,T2C,LY1,T1]{fontenc}
\RequirePackage{textcomp}
+\RequirePackage{ifthen}
\IfFileExists{mweights.sty}{\RequirePackage{mweights}}{}
\RequirePackage{etoolbox}
-\IfFileExists{fontaxes.sty}{
- \RequirePackage{fontaxes}
- \fa@naming@exception{figures}{{superior}{proportional}}{Sup}
- \fa@naming@exception{figures}{{superior}{tabular}}{Sup}
- \def\sufigures{\@nomath\sufigures
- \fontfigurestyle{superior}\selectfont}
- \DeclareTextFontCommand{\textsu}{\sufigures}
- \let\textsuperior\textsu
- \fa@naming@exception{figures}{{inferior}{proportional}}{Inf}
- \fa@naming@exception{figures}{{inferior}{tabular}}{Inf}
- \def\infigures{\@nomath\infigures
- \fontfigurestyle{inferior}\selectfont}
- \DeclareTextFontCommand{\textin}{\infigures}
- \let\textinferior\textin
-}{}
+\RequirePackage{fontaxes}
+\fa@naming@exception{figures}{{superior}{proportional}}{Sup}
+\fa@naming@exception{figures}{{superior}{tabular}}{Sup}
+\def\sufigures{\@nomath\sufigures
+ \fontfigurestyle{superior}\selectfont}
+\DeclareTextFontCommand{\textsu}{\sufigures}
+\let\textsuperior\textsu
+
+\fa@naming@exception{figures}{{inferior}{proportional}}{Inf}
+\fa@naming@exception{figures}{{inferior}{tabular}}{Inf}
+\def\infigures{\@nomath\infigures
+ \fontfigurestyle{inferior}\selectfont}
+\DeclareTextFontCommand{\textin}{\infigures}
+\let\textinferior\textin
+
\providecommand*{\textfrac}[2]{%
\textsu{#1}\kern.01em\textfractionsolidus\kern-.03em\textin{#2}}
-\IfFileExists{xkeyval.sty}{
- \newcommand*{\Heuristica@scale}{1}
- \RequirePackage{xkeyval}
- \DeclareOptionX{scale}{\renewcommand*{\Heuristica@scale}{##1}}
- \DeclareOptionX{scaled}{\renewcommand*{\Heuristica@scale}{##1}}
- \DeclareOptionX{space}[1.2]{\DeclareRobustCommand{\zut@sf}{%
- \fontdimen2\font=##1\fontdimen2\font}}
-}{
- \let\DeclareOptionX\DeclareOption
- \let\ExecuteOptionsX\ExecuteOptions
- \let\ProcessOptionsX\ProcessOptions
-}
+\def\Heuristica@spc{.211em}
+\def\Heuristica@stretch{.1055em}
+\def\Heuristica@shrink{.0703em}
+\def\Heuristica@spcf{} % a factor to multiply \fontdimen2
+
+\newcommand*{\Heuristica@scale}{1}
+\RequirePackage{xkeyval}
+\DeclareOptionX{scale}{\renewcommand*{\Heuristica@scale}{#1}}
+\DeclareOptionX{scaled}{\renewcommand*{\Heuristica@scale}{#1}}
+\DeclareOptionX{spacing}[.25em]{\gdef\Heuristica@spc{#1}}
+\DeclareOptionX{stretch}[.125em]{\gdef\Heuristica@stretch{#1}}
+\DeclareOptionX{shrink}[.1em]{\gdef\Heuristica@shrink{#1}}
+\DeclareOptionX{space}[1.23]{\gdef\Heuristica@spcf{#1}}
+
\let\orig@footnote=\thefootnote
\let\orig@makefnmark=\@makefnmark
+\def\bfseries@rm{b}
+\def\mdseries@rm{m}
\newif\if@Heuristica@sups
@@ -53,15 +58,25 @@
\DeclareOptionX{oldstyle}{\edef\Heuristica@figurestyle{OsF}}
\DeclareOptionX{osf}{\edef\Heuristica@figurestyle{OsF}}
\DeclareOptionX{tabular}{\edef\Heuristica@figurealign{T}}
-\DeclareOptionX{bold}{\edef\bfseries@rm{b}}
-\DeclareOptionX{regular}{\edef\mdseries@rm{m}}
\DeclareOptionX{sups}{\@Heuristica@supstrue}
-\ExecuteOptionsX{lining,tabular,bold,regular}
+\DeclareOptionX{looser}{%
+\gdef\Heuristica@spc{.25em}\gdef\Heuristica@stretch{.125em}\Heuristica@shrink{.1em}}
+\DeclareOptionX{loosest}{%
+\gdef\Heuristica@spc{.28em}\gdef\Heuristica@stretch{.125em}\gdef\Heuristica@shrink{.13em}}
+\ExecuteOptionsX{lining,tabular}
\ProcessOptionsX\relax
\def\useosf{\edef\Heuristica@figurestyle{OsF}}
\@onlypreamble\useosf
+\ifthenelse{\equal{\Heuristica@spcf}{}}{%
+\DeclareRobustCommand{\Heuristica@sf}{%
+ \fontdimen2\font=\Heuristica@spc
+ \fontdimen3\font=\Heuristica@stretch
+ \fontdimen4\font=\Heuristica@shrink}}{%
+\DeclareRobustCommand{\Heuristica@sf}{%
+ \fontdimen2\font=\Heuristica@spcf\fontdimen2\font}}
+
\DeclareRobustCommand{\textlf}[1]{%
{\fontfamily{Heuristica-TLF}\selectfont #1}%
}% to get lf