spark-otf (13apr19)

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

1 files changed, 48 insertions, 22 deletions

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
+