From cab89643ffa87c460fb56a55c26014557d750cd8 Mon Sep 17 00:00:00 2001
From: Karl Berry <karl@freefriends.org>
Date: Tue, 7 Apr 2015 21:06:23 +0000
Subject: baskervaldx (7apr15)

git-svn-id: svn://tug.org/texlive/trunk@36734 c570f23f-e606-0410-a88d-b1316a301751
---
 Master/texmf-dist/doc/fonts/baskervaldx/README     |   6 ++-
 .../doc/fonts/baskervaldx/baskervaldx-doc.pdf      | Bin 235785 -> 167031 bytes
 .../fonts/baskervaldx/baskervaldxmatheg-crop.pdf   | Bin 91859 -> 28282 bytes
 .../tex/latex/baskervaldx/Baskervaldx.sty          |  41 +++++++++++++--------
 4 files changed, 30 insertions(+), 17 deletions(-)

(limited to 'Master')

diff --git a/Master/texmf-dist/doc/fonts/baskervaldx/README b/Master/texmf-dist/doc/fonts/baskervaldx/README
index 8569cc996b3..645741f2ae2 100644
--- a/Master/texmf-dist/doc/fonts/baskervaldx/README
+++ b/Master/texmf-dist/doc/fonts/baskervaldx/README
@@ -12,7 +12,11 @@ NOTICE.txt;
 http://www.ctan.org/license/lppl1.3
 for the details of that license.
 
-Current version: 1.05a, 2014/11/27
+Current version: 1.07, 2015/04/06
+
+Changes in version 1.07
+1. Corrected definition of \tosfstyle in Baskervaldx.sty.
+2. Changed usage of option osf to match that used in newtxtext, testing for babel and using instead \useosf in that case.
 
 Changes in version 1.05a
 Corrected name of afm folder in tds and revised xheights in two afm files.
diff --git a/Master/texmf-dist/doc/fonts/baskervaldx/baskervaldx-doc.pdf b/Master/texmf-dist/doc/fonts/baskervaldx/baskervaldx-doc.pdf
index d610d12da0f..bf208ac5c48 100644
Binary files a/Master/texmf-dist/doc/fonts/baskervaldx/baskervaldx-doc.pdf and b/Master/texmf-dist/doc/fonts/baskervaldx/baskervaldx-doc.pdf differ
diff --git a/Master/texmf-dist/doc/fonts/baskervaldx/baskervaldxmatheg-crop.pdf b/Master/texmf-dist/doc/fonts/baskervaldx/baskervaldxmatheg-crop.pdf
index ca77f71440e..d0f189711ee 100644
Binary files a/Master/texmf-dist/doc/fonts/baskervaldx/baskervaldxmatheg-crop.pdf and b/Master/texmf-dist/doc/fonts/baskervaldx/baskervaldxmatheg-crop.pdf differ
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
-- 
cgit v1.2.3