lexend (22nov19)

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

3 files changed, 49 insertions, 13 deletions

diff --git a/Master/texmf-dist/doc/fonts/lexend/lexend.pdf b/Master/texmf-dist/doc/fonts/lexend/lexend.pdf
index 73f622104d2..f0828b5247d 100644
--- a/Master/texmf-dist/doc/fonts/lexend/lexend.pdf
+++ b/Master/texmf-dist/doc/fonts/lexend/lexend.pdf
diff --git a/Master/texmf-dist/doc/fonts/lexend/lexend.tex b/Master/texmf-dist/doc/fonts/lexend/lexend.tex
index 8f78d058a07..8ff3c5b898e 100644
--- a/Master/texmf-dist/doc/fonts/lexend/lexend.tex
+++ b/Master/texmf-dist/doc/fonts/lexend/lexend.tex
@@ -56,7 +56,7 @@
 }
 \date{
 	\today\\
-	v0.1.1.51
+	v1.0.0.55
 }
 
 \pagenumbering{roman}
@@ -79,6 +79,12 @@ Now my goal is it to bring this wonderful collection to world of \hologo{LaTeX}.
 
 \section{Changelog}
 
+\subsection*{Version 1.0.0}\label{version-1.0.0}
+
++ Added package options \texttt{nomain} (and \texttt{main}) and \texttt{nosans} (and
+\texttt{sans}).\\
+* Improved documentation.
+
 \subsection*{Version 0.1.1}\label{version-0.1.1}
 
 * Fixed detecting tags as branches that should not be added to the version.
@@ -115,14 +121,22 @@ also be loaded.
 
 When this package is loaded it sets the main font to \textsf{LexendDeca} and the sans font to
 \textsf{LexendGiga} using \textsf{fontspec}'s \code{\textbackslash{}setmainfont} and
-\code{\textbackslash{}setsansfont} commands.\footnote{See \fullref{subsec:package-options}}
+\code{\textbackslash{}setsansfont} commands.
 
-If you do wish to change the default fonts, just override the set fonts yourself with the same
-commands.
+If you do not wish for this package to change the default fonts, use the package options explained
+in \fullref{subsec:package-options}.
 
 \subsection{Package Options}\label{subsec:package-options}
 
-\textit{None at the moment}\footnote{See \fullref{subsec:future-features}}
+\begin{function}{nomain,main}
+Use one of these options to either not have this package set the main font or to have it set it
+explicitly respectively.
+\end{function}
+
+\begin{function}{nosans,sans}
+Use one of these options to either not have this package set the sans font or to have it set it
+explicitly respectively.
+\end{function}
 
 \section{Features}
 
@@ -149,14 +163,22 @@ variant name as the parameter to the \code{\textbackslash{}fontspec} command.
 
 Using it looks as follows:
 
-\begin{lstlisting}[language={[LaTeX]TeX},caption={\code{\textbackslash{}LexendPeta Example}}]
+\begin{lstlisting}[language={[LaTeX]TeX},caption={\code{\textbackslash{}LexendPeta} Example}]
 \LexendPeta{
-	Text here.
+	Text here.\\
+	More text.
+
+	This text is using the font LexendPeta.
 }
 \end{lstlisting}
 
+Result:\bigskip
+
 \LexendPeta{
-	Text here.
+	Text here.\\
+	More text.
+
+	This text is using the font LexendPeta.
 }
 \end{function}
 
@@ -188,7 +210,7 @@ Use the \code{\textbackslash{}defaultfontfeatures+} command of \textsf{fontspec}
 For example if you would like to set the default color for every time you use the font
 \textsf{LexendPeta}, all you have to do is this:
 
-\begin{lstlisting}[language={[LaTeX]TeX}]
+\begin{lstlisting}[language={[LaTeX]TeX},caption={\code{\textbackslash{}defaultfontfeatures+} Example}]
 \defaultfontfeatures+[LexendPeta]{
 	Color=888888
 }
@@ -203,7 +225,6 @@ This package is still very young and also fairly incomplete. There's a list of t
 add over time. Ordered by how soon I wish to implement them myself.
 
 \begin{itemize}
-\item Package option to turn off setting the main and sans font\tightlist
 \item Support for the continuous spacing font variant of Lexend\tightlist
 \item Support for other \hologo{LaTeX} engines\\
 	That's something I definately need help with. So feel free to reach out to me or to create a
diff --git a/Master/texmf-dist/tex/latex/lexend/lexend.sty b/Master/texmf-dist/tex/latex/lexend/lexend.sty
index d18aee15c18..07ddb21b747 100644
--- a/Master/texmf-dist/tex/latex/lexend/lexend.sty
+++ b/Master/texmf-dist/tex/latex/lexend/lexend.sty
@@ -9,11 +9,21 @@
 % 
 \NeedsTeXFormat{LaTeX2e}[1994/06/01]
 \ProvidesPackage{lexend}
-  [2019/11/16 0.1.1.51 The Lexend fonts for XeLaTeX and LuaLaTeX through fontspec]
+  [2019/11/18 1.0.0.55 The Lexend fonts for XeLaTeX and LuaLaTeX through fontspec]
 
+% Packages/Dependencies
 \RequirePackage{expl3}
 \RequirePackage{fontspec}
+\RequirePackage{kvoptions}
 
+% Package options
+\DeclareBoolOption[true]{main}
+\DeclareComplementaryOption{nomain}{main}
+
+\DeclareBoolOption[true]{sans}
+\DeclareComplementaryOption{nosans}{sans}
+
+\ProcessKeyvalOptions*{}
 
 % Font list
 \def\LexendVariants{
@@ -33,8 +43,13 @@ LexendZetta%
 \ExplSyntaxOff
 
 % Set main fonts
-\setmainfont{LexendDeca}
-\setsansfont{LexendGiga}
+\iflexend@main
+  \setmainfont{LexendDeca}
+\fi
+
+\iflexend@sans
+  \setsansfont{LexendGiga}
+\fi
 
 \endinput
 %%