erewhon (15mar17)

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

1 files changed, 29 insertions, 15 deletions

diff --git a/Master/texmf-dist/tex/latex/erewhon/erewhon.sty b/Master/texmf-dist/tex/latex/erewhon/erewhon.sty
index dd50919aadc..53182a6c24b 100644
--- a/Master/texmf-dist/tex/latex/erewhon/erewhon.sty
+++ b/Master/texmf-dist/tex/latex/erewhon/erewhon.sty
@@ -1,8 +1,8 @@
 %% erewhon.sty
 %%
 \NeedsTeXFormat{LaTeX2e}
-\def\fileversion{1.075}
-\def\filedate{2017/03/11}
+\def\fileversion{1.08}
+\def\filedate{2017/03/14}
 \ProvidesPackage{erewhon}
     [\filedate\space v\fileversion]
     
@@ -11,6 +11,7 @@
 %\RequirePackage[T2A,T2B,T2C,LY1,T1]{fontenc}
 \RequirePackage[LY1,T1]{fontenc}
 \RequirePackage{textcomp}
+\RequirePackage{ifthen}
 \IfFileExists{mweights.sty}{\RequirePackage{mweights}}{}
 \RequirePackage{etoolbox}
 \IfFileExists{fontaxes.sty}{
@@ -45,18 +46,20 @@
 \providecommand*{\textfrac}[2]{%
     \textnu{#1}\kern0em\textfractionsolidus\kern0em\textde{#2}}
 
-\IfFileExists{xkeyval.sty}{
-    \newcommand*{\erewhon@scale}{1}
-    \RequirePackage{xkeyval}
-    \DeclareOptionX{scale}{\renewcommand*{\erewhon@scale}{##1}}
-    \DeclareOptionX{scaled}{\renewcommand*{\erewhon@scale}{##1}}
-    \DeclareOptionX{space}[1.2]{\DeclareRobustCommand{\erewhon@sf}{%
-    \fontdimen2\font=##1\fontdimen2\font}}
-}{
-    \let\DeclareOptionX\DeclareOption
-    \let\ExecuteOptionsX\ExecuteOptions
-    \let\ProcessOptionsX\ProcessOptions
-}
+\def\erewhon@spc{.211em}
+\def\erewhon@stretch{.1055em}
+\def\erewhon@shrink{.0703em}
+\def\erewhon@spcf{} % a factor to multiply \fontdimen2
+
+\newcommand*{\erewhon@scale}{1}
+\RequirePackage{xkeyval}
+\DeclareOptionX{scale}{\renewcommand*{\erewhon@scale}{#1}}
+\DeclareOptionX{scaled}{\renewcommand*{\erewhon@scale}{#1}}
+\DeclareOptionX{spacing}[.25em]{\gdef\erewhon@spc{#1}}
+\DeclareOptionX{stretch}[.125em]{\gdef\erewhon@stretch{#1}}
+\DeclareOptionX{shrink}[.1em]{\gdef\erewhon@shrink{#1}}
+\DeclareOptionX{space}[1.23]{\gdef\erewhon@spcf{#1}}
+
 \let\orig@footnote=\thefootnote
 \let\orig@makefnmark=\@makefnmark
 \def\bfseries@rm{b}
@@ -80,10 +83,21 @@
 \DeclareOptionX{proportional}{\useproportional}
 \DeclareOptionX{sups}{\@Erewhon@supstrue}
 \DeclareOptionX{scosf}{\@Erewhon@scosftrue}
+\DeclareOptionX{looser}{%
+\gdef\erewhon@spc{.25em}\gdef\erewhon@stretch{.125em}\erewhon@shrink{.1em}}
+\DeclareOptionX{loosest}{%
+\gdef\erewhon@spc{.28em}\gdef\erewhon@stretch{.125em}\gdef\erewhon@shrink{.13em}}
 \ExecuteOptionsX{lining,tabular}
 \ProcessOptionsX\relax
 
-
+\ifthenelse{\equal{\erewhon@spcf}{}}{%
+\DeclareRobustCommand{\erewhon@sf}{%
+	\fontdimen2\font=\erewhon@spc
+	\fontdimen3\font=\erewhon@stretch
+	\fontdimen4\font=\erewhon@shrink}}{%
+\DeclareRobustCommand{\erewhon@sf}{%
+    \fontdimen2\font=\erewhon@spcf\fontdimen2\font}}
+    
 \DeclareRobustCommand{\lfstyle}{%
   \not@math@alphabet\lfstyle\relax
   \fontfamily{erewhon-LF}\selectfont %