2 files changed, 20 insertions, 17 deletions
diff --git a/Master/texmf-dist/tex/generic/yax/yax.sty b/Master/texmf-dist/tex/generic/yax/yax.sty
index a537c3d92fc..0b52e79ca02 100644
--- a/Master/texmf-dist/tex/generic/yax/yax.sty
+++ b/Master/texmf-dist/tex/generic/yax/yax.sty
@@ -8,7 +8,7 @@
 % Date: July 2010.
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{yax}[2010/07/10 v.1.01 Yet Another Key System.]
+\ProvidesPackage{yax}[2010/07/10 v.1.02 Yet Another Key System.]
 \chardef\formatnumber=4
 \input yax.tex
 \endinput
 \ No newline at end of file
diff --git a/Master/texmf-dist/tex/generic/yax/yax.tex b/Master/texmf-dist/tex/generic/yax/yax.tex
index 36cf486f02a..17374883837 100644
--- a/Master/texmf-dist/tex/generic/yax/yax.tex
+++ b/Master/texmf-dist/tex/generic/yax/yax.tex
@@ -12,15 +12,18 @@
   \expandafter\endinput
 \fi
 
-% No need to test texapi's version, since \texapiversion was
-% defined in v.1.01 and that's the one needed.
-\unless\ifdefined\texapiversion
-  \senderror{YaX}{You need texapi with version at least 1.01. I quit}
+\ifdefined\texapiversion
+  \ifdim\texapiversion pt<1.02pt
+    \senderror{YaX}{You need texapi with version at least 1.02. I quit}
+    \expandafter\expandafter\expandafter\endinput
+  \fi
+\else
+  \senderror{YaX}{You need texapi with version at least 1.02. I quit}
   \expandafter\endinput
 \fi
 
 \setcatcodes{@_=11}
-\def\yaxversion{1.01}
+\def\yaxversion{1.02}
 \let\yax@already_loaded\relax
 \def\yax@error{\senderror{YaX}}
 
@@ -106,15 +109,15 @@
   }
 \long\def\yax@setattributes_getquote"#1"{%
   \passexpanded{\yax@space_loop{\yax@setattribute_single{#1}}}{\yax@attribute}%
-  \nospace{\resumefor\yax@setattributes_loop}% Better not to forget this!
+  \skipspace{\resumefor\yax@setattributes_loop}% Better not to forget this!
   }
 \long\def\yax@setattributes_getcommand#1{%
   \passexpanded{\yax@space_loop{\yax@setattribute_single{#1}}}{\yax@attribute}%
-  \nospace{\resumefor\yax@setattributes_loop}%
+  \skipspace{\resumefor\yax@setattributes_loop}%
   }
 \long\def\yax@setattributes_getspace#1 {%
   \passexpanded{\yax@space_loop{\yax@setattribute_single{#1}}}{\yax@attribute}%
-  \nospace{\resumefor\yax@setattributes_loop}%
+  \skipspace{\resumefor\yax@setattributes_loop}%
   }
 \newif\ifyax@makedef
 \long\def\yax@setattributes_do#1{%
@@ -227,7 +230,7 @@
   \yax@activeparametertrue\defparameter
   }%
 \long\def\yax@defparameter_def#1{%
-  \edefcs{yax@#1@def}{\unexpanded\expandafter{\yax@temp{#1}}}%
+  \edefcs{yax@#1@def}{\primunexpanded\expandafter{\yax@temp{#1}}}%
   \ifyax@activeparameter
     \yax@activeparameterfalse
     \letcs{yax@#1@active}\relax
@@ -274,7 +277,7 @@
 \def\yax@setattribute#1#2{%
   \def\yax@parameter{#1}%
   \def\yax@attribute{#2}%
-  \nospace\yax@setattribute_getvalue
+  \skipspace\yax@setattribute_getvalue
   }
 \def\yax@setattribute_getvalue#1 {%
   \yax@setattributes_do{#1}%
@@ -494,12 +497,12 @@
   }
 \newstring\val \newstring\elseval
 \long\def\yax@ifcasevalue_novalue#1\endval{%
-  \iffcontains{\elseval}{#1}{\splitstring{\elseval}{#1}\yax@ifcasevalue_doelse}%
+  \iffcontains{\elseval}{#1}{\splitstringat{\elseval}{#1}\yax@ifcasevalue_doelse}%
   }
 \def\yax@ifcasevalue_doelse#1#2{\trim{#2}}
 \def\yax@ifcasevalue_scan#1#2\endval{%
   \ifcontains{\elseval}{#2}
-             {\splitstring{\elseval}{#2}\yax@ifcasevalue_dotest{#1}}
+             {\splitstringat{\elseval}{#2}\yax@ifcasevalue_dotest{#1}}
              {\yax@ifcasevalue_dotest{#2}{}{#1}}%
   }
 \def\yax@ifcasevalue_dotest#1#2#3{%
@@ -538,10 +541,10 @@
 \long\def\yax@newsyntax#1#2{%
   \defcs{#2restrictattribute}#1{\yax@restrictattribute_getrestrictions{##1}{##2}}%
   \defcs{#2deleteattribute}#1{\letcs{yax@##1:##2}\yax@undefined}%
-  \defcs{#2setattribute}#1{\let\yax@dodef\defcs\yax@removesign{\nospace\yax@setattribute}{##1}{##2}}%
-  \defcs{#2esetattribute}#1{\let\yax@dodef\edefcs\yax@removesign{\nospace\yax@setattribute}{##1}{##2}}%
-  \defcs{#2gsetattribute}#1{\let\yax@dodef\gdefcs\yax@removesign{\nospace\yax@setattribute}{##1}{##2}}%
-  \defcs{#2xsetattribute}#1{\let\yax@dodef\xdefcs\yax@removesign{\nospace\yax@setattribute}{##1}{##2}}%
+  \defcs{#2setattribute}#1{\let\yax@dodef\defcs\yax@removesign{\skipspace\yax@setattribute}{##1}{##2}}%
+  \defcs{#2esetattribute}#1{\let\yax@dodef\edefcs\yax@removesign{\skipspace\yax@setattribute}{##1}{##2}}%
+  \defcs{#2gsetattribute}#1{\let\yax@dodef\gdefcs\yax@removesign{\skipspace\yax@setattribute}{##1}{##2}}%
+  \defcs{#2xsetattribute}#1{\let\yax@dodef\xdefcs\yax@removesign{\skipspace\yax@setattribute}{##1}{##2}}%
   \defcs{#2ifattribute}#1{\yax@ifattribute_and{}\gobbleone{##1}{##2}}%
   \defcs{yax@#2ifattribute_nometa}#1{\yax@ifattributenometa_and\gobbleone{##1}{##2}}%
   \yax@newsyntax_noarg{#2usevalue}{#1}\usecs