summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Master/texmf-dist/doc/fonts/dejavu-otf/Changes2
-rw-r--r--Master/texmf-dist/doc/fonts/dejavu-otf/dejavu-otf-doc.fonts46
-rw-r--r--Master/texmf-dist/doc/fonts/dejavu-otf/dejavu-otf-doc.pdfbin334892 -> 334822 bytes
-rw-r--r--Master/texmf-dist/doc/fonts/dejavu-otf/dejavu-otf-doc.tex11
-rw-r--r--Master/texmf-dist/tex/latex/dejavu-otf/dejavu-otf.sty32
5 files changed, 52 insertions, 39 deletions
diff --git a/Master/texmf-dist/doc/fonts/dejavu-otf/Changes b/Master/texmf-dist/doc/fonts/dejavu-otf/Changes
index ee4884a0706..662d17a9cf6 100644
--- a/Master/texmf-dist/doc/fonts/dejavu-otf/Changes
+++ b/Master/texmf-dist/doc/fonts/dejavu-otf/Changes
@@ -1,2 +1,4 @@
+0.04 2017-12-05 - do not define SmallCaps, DejaVu has no one
+0.03 2017-10-04 - fix for mono font
0.02 2017-10-04 - fix for spurious spaces in the code
0.01 2017-09-29 - first CTAN version
diff --git a/Master/texmf-dist/doc/fonts/dejavu-otf/dejavu-otf-doc.fonts b/Master/texmf-dist/doc/fonts/dejavu-otf/dejavu-otf-doc.fonts
index 9da354b6747..a7ed8b68b4f 100644
--- a/Master/texmf-dist/doc/fonts/dejavu-otf/dejavu-otf-doc.fonts
+++ b/Master/texmf-dist/doc/fonts/dejavu-otf/dejavu-otf-doc.fonts
@@ -1,25 +1,25 @@
name type encoding emb sub uni object ID
------------------------------------ ----------------- ---------------- --- --- --- ---------
-IGROJN+DejaVuSerif CID TrueType Identity-H yes yes yes 5 0
-LNJAYK+DejaVuSerif-Bold CID TrueType Identity-H yes yes yes 7 0
-IOSZDE+DejaVuSansMono CID TrueType Identity-H yes yes yes 15 0
-OMIAQD+DejaVuSerif-Italic CID TrueType Identity-H yes yes yes 20 0
-HBRQDR+DejaVuSansMono-Oblique CID TrueType Identity-H yes yes yes 22 0
-PSDAVJ+DejaVuSerif-BoldItalic CID TrueType Identity-H yes yes yes 30 0
-MDYHEB+DejaVuSans CID TrueType Identity-H yes yes yes 32 0
-NSPVTF+DejaVuSans-Oblique CID TrueType Identity-H yes yes yes 34 0
-BCIUUO+DejaVuSans-Bold CID TrueType Identity-H yes yes yes 36 0
-LWTJBI+DejaVuSans-BoldOblique CID TrueType Identity-H yes yes yes 38 0
-MQCRQX+DejaVuSansMono-Bold CID TrueType Identity-H yes yes yes 43 0
-BFCZOI+DejaVuSansMono-BoldOblique CID TrueType Identity-H yes yes yes 45 0
-ABARYV+DejaVuSerifCondensed CID TrueType Identity-H yes yes yes 47 0
-YZXGTT+DejaVuSerifCondensed-Italic CID TrueType Identity-H yes yes yes 49 0
-WFPQOQ+DejaVuSerifCondensed-Bold CID TrueType Identity-H yes yes yes 51 0
-ADGCUZ+DejaVuSerifCondensed-BoldItalic CID TrueType Identity-H yes yes yes 53 0
-BVEDWS+DejaVuSansCondensed CID TrueType Identity-H yes yes yes 55 0
-LWTNPR+DejaVuSansCondensed-Oblique CID TrueType Identity-H yes yes yes 60 0
-LNTKWM+DejaVuSansCondensed-Bold CID TrueType Identity-H yes yes yes 62 0
-ESTTIK+DejaVuSansCondensed-BoldOblique CID TrueType Identity-H yes yes yes 64 0
-MINUMJ+DejaVuSans-ExtraLight CID TrueType Identity-H yes yes yes 66 0
-TNHZSD+TeXGyreDejaVuMath-Regular-Identity-H CID Type 0C Identity-H yes yes yes 71 0
-GGHBQD+LinLibertineO-Identity-H CID Type 0C Identity-H yes yes yes 80 0
+XWRXBK+DejaVuSerif CID TrueType Identity-H yes yes yes 5 0
+BPLPDT+DejaVuSerif-Bold CID TrueType Identity-H yes yes yes 7 0
+YHDRHE+DejaVuSansMono CID TrueType Identity-H yes yes yes 15 0
+DNPWHP+DejaVuSerif-Italic CID TrueType Identity-H yes yes yes 20 0
+FKESZH+DejaVuSansMono-Oblique CID TrueType Identity-H yes yes yes 22 0
+WAJTVT+DejaVuSerif-BoldItalic CID TrueType Identity-H yes yes yes 30 0
+YTAEMJ+DejaVuSans CID TrueType Identity-H yes yes yes 32 0
+IPWAMF+DejaVuSans-Oblique CID TrueType Identity-H yes yes yes 34 0
+PTPULR+DejaVuSans-Bold CID TrueType Identity-H yes yes yes 36 0
+DZRLXY+DejaVuSans-BoldOblique CID TrueType Identity-H yes yes yes 38 0
+ZVYKOU+DejaVuSansMono-Bold CID TrueType Identity-H yes yes yes 43 0
+DPPFVE+DejaVuSansMono-BoldOblique CID TrueType Identity-H yes yes yes 45 0
+PDTNFF+DejaVuSerifCondensed CID TrueType Identity-H yes yes yes 47 0
+TVAKRM+DejaVuSerifCondensed-Italic CID TrueType Identity-H yes yes yes 49 0
+DWLXIK+DejaVuSerifCondensed-Bold CID TrueType Identity-H yes yes yes 51 0
+VJIVTY+DejaVuSerifCondensed-BoldItalic CID TrueType Identity-H yes yes yes 53 0
+RYPHDK+DejaVuSansCondensed CID TrueType Identity-H yes yes yes 55 0
+NUQGIV+DejaVuSansCondensed-Oblique CID TrueType Identity-H yes yes yes 60 0
+ODSOPJ+DejaVuSansCondensed-Bold CID TrueType Identity-H yes yes yes 62 0
+ATGOQQ+DejaVuSansCondensed-BoldOblique CID TrueType Identity-H yes yes yes 64 0
+ANBKIW+DejaVuSans-ExtraLight CID TrueType Identity-H yes yes yes 66 0
+LAUAJZ+TeXGyreDejaVuMath-Regular-Identity-H CID Type 0C Identity-H yes yes yes 71 0
+ASFVHU+LinLibertineO-Identity-H CID Type 0C Identity-H yes yes yes 80 0
diff --git a/Master/texmf-dist/doc/fonts/dejavu-otf/dejavu-otf-doc.pdf b/Master/texmf-dist/doc/fonts/dejavu-otf/dejavu-otf-doc.pdf
index 973a3312351..84eb365d9c0 100644
--- a/Master/texmf-dist/doc/fonts/dejavu-otf/dejavu-otf-doc.pdf
+++ b/Master/texmf-dist/doc/fonts/dejavu-otf/dejavu-otf-doc.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/fonts/dejavu-otf/dejavu-otf-doc.tex b/Master/texmf-dist/doc/fonts/dejavu-otf/dejavu-otf-doc.tex
index b56a92662cd..cf79090b98e 100644
--- a/Master/texmf-dist/doc/fonts/dejavu-otf/dejavu-otf-doc.tex
+++ b/Master/texmf-dist/doc/fonts/dejavu-otf/dejavu-otf-doc.tex
@@ -163,19 +163,16 @@ The DejaVu fonts have no Small Caps and no oldstyle figures!
\newcommand*\demotextsc{\textsc{\ Sphinx of black quartz, judge my vow}.}
-\newcommand*\otfoldstylenums{\addfontfeatures{Numbers={OldStyle}}}
-\newcommand*\demotextosf{\ \otfoldstylenums{0123456789}.}
-
The basic text family is \code{DejaVuSerif}, with the usual four
variants---\allowbreak regular, italic, bold, and bold italic. %, all with
%oldstyle figures; small caps are available in the upright shapes:
\noindent
\begin{tabularx}{\dimexpr\linewidth+\marginparwidth}{@{} >{\raggedright}X >{\ttfamily}l @{}}
-\demotext\demotextsc \demotextosf & DejaVu Serif\\[4pt]
-\itshape\demotext\demotextosf & DejaVu Serif Italic\\[4pt]
-\bfseries\demotext\demotextsc \demotextosf & DejaVu Serif Bold\\[4pt]
-\bfseries\itshape\demotext\demotextosf & DejaVu Serif BoldItalic\\[12pt]
+\demotext\demotextsc & DejaVu Serif\\[4pt]
+\itshape\demotext & DejaVu Serif Italic\\[4pt]
+\bfseries\demotext & DejaVu Serif Bold\\[4pt]
+\bfseries\itshape\demotext & DejaVu Serif BoldItalic\\[12pt]
%\end{tabularx}
~ & ~ \\
%\noindent
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