summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/fonts/spark-otf/Changes1
-rw-r--r--Master/texmf-dist/doc/fonts/spark-otf/README.md12
-rw-r--r--Master/texmf-dist/doc/fonts/spark-otf/spark-otf-doc.bib2
-rw-r--r--Master/texmf-dist/doc/fonts/spark-otf/spark-otf-doc.pdfbin88672 -> 106096 bytes
-rw-r--r--Master/texmf-dist/doc/fonts/spark-otf/spark-otf-doc.tex294
-rw-r--r--Master/texmf-dist/tex/latex/spark-otf/spark-otf.sty70
6 files changed, 207 insertions, 172 deletions
diff --git a/Master/texmf-dist/doc/fonts/spark-otf/Changes b/Master/texmf-dist/doc/fonts/spark-otf/Changes
index a0258271564..4425b163de6 100644
--- a/Master/texmf-dist/doc/fonts/spark-otf/Changes
+++ b/Master/texmf-dist/doc/fonts/spark-otf/Changes
@@ -1,3 +1,4 @@
+0.05 2019-04-13 - fix for new fontnames and more styles
0.04 2017-09-26 - fix for filenames
- added short form ! for marks
- added char sets for the documentation
diff --git a/Master/texmf-dist/doc/fonts/spark-otf/README.md b/Master/texmf-dist/doc/fonts/spark-otf/README.md
index 6fa1de08362..0fd25d8a041 100644
--- a/Master/texmf-dist/doc/fonts/spark-otf/README.md
+++ b/Master/texmf-dist/doc/fonts/spark-otf/README.md
@@ -1,16 +1,14 @@
# README #
Package spark-otf supports the free fonts from
"After the Flood" which are available from the
-website http://aftertheflood.co/projects/atf-spark
+website https://aftertheflood.com/projects/sparks/
+or from https://github.com/aftertheflood/spark
Following font files are supported:
-- Spark - Bar - Medium.otf
-- Spark - Bar - Narrow.otf
-- Spark - Bar - Thin.otf
-- Spark - Dot-line - Medium.otf
-- Spark - Dot - Medium.otf
-- Spark - Dot - Small.otf
+- Sparks-Bar-???.otf
+- Sparks-Dotline-???.otf
+- Sparks-Dot-???.otf
diff --git a/Master/texmf-dist/doc/fonts/spark-otf/spark-otf-doc.bib b/Master/texmf-dist/doc/fonts/spark-otf/spark-otf-doc.bib
index e8d98235a85..9dde6057b7f 100644
--- a/Master/texmf-dist/doc/fonts/spark-otf/spark-otf-doc.bib
+++ b/Master/texmf-dist/doc/fonts/spark-otf/spark-otf-doc.bib
@@ -40,6 +40,6 @@ author = {Max Gadney and Mike Gallagher and Nick Cross and Sabih Ali},
title = {AtF Spark},
subtitle = {Our new typeface for code-free sparklines},
Organisation = {After the flood},
-url = {http://aftertheflood.co/projects/atf-spark},
+url = {https://aftertheflood.com/projects/sparks/},
}
diff --git a/Master/texmf-dist/doc/fonts/spark-otf/spark-otf-doc.pdf b/Master/texmf-dist/doc/fonts/spark-otf/spark-otf-doc.pdf
index c69c7c38384..e436bd73c07 100644
--- a/Master/texmf-dist/doc/fonts/spark-otf/spark-otf-doc.pdf
+++ b/Master/texmf-dist/doc/fonts/spark-otf/spark-otf-doc.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/fonts/spark-otf/spark-otf-doc.tex b/Master/texmf-dist/doc/fonts/spark-otf/spark-otf-doc.tex
index 4f3233e23c3..d92461a66e4 100644
--- a/Master/texmf-dist/doc/fonts/spark-otf/spark-otf-doc.tex
+++ b/Master/texmf-dist/doc/fonts/spark-otf/spark-otf-doc.tex
@@ -1,10 +1,10 @@
-%% $Id: spark-otf-doc.tex 584 2017-09-26 18:27:43Z herbert $
+%% $Id: spark-otf-doc.tex 1047 2019-04-12 17:22:07Z herbert $
%
\listfiles
\documentclass[fontsize=11pt,DIV=14,parskip=half-]{scrartcl}
\usepackage{fontspec}
\usepackage{graphicx}
-\usepackage{multido}
+\usepackage{multido,showexpl}
\usepackage[%usefilenames,
TT={Scale=0.88,FakeStretch=0.9},
SS={Scale=0.9},
@@ -56,27 +56,50 @@ either in \path{Library/fonts/} (MAC OSX), \path{c:\Windows\Fonts} (Windows) or
the fonts will be found by the system.
\begin{verbatim}
--rw-r--r-- 1 voss voss 24708 Sep 15 11:20 Spark - Bar - Medium.otf
--rw-r--r-- 1 voss voss 24696 Sep 15 11:20 Spark - Bar - Narrow.otf
--rw-r--r-- 1 voss voss 24680 Sep 15 11:20 Spark - Bar - Thin.otf
--rw-r--r-- 1 voss voss 22140 Sep 15 11:20 Spark - Dot-line - Medium.otf
--rw-r--r-- 1 voss voss 24616 Sep 15 11:20 Spark - Dot - Medium.otf
--rw-r--r-- 1 voss voss 24580 Sep 15 11:20 Spark - Dot - Small.otf
+Sparks-Bar-Extranarrow.otf
+Sparks-Bar-Extrawide.otf
+Sparks-Bar-Medium.otf
+Sparks-Bar-Narrow.otf
+Sparks-Bar-Wide.otf
+Sparks-Dot-Extralarge.otf
+Sparks-Dot-Extrasmall.otf
+Sparks-Dot-Large.otf
+Sparks-Dot-Medium.otf
+Sparks-Dot-Small.otf
+Sparks-Dotline-Extrathick.otf
+Sparks-Dotline-Extrathin.otf
+Sparks-Dotline-Medium.otf
+Sparks-Dotline-Thick.otf
+Sparks-Dotline-Thin.otf
\end{verbatim}
+%-rw-r--r-- 1 voss voss 24708 Sep 15 11:20 Spark - Bar - Medium.otf
+%-rw-r--r-- 1 voss voss 24696 Sep 15 11:20 Spark - Bar - Narrow.otf
+%-rw-r--r-- 1 voss voss 24680 Sep 15 11:20 Spark - Bar - Thin.otf
+%-rw-r--r-- 1 voss voss 22140 Sep 15 11:20 Spark - Dot-line - Medium.otf
+%-rw-r--r-- 1 voss voss 24616 Sep 15 11:20 Spark - Dot - Medium.otf
+%-rw-r--r-- 1 voss voss 24580 Sep 15 11:20 Spark - Dot - Small.otf
The package defines the following font macros (using symbol names):
\small
\begin{verbatim}
-\newfontface\sparkBarMedium{Spark-BarMedium}[RawFeature=+calt,\spark@DefaultFeatures]
-\newfontface\sparkBarNarrow{Spark-BarNarrow}[RawFeature=+calt,\spark@DefaultFeatures]
-\newfontface\sparkBarThin{Spark-BarThin}[RawFeature=+calt,\spark@DefaultFeatures]
+\newfontface\sparkBarMedium{Spark-Bar-Medium}[RawFeature=+calt,\spark@DefaultFeatures]
+\newfontface\sparkBarNarrow{Spark-Bar-Narrow}[RawFeature=+calt,\spark@DefaultFeatures]
+\newfontface\sparkBarExtranarrow{Spark-Bar-Extranarrow}[RawFeature=+calt,\spark@DefaultFeatures]
+\newfontface\sparkBarWide{Spark-Bar-Wide}[RawFeature=+calt,\spark@DefaultFeatures]
+\newfontface\sparkBarExtrawide{Spark-Bar-Extrawide}[RawFeature=+calt,\spark@DefaultFeatures]
%
-\newfontface\sparkDotLine{Spark-Dot-lineMedium}[RawFeature=+calt,\spark@DefaultFeatures]
+\newfontface\sparkDotLineMedium{Spark-Dotline-Medium}[RawFeature=+calt,\spark@DefaultFeatures]
+\newfontface\sparkDotLineThick{Spark-Dotline-Thick}[RawFeature=+calt,\spark@DefaultFeatures]
+\newfontface\sparkDotLineExtrathick{Spark-Dotline-Extrathick}[RawFeature=+calt,\spark@DefaultFeatures]
+\newfontface\sparkDotLineThin{Spark-Dotline-Thin}[RawFeature=+calt,\spark@DefaultFeatures]
+\newfontface\sparkDotLineExtrathin{Spark-Dotline-Extrathin}[RawFeature=+calt,\spark@DefaultFeatures]
%
-\newfontface\sparkDotMedium{Spark-DotMedium}[RawFeature=+calt,\spark@DefaultFeatures]
-\newfontface\sparkDotSmall{Spark-DotSmall}[RawFeature=+calt,\spark@DefaultFeatures]
+\newfontface\sparkDotMedium{Spark-Dot-Medium}[RawFeature=+calt,\spark@DefaultFeatures]
+\newfontface\sparkDotSmall{Spark-Dot-Small}[RawFeature=+calt,\spark@DefaultFeatures]
+\newfontface\sparkDotExtralarge{Spark-Dot-Extralarge}[RawFeature=+calt,\spark@DefaultFeatures]
+\newfontface\sparkDotExtrasmall{Spark-Dot-Extrasmall}[RawFeature=+calt,\spark@DefaultFeatures]
\end{verbatim}
\normalsize
@@ -86,12 +109,16 @@ The package defines the following font macros (using symbol names):
\begin{verbatim}
\sparkBar[<Type>][<No>]{values}[<No>]
\sparkDot[<Type>][<No>]{values}[<No>]
+\sparkDotline[<Type>][<No>]{values}[<No>]
\sparkBar*[<Type>][<No>]{values}[<No>]
\sparkDot*[<Type>][<No>]{values}[<No>]
+\sparkDotline*[<Type>][<No>]{values}[<No>]
\sparkBar[<Type>]{!value,values,...,!value}
\sparkDot[<Type>]{!value,values,...,!value}
+\sparkDotline[<Type>]{!value,values,...,!value}
\sparkBar*[<Type>]{!value,values,...,!value}
\sparkDot*[<Type>]{!value,values,...,!value}
+\sparkDotline*[<Type>]{!value,values,...,!value}
\end{verbatim}
If \texttt{[<Type>]} is missing, \texttt{Medium} is assumed. The type is mandatory if you use
@@ -99,7 +126,7 @@ the first \texttt{[<No>]} argument! The star versions are only valid for Lua\LaT
can be of any interval. They will be changed to the allowed interval:
\begin{itemize}
-\item for \cs{sparkDot[Line]}: $[0,9]$
+\item for \cs{sparkDotline}: $[0,9]$
\item for all other: $[0,100]$
\end{itemize}
@@ -113,195 +140,172 @@ the same as in the list.
\subsection{Bars}
+\typeout{Bar-Medium}%
\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}}\\
+\begin{LTXexample}[pos=t]
+Text \sparkBar{14,95,68,9,19,41,91,1,81,97,79,45,96,76,17,65,8,92} Text\\
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
+Text \sparkBar{!14,95,68,9,19,41,91,1,81,97,79,45,96,76,17,65,8,!92} Text
+\end{LTXexample}
\subsubsection{Bar-Narrow}
-\footnotesize
-\begin{verbatim}
+\begin{LTXexample}[pos=t]
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}
+Text \sparkBar[Narrow][19]{19,32,93,4,95,46,13,23,50,86,94,68,58,41,89,57,74,!8} Text\\
+Text \sparkBar[Narrow]{!19,32,93,4,95,46,13,23,50,86,94,68,58,41,89,57,74,!8} Text
+\end{LTXexample}
-\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}
+\subsubsection{Bar-Extranarrow}
-\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}
+\begin{LTXexample}[pos=t]
+Text \sparkBar[Extranarrow]{19,32,93,4,95,46,13,23,50,86,94,68,58,41,89,57,74,8} Text\\
+Text \sparkBar[Extranarrow][19]{19,32,93,4,95,46,13,23,50,86,94,68,58,41,89,57,74,!8} Text\\
+Text \sparkBar[Extranarrow]{!19,32,93,4,95,46,13,23,50,86,94,68,58,41,89,57,74,!8} Text
+\end{LTXexample}
-\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
+\subsubsection{Bar-Wide}
+\begin{LTXexample}[pos=t]
+Text \sparkBar[Wide]{13,15,59,73,42,1,41,51,4,97,35,55,37,24,89,21,30,22} Text\\
+Text \sparkBar[Wide][13]{13,15,59,73,42,1,41,51,4,97,35,55,37,24,89,21,30,22}[22] Text\\
+Text \sparkBar[Wide]{!13,15,59,73,42,1,41,51,4,97,35,55,37,24,89,21,30,22} Text\\
+Text \sparkBar[Wide]{!13,15,59,73,42,1,41,51,4,97,35,55,37,24,89,21,30,!22} Text
+\end{LTXexample}
-\subsection{Dots}
-\subsubsection{Dot-Medium}
+\subsubsection{Bar-Extrawide}
+
+\begin{LTXexample}[pos=t]
+Text \sparkBar[Extrawide]{13,15,59,73,42,1,41,51,4,97,35,55,37,24,89,21,30,22} Text\\
+Text \sparkBar[Extrawide][13]{13,15,59,73,42,1,41,51,4,97,35,55,37,24,89,21,30,22}[22] Text\\
+Text \sparkBar[Extrawide]{!13,15,59,73,42,1,41,51,4,97,35,55,37,24,89,21,30,22} Text\\
+Text \sparkBar[Extrawide]{!13,15,59,73,42,1,41,51,4,97,35,55,37,24,89,21,30,!22} Text
+\end{LTXexample}
-\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
+
+\subsection{Dots}
+
+\subsubsection{Dot-Medium -- the default}
+
+\begin{LTXexample}[pos=t]
+Text \sparkDot{54,39,26,65,29,58,36,99,16,56,76,69,71,77,7,40,79,1} Text\\
+Text \sparkDot[Medium][54]{54,39,26,65,29,58,36,99,16,56,76,69,71,77,7,40,79,1}[1] Text\\
+Text \sparkDot{!54,39,26,65,29,58,36,99,16,56,76,69,71,77,7,40,79,!1} Text
+\end{LTXexample}
\subsubsection{Dot-Small}
-\footnotesize
-\begin{verbatim}
+\begin{LTXexample}[pos=t]
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}
+\end{LTXexample}
-\normalsize
-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
+\subsubsection{Dot-Extrasmall}
+\begin{LTXexample}[pos=t]
+Text \sparkDot[Extrasmall]{1,79,88,46,54,77,91,24,70,22,27,29,40,33,31,95,26,76} Text\\
+Text \sparkDot[Extrasmall][1]{1,79,88,46,54,77,91,24,70,22,27,29,40,33,31,95,26,76}[76] Text\\
+Text \sparkDot[Extrasmall]{!1,79,88,46,54,77,91,24,70,22,27,29,40,33,31,95,26,!76} Text
+\end{LTXexample}
-\subsection{Dot-Line}
+\subsubsection{Dot-Extralarge}
+\begin{LTXexample}[pos=t]
+Text \sparkDot[Extralarge]{1,79,88,46,54,77,91,24,70,22,27,29,40,33,31,95,26,76} Text\\
+Text \sparkDot[Extralarge][1]{1,79,88,46,54,77,91,24,70,22,27,29,40,33,31,95,26,76}[76] Text\\
+Text \sparkDot[Extralarge]{!1,79,88,46,54,77,91,24,70,22,27,29,40,33,31,95,26,!76} Text
+\end{LTXexample}
-\footnotesize
-\begin{verbatim}
-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
-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}}
+\subsection{Dotline}
+\subsubsection{Dotline-Thin}
+\begin{LTXexample}[pos=t]
+Text \sparkDotline[Thin]{1,79,88,46,54,77,91,24,70,22,27,29,40,33,31,95,26,76} Text\\
+Text \sparkDotline[Thin][1]{1,79,88,46,54,77,91,24,70,22,27,29,40,33,31,95,26,76}[76] Text\\
+Text \sparkDotline[Thin]{!1,79,88,46,54,77,91,24,70,22,27,29,40,33,31,95,26,!76} Text
+\end{LTXexample}
-\section{Examples for Lua\protect\LaTeX}
-The current version of \texttt{spark-otf} supports only star versions for Lua\LaTeX.
+\subsubsection{Dotline-Extrathin}
+\begin{LTXexample}[pos=t]
+Text \sparkDotline[Extrathin]{1,79,88,46,54,77,91,24,70,22,27,29,40,33,31,95,26,76} Text\\
+Text \sparkDotline[Extrathin][1]{1,79,88,46,54,77,91,24,70,22,27,29,40,33,31,95,26,76}[76] Text\\
+Text \sparkDotline[Extrathin]{!1,79,88,46,54,77,91,24,70,22,27,29,40,33,31,95,26,!76} Text
+\end{LTXexample}
-\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\\
+\subsubsection{Dotline-Medium -- the default}
-\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}
+\begin{LTXexample}[pos=t]
+Text \sparkDotline{1,79,88,46,54,77,91,24,70,22,27,29,40,33,31,95,26,76} Text\\
+Text \sparkDotline[Medium][1]{1,79,88,46,54,77,91,24,70,22,27,29,40,33,31,95,26,76}[76] Text\\
+Text \sparkDotline{!1,79,88,46,54,77,91,24,70,22,27,29,40,33,31,95,26,!76} Text
+\end{LTXexample}
+\subsubsection{Dotline-Thick}
-\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\\
+\begin{LTXexample}[pos=t]
+Text \sparkDotline[Thick]{1,79,88,46,54,77,91,24,70,22,27,29,40,33,31,95,26,76} Text\\
+Text \sparkDotline[Thick][1]{1,79,88,46,54,77,91,24,70,22,27,29,40,33,31,95,26,76}[76] Text\\
+Text \sparkDotline[Thick]{!1,79,88,46,54,77,91,24,70,22,27,29,40,33,31,95,26,!76} Text
+\end{LTXexample}
-\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}
+\subsubsection{Dotline-Extrathick}
+\begin{LTXexample}[pos=t]
+Text \sparkDotline[Extrathick]{1,79,88,46,54,77,91,24,70,22,27,29,40,33,31,95,26,76} Text\\
+Text \sparkDotline[Extrathick][1]{1,79,88,46,54,77,91,24,70,22,27,29,40,33,31,95,26,76}[76] Text\\
+Text \sparkDotline[Extrathick]{!1,79,88,46,54,77,91,24,70,22,27,29,40,33,31,95,26,!76} Text
+\end{LTXexample}
-\normalsize
-\subsection{Dots}
+\section{Examples for Lua\protect\LaTeX}
+The current version of \texttt{spark-otf} supports only star versions for Lua\LaTeX.
-\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
-\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}
+\subsection{Bars}
-\normalsize
-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
+\begin{LTXexample}[pos=t]
+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\\
+\end{LTXexample}
-\huge
-\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]
+
+\subsection{Dots}
+\begin{LTXexample}[pos=t]
+Text \sparkDotline*{1,79,88,46,54,77,91,24,70,22,27,29,40,33,31,95,26,76} Text\\
+Text \sparkDotline{9,4,2,1,6,7,3,8,3,7,1,4,9,2,8,5,1,8} Text\\
+Text \sparkDotline+{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 \sparkDotline*[Medium][111]{111,179,188,146,154,177,191,124,170,122,127,129,140,133,131,195,126,176}[176] Text
+\end{LTXexample}
-\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
+\begin{LTXexample}[pos=t]
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
@@ -309,9 +313,10 @@ Text \sparkBar{14,95,68,9,19,41,\setSparkColor{ff0000}{91,}1,81,97,79,45,96,76,1
\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
+\end{LTXexample}
Coloring does \emph{not} work for the star version of the macro and \emph{not} for
-\verb|\sparkDot[Line]|.
+\verb|\sparkDotline|.
\section{The charsets}
@@ -353,6 +358,9 @@ Coloring does \emph{not} work for the star version of the macro and \emph{not} f
\usebox\ZBox\\\fi}
}
+
+\iffalse
+
\subsection*{Spark-BarThin}
{\sparkBarThin
@@ -413,6 +421,8 @@ Coloring does \emph{not} work for the star version of the macro and \emph{not} f
}
+\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 d756b7e4ada..eae4f650d0c 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 582 2017-09-25 06:27:35Z herbert $
+%% $Id: spark-otf.sty 1047 2019-04-12 17:22:07Z 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.04}
+\def\spark@version{0.05}
\ProvidesPackage{spark-otf}[%
- 2017/09/26 v. \spark@version~(Herbert Voss) Supports spark OpenType for lualatex/xelatex.]
+ 2019/04/12 v. \spark@version~(Herbert Voss) Supports spark OpenType for lualatex/xelatex.]
%
\RequirePackage{ifxetex,ifluatex,xkeyval}
%
@@ -24,7 +24,7 @@
\@latex@error{This package can only be used with "XeLaTeX" or "LuaLaTeX"!%
\MessageBreak "pdfLaTeX" or any other "TeX" version are _not_ possible!}%
\fi\fi
-\RequirePackage{fontspec,xparse}
+\RequirePackage{luaotfload,xparse}
\ifluatex\RequirePackage{luacode}\fi
@@ -35,26 +35,42 @@
\ifspark@usefilenames
\typeout {Using file names for the spark font}%
%----------------------------------------- file names ----------------------------
- \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"
+ \font\sparkBarMedium ="file:Sparks-Bar-Medium.otf:mode=node;+calt;\spark@DefaultFeatures"
+ \font\sparkBarNarrow ="file:Sparks-Bar-Narrow.otf:mode=node;+calt;\spark@DefaultFeatures"
+ \font\sparkBarExtranarrow="file:Sparks-Bar-Extranarrow.otf:mode=node;+calt;\spark@DefaultFeatures"
+ \font\sparkBarWide ="file:Sparks-Bar-Wide.otf:mode=node;+calt;\spark@DefaultFeatures"
+ \font\sparkBarExtrawide ="file:Sparks-Bar-Extrawide.otfmode=node;+calt;\spark@DefaultFeatures"
%
- \font\sparkDotLine="file:Spark - Dot-line - Medium.otf:mode=node;+calt;\spark@DefaultFeatures"
+ \font\sparkDotlineMedium ="file:Sparks-Dotline-Medium.otf:mode=node;+calt;\spark@DefaultFeatures"
+ \font\sparkDotlineThick ="file:Sparks-Dotline-Thick.otf:mode=node;+calt;\spark@DefaultFeatures"
+ \font\sparkDotlineExtrathick="file:Sparks-Dotline-Extrathick.otf:mode=node;+calt;\spark@DefaultFeatures"
+ \font\sparkDotlineThin ="file:Sparks-Dotline-Thin.otf:mode=node;+calt;\spark@DefaultFeatures"
+ \font\sparkDotlineExtrathin ="file:Sparks-Dotline-Extrathin.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"
+ \font\sparkDotMedium ="file:Sparks-Dot-Medium.otf:mode=node;+calt;\spark@DefaultFeatures"
+ \font\sparkDotSmall ="file:Sparks-Dot-Small.otf:mode=node;+calt;\spark@DefaultFeatures"
+ \font\sparkDotExtralarge="file:Sparks-Dot-Extralarge.otf:mode=node;+calt;\spark@DefaultFeatures"
+ \font\sparkDotExtrasmall="file:Sparks-Dot-Extrasmall.otf:mode=node;+calt;\spark@DefaultFeatures"
%
\else
\typeout {Using symbolic names for the spark font}%
%----------------------------------------- symbolic names ----------------------------
- \newfontface\sparkBarMedium{Spark-BarMedium}[RawFeature=+calt,\spark@DefaultFeatures]
- \newfontface\sparkBarNarrow{Spark-BarNarrow}[RawFeature=+calt,\spark@DefaultFeatures]
- \newfontface\sparkBarThin{Spark-BarThin}[RawFeature=+calt,\spark@DefaultFeatures]
+ \font\sparkBarMedium = "name:Sparks Bar Medium:mode=node;+calt;\spark@DefaultFeatures"
+ \font\sparkBarNarrow = "name:Sparks Bar Narrow:mode=node;+calt;\spark@DefaultFeatures"
+ \font\sparkBarExtranarrow= "name:Sparks Bar Extra-narrow:mode=node;+calt;\spark@DefaultFeatures"
+ \font\sparkBarWide = "name:Sparks Bar Wide:mode=node;+calt;\spark@DefaultFeatures"
+ \font\sparkBarExtrawide = "name:Sparks Bar Extra-wide:mode=node;+calt;\spark@DefaultFeatures"
%
- \newfontface\sparkDotLine{Spark-Dot-lineMedium}[RawFeature=+calt,\spark@DefaultFeatures]
+ \font\sparkDotlineMedium = "name:Sparks Dot-line Medium:mode=node;+calt;\spark@DefaultFeatures"
+ \font\sparkDotlineThick = "name:Sparks Dot-line Thick:mode=node;+calt;\spark@DefaultFeatures"
+ \font\sparkDotlineExtrathick= "name:Sparks Dot-line Extra-thick:mode=node;+calt;\spark@DefaultFeatures"
+ \font\sparkDotlineThin = "name:Sparks Dot-line Thin:mode=node;+calt;\spark@DefaultFeatures"
+ \font\sparkDotlineExtrathin = "name:Sparks Dot-line Extra-thin:mode=node;+calt;\spark@DefaultFeatures"
%
- \newfontface\sparkDotMedium{Spark-DotMedium}[RawFeature=+calt,\spark@DefaultFeatures]
- \newfontface\sparkDotSmall{Spark-DotSmall}[RawFeature=+calt,\spark@DefaultFeatures]
+ \font\sparkDotMedium = "name:Sparks Dot Medium:mode=node;+calt;\spark@DefaultFeatures"
+ \font\sparkDotSmall = "name:Sparks Dot Small:mode=node;+calt;\spark@DefaultFeatures"
+ \font\sparkDotExtralarge= "name:Sparks Dot Extra-large:mode=node;+calt;\spark@DefaultFeatures"
+ \font\sparkDotExtrasmall= "name:Sparks Dot Extra-small:mode=node;+calt;\spark@DefaultFeatures"
\fi
%
%
@@ -102,7 +118,7 @@ function RelativeValues(v,m)
end
end
\end{luacode}
- \def\spark@line{Line}% 12 3 45
+% 12 3 45
\NewDocumentCommand\sparkBar{sO{Medium}O{}mO{}}{{%
\check@list@values{#4}%
\IfBooleanTF{#1}%
@@ -114,12 +130,17 @@ end
\NewDocumentCommand\sparkDot{sO{Medium}O{}mO{}}{{%
\check@list@values{#4}%
\IfBooleanTF{#1}%
- {\def\spark@arg{#2}%
- \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}%
+ {\edef\spark@values@ii{\directlua{RelativeValues({\spark@values@i},100)}}}%
{\let\spark@values@ii\spark@values@i}%
- \@nameuse{sparkDot#2}\spark@mark@first\string{\spark@values@ii\string}\spark@mark@last%
+ \@nameuse{sparkDot#2}#3\spark@mark@first\string{\spark@values@ii\string}\spark@mark@last#5%
+ }}
+% 12 3 45
+ \NewDocumentCommand\sparkDotline{sO{Medium}O{}mO{}}{{%
+ \check@list@values{#4}%
+ \IfBooleanTF{#1}%
+ {\edef\spark@values@ii{\directlua{RelativeValues({\spark@values@i},100)}}}%
+ {\let\spark@values@ii\spark@values@i}%
+ \@nameuse{sparkDotline#2}#3\spark@mark@first\string{\spark@values@ii\string}\spark@mark@last#5%
}}
\else %% XeLaTeX% 1 2 34
\NewDocumentCommand\sparkBar{O{Medium}O{}mO{}}{{%
@@ -129,7 +150,12 @@ end
\NewDocumentCommand\sparkDot{O{Medium}O{}mO{}}{{%
\check@list@values{#3}%
\@nameuse{sparkDot#1}\spark@mark@first\string{\spark@values@i\string}\spark@mark@last%
+ }}%
+ \NewDocumentCommand\sparkDotline{O{Medium}O{}mO{}}{{%
+ \check@list@values{#3}%
+ \@nameuse{sparkDotline#1}\spark@mark@first\string{\spark@values@i\string}\spark@mark@last%
}}
\fi
%%
\endinput
+