From 4dc0d9564a74cab11a246931ff4f35b5a796242d Mon Sep 17 00:00:00 2001
From: Karl Berry <karl@freefriends.org>
Date: Tue, 5 Dec 2017 22:48:16 +0000
Subject: dejavu-otf (5dec17)

git-svn-id: svn://tug.org/texlive/trunk@45991 c570f23f-e606-0410-a88d-b1316a301751
---
 .../texmf-dist/tex/latex/dejavu-otf/dejavu-otf.sty | 32 ++++++++++++++++------
 1 file changed, 23 insertions(+), 9 deletions(-)

(limited to 'Master/texmf-dist/tex/latex')

diff --git a/Master/texmf-dist/tex/latex/dejavu-otf/dejavu-otf.sty b/Master/texmf-dist/tex/latex/dejavu-otf/dejavu-otf.sty
index b6111534b52..95c293473cc 100644
--- a/Master/texmf-dist/tex/latex/dejavu-otf/dejavu-otf.sty
+++ b/Master/texmf-dist/tex/latex/dejavu-otf/dejavu-otf.sty
@@ -7,7 +7,7 @@
 % Copyright 2017 Herbert Voss hvoss@tug.org
 %%
 \ProvidesPackage{dejavu-otf}[%
-  2017/10/04 v. 0.02 (Herbert Voss) Supports DejaVu OpenType for lualatex/xelatex.] 
+  2017/12/05 v. 0.04 (Herbert Voss) Supports DejaVu OpenType for lualatex/xelatex.] 
 %
 \RequirePackage{ifxetex,ifluatex,xkeyval,textcomp}
 \RequirePackage{unicode-math}  % support opentype math fonts
@@ -41,7 +41,7 @@
 
 \ProcessOptionsX\relax
 
-\defaultfontfeatures{Ligatures=TeX,\DejaVu@DefaultFeatures}% default in fontspec
+\defaultfontfeatures{Ligatures=TeX,RawFeature={-smcp},\DejaVu@DefaultFeatures}% default in fontspec
 %
 \ifDejaVu@usefilenames
 %
@@ -71,6 +71,9 @@
     \setmonofont{DejaVuSansMono}[% main typewriter
         UprightFont = *,
            Extension = .ttf,
+            BoldFont = *-Bold,
+           ItalicFont= *-Oblique,
+      BoldItalicFont = *-BoldOblique,
       \DejaVuTT@features,
     ]
   \fi
@@ -78,7 +81,7 @@
   % Setting math
   % First we have to expand the feature macros:
   \ifDejaVu@math
-    \edef\Set@MathNormal{\noexpand\setmathfont{texgyredejavu-math.otf}[AutoFakeBold=1.6,\DejaVuMM@features,version=normal]}%
+    \edef\Set@MathNormal{\noexpand\setmathfont{texgyredejavu-math.otf}[AutoFakeBold=1.4,\DejaVuMM@features,version=normal]}%
     \Set@MathNormal
 %    \ifxetex
 %      \edef\Set@MathBold{\noexpand\setmathfont{texgyredejavu-math.otf}[AutoFakeBold=2,\DejaVuMMbold@features,version=bold]}%
@@ -105,6 +108,9 @@
   \newfontfamily\DejaVuSansLight{DejaVuSans-ExtraLight}[% 
            Extension = .ttf,
       \DejaVuSS@features,
+            BoldFont = *-Bold,
+           ItalicFont= *-Oblique,
+      BoldItalicFont = *-BoldOblique,
     ]
 
 \else
@@ -118,7 +124,7 @@
         ItalicFont = * Italic,
     BoldItalicFont = * Bold Italic,
     SmallCapsFont  = *, %
-    SmallCapsFeatures={Letters=SmallCaps},
+%    SmallCapsFeatures={Letters=SmallCaps},
 %    UprightFeatures = { SmallCapsFont={ <sc> }},
 %    BoldFeatures = { SmallCapsFont={ <bf sc> }},
 %    ItalicFeatures = { SmallCapsFont={ <it sc> }},
@@ -133,22 +139,30 @@
           BoldFont = * Bold,
          ItalicFont= * Oblique,
     BoldItalicFont = * Bold Oblique,
-    SmallCapsFont  = *, %
-    SmallCapsFeatures={Letters=SmallCaps},
+%    SmallCapsFont  = *, %
+%    SmallCapsFeatures={Letters=SmallCaps},
   ]
 \fi
 %
 \ifDejaVu@mono
-  \setmonofont{DejaVu Sans Mono}[\DejaVuTT@features,]
+  \setmonofont{DejaVu Sans Mono}[
+        UprightFont= *,
+    \DejaVuTT@features,
+          BoldFont = * Bold,
+         ItalicFont= * Oblique,
+    BoldItalicFont = * Bold Oblique,
+  ]
 \fi
 %
 % Setting math
 % First we have to expand the feature macros:
 \ifDejaVu@math
   \ifxetex
-    \edef\Set@MathNormal{\noexpand\setmathfont{texgyredejavu-math.otf}[AutoFakeBold=1.6,\DejaVuMMbold@features]}%
+    \edef\Set@MathNormal{\noexpand\setmathfont{texgyredejavu-math.otf}[AutoFakeBold=1,\DejaVuMMbold@features]}%
   \else
-    \edef\Set@MathNormal{\noexpand\setmathfont{TeXGyreDejaVuMath-Regular}[AutoFakeBold=1.6,\DejaVuMM@features]}%
+    \edef\Set@MathNormal{\noexpand\setmathfont{TeXGyreDejaVuMath-Regular}[\DejaVuMM@features]%
+                         \noexpand\setmathfont{TeXGyreDejaVuMath-Regular}[\DejaVuMM@features,version=bold]%
+    }%
   \fi
   \Set@MathNormal
 \fi
-- 
cgit v1.2.3