summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2017-09-27 23:01:58 +0000
committerKarl Berry <karl@freefriends.org>2017-09-27 23:01:58 +0000
commit49c73d01116f5b4c5f2d55a3661b8fa28bc5f831 (patch)
treec0b8ed2496980ec009a82bf3088cdae4a0973522
parentfa7c000e3d3c40d1d60e36bc18739ba316cf919d (diff)
spark-otf (27sep17)
git-svn-id: svn://tug.org/texlive/trunk@45411 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/spark-otf/Changes6
-rw-r--r--Master/texmf-dist/doc/latex/spark-otf/spark-otf-doc.bib4
-rw-r--r--Master/texmf-dist/doc/latex/spark-otf/spark-otf-doc.pdfbin48475 -> 88672 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spark-otf/spark-otf-doc.tex351
-rw-r--r--Master/texmf-dist/tex/latex/spark-otf/spark-otf.sty98
5 files changed, 356 insertions, 103 deletions
diff --git a/Master/texmf-dist/doc/latex/spark-otf/Changes b/Master/texmf-dist/doc/latex/spark-otf/Changes
index 3ac0430227a..a0258271564 100644
--- a/Master/texmf-dist/doc/latex/spark-otf/Changes
+++ b/Master/texmf-dist/doc/latex/spark-otf/Changes
@@ -1,3 +1,9 @@
+0.04 2017-09-26 - fix for filenames
+ - added short form ! for marks
+ - added char sets for the documentation
+0.03 2017-09-24 - added color
+ - fix for \IfValueTF->\IfBooleanTF
+ - fix for xelatex
0.02 2017-09-21 - added a star version for LuaLaTeX which
allows any values in the data list
- added error message for pdflatex
diff --git a/Master/texmf-dist/doc/latex/spark-otf/spark-otf-doc.bib b/Master/texmf-dist/doc/latex/spark-otf/spark-otf-doc.bib
index bfcee05cf13..e8d98235a85 100644
--- a/Master/texmf-dist/doc/latex/spark-otf/spark-otf-doc.bib
+++ b/Master/texmf-dist/doc/latex/spark-otf/spark-otf-doc.bib
@@ -3,8 +3,8 @@
sortname = {freedesktop},
title = {Fontconfig},
subtitle = {A library for configuring and customizing font access},
- date = {2016-06-15},
- urldate={2017-03-18},
+ date = {2017-07-05},
+ urldate={2017-09-26},
url = {https://www.freedesktop.org/wiki/Software/fontconfig/}
}
@online{wikipedia,
diff --git a/Master/texmf-dist/doc/latex/spark-otf/spark-otf-doc.pdf b/Master/texmf-dist/doc/latex/spark-otf/spark-otf-doc.pdf
index 482736583f8..c69c7c38384 100644
--- a/Master/texmf-dist/doc/latex/spark-otf/spark-otf-doc.pdf
+++ b/Master/texmf-dist/doc/latex/spark-otf/spark-otf-doc.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spark-otf/spark-otf-doc.tex b/Master/texmf-dist/doc/latex/spark-otf/spark-otf-doc.tex
index 9ca37ed67ef..4f3233e23c3 100644
--- a/Master/texmf-dist/doc/latex/spark-otf/spark-otf-doc.tex
+++ b/Master/texmf-dist/doc/latex/spark-otf/spark-otf-doc.tex
@@ -1,8 +1,10 @@
-%% $Id: spark-otf-doc.tex 566 2017-09-20 08:49:20Z herbert $
+%% $Id: spark-otf-doc.tex 584 2017-09-26 18:27:43Z herbert $
%
\listfiles
-\documentclass[fontsize=11pt,DIV=14]{scrartcl}
+\documentclass[fontsize=11pt,DIV=14,parskip=half-]{scrartcl}
\usepackage{fontspec}
+\usepackage{graphicx}
+\usepackage{multido}
\usepackage[%usefilenames,
TT={Scale=0.88,FakeStretch=0.9},
SS={Scale=0.9},
@@ -12,6 +14,7 @@
\makeatletter
\let\SparkVersion\spark@version
\makeatother
+\newsavebox\ZBox \newsavebox\SBox
\usepackage{biblatex}
\addbibresource{\jobname.bib}
@@ -62,18 +65,18 @@ the fonts will be found by the system.
\end{verbatim}
-The package defines the following families:
+The package defines the following font macros (using symbol names):
\small
\begin{verbatim}
-\newfontfamily\sparkBarMedium{SparkBar-Medium}[RawFeature=+calt,\spark@DefaultFeatures]
-\newfontfamily\sparkBarNarrow{SparkBar-Narrow}[RawFeature=+calt,\spark@DefaultFeatures]
-\newfontfamily\sparkBarThin{SparkBar-Thin}[RawFeature=+calt,\spark@DefaultFeatures]
+\newfontface\sparkBarMedium{Spark-BarMedium}[RawFeature=+calt,\spark@DefaultFeatures]
+\newfontface\sparkBarNarrow{Spark-BarNarrow}[RawFeature=+calt,\spark@DefaultFeatures]
+\newfontface\sparkBarThin{Spark-BarThin}[RawFeature=+calt,\spark@DefaultFeatures]
%
-\newfontfamily\sparkDotLine{Spark-Dot-lineMedium}[RawFeature=+calt,\spark@DefaultFeatures]
+\newfontface\sparkDotLine{Spark-Dot-lineMedium}[RawFeature=+calt,\spark@DefaultFeatures]
%
-\newfontfamily\sparkDotMedium{Spark-DotMedium}[RawFeature=+calt,\spark@DefaultFeatures]
-\newfontfamily\sparkDotSmall{Spark-DotSmall}[RawFeature=+calt,\spark@DefaultFeatures]
+\newfontface\sparkDotMedium{Spark-DotMedium}[RawFeature=+calt,\spark@DefaultFeatures]
+\newfontface\sparkDotSmall{Spark-DotSmall}[RawFeature=+calt,\spark@DefaultFeatures]
\end{verbatim}
\normalsize
@@ -85,121 +88,331 @@ The package defines the following families:
\sparkDot[<Type>][<No>]{values}[<No>]
\sparkBar*[<Type>][<No>]{values}[<No>]
\sparkDot*[<Type>][<No>]{values}[<No>]
+\sparkBar[<Type>]{!value,values,...,!value}
+\sparkDot[<Type>]{!value,values,...,!value}
+\sparkBar*[<Type>]{!value,values,...,!value}
+\sparkDot*[<Type>]{!value,values,...,!value}
\end{verbatim}
If \texttt{[<Type>]} is missing, \texttt{Medium} is assumed. The type is mandatory if you use
the first \texttt{[<No>]} argument! The star versions are only valid for Lua\LaTeX\ where the values
-can be of any interval. They will be changed to the allowed interval:
+can be of any interval. They will be changed to the allowed interval:
\begin{itemize}
\item for \cs{sparkDot[Line]}: $[0,9]$
-\item for all other: $[0,99]$
+\item for all other: $[0,100]$
\end{itemize}
+Instead of using the optional arguments for printing the first and/or last value you
+can use the !-notation, then the first and/or last listed value are printed. There is no difference
+in using the optional arguments; it saves only some keystrokes if the printed values are
+the same as in the list.
+
\section{Text examples}
+\subsection{Bars}
+
+
+\subsubsection{Bar-Medium}
+
+\footnotesize
+\begin{verbatim}
+Text \sparkBar{14,95,68,9,19,41,91,1,81,97,79,45,96,76,17,65,8,92} Text\hfill
+ {\huge\sparkBar{14,95,68,9,19,41,91,1,81,97,79,45,96,76,17,65,8,92}}\\
+Text \sparkBar[Medium]{14,95,68,9,19,41,91,1,81,97,79,45,96,76,17,65,8,92} Text\\
+Text \sparkBar[Medium][14]{14,95,68,9,19,41,91,1,81,97,79,45,96,76,17,65,8,92}[92] Text\\
+Text \sparkBar[Medium]{!14,95,68,9,19,41,91,1,81,97,79,45,96,76,17,65,8,!92} Text
+\end{verbatim}
+
+\normalsize
+Text \sparkBar{14,95,68,9,19,41,91,1,81,97,79,45,96,76,17,65,8,92} Text\hfill
+ {\huge\sparkBar{14,95,68,9,19,41,91,1,81,97,79,45,96,76,17,65,8,92}}\\
+Text \sparkBar[Medium]{14,95,68,9,19,41,91,1,81,97,79,45,96,76,17,65,8,92} Text\\
+Text \sparkBar[Medium][14]{14,95,68,9,19,41,91,1,81,97,79,45,96,76,17,65,8,92}[92] Text\\
+Text \sparkBar[Medium]{!14,95,68,9,19,41,91,1,81,97,79,45,96,76,17,65,8,!92} Text
+
+
+\subsubsection{Bar-Narrow}
+
+\footnotesize
+\begin{verbatim}
+Text \sparkBar[Narrow]{19,32,93,4,95,46,13,23,50,86,94,68,58,41,89,57,74,8} Text\\
+Text \sparkBar[Narrow][19]{19,32,93,4,95,46,13,23,50,86,94,68,58,41,89,57,74,!8} Text\hfill
+ {\huge\sparkBar[Narrow][19]{19,32,93,4,95,46,13,23,50,86,94,68,58,41,89,57,74,!8}}\\
+Text \sparkBar[Narrow]{!19,32,93,4,95,46,13,23,50,86,94,68,58,41,89,57,74,!8} Text\hfill
+ {\huge\sparkBar[Narrow]{!19,32,93,4,95,46,13,23,50,86,94,68,58,41,89,57,74,!8}}
+\end{verbatim}
+
+\normalsize
+Text \sparkBar[Narrow]{19,32,93,4,95,46,13,23,50,86,94,68,58,41,89,57,74,8} Text\\
+Text \sparkBar[Narrow][19]{19,32,93,4,95,46,13,23,50,86,94,68,58,41,89,57,74,!8} Text\hfill
+ {\huge\sparkBar[Narrow][19]{19,32,93,4,95,46,13,23,50,86,94,68,58,41,89,57,74,!8}}\\
+Text \sparkBar[Narrow]{!19,32,93,4,95,46,13,23,50,86,94,68,58,41,89,57,74,!8} Text\hfill
+ {\huge\sparkBar[Narrow]{!19,32,93,4,95,46,13,23,50,86,94,68,58,41,89,57,74,!8}}
+
+\subsubsection{Bar-Thin}
+
+\footnotesize
+\begin{verbatim}
+Text \sparkBar[Thin]{13,15,59,73,42,1,41,51,4,97,35,55,37,24,89,21,30,22} Text\\
+Text \sparkBar[Thin][13]{13,15,59,73,42,1,41,51,4,97,35,55,37,24,89,21,30,22}[22] Text\\
+Text \sparkBar[Thin]{!13,15,59,73,42,1,41,51,4,97,35,55,37,24,89,21,30,22} Text\\
+Text \sparkBar[Thin]{!13,15,59,73,42,1,41,51,4,97,35,55,37,24,89,21,30,!22} Text
+\end{verbatim}
+
+\normalsize
+Text \sparkBar[Thin]{13,15,59,73,42,1,41,51,4,97,35,55,37,24,89,21,30,22} Text\\
+Text \sparkBar[Thin][13]{13,15,59,73,42,1,41,51,4,97,35,55,37,24,89,21,30,22}[22] Text\\
+Text \sparkBar[Thin]{!13,15,59,73,42,1,41,51,4,97,35,55,37,24,89,21,30,22} Text\\
+Text \sparkBar[Thin]{!13,15,59,73,42,1,41,51,4,97,35,55,37,24,89,21,30,!22} Text
+
+
+
+\subsection{Dots}
+
+\subsubsection{Dot-Medium}
+
+\footnotesize
+\begin{verbatim}
+Text \sparkDot{54,39,26,65,29,58,36,99,16,56,76,69,71,77,7,40,79,1} Text\hfill
+ {\huge\sparkDot{54,39,26,65,29,58,36,99,16,56,76,69,71,77,7,40,79,1}}\\
+Text \sparkDot[Medium]{54,39,26,65,29,58,36,99,16,56,76,69,71,77,7,40,79,1} Text\\
+Text \sparkDot[Medium]{!54,39,26,65,29,58,36,99,16,56,76,69,71,77,7,40,79,!1} Text
+\end{verbatim}
+
+\normalsize
+Text \sparkDot{54,39,26,65,29,58,36,99,16,56,76,69,71,77,7,40,79,1} Text\hfill
+ {\huge\sparkDot{54,39,26,65,29,58,36,99,16,56,76,69,71,77,7,40,79,1}}\\
+Text \sparkDot[Medium]{54,39,26,65,29,58,36,99,16,56,76,69,71,77,7,40,79,1} Text\\
+Text \sparkDot[Medium]{!54,39,26,65,29,58,36,99,16,56,76,69,71,77,7,40,79,!1} Text
+
+
+\subsubsection{Dot-Small}
+
+
\footnotesize
\begin{verbatim}
-\begin{description}
-\item[Bar-Medium] Text \sparkBar{14,95,68,9,19,41,91,1,81,97,79,45,96,76,17,65,8,92} Text
- {\huge\sparkBar{14,95,68,9,19,41,91,1,81,97,79,45,96,76,17,65,8,92}}
-\item[Bar-Medium] Text \sparkBar[Medium]{14,95,68,9,19,41,91,1,81,97,79,45,96,76,17,65,8,92} Text
-\item[Bar-Narrow] Text \sparkBar[Narrow]{19,32,93,4,95,46,13,23,50,86,94,68,58,41,89,57,74,8} Text
-\item[Bar-Thin] Text \sparkBar[Thin]{13,15,59,73,42,1,41,51,4,97,35,55,37,24,89,21,30,22} Text
-\item[Bar-Medium] Text \sparkBar[Medium][14]{14,95,68,9,19,41,91,1,81,97,79,45,96,76,17,65,8,92}[92] Text
-\item[Bar-Narrow] Text \sparkBar[Narrow][19]{19,32,93,4,95,46,13,23,50,86,94,68,58,41,89,57,74,8}[8] Text
- {\huge\sparkBar[Narrow][19]{19,32,93,4,95,46,13,23,50,86,94,68,58,41,89,57,74,8}[8]}
-\item[Bar-Thin] Text \sparkBar[Thin][13]{13,15,59,73,42,1,41,51,4,97,35,55,37,24,89,21,30,22}[22] Text
-\end{description}
+Text \sparkDot[Small]{1,79,88,46,54,77,91,24,70,22,27,29,40,33,31,95,26,76} Text\\
+Text \sparkDot[Small][1]{1,79,88,46,54,77,91,24,70,22,27,29,40,33,31,95,26,76}[76] Text\\
+Text \sparkDot[Small]{!1,79,88,46,54,77,91,24,70,22,27,29,40,33,31,95,26,!76} Text
\end{verbatim}
\normalsize
-\begin{description}
-\item[Bar-Medium] Text \sparkBar{14,95,68,9,19,41,91,1,81,97,79,45,96,76,17,65,8,92} Text
- {\huge\sparkBar{14,95,68,9,19,41,91,1,81,97,79,45,96,76,17,65,8,92}}
-\item[Bar-Medium] Text \sparkBar[Medium]{14,95,68,9,19,41,91,1,81,97,79,45,96,76,17,65,8,92} Text
-\item[Bar-Narrow] Text \sparkBar[Narrow]{19,32,93,4,95,46,13,23,50,86,94,68,58,41,89,57,74,8} Text
-\item[Bar-Thin] Text \sparkBar[Thin]{13,15,59,73,42,1,41,51,4,97,35,55,37,24,89,21,30,22} Text
-\item[Bar-Medium] Text \sparkBar[Medium][14]{14,95,68,9,19,41,91,1,81,97,79,45,96,76,17,65,8,92}[92] Text
-\item[Bar-Narrow] Text \sparkBar[Narrow][19]{19,32,93,4,95,46,13,23,50,86,94,68,58,41,89,57,74,8}[8] Text
- {\huge\sparkBar[Narrow][19]{19,32,93,4,95,46,13,23,50,86,94,68,58,41,89,57,74,8}[8]}
-\item[Bar-Thin] Text \sparkBar[Thin][13]{13,15,59,73,42,1,41,51,4,97,35,55,37,24,89,21,30,22}[22] Text
-\end{description}
+Text \sparkDot[Small]{1,79,88,46,54,77,91,24,70,22,27,29,40,33,31,95,26,76} Text\\
+Text \sparkDot[Small][1]{1,79,88,46,54,77,91,24,70,22,27,29,40,33,31,95,26,76}[76] Text\\
+Text \sparkDot[Small]{!1,79,88,46,54,77,91,24,70,22,27,29,40,33,31,95,26,!76} Text
+
+
+
+\subsection{Dot-Line}
+
\footnotesize
\begin{verbatim}
-\begin{description}
-\item[Dot-Medium] Text \sparkDot{54,39,26,65,29,58,36,99,16,56,76,69,71,77,7,40,79,1} Text
- {\huge\sparkDot{54,39,26,65,29,58,36,99,16,56,76,69,71,77,7,40,79,1}}
-\item[Dot-Medium] Text \sparkDot[Medium]{54,39,26,65,29,58,36,99,16,56,76,69,71,77,7,40,79,1} Text
-\item[Dot-Small] Text \sparkDot[Small]{1,79,88,46,54,77,91,24,70,22,27,29,40,33,31,95,26,76} Text
-\item[Dot-Line] Text \sparkDot[Line]{9,4,2,1,6,7,3,8,3,7,1,4,9,2,8,5,1,8} Text
-\item[Dot-Medium] Text \sparkDot[Medium][54]{54,39,26,65,29,58,36,99,16,56,76,69,71,77,7,40,79,1}[1] Text
-\item[Dot-Small] Text \sparkDot[Small][1]{1,79,88,46,54,77,91,24,70,22,27,29,40,33,31,95,26,76}[76] Text
-\item[Dot-Line] Text \sparkDot[Line][9]{9,4,2,1,6,7,3,8,3,7,1,4,9,2,8,5,1,8}[8] Text
- {\huge\sparkDot[Line][9]{9,4,2,1,6,7,3,8,3,7,1,4,9,2,8,5,1,8}[8]}
-\end{description}
+Text \sparkDot[Line]{9,4,2,1,6,7,3,8,3,7,1,4,9,2,8,5,1,8} Text\\
+Text \sparkDot[Line][9]{9,4,2,1,6,7,3,8,3,7,1,4,9,2,8,5,1,8}[8] Text\hfill
+ {\huge\sparkDot[Line]{!9,4,2,1,6,7,3,8,3,7,1,4,9,2,8,5,1,!8}}
\end{verbatim}
\normalsize
-\begin{description}
-\item[Dot-Medium] Text \sparkDot{54,39,26,65,29,58,36,99,16,56,76,69,71,77,7,40,79,1} Text
- {\huge\sparkDot{54,39,26,65,29,58,36,99,16,56,76,69,71,77,7,40,79,1}}
-\item[Dot-Medium] Text \sparkDot[Medium]{54,39,26,65,29,58,36,99,16,56,76,69,71,77,7,40,79,1} Text
-\item[Dot-Small] Text \sparkDot[Small]{1,79,88,46,54,77,91,24,70,22,27,29,40,33,31,95,26,76} Text
-\item[Dot-Line] Text \sparkDot[Line]{9,4,2,1,6,7,3,8,3,7,1,4,9,2,8,5,1,8} Text
-\item[Dot-Medium] Text \sparkDot[Medium][54]{54,39,26,65,29,58,36,99,16,56,76,69,71,77,7,40,79,1}[1] Text
-\item[Dot-Small] Text \sparkDot[Small][1]{1,79,88,46,54,77,91,24,70,22,27,29,40,33,31,95,26,76}[76] Text
-\item[Dot-Line] Text \sparkDot[Line][9]{9,4,2,1,6,7,3,8,3,7,1,4,9,2,8,5,1,8}[8] Text
- {\huge\sparkDot[Line][9]{9,4,2,1,6,7,3,8,3,7,1,4,9,2,8,5,1,8}[8]}
-\end{description}
+Text \sparkDot[Line]{9,4,2,1,6,7,3,8,3,7,1,4,9,2,8,5,1,8} Text\\
+Text \sparkDot[Line][9]{9,4,2,1,6,7,3,8,3,7,1,4,9,2,8,5,1,8}[8] Text\hfill
+ {\huge\sparkDot[Line]{!9,4,2,1,6,7,3,8,3,7,1,4,9,2,8,5,1,!8}}
+
+
+
\section{Examples for Lua\protect\LaTeX}
The current version of \texttt{spark-otf} supports only star versions for Lua\LaTeX.
+
+\subsection{Bars}
+
+
\footnotesize
\begin{verbatim}
Text \sparkBar*{1,79,88,46,54,77,91,24,70,22,27,29,40,33,31,95,26,76} Text\\
Text \sparkBar*{9,4,2,1,6,7,3,8,3,7,1,4,9,2,8,5,1,8} Text\\
Text \sparkBar*[Narrow]{111,179,188,146,154,177,191,124,170,122,127,129,140,133,131,195,126,176} Text\\
-Text \sparkDot[Line]{1,79,88,46,54,77,91,24,70,22,27,29,40,33,31,95,26,76} Text\\
+
+\huge
+\sparkBar*{1,79,88,46,54,77,91,24,70,22,27,29,40,33,31,95,26,76}\\
+\sparkBar*{9,4,2,1,6,7,3,8,3,7,1,4,9,2,8,5,1,8}\\
+\sparkBar*[Narrow]{111,179,188,146,154,177,191,124,170,122,127,129,140,133,131,195,126,176}
+\end{verbatim}
+
+
+\normalsize\noindent
+Text \sparkBar*{1,79,88,46,54,77,91,24,70,22,27,29,40,33,31,95,26,76} Text\\
+Text \sparkBar*{9,4,2,1,6,7,3,8,3,7,1,4,9,2,8,5,1,8} Text\\
+Text \sparkBar*[Narrow]{111,179,188,146,154,177,191,124,170,122,127,129,140,133,131,195,126,176} Text\\
+
+\huge
+\sparkBar*{1,79,88,46,54,77,91,24,70,22,27,29,40,33,31,95,26,76}\\
+\sparkBar*{9,4,2,1,6,7,3,8,3,7,1,4,9,2,8,5,1,8}\\
+\sparkBar*[Narrow]{111,179,188,146,154,177,191,124,170,122,127,129,140,133,131,195,126,176}
+
+
+\normalsize
+
+\subsection{Dots}
+
+\footnotesize
+\begin{verbatim}
+Text \sparkDot*[Line]{1,79,88,46,54,77,91,24,70,22,27,29,40,33,31,95,26,76} Text\\
Text \sparkDot[Line]{9,4,2,1,6,7,3,8,3,7,1,4,9,2,8,5,1,8} Text\\
Text \sparkDot*[Medium][19]{19,114,12,111,16,17,113,118,113,67,61,74,39,52,38,55,111,88}[88] Text\\
Text \sparkDot*[Line][111]{111,179,188,146,154,177,191,124,170,122,127,129,140,133,131,195,126,176}[176] Text
\huge
-\sparkBar*{1,79,88,46,54,77,91,24,70,22,27,29,40,33,31,95,26,76}\\
-\sparkBar*{9,4,2,1,6,7,3,8,3,7,1,4,9,2,8,5,1,8}\\
-\sparkBar*[Narrow]{111,179,188,146,154,177,191,124,170,122,127,129,140,133,131,195,126,176}\\
-\sparkDot[Line]{1,79,88,46,54,77,91,24,70,22,27,29,40,33,31,95,26,76}\\
+\sparkDot*[Line]{1,79,88,46,54,77,91,24,70,22,27,29,40,33,31,95,26,76}\\
\sparkDot[Line]{9,4,2,1,6,7,3,8,3,7,1,4,9,2,8,5,1,8}\\
\sparkDot*[Medium][19]{19,114,12,111,16,17,113,118,113,67,61,74,39,52,38,55,111,88}[88]\\
\sparkDot*[Line][111]{111,179,188,146,154,177,191,124,170,122,127,129,140,133,131,195,126,176}[176]
\end{verbatim}
\normalsize
-
-Text \sparkBar*{1,79,88,46,54,77,91,24,70,22,27,29,40,33,31,95,26,76} Text\\
-Text \sparkBar*{9,4,2,1,6,7,3,8,3,7,1,4,9,2,8,5,1,8} Text\\
-Text \sparkBar*[Narrow]{111,179,188,146,154,177,191,124,170,122,127,129,140,133,131,195,126,176} Text\\
-Text \sparkDot[Line]{1,79,88,46,54,77,91,24,70,22,27,29,40,33,31,95,26,76} Text\\
+Text \sparkDot*[Line]{1,79,88,46,54,77,91,24,70,22,27,29,40,33,31,95,26,76} Text\\
Text \sparkDot[Line]{9,4,2,1,6,7,3,8,3,7,1,4,9,2,8,5,1,8} Text\\
Text \sparkDot*[Medium][19]{19,114,12,111,16,17,113,118,113,67,61,74,39,52,38,55,111,88}[88] Text\\
Text \sparkDot*[Line][111]{111,179,188,146,154,177,191,124,170,122,127,129,140,133,131,195,126,176}[176] Text
\huge
-\sparkBar*{1,79,88,46,54,77,91,24,70,22,27,29,40,33,31,95,26,76}\\
-\sparkBar*{9,4,2,1,6,7,3,8,3,7,1,4,9,2,8,5,1,8}\\
-\sparkBar*[Narrow]{111,179,188,146,154,177,191,124,170,122,127,129,140,133,131,195,126,176}\\
-\sparkDot[Line]{1,79,88,46,54,77,91,24,70,22,27,29,40,33,31,95,26,76}\\
+\sparkDot*[Line]{1,79,88,46,54,77,91,24,70,22,27,29,40,33,31,95,26,76}\\
\sparkDot[Line]{9,4,2,1,6,7,3,8,3,7,1,4,9,2,8,5,1,8}\\
\sparkDot*[Medium][19]{19,114,12,111,16,17,113,118,113,67,61,74,39,52,38,55,111,88}[88]\\
\sparkDot*[Line][111]{111,179,188,146,154,177,191,124,170,122,127,129,140,133,131,195,126,176}[176]
+
\normalsize
+\section{Using color}
+It is possible to mark single or some values with a specific color, which must
+be given in binary notation, e.g. \verb|ff0000| for red (R-G-B). The macro \verb|\setSparkColor|
+\emph{should} include the (last) comma after the value:
+
+\begin{verbatim}
+Text \sparkBar{14,95,68,9,19,41,\setSparkColor{ff0000}{91,}1,81,97,79,45,96,76,17,65,8,92} Text
+ \sparkBar{!14,95,68,9,19,41,\setSparkColor{ff0000}{91,1,81,97,79,}45,96,76,17,65,8,!92} Text
+
+Text \sparkDot{14,95,68,9,19,41,\setSparkColor{ff0000}{91,}1,81,97,79,45,96,76,17,65,8,92} Text
+ \sparkDot{!14,95,68,9,19,41,\setSparkColor{ff0000}{91,1,81,97,79,}45,96,76,17,65,8,!92} Text
+\end{verbatim}
+
+\noindent
+Text \sparkBar{14,95,68,9,19,41,\setSparkColor{ff0000}{91,}1,81,97,79,45,96,76,17,65,8,92} Text
+ \sparkBar{!14,95,68,9,19,41,\setSparkColor{ff0000}{91,1,81,97,79,}45,96,76,17,65,8,!92} Text
+
+\bigskip
+\noindent
+Text \sparkDot{14,95,68,9,19,41,\setSparkColor{ff0000}{91,}1,81,97,79,45,96,76,17,65,8,92} Text
+ \sparkDot{!14,95,68,9,19,41,\setSparkColor{ff0000}{91,1,81,97,79,}45,96,76,17,65,8,!92} Text
+
+Coloring does \emph{not} work for the star version of the macro and \emph{not} for
+\verb|\sparkDot[Line]|.
+
+
+\section{The charsets}
+
+\subsection{Spark-BarMedium}
+
+%\includegraphics{images/Spark-BarMedium}
+
+{\sparkBarMedium
+\multido{\iA=32+50}{20000}{\sbox\ZBox{%
+ \multido{\iB=\iA+1}{50}{%
+ \sbox\SBox{\symbol{\iB}}%
+ \ifdim\wd\SBox>0pt\usebox\SBox\kern0.45pt\fi}}%
+ \ifdim\wd\ZBox>0pt \sbox\ZBox{\makebox[4em][r]{\iA: }%
+ \multido{\iB=\iA+1}{50}{%
+ \sbox\SBox{\symbol{\iB}}%
+ \ifdim\wd\SBox>0pt\usebox\SBox\else\kern0.45em\fi\kern0.25pt}}%
+ \usebox\ZBox\\\fi}
+}
+
+
+%\string{0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,1\string}
+
+
+
+%-* !"\#\$\%'()*+,-./0123456789.;<=>@CDEGHILNOSTU[\textbackslash]\_ht\{\_\}°¢
+
+\subsection*{Spark-BarNarrow}
+
+{\sparkBarNarrow
+\multido{\iA=32+50}{20000}{\sbox\ZBox{%
+ \multido{\iB=\iA+1}{50}{%
+ \sbox\SBox{\symbol{\iB}}%
+ \ifdim\wd\SBox>0pt\usebox\SBox\kern0.35pt\fi}}%
+ \ifdim\wd\ZBox>0pt \sbox\ZBox{\makebox[4em][r]{\iA: }%
+ \multido{\iB=\iA+1}{50}{%
+ \sbox\SBox{\symbol{\iB}}%
+ \ifdim\wd\SBox>0pt\usebox\SBox\else\kern0.35em\fi\kern0.25pt}}%
+ \usebox\ZBox\\\fi}
+}
+
+\subsection*{Spark-BarThin}
+
+{\sparkBarThin
+\multido{\iA=32+50}{20000}{\sbox\ZBox{%
+ \multido{\iB=\iA+1}{50}{%
+ \sbox\SBox{\symbol{\iB}}%
+ \ifdim\wd\SBox>0pt\usebox\SBox\kern0.1pt\fi}}%
+ \ifdim\wd\ZBox>0pt \sbox\ZBox{\makebox[4em][r]{\iA: }%
+ \multido{\iB=\iA+1}{50}{%
+ \sbox\SBox{\symbol{\iB}}%
+ \ifdim\wd\SBox>0pt\usebox\SBox\else\kern0.1em\fi\kern0.25pt}}%
+ \usebox\ZBox\\\fi}
+}
+
+
+\subsection*{Spark-DotMedium}
+
+{\sparkDotMedium
+\multido{\iA=32+50}{20000}{\sbox\ZBox{%
+ \multido{\iB=\iA+1}{50}{%
+ \sbox\SBox{\symbol{\iB}}%
+ \ifdim\wd\SBox>0pt\usebox\SBox\kern0.35pt\fi}}%
+ \ifdim\wd\ZBox>0pt \sbox\ZBox{\makebox[4em][r]{\iA: }%
+ \multido{\iB=\iA+1}{50}{%
+ \sbox\SBox{\symbol{\iB}}%
+ \ifdim\wd\SBox>0pt\usebox\SBox\else\kern0.35em\fi\kern0.25pt}}%
+ \usebox\ZBox\\\fi}
+}
+
+
+\subsection*{Spark-DotSmall}
+
+{\sparkDotSmall
+\multido{\iA=32+50}{20000}{\sbox\ZBox{%
+ \multido{\iB=\iA+1}{50}{%
+ \sbox\SBox{\symbol{\iB}}%
+ \ifdim\wd\SBox>0pt\usebox\SBox\kern0.2pt\fi}}%
+ \ifdim\wd\ZBox>0pt \sbox\ZBox{\makebox[4em][r]{\iA: }%
+ \multido{\iB=\iA+1}{50}{%
+ \sbox\SBox{\symbol{\iB}}%
+ \ifdim\wd\SBox>0pt\usebox\SBox\else\kern0.2em\fi\kern0.25pt}}%
+ \usebox\ZBox\\\fi}
+}
+
+
+\subsection*{Spark-DotLine}
+
+{\sparkDotLine
+\multido{\iA=32+50}{20000}{\sbox\ZBox{%
+ \multido{\iB=\iA+1}{50}{%
+ \sbox\SBox{\symbol{\iB}}%
+ \ifdim\wd\SBox>0pt\usebox\SBox\kern0.4pt\fi}}%
+ \ifdim\wd\ZBox>0pt \sbox\ZBox{\makebox[4em][r]{\iA: }%
+ \multido{\iB=\iA+1}{50}{%
+ \sbox\SBox{\symbol{\iB}}%
+ \ifdim\wd\SBox>0pt\usebox\SBox\else\kern0.4em\fi\kern0.25pt}}%
+ \usebox\ZBox\\\fi}
+}
+
+
\nocite{*}
\printbibliography
diff --git a/Master/texmf-dist/tex/latex/spark-otf/spark-otf.sty b/Master/texmf-dist/tex/latex/spark-otf/spark-otf.sty
index 4b05b9d668e..d756b7e4ada 100644
--- a/Master/texmf-dist/tex/latex/spark-otf/spark-otf.sty
+++ b/Master/texmf-dist/tex/latex/spark-otf/spark-otf.sty
@@ -1,4 +1,4 @@
-%% $Id: spark-otf.sty 565 2017-09-20 08:23:06Z herbert $
+%% $Id: spark-otf.sty 582 2017-09-25 06:27:35Z herbert $
%%
%% This file is distributed under the terms of the LaTeX Project Public
%% License from CTAN archives in directory macros/latex/base/lppl.txt.
@@ -6,9 +6,9 @@
%%
% Copyright 2017 Herbert Voss hvoss@tug.org
%%
-\def\spark@version{0.02}
+\def\spark@version{0.04}
\ProvidesPackage{spark-otf}[%
- 2017/09/21 v. \spark@version~(Herbert Voss) Supports spark OpenType for lualatex/xelatex.]
+ 2017/09/26 v. \spark@version~(Herbert Voss) Supports spark OpenType for lualatex/xelatex.]
%
\RequirePackage{ifxetex,ifluatex,xkeyval}
%
@@ -28,33 +28,62 @@
\ifluatex\RequirePackage{luacode}\fi
+\newcommand\setSparkColor[2]{%
+ \addfontfeatures{UprightFeatures={Color=#1}}#2%
+ \addfontfeatures{UprightFeatures={Color=000000}}}
+
\ifspark@usefilenames
\typeout {Using file names for the spark font}%
%----------------------------------------- file names ----------------------------
- \newfontfamily\sparkBarMedium{{Spark - Bar - Medium}}[RawFeature=+calt,\spark@DefaultFeatures]
- \newfontfamily\sparkBarNarrow{{Spark - Bar - Narrow}}[RawFeature=+calt,\spark@DefaultFeatures]
- \newfontfamily\sparkBarThin{{Spark - Bar - Thin}}[RawFeature=+calt,\spark@DefaultFeatures]
+ \font\sparkBarMedium="file:Spark - Bar - Medium.otf:mode=node;+calt;\spark@DefaultFeatures"
+ \font\sparkBarNarrow="file:Spark - Bar - Narrow.otf:mode=node;+calt;\spark@DefaultFeatures"
+ \font\sparkBarThin="file:Spark - Bar - Thin.otf:mode=node;+calt;\spark@DefaultFeatures"
%
- \newfontfamily\sparkDotLine{{Spark - Dot-line - Medium}}[RawFeature=+calt,\spark@DefaultFeatures]
+ \font\sparkDotLine="file:Spark - Dot-line - Medium.otf:mode=node;+calt;\spark@DefaultFeatures"
+%
+ \font\sparkDotMedium="file:Spark - Dot - Medium.otf:mode=node;+calt;\spark@DefaultFeatures"
+ \font\sparkDotSmall="file:Spark - Dot - Small.otf:mode=node;+calt;\spark@DefaultFeatures"
%
- \newfontfamily\sparkDotMedium{{Spark - Dot - Medium}}[RawFeature=+calt,\spark@DefaultFeatures]
- \newfontfamily\sparkDotSmall{{Spark - Dot - Small}}[RawFeature=+calt,\spark@DefaultFeatures]
-%Spark - Bar - Medium.otf Spark - Bar - Thin.otf Spark - Dot - Medium.otf
-%Spark - Bar - Narrow.otf Spark - Dot-line - Medium.otf Spark - Dot - Small.otf
-
\else
\typeout {Using symbolic names for the spark font}%
%----------------------------------------- symbolic names ----------------------------
- \newfontfamily\sparkBarMedium{SparkBar-Medium}[RawFeature=+calt,\spark@DefaultFeatures]
- \newfontfamily\sparkBarNarrow{SparkBar-Narrow}[RawFeature=+calt,\spark@DefaultFeatures]
- \newfontfamily\sparkBarThin{SparkBar-Thin}[RawFeature=+calt,\spark@DefaultFeatures]
+ \newfontface\sparkBarMedium{Spark-BarMedium}[RawFeature=+calt,\spark@DefaultFeatures]
+ \newfontface\sparkBarNarrow{Spark-BarNarrow}[RawFeature=+calt,\spark@DefaultFeatures]
+ \newfontface\sparkBarThin{Spark-BarThin}[RawFeature=+calt,\spark@DefaultFeatures]
%
- \newfontfamily\sparkDotLine{Spark-Dot-lineMedium}[RawFeature=+calt,\spark@DefaultFeatures]
+ \newfontface\sparkDotLine{Spark-Dot-lineMedium}[RawFeature=+calt,\spark@DefaultFeatures]
%
- \newfontfamily\sparkDotMedium{Spark-DotMedium}[RawFeature=+calt,\spark@DefaultFeatures]
- \newfontfamily\sparkDotSmall{Spark-DotSmall}[RawFeature=+calt,\spark@DefaultFeatures]
+ \newfontface\sparkDotMedium{Spark-DotMedium}[RawFeature=+calt,\spark@DefaultFeatures]
+ \newfontface\sparkDotSmall{Spark-DotSmall}[RawFeature=+calt,\spark@DefaultFeatures]
\fi
%
+%
+\def\Extend@List{\@ifnextchar!\Extend@List@i\Extend@List@ii}
+\def\Extend@List@i!#1,#2\@nil{%
+ \def\spark@mark@first{#1}%
+ \def\spark@values@i{#1,}%
+ \Extend@List@iii#2,!,!\@nil
+}
+\def\Extend@List@ii#1\@nil{\Extend@List@iii#1,!,!\@nil}
+%
+\def\Extend@List@iii#1,!#2,!#3\@nil{%
+ \ifx\relax#2\relax % no value with !
+ \edef\spark@values@i{\spark@values@i#1}%
+ \def\spark@mark@last{}%
+ \else
+ \edef\spark@values@i{\spark@values@i#1,#2}%
+ \def\spark@mark@last{#2}%
+ \fi
+}
+
+\def\check@list@values#1{%
+ \def\spark@values@i{}%
+ \def\spark@mark@first{}%
+ \def\spark@mark@last{}%
+ \Extend@List#1\@nil
+}
+
+%
\ifluatex
\begin{luacode}
function RelativeValues(v,m)
@@ -73,28 +102,33 @@ function RelativeValues(v,m)
end
end
\end{luacode}
-\def\spark@line{Line}
+ \def\spark@line{Line}% 12 3 45
\NewDocumentCommand\sparkBar{sO{Medium}O{}mO{}}{{%
- \IfValueTF{#1}%
- {\edef\spark@values{\directlua{RelativeValues({#4},99)}}}%
- {\def\spark@values{#4}}%
- \@nameuse{sparkBar#2}#3\string{\spark@values\string}#5%
+ \check@list@values{#4}%
+ \IfBooleanTF{#1}%
+ {\edef\spark@values@ii{\directlua{RelativeValues({\spark@values@i},99)}}}%
+ {\let\spark@values@ii\spark@values@i}%
+ \@nameuse{sparkBar#2}#3\spark@mark@first\string{\spark@values@ii\string}\spark@mark@last#5%
}}
+% 12 3 45
\NewDocumentCommand\sparkDot{sO{Medium}O{}mO{}}{{%
- \IfValueTF{#1}%
+ \check@list@values{#4}%
+ \IfBooleanTF{#1}%
{\def\spark@arg{#2}%
- \ifx\spark@line\spark@arg \edef\spark@values{\directlua{RelativeValues({#4},9)}}%
- \else \edef\spark@values{\directlua{RelativeValues({#4},99)}}%
+ \ifx\spark@line\spark@arg \edef\spark@values@ii{\directlua{RelativeValues({\spark@values@i},9)}}%
+ \else \edef\spark@values@ii{\directlua{RelativeValues({\spark@values@i},100)}}%
\fi}%
- {\def\spark@values{#4}}%
- \@nameuse{sparkDot#2}#3\string{\spark@values\string}#5%
+ {\let\spark@values@ii\spark@values@i}%
+ \@nameuse{sparkDot#2}\spark@mark@first\string{\spark@values@ii\string}\spark@mark@last%
}}
-\else %% XeLaTeX
+\else %% XeLaTeX% 1 2 34
\NewDocumentCommand\sparkBar{O{Medium}O{}mO{}}{{%
- \@nameuse{sparkBar#1}#2\string{#3\string}#4%
- }}
+ \check@list@values{#3}%
+ \@nameuse{sparkBar#1}\spark@mark@first\string{\spark@values@i\string}\spark@mark@last%
+ }}% 1 2 34
\NewDocumentCommand\sparkDot{O{Medium}O{}mO{}}{{%
- \@nameuse{sparkDot#1}#2\string{#3\string}#4%
+ \check@list@values{#3}%
+ \@nameuse{sparkDot#1}\spark@mark@first\string{\spark@values@i\string}\spark@mark@last%
}}
\fi
%%