summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2015-04-07 21:16:17 +0000
committerKarl Berry <karl@freefriends.org>2015-04-07 21:16:17 +0000
commiteb1810ec9d0511689b7c6af2bea14ea0c3eb2a93 (patch)
treeb72439e2eb26f9c0d7039b9da6c12afc1434f643 /Master
parent5cbead65fa76d802d2dd1c1ef31f0f6c8a7a19a4 (diff)
erewhon (7apr15)
git-svn-id: svn://tug.org/texlive/trunk@36736 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/fonts/erewhon/README5
-rw-r--r--Master/texmf-dist/tex/latex/erewhon/erewhon.sty59
2 files changed, 45 insertions, 19 deletions
diff --git a/Master/texmf-dist/doc/fonts/erewhon/README b/Master/texmf-dist/doc/fonts/erewhon/README
index d6ee1e5c170..9227a4197d7 100644
--- a/Master/texmf-dist/doc/fonts/erewhon/README
+++ b/Master/texmf-dist/doc/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.02, 2015/01/02
+Current version: 1.03, 2015/04/06
+
+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.
Changes in version 1.02
1. Added a visiblespace (uni2423) glyph to all fonts.
diff --git a/Master/texmf-dist/tex/latex/erewhon/erewhon.sty b/Master/texmf-dist/tex/latex/erewhon/erewhon.sty
index 309bfcbedf2..5ec963b5eb3 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.02}
-\def\filedate{2015/01/02}
+\def\fileversion{1.03}
+\def\filedate{2015/04/06}
\ProvidesPackage{erewhon}
[\filedate\space v\fileversion]
@@ -58,38 +58,56 @@
}
\let\orig@footnote=\thefootnote
\let\orig@makefnmark=\@makefnmark
+\def\bfseries@rm{b}
+\def\mdseries@rm{m}
\newif\if@Erewhon@sups
\newif\if@Erewhon@scosf
+\def\useosf{\edef\Erewhon@figurestyle{OsF}}
+\@onlypreamble\useosf
+\newif\ifErewhon@babel
+\ifdefined\bbl@tempa \Erewhon@babeltrue\fi
\DeclareOptionX{lining}{\edef\Erewhon@figurestyle{LF}}
\DeclareOptionX{lf}{\edef\Erewhon@figurestyle{LF}}
-\DeclareOptionX{oldstyle}{\edef\Erewhon@figurestyle{OsF}}
-\DeclareOptionX{osf}{\edef\Erewhon@figurestyle{OsF}}
+\DeclareOptionX{oldstyle}{\useosf}
+\DeclareOptionX{osf}{\useosf}
\DeclareOptionX{tabular}{\edef\Erewhon@figurealign{T}}
\DeclareOptionX{p}{\edef\Erewhon@figurealign{}}
\DeclareOptionX{proportional}{\edef\Erewhon@figurealign{}}
-\DeclareOptionX{bold}{\edef\bfseries@rm{b}}
-\DeclareOptionX{regular}{\edef\mdseries@rm{m}}
\DeclareOptionX{sups}{\@Erewhon@supstrue}
\DeclareOptionX{scosf}{\@Erewhon@scosftrue}
-\ExecuteOptionsX{lining,tabular,bold,regular}
+\ExecuteOptionsX{lining,tabular}
\ProcessOptionsX\relax
-\def\useosf{\edef\Erewhon@figurestyle{OsF}}
-\@onlypreamble\useosf
+\DeclareRobustCommand{\lfstyle}{%
+ \not@math@alphabet\lfstyle\relax
+ \fontfamily{erewhon-LF}\selectfont %
+}% to get lf
+\DeclareRobustCommand{\tlfstyle}{%
+ \not@math@alphabet\tlfstyle\relax
+ \fontfamily{erewhon-TLF}\selectfont %
+}% to get tlf
+\DeclareRobustCommand{\osfstyle}{%
+ \not@math@alphabet\osfstyle\relax
+ \fontfamily{erewhon-OsF}\selectfont %
+}% to get osf
+\DeclareRobustCommand{\tosfstyle}{%
+ \not@math@alphabet\tosfstyle\relax
+ \fontfamily{erewhon-TOsF}\selectfont %
+}% to get tosf
\DeclareRobustCommand{\textlf}[1]{%
- {\fontfamily{erewhon-LF}\selectfont #1}%
+ {\lfstyle #1}%
}% to get lf
\DeclareRobustCommand{\texttlf}[1]{%
- {\fontfamily{erewhon-TLF}\selectfont #1}%
+ {\tlfstyle #1}%
}% to get tlf
\DeclareRobustCommand{\textosf}[1]{%
- {\fontfamily{erewhon-OsF}\selectfont #1}%
+ {\osfstyle #1}%
}% to get osf
\DeclareRobustCommand{\texttosf}[1]{%
- {\fontfamily{erewhon-TOsF}\selectfont #1}%
+ {\tosfstyle #1}%
}% to get tosf
\if@Erewhon@scosf %
\DeclareRobustCommand{\textsc}[1]{%
@@ -115,9 +133,14 @@ OsF}\fontshape{sc}\selectfont #1}%
\fi%
\fi
-\AtEndPreamble{%
-\renewcommand*{\rmdefault}{erewhon-\Erewhon@figurealign%
-\Erewhon@figurestyle}
-\normalfont}
-
+\ifErewhon@babel
+ \renewcommand*{\rmdefault}{erewhon-\Erewhon@figurealign%
+ \Erewhon@figurestyle}
+ \normalfont
+\else
+ \AtEndPreamble{%
+ \renewcommand*{\rmdefault}{erewhon-\Erewhon@figurealign%
+ \Erewhon@figurestyle}
+ \normalfont}
+\fi
\endinput