summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/baskervaldx
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2015-04-07 21:06:23 +0000
committerKarl Berry <karl@freefriends.org>2015-04-07 21:06:23 +0000
commitcab89643ffa87c460fb56a55c26014557d750cd8 (patch)
tree743895bbf1ae410af74544d0fcbb2da491c58a48 /Master/texmf-dist/tex/latex/baskervaldx
parentfb723a8e279c933c3637de299936c8ada7323f5c (diff)
baskervaldx (7apr15)
git-svn-id: svn://tug.org/texlive/trunk@36734 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/baskervaldx')
-rw-r--r--Master/texmf-dist/tex/latex/baskervaldx/Baskervaldx.sty41
1 files changed, 25 insertions, 16 deletions
diff --git a/Master/texmf-dist/tex/latex/baskervaldx/Baskervaldx.sty b/Master/texmf-dist/tex/latex/baskervaldx/Baskervaldx.sty
index b6808079170..b7e01cb0c26 100644
--- a/Master/texmf-dist/tex/latex/baskervaldx/Baskervaldx.sty
+++ b/Master/texmf-dist/tex/latex/baskervaldx/Baskervaldx.sty
@@ -1,8 +1,8 @@
%% Baskervaldx.sty
%%
\NeedsTeXFormat{LaTeX2e}
-\def\fileversion{1.05}
-\def\filedate{2014/11/25}
+\def\fileversion{1.07}
+\def\filedate{2015/04/06}
\ProvidesPackage{Baskervaldx}
[\filedate\space v\fileversion]
@@ -38,25 +38,27 @@
}
\let\orig@footnote=\thefootnote
\let\orig@makefnmark=\@makefnmark
-
+\def\useosf{\edef\Baskervaldx@figurestyle{OsF}}
+\@onlypreamble\useosf
+\def\bfseries@rm{b}
+\def\mdseries@rm{m}
\newif\if@Baskervaldx@sups
\newif\if@Baskervaldx@sw
+\newif\ifBaskervaldx@babel
+\ifdefined\bbl@tempa \Baskervaldx@babeltrue\fi
\DeclareOptionX{lining}{\edef\Baskervaldx@figurestyle{LF}}
\DeclareOptionX{lf}{\edef\Baskervaldx@figurestyle{LF}}
-\DeclareOptionX{oldstyle}{\edef\Baskervaldx@figurestyle{OsF}}
-\DeclareOptionX{osf}{\edef\Baskervaldx@figurestyle{OsF}}
+\DeclareOptionX{oldstyle}{\useosf}
+\DeclareOptionX{osf}{\useosf}
\DeclareOptionX{tabular}{\edef\Baskervaldx@figurealign{T}}
\DeclareOptionX{proportional}{\edef\Baskervaldx@figurealign{}}
-\DeclareOptionX{bold}{\edef\bfseries@rm{b}}
-\DeclareOptionX{regular}{\edef\mdseries@rm{m}}
+\DeclareOptionX{p}{\edef\Baskervaldx@figurealign{}}
\DeclareOptionX{sups}{\@Baskervaldx@supstrue}
\DeclareOptionX{swash}{\@Baskervaldx@swtrue} % used in fd files
-\ExecuteOptionsX{lining,tabular,bold,regular}
+\ExecuteOptionsX{lining,tabular}
\ProcessOptionsX\relax
-\def\useosf{\edef\Baskervaldx@figurestyle{OsF}\@Baskervaldx@osftrue}
-\@onlypreamble\useosf
\DeclareTextCommand{\textcircled}{TS1}[1]{\hmode@bgroup
\ooalign{%
@@ -77,7 +79,7 @@
\not@math@alphabet\osfstyle\relax
\fontfamily{Baskervaldx-OsF}\selectfont %
}% to get osf
-\DeclareRobustCommand{\tosfstyle}[1]{%
+\DeclareRobustCommand{\tosfstyle}{%
\not@math@alphabet\tosfstyle\relax
\fontfamily{Baskervaldx-TOsF}\selectfont %
}% to get tosf
@@ -114,9 +116,16 @@
\fi%
\fi
-\AtEndPreamble{%
-\renewcommand*{\swdefault}{sw}
-\renewcommand*{\rmdefault}%
-{Baskervaldx-\Baskervaldx@figurealign\Baskervaldx@figurestyle}
-\normalfont}
+\ifBaskervaldx@babel
+ \renewcommand*{\swdefault}{sw}
+ \renewcommand*{\rmdefault}%
+ {Baskervaldx-\Baskervaldx@figurealign\Baskervaldx@figurestyle}
+ \normalfont
+\else
+ \AtEndPreamble{%
+ \renewcommand*{\swdefault}{sw}
+ \renewcommand*{\rmdefault}%
+ {Baskervaldx-\Baskervaldx@figurealign\Baskervaldx@figurestyle}
+ \normalfont}
+\fi
\endinput