baskervaldx (28nov14)

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

3 files changed, 31 insertions, 35 deletions

diff --git a/Master/texmf-dist/tex/latex/baskervaldx/Baskervaldx.sty b/Master/texmf-dist/tex/latex/baskervaldx/Baskervaldx.sty
index 72e7925ca7e..b6808079170 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.04}
-\def\filedate{2014/04/27}
+\def\fileversion{1.05}
+\def\filedate{2014/11/25}
 \ProvidesPackage{Baskervaldx}
     [\filedate\space v\fileversion]
     
@@ -65,17 +65,34 @@
    }%
  \egroup}
 
+\DeclareRobustCommand{\lfstyle}{%
+  \not@math@alphabet\lfstyle\relax
+  \fontfamily{Baskervaldx-LF}\selectfont %
+}% to get lf
+\DeclareRobustCommand{\tlfstyle}{%
+  \not@math@alphabet\tlfstyle\relax
+  \fontfamily{Baskervaldx-TLF}\selectfont %
+}% to get tlf
+\DeclareRobustCommand{\osfstyle}{%
+  \not@math@alphabet\osfstyle\relax
+  \fontfamily{Baskervaldx-OsF}\selectfont %
+}% to get osf
+\DeclareRobustCommand{\tosfstyle}[1]{%
+  \not@math@alphabet\tosfstyle\relax
+  \fontfamily{Baskervaldx-TOsF}\selectfont %
+}% to get tosf
+
 \DeclareRobustCommand{\textlf}[1]{%
-  {\fontfamily{Baskervaldx-LF}\selectfont #1}%
+  {\lfstyle #1}%
 }% to get lf
 \DeclareRobustCommand{\texttlf}[1]{%
-  {\fontfamily{Baskervaldx-TLF}\selectfont #1}%
+  {\tlfstyle #1}%
 }% to get tlf
 \DeclareRobustCommand{\textosf}[1]{%
-  {\fontfamily{Baskervaldx-OsF}\selectfont #1}%
+  {\osfstyle #1}%
 }% to get osf
 \DeclareRobustCommand{\texttosf}[1]{%
-  {\fontfamily{Baskervaldx-TOsF}\selectfont #1}%
+  {\tosfstyle #1}%
 }% to get tosf
 
 \renewcommand*{\rmdefault}{Baskervaldx-TLF} % always TLF in math
diff --git a/Master/texmf-dist/tex/latex/baskervaldx/baskervaldx.fontspec b/Master/texmf-dist/tex/latex/baskervaldx/baskervaldx.fontspec
new file mode 100644
index 00000000000..3fe164f31a6
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/baskervaldx/baskervaldx.fontspec
@@ -0,0 +1,8 @@
+\defaultfontfeatures[baskervaldx]
+  {
+  Extension = .otf ,
+  UprightFont = Baskervaldx-Reg,
+  BoldFont = Baskervaldx-Bol,
+  ItalicFont = Baskervaldx-Ita,
+  BoldItalicFont = Baskervaldx-BolIta
+  }
diff --git a/Master/texmf-dist/tex/latex/baskervaldx/omlzbvmi.fd b/Master/texmf-dist/tex/latex/baskervaldx/omlzbvmi.fd
deleted file mode 100644
index a5af8d16443..00000000000
--- a/Master/texmf-dist/tex/latex/baskervaldx/omlzbvmi.fd
+++ /dev/null
@@ -1,29 +0,0 @@
-%Filename: omlzbvmi.fd
-%Created by: tex bv-drv
-%Created using fontinst v1.933
-
-%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
-
-\ProvidesFile{omlzbvmi.fd}
-   [2014/04/06 Fontinst v1.933 font definitions for OML/zbvmi.]
-
-\expandafter\ifx\csname ntxmath@scaled\endcsname\relax
-  \let\ntxmath@scaled\@empty%
-\fi
-
-\DeclareFontFamily{OML}{zbvmi}{\skewchar \font =127}
-
-\DeclareFontShape{OML}{zbvmi}{m}{it}{
-   <-> \ntxmath@scaled zbvmi
-}{}
-
-\DeclareFontShape{OML}{zbvmi}{b}{it}{
-   <-> \ntxmath@scaled zbvbmi
-}{}
-
-\DeclareFontShape{OML}{zbvmi}{m}{sl}{<->ssub * zbvmi/m/it}{}
-\DeclareFontShape{OML}{zbvmi}{bx}{it}{<->ssub * zbvmi/b/it}{}
-\DeclareFontShape{OML}{zbvmi}{b}{sl}{<->ssub * zbvmi/b/it}{}
-\DeclareFontShape{OML}{zbvmi}{bx}{sl}{<->ssub * zbvmi/b/sl}{}
-
-\endinput