dejavu-otf (1oct17)

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

11 files changed, 580 insertions, 1 deletions

diff --git a/Master/texmf-dist/doc/fonts/dejavu-otf/Changes b/Master/texmf-dist/doc/fonts/dejavu-otf/Changes
new file mode 100644
index 00000000000..e7abe7f0569
--- /dev/null
+++ b/Master/texmf-dist/doc/fonts/dejavu-otf/Changes
@@ -0,0 +1 @@
+0.01  2017-09-29  - first CTAN version
diff --git a/Master/texmf-dist/doc/fonts/dejavu-otf/README.md b/Master/texmf-dist/doc/fonts/dejavu-otf/README.md
new file mode 100644
index 00000000000..decf968cb4b
--- /dev/null
+++ b/Master/texmf-dist/doc/fonts/dejavu-otf/README.md
@@ -0,0 +1,32 @@
+# README #
+Package dejavu-otf supports the free ttf-fonts from
+the DejaVu project which are available from GitHub
+or already part of your system (Windows/Linux/...)
+and the OpenType version of the TeXGyre Math which
+is part of any TeX distribution.
+
+
+Following font files are supported:
+
+- DejaVuSans-BoldOblique.ttf
+- DejaVuSans-Bold.ttf
+- DejaVuSansCondensed-BoldOblique.ttf
+- DejaVuSansCondensed-Bold.ttf
+- DejaVuSansCondensed-Oblique.ttf
+- DejaVuSansCondensed.ttf
+- DejaVuSans-ExtraLight.ttf
+- DejaVuSansMono-BoldOblique.ttf
+- DejaVuSansMono-Bold.ttf
+- DejaVuSansMono-Oblique.ttf
+- DejaVuSansMono.ttf
+- DejaVuSans-Oblique.ttf
+- DejaVuSans.ttf
+- DejaVuSerif-BoldItalic.ttf
+- DejaVuSerif-Bold.ttf
+- DejaVuSerifCondensed-BoldItalic.ttf
+- DejaVuSerifCondensed-Bold.ttf
+- DejaVuSerifCondensed-Italic.ttf
+- DejaVuSerifCondensed.ttf
+- DejaVuSerif-Italic.ttf
+- DejaVuSerif.ttf
+- texgyredejavu-math.otf
diff --git a/Master/texmf-dist/doc/fonts/dejavu-otf/dejavu-otf-doc.bib b/Master/texmf-dist/doc/fonts/dejavu-otf/dejavu-otf-doc.bib
new file mode 100644
index 00000000000..6e8af680da0
--- /dev/null
+++ b/Master/texmf-dist/doc/fonts/dejavu-otf/dejavu-otf-doc.bib
@@ -0,0 +1,45 @@
+@online{fontconfig,
+  author ={{\texttt{freedesktop.org}}},
+  sortname = {freedesktop},
+  title = {Fontconfig},
+  subtitle = {A library for configuring and customizing font access},
+  date = {2016-06-15},
+  urldate={2017-03-18},
+  url = {https://www.freedesktop.org/wiki/Software/fontconfig/}
+}
+@online{wikipedia,
+  author    = {{\WikipediA}},
+  sortlabel = {Wikipedia},
+  sortname  = {Wikipedia},
+  title     = {DejaVu},
+  date      = {2016-10-19},
+  urldate   = {2017-04-03},
+  url       = {https://en.wikipedia.org/wiki/Lucida},
+}
+
+@online{features,
+  author    = {{\WikipediA}},
+  sortlabel = {Wikipedia},
+  sortname  = {Wikipedia},
+  title     = {List of typographic features},
+  date      = {2017-02-21},
+  urldate   = {2017-03-24},
+  url       = {https://en.wikipedia.org/wiki/List_of_typographic_features},
+}
+
+@online{dejavu,
+  author ={Štěpán Roh and other},
+  title = {DejaVu Fonts},
+  date = {2017-09-29},
+%  urldate={2017-03-18},
+  url = {https://en.wikipedia.org/wiki/DejaVu_fonts}
+}
+
+@online{dejavu-download,
+  author ={unknown},
+  title = {DejaVu Fonts},
+  Organisation = {Github},
+  date = {2017-09-29},
+%  urldate={2017-03-18},
+  url = {https://dejavu-fonts.github.io}
+}
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
new file mode 100644
index 00000000000..a9f0bd16ffe
--- /dev/null
+++ b/Master/texmf-dist/doc/fonts/dejavu-otf/dejavu-otf-doc.fonts
@@ -0,0 +1,25 @@
+name                                 type              encoding         emb sub uni object ID
+------------------------------------ ----------------- ---------------- --- --- --- ---------
+VFEDSK+DejaVuSerif                   CID TrueType      Identity-H       yes yes yes      5  0
+DQRHQV+DejaVuSerif-Bold              CID TrueType      Identity-H       yes yes yes      7  0
+OPAFNO+DejaVuSerif-Italic            CID TrueType      Identity-H       yes yes yes     18  0
+OGJAXR+DejaVuSansMono                CID TrueType      Identity-H       yes yes yes     20  0
+PAJDLO+DejaVuSansMono-Oblique        CID TrueType      Identity-H       yes yes yes     22  0
+FCOGUB+DejaVuSerif-BoldItalic        CID TrueType      Identity-H       yes yes yes     30  0
+CHPMBY+DejaVuSans                    CID TrueType      Identity-H       yes yes yes     32  0
+DFLAVU+DejaVuSans-Oblique            CID TrueType      Identity-H       yes yes yes     34  0
+ZAJUIN+DejaVuSans-Bold               CID TrueType      Identity-H       yes yes yes     36  0
+EPPBNU+DejaVuSans-BoldOblique        CID TrueType      Identity-H       yes yes yes     38  0
+KKDMIV+DejaVuSansMono-Bold           CID TrueType      Identity-H       yes yes yes     43  0
+IAQTFC+DejaVuSansMono-BoldOblique    CID TrueType      Identity-H       yes yes yes     45  0
+XVVXGS+DejaVuSerifCondensed          CID TrueType      Identity-H       yes yes yes     47  0
+NKLDHM+DejaVuSerifCondensed-Italic   CID TrueType      Identity-H       yes yes yes     49  0
+PUEPHD+DejaVuSerifCondensed-Bold     CID TrueType      Identity-H       yes yes yes     51  0
+CWTZOP+DejaVuSerifCondensed-BoldItalic CID TrueType      Identity-H       yes yes yes     53  0
+MTDASH+DejaVuSansCondensed           CID TrueType      Identity-H       yes yes yes     55  0
+RSDEFO+DejaVuSansCondensed-Oblique   CID TrueType      Identity-H       yes yes yes     60  0
+CGOHQF+DejaVuSansCondensed-Bold      CID TrueType      Identity-H       yes yes yes     62  0
+MDCHMZ+DejaVuSansCondensed-BoldOblique CID TrueType      Identity-H       yes yes yes     64  0
+WUZUCH+DejaVuSans-ExtraLight         CID TrueType      Identity-H       yes yes yes     66  0
+THVGFY+TeXGyreDejaVuMath-Regular-Identity-H CID Type 0C       Identity-H       yes yes yes     71  0
+QVHBPO+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
new file mode 100644
index 00000000000..778c010d894
--- /dev/null
+++ b/Master/texmf-dist/doc/fonts/dejavu-otf/dejavu-otf-doc.pdf
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
new file mode 100644
index 00000000000..4167b9b0134
--- /dev/null
+++ b/Master/texmf-dist/doc/fonts/dejavu-otf/dejavu-otf-doc.tex
@@ -0,0 +1,293 @@
+%% $Id: lucida-otf-doc.tex 556 2017-09-18 06:22:29Z herbert $
+% Copyright 2012-2015 TeX Users Group.
+% 
+% Copying and distribution of this file, with or without modification,
+% are permitted in any medium, without royalty.
+
+\listfiles
+\documentclass[11pt]{article}
+\usepackage{geometry}
+
+\usepackage[usefilenames=false,
+            TT={Scale=0.88,FakeStretch=0.9},
+            SS={Scale=0.9},
+            RM={Scale=0.9},
+            DefaultFeatures={Ligatures=TeX}]{dejavu-otf}  % support opentype math fonts
+
+\usepackage{biblatex}
+\addbibresource{\jobname.bib}
+\usepackage{array}
+\usepackage{metalogo} % for \XeTeX logo
+\usepackage{booktabs} % for examples
+\usepackage{ltablex} % for examples
+\usepackage{listings} % for code
+\usepackage{dtk-logos} % for Wikipedia W
+
+\pagestyle{headings}
+
+\usepackage[colorlinks,hyperfootnotes=false]{hyperref}
+% define \code for url-like breaking of typewriter fragments.
+\ifx\nolinkurl\undefined \let\code\url \else \let\code\nolinkurl \fi
+
+% Define \cs to prepend a backslash, and be unbreakable:
+\DeclareRobustCommand\cs[1]{\mbox{\texttt{\char`\\#1}}}
+
+% An environment like quote, but less space above and more below:
+\newenvironment{demoquote}
+   {\tabularx{\dimexpr\linewidth+\marginparwidth}{@{} X >{\ttfamily}l @{}}}
+   {\endtabularx}
+
+
+\title{Support for the DejaVu TrueType fonts and Math OpenType font}
+\author{Herbert Voß}
+\begin{document}
+\maketitle
+\tableofcontents
+
+\section{Introduction}
+
+
+\textsc{Fooflamitk}
+
+
+The DejaVu fonts are modifications of the Bitstream Vera fonts designed for greater coverage of 
+Unicode, as well as providing more styles. The Bitstream Vera family was limited mainly to the 
+characters in the Basic Latin and Latin-1 Supplement portions of Unicode, roughly equivalent to 
+ISO/IEC 8859-15, but was released with a license that permitted changes. The DejaVu fonts project 
+was started with the aim to "provide a wider range of characters ... while maintaining the original 
+look and feel through the process of collaborative development". The development of the fonts is 
+done by many contributors, and is organized through a wiki and a mailing list.~\cite{dejavu}
+
+A brief overview:
+
+\begin{itemize}
+\item Math fonts: TeXGyre DejaVu Math Regular, created by the Polish \TeX\ User group GUST.
+
+\item Three text families (regular, italic, bold, bold italic)  
+coming from the original Bitstream Vera.
+
+\end{itemize}
+
+The package \texttt{dejavu-otf} supports all families with specific optional
+arguments:
+
+\begin{tabular}{@{} >{\ttfamily}l l l @{}}\\\toprule
+\emph{name} & \emph{value} &\emph{meaning}\\\midrule
+mono & true/false & use only the DejaVu Sans Mono\\
+serif & true/false & use only the DejaVu Serif\\
+sans & true/false & use only the DejaVu Sans\\
+math & true/false & use only the \TeX\ Gyre DejaVu Math \\
+RM & code & options for DejaVu Serif\\
+SS & code &  options for DejaVu Sans\\
+TT & code &  options for DejaVu Sans Mono\\
+MM & code &  options for TeXGyre DejaVu Math\\
+%MMbold & TeXGyre DejaVu Boldmath\\
+DefaultFeatures & code &  for all font styles\\\bottomrule
+\end{tabular}
+
+\bigskip
+Except math all fonts are preset with \texttt{Scale=0.92}. For this documentation
+we use instead:
+
+\begin{verbatim}
+\usepackage[TT={Scale=0.88,FakeStretch=0.9},
+            SS={Scale=0.9},
+            RM={Scale=0.9},
+            DefaultFeatures={Ligatures=TeX}]{dejavu-otf}  % support opentype DejaVu fonts
+\end{verbatim}
+
+
+The standard font families \texttt{rm}, \texttt{sf}, and \texttt{tt} 
+can be used as usual for any \LaTeX\  engine. 
+By default the fonts are defined by their symbolic name. As an alternative you can load 
+the package with the option \texttt{usefilenames}. 
+
+\begin{verbatim}
+\usepackage[usefilenames=true,
+            TT={Scale=0.88,FakeStretch=0.9},
+            SS={Scale=0.9},
+            RM={Scale=0.9},
+            DefaultFeatures={Ligatures=TeX}]{dejavu-otf}  % supports also opentype math fonts
+\end{verbatim}
+
+
+Then all definitions uses the
+extension \texttt{.ttf} (roman, sans serif, mono)  and  \texttt{.otf} (math)  for the filenames of the fonts:
+
+\begin{verbatim}
+DejaVuSans-BoldOblique.ttf
+DejaVuSans-Bold.ttf
+DejaVuSansCondensed-BoldOblique.ttf
+DejaVuSansCondensed-Bold.ttf
+DejaVuSansCondensed-Oblique.ttf
+DejaVuSansCondensed.ttf
+DejaVuSans-ExtraLight.ttf
+DejaVuSansMono-BoldOblique.ttf
+DejaVuSansMono-Bold.ttf
+DejaVuSansMono-Oblique.ttf
+DejaVuSansMono.ttf
+DejaVuSans-Oblique.ttf
+DejaVuSans.ttf
+DejaVuSerif-BoldItalic.ttf
+DejaVuSerif-Bold.ttf
+DejaVuSerifCondensed-BoldItalic.ttf
+DejaVuSerifCondensed-Bold.ttf
+DejaVuSerifCondensed-Italic.ttf
+DejaVuSerifCondensed.ttf
+DejaVuSerif-Italic.ttf
+DejaVuSerif.ttf
+texgyredejavu-math.otf
+\end{verbatim}
+
+The condensed and extra-light versions are definied by \cs{newfontfamily} and can be accessed by
+the macros:
+
+
+\begin{verbatim}
+\DejaVuSerifCondensed
+\DejaVuSansCondensed
+\DejaVuSansLight
+\end{verbatim}
+
+
+
+
+\section{Text examples}
+
+The DejaVu fonts have no Small Caps and no oldstyle figures!
+
+
+\newcommand\demotext{%
+  For \textsterling 45, almost anything can
+  be found floating in fields. 
+  !`THE DAZED BROWN FOX QUICKLY GAVE 12345--67890 JUMPS!
+  --- ?`But aren't Kafka's Schlo\ss{} and
+  \AE sop's \OE uvres often na\"\i ve vis-\`a-vis the d\ae monic
+  ph\oe nix's official r\^ole in fluffy souffl\'es?}
+
+\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]
+%\end{tabularx}
+~ & ~ \\
+%\noindent
+%\begin{tabularx}{\dimexpr\linewidth+\marginparwidth}{@{} >{\raggedright}X >{\ttfamily}l @{}}
+\sffamily\demotext & DejaVu Sans\\[4pt]
+\sffamily\itshape\demotext & DejaVu Sans Italic\\[4pt]
+\sffamily\bfseries\demotext & DejaVu Sans Bold \\[4pt]
+\sffamily\bfseries\itshape\demotext & DejaVu Sans BoldItalic\\[12pt]
+%\end{tabularx}
+~ & ~ \\
+
+%\noindent
+%\begin{tabularx}{\dimexpr\linewidth+\marginparwidth}{@{} >{\raggedright}X >{\ttfamily}l @{}}
+\ttfamily\demotext &    DejaVu Sans Mono\\[4pt]
+\ttfamily\itshape\demotext & DejaVu Sans Mono Italic\\[4pt]
+\ttfamily\bfseries\demotext & DejaVu Sans Mono Bold\\[4pt]
+\ttfamily\bfseries\itshape\demotext & DejaVu Sans Mono Bold Italic\\[12pt]
+%\end{tabularx}
+~ & ~ \\%
+
+%\noindent
+%\begin{tabularx}{\dimexpr\linewidth+\marginparwidth}{@{} >{\raggedright}X >{\ttfamily}l @{}}
+\DejaVuSerifCondensed\demotext &    DejaVu Serif Condensed\\[4pt]
+\DejaVuSerifCondensed\itshape\demotext & DejaVu Serif Condensed Italic\\[4pt]
+\DejaVuSerifCondensed\bfseries\demotext & DejaVu Serif Condensed Bold\\[4pt]
+\DejaVuSerifCondensed\bfseries\itshape\demotext & DejaVu Serif Condensed Bold Italic\\[12pt]
+%\end{tabularx}
+~ & ~ \\%
+
+%\noindent
+%\begin{tabularx}{\dimexpr\linewidth+\marginparwidth}{@{} >{\raggedright}X >{\ttfamily}l @{}}
+\DejaVuSansCondensed\demotext &    DejaVu Sans Condensed\\[4pt]
+\DejaVuSansCondensed\itshape\demotext & DejaVu Sans Condensed Italic\\[4pt]
+\DejaVuSansCondensed\bfseries\demotext & DejaVu Sans Condensed Bold\\[4pt]
+\DejaVuSansCondensed\bfseries\itshape\demotext & DejaVu Sans Condensed Bold Italic\\[12pt]
+%\end{tabularx}
+~ & ~ \\%
+
+%\noindent
+%\begin{tabularx}{\dimexpr\linewidth+\marginparwidth}{@{} >{\raggedright}X >{\ttfamily}l @{}}
+\DejaVuSansLight\demotext &    DejaVu Sans Light\\[4pt]
+%\end{tabularx}
+~ & ~ \\%
+\end{tabularx}
+
+
+
+\section{Math examples}
+
+There is only the regular version of the math font \cs{mathnormal}. With running \XeLaTeX\ 
+it is possible to fake the fonts for a bold version:
+
+\begin{verbatim}
+\setmathfont{texgyredejavu-math.otf}[AutoFakeBold=1.6,\DejaVuMM@features,version=normal]
+\end{verbatim}
+
+
+
+
+
+
+\begin{verbatim}
+Here's some text. And here's some math:
+\[ 
+  \phi(x)=\int_{-\infty}^{x} e^{-x^{2}/2} 
+\]
+And now bold math:
+\boldmath % works only for xelatex
+\[ 
+  \phi(x)=\int_{-\infty}^{x} e^{-x^{2}/2} 
+\]
+\unboldmath
+Euro and copyright symbols are available: \texteuro\ \textcopyright.
+\end{verbatim}
+
+Here's some text. And here's some math:
+\[ 
+  \phi(x)=\int_{-\infty}^{x} e^{-x^{2}/2} 
+\]
+And now bold math:
+
+\boldmath
+
+\[ 
+ \phi(x)=\int_{-\infty}^{x} e^{-x^{2}/2} 
+\]
+\unboldmath
+Euro and copyright symbols are available: \texteuro\ \textcopyright.
+
+
+
+$f(x)=13\int$ \boldmath$f(x)=13 \int$\unboldmath
+\section{Closing}
+
+
+The font list of this documentation is:
+
+
+\scriptsize\ttfamily
+\expandafter\IfFileExists\expandafter{\jobname.fonts}%
+  {\lstinputlisting{\jobname.fonts}}{}
+
+\normalfont\rmfamily
+
+\nocite{*}
+\printbibliography
+
+
+\end{document}
+
+https://en.wikipedia.org/wiki/DejaVu_fonts
\ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/dejavu-otf/dejavu-otf.sty b/Master/texmf-dist/tex/latex/dejavu-otf/dejavu-otf.sty
new file mode 100644
index 00000000000..ee74f437dff
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/dejavu-otf/dejavu-otf.sty
@@ -0,0 +1,181 @@
+%% $Id: dejavu-otf.sty 556 2017-09-18 06:22:29Z herbert $
+%%
+%% This file is distributed under the terms of the LaTeX Project Public
+%% License from CTAN archives in directory  macros/latex/base/lppl.txt.
+%% Either version 1.3 or, at your option, any later version.
+%%
+% Copyright 2017 Herbert Voss hvoss@tug.org
+%%
+\ProvidesPackage{dejavu-otf}[%
+  2017/09/29 v. 0.01 (Herbert Voss) Supports DejaVu OpenType for lualatex/xelatex.] 
+%
+\RequirePackage{ifxetex,ifluatex,xkeyval,textcomp}
+\RequirePackage{unicode-math}  % support opentype math fonts
+                               % loads itself fontspec
+%
+\newif\ifDejaVu@usefilenames \DejaVu@usefilenamesfalse
+\DeclareOptionX{usefilenames}[true]{\@nameuse{DejaVu@usefilenames#1}}
+
+\newif\ifDejaVu@mono  \DejaVu@monotrue
+\newif\ifDejaVu@serif \DejaVu@seriftrue
+\newif\ifDejaVu@sans  \DejaVu@sanstrue
+\newif\ifDejaVu@math  \DejaVu@mathtrue
+
+\DeclareOptionX{mono}[true] {\@nameuse{DejaVu@mono#1}}
+\DeclareOptionX{sans}[true] {\@nameuse{DejaVu@sans#1}}
+\DeclareOptionX{serif}[true]{\@nameuse{DejaVu@serif#1}}
+\DeclareOptionX{math}[true] {\@nameuse{DejaVu@math#1}}
+%
+\providecommand\DejaVuRM@features{Scale=0.92}%  Roman
+\providecommand\DejaVuSS@features{Scale=0.92}%  SansSerif
+\providecommand\DejaVuTT@features{Scale=MatchLowercase,FakeStretch=0.9}%  Typewriter
+\providecommand\DejaVuMM@features{}%            Math regular
+\providecommand\DejaVuMMbold@features{}%        Math bold
+\providecommand\DejaVu@DefaultFeatures{}
+\DeclareOptionX{RM}{\renewcommand*{\DejaVuRM@features}{#1}}
+\DeclareOptionX{SS}{\renewcommand*{\DejaVuSS@features}{#1}}
+\DeclareOptionX{TT}{\renewcommand*{\DejaVuTT@features}{#1}}
+\DeclareOptionX{MM}{\renewcommand*{\DejaVuMM@features}{#1}}
+\DeclareOptionX{MMbold}{\renewcommand*{\DejaVuMMbold@features}{#1}}
+\DeclareOptionX{DefaultFeatures}{\def\DejaVu@DefaultFeatures{#1}}
+
+\ProcessOptionsX\relax
+
+\defaultfontfeatures{Ligatures=TeX,\DejaVu@DefaultFeatures}% default in fontspec
+%
+\ifDejaVu@usefilenames
+%
+  \ifDejaVu@serif
+    \setmainfont{DejaVuSerif}[% main rm
+      \DejaVuRM@features,
+           Extension = .ttf,
+          UprightFont= *,
+            BoldFont = *-Bold,
+          ItalicFont = *-Italic,
+      BoldItalicFont = *-BoldItalic,
+    ]
+  \fi
+%
+  \ifDejaVu@sans
+    \setsansfont{DejaVuSans}[% main sans
+           Extension = .ttf,
+      \DejaVuSS@features,
+          UprightFont= *,
+            BoldFont = *-Bold,
+           ItalicFont= *-Oblique,
+      BoldItalicFont = *-BoldOblique,
+    ]
+  \fi
+%
+  \ifDejaVu@mono
+    \setmonofont{DejaVuSansMono}[% main typewriter
+        UprightFont = *,
+           Extension = .ttf,
+      \DejaVuTT@features,
+    ]
+  \fi
+%
+  % 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]}%
+    \Set@MathNormal
+%    \ifxetex
+%      \edef\Set@MathBold{\noexpand\setmathfont{texgyredejavu-math.otf}[AutoFakeBold=2,\DejaVuMMbold@features,version=bold]}%
+%      \Set@MathBold
+%    \fi
+  \fi
+%
+  \newfontfamily\DejaVuSerifCondensed{DejaVuSerifCondensed}[% 
+      \DejaVuRM@features,
+           Extension = .ttf,
+          UprightFont= *,
+            BoldFont = *-Bold,
+          ItalicFont = *-Italic,
+      BoldItalicFont = *-BoldItalic,
+    ]
+  \newfontfamily\DejaVuSansCondensed{DejaVuSansCondensed}[% 
+           Extension = .ttf,
+      \DejaVuSS@features,
+          UprightFont= *,
+            BoldFont = *-Bold,
+           ItalicFont= *-Oblique,
+      BoldItalicFont = *-BoldOblique,
+    ]
+  \newfontfamily\DejaVuSansLight{DejaVuSans-ExtraLight}[% 
+           Extension = .ttf,
+      \DejaVuSS@features,
+    ]
+
+\else
+%-----------------------------------------  symbolic names ----------------------------
+\typeout {Using symbolic names for the DejaVu font}%
+\ifDejaVu@serif
+  \setmainfont{DejaVu Serif}[% main rm
+    \DejaVuRM@features,
+        UprightFont= *,
+          BoldFont = * Bold,
+        ItalicFont = * Italic,
+    BoldItalicFont = * Bold Italic,
+    SmallCapsFont  = *, %
+    SmallCapsFeatures={Letters=SmallCaps},
+%    UprightFeatures = { SmallCapsFont={ <sc> }},
+%    BoldFeatures = { SmallCapsFont={ <bf sc> }},
+%    ItalicFeatures = { SmallCapsFont={ <it sc> }},
+%    BoldItalicFeatures = { SmallCapsFont={ <bf it sc> }},
+  ]
+\fi
+%
+\ifDejaVu@sans
+  \setsansfont{DejaVu Sans}[% main sans
+    \DejaVuSS@features,
+        UprightFont= *,
+          BoldFont = * Bold,
+         ItalicFont= * Oblique,
+    BoldItalicFont = * Bold Oblique,
+    SmallCapsFont  = *, %
+    SmallCapsFeatures={Letters=SmallCaps},
+  ]
+\fi
+%
+\ifDejaVu@mono
+  \setmonofont{DejaVu Sans Mono}[% main typewriter
+    \DejaVuTT@features,
+  ]
+\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]}%
+  \else
+    \edef\Set@MathNormal{\noexpand\setmathfont{TeXGyreDejaVuMath-Regular}[AutoFakeBold=1.6,\DejaVuMM@features]}%
+  \fi
+  \Set@MathNormal
+\fi
+
+  \newfontfamily\DejaVuSerifCondensed{DejaVu Serif Condensed}[% 
+      \DejaVuRM@features,
+          UprightFont= *,
+            BoldFont = * Bold,
+          ItalicFont = * Italic,
+      BoldItalicFont = * Bold Italic,
+    ]
+  \newfontfamily\DejaVuSansCondensed{DejaVu Sans Condensed}[% 
+      \DejaVuSS@features,
+          UprightFont= *,
+            BoldFont = * Bold,
+           ItalicFont= * Oblique,
+      BoldItalicFont = * Bold Oblique,
+    ]
+  \newfontfamily\DejaVuSansLight{DejaVu Sans ExtraLight}[% 
+      \DejaVuSS@features,
+    ]
+
+
+\fi
+
+\endinput
+
+
diff --git a/Master/tlpkg/bin/tlpkg-ctan-check b/Master/tlpkg/bin/tlpkg-ctan-check
index 86ef689d109..a0ea40699f7 100755
--- a/Master/tlpkg/bin/tlpkg-ctan-check
+++ b/Master/tlpkg/bin/tlpkg-ctan-check
@@ -206,7 +206,7 @@ my @TLP_working = qw(
     datetime2-spanish datetime2-swedish datetime2-turkish datetime2-ukrainian
     datetime2-usorbian datetime2-welsh
     dblfloatfix dccpaper dcpic de-macro decimal decorule dehyph-exptl
-    dejavu
+    dejavu dejavu-otf
     delim delimseasy delimset delimtxt denisbdoc dhua
     diadia diagbox diagmac2 dialogl diagnose dice dichokey
     dickimaw dictsym diffcoeff digiconfigs dijkstra din1505
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index 257837fa4c6..38e0fc7ac4d 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -342,6 +342,7 @@ chomp ($Build = `cd $Master/../Build/source && pwd`);
  'dco',		"die 'skipping, obsolete DC fonts with oldstyle numerals'",
  'dejavu',      "&MAKEflatten",
  'dejavu-math', "&MAKEflatten",
+ 'dejavu-otf',  "&MAKEflatten",
  'deleq',       "die 'skipping, nosell license'",
  'denisbdoc',   "&MAKEflatten",
  'deproc',      "die 'skipping, for latex 2.09'",
diff --git a/Master/tlpkg/tlpsrc/collection-fontsextra.tlpsrc b/Master/tlpkg/tlpsrc/collection-fontsextra.tlpsrc
index 63dbdc41209..ed1e6f58e61 100644
--- a/Master/tlpkg/tlpsrc/collection-fontsextra.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-fontsextra.tlpsrc
@@ -83,6 +83,7 @@ depend cyklop
 depend dancers
 depend dantelogo
 depend dejavu
+depend dejavu-otf
 depend dice
 depend dictsym
 depend dingbat
diff --git a/Master/tlpkg/tlpsrc/dejavu-otf.tlpsrc b/Master/tlpkg/tlpsrc/dejavu-otf.tlpsrc
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/Master/tlpkg/tlpsrc/dejavu-otf.tlpsrc