1 files changed, 41 insertions, 40 deletions
diff --git a/tex/context/base/core-job.tex b/tex/context/base/core-job.tex
index f1f296922..91c963770 100644
--- a/tex/context/base/core-job.tex
+++ b/tex/context/base/core-job.tex
@@ -11,7 +11,7 @@
 %C therefore copyrighted by \PRAGMA. See mreadme.pdf for
 %C details.
 
-%D This module is still to be split and documented. 
+%D This module is still to be split and documented.
 
 \writestatus{loading}{Context Core Macros / Job Handling}
 
@@ -31,9 +31,9 @@
 %S
 %S CheckChar     $
 
-% \appendtoks \reportprotectionstate \to \everydump    
+% \appendtoks \reportprotectionstate \to \everydump
 
-\unprotect 
+\unprotect
 
 \let \currentproject     \empty
 \let \currentproduct     \empty
@@ -50,7 +50,7 @@
 
 \setvalue{\c!file::0}{\jobname}
 
-\def\processedfile % is used in styles, don't change ! 
+\def\processedfile % is used in styles, don't change !
   {\getvalue{\c!file::\fileprocesslevel}}
 
 %\def\processfile#1%
@@ -65,13 +65,13 @@
    \setxvalue{\c!file::\fileprocesslevel}{#1}%
    \@EA\doglobal\@EA\addtocommalist\@EA{#1}\processedfiles}
 
-\def\dostoptextfile  
+\def\dostoptextfile
   {\doglobal\decrement\fileprocesslevel}
 
 \def\processlocalfile#1#2%
   {% #1=\readlocfile|\readsetfile{dir} #2=filename
-   % #1{#2}\donothing\donothing  
-   #1{#2}\donothing{\readfile{#2}\donothing\donothing}}  
+   % #1{#2}\donothing\donothing
+   #1{#2}\donothing{\readfile{#2}\donothing\donothing}}
 
 \def\processfile#1%
   {\ifx\allinputpaths\empty
@@ -83,7 +83,7 @@
           {\donetrue\def\filepath{##1}}
           {\donefalse}%
         \ifdone\expandafter\quitcommalist\fi}%
-     \doifparentfileelse{#1} % new 
+     \doifparentfileelse{#1} % new
        {\processcommacommand  [\allinputpaths]\docommando}
        {\processcommacommand[.,\allinputpaths]\docommando}%
      \ifx\filepath\empty
@@ -103,7 +103,7 @@
         {\addtocommalist{##1}\allinputpaths}}%
    \processcommalist[#1]\docommando}
 
-\def\usesubpath[#1]% new, see webschrift for usage  
+\def\usesubpath[#1]% new, see webschrift for usage
   {\ifx\allinputpaths\empty
      \edef\allinputpaths{#1}%
    \else
@@ -113,7 +113,7 @@
      \processcommacommand[\allinputpaths]\docommando
    \fi}
 
-\def\registreerfileinfo[#1#2]#3% geen \showmessage ? 
+\def\registreerfileinfo[#1#2]#3% geen \showmessage ?
   {\writestatus\m!systems{#1#2 file #3 at line \the\inputlineno}%
    \immediatewriteutility{f #1 {#3}}}
 
@@ -130,13 +130,13 @@
 %      {\showmessage\m!systems2\f!filfilename}\donothing
 %    \readsysfile\f!sysfilename
 %      {\showmessage\m!systems2\f!sysfilename}\donothing}
-% 
+%
 % test \@@svgebied
 
 \def\loadallsystemfiles#1#2%
   {\ifx\@@svgebied\empty
      \readsysfile{#1}{\showmessage\m!systems2{#1}}{#2}%
-   \else% yet undocumented 
+   \else% yet undocumented
      \def\doloadsystemfile##1%
        {\readsetfile{##1}{#1}{\showmessage\m!systems2{#1}}{#2}}%
      \processcommacommand[\@@svgebied]\doloadsystemfile
@@ -160,8 +160,8 @@
   %\loadallsystemfiles\f!modfilename
   %  \donothing}
 
-%D Loading of \type {cont-usr.tex} (edited by the user) 
-%D and \type {cont-fmt.tex} (generated by texexec). 
+%D Loading of \type {cont-usr.tex} (edited by the user)
+%D and \type {cont-fmt.tex} (generated by texexec).
 
 \def\loaduserspecifications
   {\readsysfile\f!usrfilename
@@ -169,7 +169,7 @@
    \readjobfile\f!fmtfilename
      {\showmessage\m!systems2\f!fmtfilename}\donothing}
 
-%D We don't want multiple jobfiles to interfere. 
+%D We don't want multiple jobfiles to interfere.
 
 \bgroup
 \catcode`\%=\@@other
@@ -193,7 +193,7 @@
 \appendtoks \preloadlanguages     \to \everyjob
 \appendtoks \preloadspecials      \to \everyjob
 \appendtoks \openspecialfile      \to \everyjob
-%appendtoks \checkutilityfile     \to \everyjob % obsolete 
+%appendtoks \checkutilityfile     \to \everyjob % obsolete
 \appendtoks \openutilities        \to \everyjob
 \appendtoks \loadoptionfile       \to \everyjob
 %appendtoks \loadtwopassdata      \to \everyjob
@@ -213,7 +213,7 @@
 
 \prependtoks \resetutilities  \to \everystarttext % moved 28-02-2002
 \prependtoks \loadtwopassdata \to \everystarttext % moved 28-02-2002
-\appendtoks  \checkreferences \to \everystarttext % new   04-12-1999 
+\appendtoks  \checkreferences \to \everystarttext % new   04-12-1999
 
 % Most natural ...
 %
@@ -221,14 +221,14 @@
 %   {\the\everystarttext
 %    \global\let\doateverystarttext\relax}
 %
-% ... most practical, since we can load env's in a 
-% something.run file (nested \starttext's; see for 
-% instance x-res-08, where we definitely want to 
+% ... most practical, since we can load env's in a
+% something.run file (nested \starttext's; see for
+% instance x-res-08, where we definitely want to
 % open the file!).
 
 \def\doateverystarttext
   {\the\everystarttext
-   \global\everystarttext\emptytoks} 
+   \global\everystarttext\emptytoks}
 
 \def\starttekst
   {\doateverystarttext
@@ -242,14 +242,14 @@
   {\doglobal\decrement\textlevel\relax
    \ifnum\textlevel>\zerocount \else
      \the\everystoptext
-    %\the\everybye            % 
+    %\the\everybye            %
     %\the\everygoodbye        % == \end (new)
     %\expandafter\normalend   %
      \expandafter\end
    \fi}
 
-\let\starttext\starttekst 
-\let\stoptext \stoptekst 
+\let\starttext\starttekst
+\let\stoptext \stoptekst
 
 \let\normalend=\end
 
@@ -258,7 +258,7 @@
      \the\everybye
      \the\everygoodbye
      \global\everybye    \emptytoks % rather unneeded
-     \global\everygoodbye\emptytoks % but for sure 
+     \global\everygoodbye\emptytoks % but for sure
      \expandafter\normalend
    \fi}
 
@@ -291,11 +291,11 @@
    \dostoptextfile}
 
 \def\onderdeel #1 % at outermost level only
-  {\dostarttextfile{#1}%   
+  {\dostarttextfile{#1}%
    \processfile{#1}%
    \dostoptextfile}
 
-\def\environment{\omgeving} % for the moment, no \let !  
+\def\environment{\omgeving} % for the moment, no \let !
 
 \newcounter\filelevel
 
@@ -389,6 +389,9 @@
    \next}
 
 \def\dodosetups#1%
+  {\processcommalist[#1]\dododosetups}
+
+\def\dodososetups#1%
   {\getvalue{\??su#1}}
 
 \def\doifsetupselse#1%
@@ -400,17 +403,15 @@
    \xdostartsetups{#1}}
 
 \expanded
-  {\long\noexpand\def\noexpand\xdostartsetups##1##2\csname\e!stop\v!instellingen\endcsname%
+  {\long\noexpand\def\noexpand\xdostartsetups##1##2\csname\e!stop\v!instellingen\endcsname
      {\egroup
       \long\noexpand\setvalue{\??su##1}{##2}}}
 
 \def\startsetups % for international purposes
-  {\bgroup\doifnextcharelse[{\startsetupsA\stopsetups}%
-                            {\startsetupsB\stopsetups}}
+  {\bgroup\doifnextcharelse[\startsetupsA\startsetupsB\stopsetups}
 
 \def\startlocalsetups % for nested purposes
-  {\bgroup\doifnextcharelse[{\startsetupsA\stoplocalsetups}%
-                            {\startsetupsB\stoplocalsetups}}
+  {\bgroup\doifnextcharelse[\startsetupsA\startsetupsB\stoplocalsetups}
 
 \def\startsetupsA#1[#2]%
   {\catcode`\^^M=\@@ignore
@@ -430,18 +431,18 @@
 
 \neverypar=\emptytoks
 
-\appendtoks \flushnotes                     \to \everypar    
-\appendtoks \ifinner\else\checksidefloat\fi \to \everypar    
-\appendtoks \checkindentation               \to \everypar    
-\appendtoks \showparagraphnumber            \to \everypar    
-\appendtoks \flushmargincontents            \to \everypar    
-\appendtoks \flushcommentanchors            \to \everypar    
-\appendtoks \synchronizenotes               \to \everypar    
+\appendtoks \flushnotes                     \to \everypar
+\appendtoks \ifinner\else\checksidefloat\fi \to \everypar
+\appendtoks \checkindentation               \to \everypar
+\appendtoks \showparagraphnumber            \to \everypar
+\appendtoks \flushmargincontents            \to \everypar
+\appendtoks \flushcommentanchors            \to \everypar
+\appendtoks \synchronizenotes               \to \everypar
 
 \appendtoks \flushnotes                     \to \everydisplay
 \appendtoks \adjustsidefloatdisplaylines    \to \everydisplay
 
-%D Better here than in supp-mps: 
+%D Better here than in supp-mps:
 
 \def\executesystemcommand{\immediate\write18}