summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/heuristica/heuristica.sty
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 /Master/texmf-dist/tex/latex/heuristica/heuristica.sty
parent1f8fea5444c47ab259d5ea7dfe2a03c662c09f14 (diff)
heuristica (15mar17)
git-svn-id: svn://tug.org/texlive/trunk@43507 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/heuristica/heuristica.sty')
-rw-r--r--Master/texmf-dist/tex/latex/heuristica/heuristica.sty79
1 files changed, 47 insertions, 32 deletions
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