erewhon (8apr15)

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

2 files changed, 14 insertions, 8 deletions

diff --git a/Master/texmf-dist/doc/fonts/erewhon/README b/Master/texmf-dist/doc/fonts/erewhon/README
index 9227a4197d7..0291e5b7449 100644
--- a/Master/texmf-dist/doc/fonts/erewhon/README
+++ b/Master/texmf-dist/doc/fonts/erewhon/README
@@ -2,7 +2,11 @@ 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.03, 2015/04/06
+Current version: 1.04, 2015/04/07
+
+Changes in version 1.04
+1. Changed \Erewhon@scale in erewhon.sty to \erewhon@scale, in accordance with .fd files. (Thanks Marco Zunino.)
+2. Added a new macro, \useproportional, to erewhon.sty. It works analogously to \useosf, and may be useful if working with babel, where the option proportional to newtxtext should not be used if loading a math font.
 
 Changes in version 1.03
 Brought erewhon.sty more into conformance with newtxtext.sty with respect to handling babel, osf and figure commands like \osfstyle.
diff --git a/Master/texmf-dist/tex/latex/erewhon/erewhon.sty b/Master/texmf-dist/tex/latex/erewhon/erewhon.sty
index 5ec963b5eb3..06c2de58661 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.03}
-\def\filedate{2015/04/06}
+\def\fileversion{1.04}
+\def\filedate{2015/04/07}
 \ProvidesPackage{erewhon}
     [\filedate\space v\fileversion]
     
@@ -45,10 +45,10 @@
     \textnu{#1}\kern0em\textfractionsolidus\kern0em\textde{#2}}
 
 \IfFileExists{xkeyval.sty}{
-    \newcommand*{\Erewhon@scale}{1}
+    \newcommand*{\erewhon@scale}{1}
     \RequirePackage{xkeyval}
-    \DeclareOptionX{scale}{\renewcommand*{\Erewhon@scale}{##1}}
-    \DeclareOptionX{scaled}{\renewcommand*{\Erewhon@scale}{##1}}
+    \DeclareOptionX{scale}{\renewcommand*{\erewhon@scale}{##1}}
+    \DeclareOptionX{scaled}{\renewcommand*{\erewhon@scale}{##1}}
     \DeclareOptionX{space}[1.2]{\DeclareRobustCommand{\erewhon@sf}{%
     \fontdimen2\font=##1\fontdimen2\font}}
 }{
@@ -65,6 +65,8 @@
 \newif\if@Erewhon@scosf
 \def\useosf{\edef\Erewhon@figurestyle{OsF}}
 \@onlypreamble\useosf
+\def\useproportional{\edef\Erewhon@figurealign{}}
+\@onlypreamble\useproportional
 \newif\ifErewhon@babel
 \ifdefined\bbl@tempa \Erewhon@babeltrue\fi
 
@@ -73,8 +75,8 @@
 \DeclareOptionX{oldstyle}{\useosf}
 \DeclareOptionX{osf}{\useosf}
 \DeclareOptionX{tabular}{\edef\Erewhon@figurealign{T}}
-\DeclareOptionX{p}{\edef\Erewhon@figurealign{}}
-\DeclareOptionX{proportional}{\edef\Erewhon@figurealign{}}
+\DeclareOptionX{p}{\useproportional}
+\DeclareOptionX{proportional}{\useproportional}
 \DeclareOptionX{sups}{\@Erewhon@supstrue}
 \DeclareOptionX{scosf}{\@Erewhon@scosftrue}
 \ExecuteOptionsX{lining,tabular}