beta 2013.03.27 00:08

1 files changed, 12 insertions, 10 deletions

diff --git a/tex/context/base/mult-aux.mkiv b/tex/context/base/mult-aux.mkiv
index dc6aca920..24eaa3366 100644
--- a/tex/context/base/mult-aux.mkiv
+++ b/tex/context/base/mult-aux.mkiv
@@ -309,7 +309,7 @@
         \expandafter\noexpand\csname current#2parent\endcsname
         \expandafter\noexpand\csname saved_defined_#2\endcsname}}
 
-\unexpanded\def\mult_interfaces_install_setup_handler#1#2#3#4#5#6#7#8%
+\unexpanded\def\mult_interfaces_install_setup_handler#1#2#3#4#5#6#7#8#9%
   {\ifx#3\relax\let#3\empty\fi
    \unexpanded\def#2{\dodoubleempty#4}%
    \unexpanded\def#6{\mult_interfaces_get_parameters{#1#3:}}% no every ! don't change it
@@ -318,11 +318,11 @@
    \unexpanded\def#4[##1][##2]% maybe helper
      {\let#7#3%
       \ifsecondargument
-        \def\mult_interfaces_with_comma_list_element####1% we will have a simple one as well
+        \def#9####1% we will have a simple one as well
           {\edef#3{####1}%
            \mult_interfaces_get_parameters{#1#3:}[##2]%
            \the#5}%
-        \processcommalist[##1]\mult_interfaces_with_comma_list_element
+        \processcommalist[##1]#9%
       \else
         \let#3\empty
         \mult_interfaces_get_parameters{#1:}[##1]%
@@ -341,7 +341,8 @@
         \expandafter\noexpand\csname everysetup#2\endcsname
         \expandafter\noexpand\csname setupcurrent#2\endcsname
         \expandafter\noexpand\csname saved_setup_current#2\endcsname
-        \expandafter\noexpand\csname everysetup#2root\endcsname}}
+        \expandafter\noexpand\csname everysetup#2root\endcsname
+        \expandafter\noexpand\csname nested_setup_current#2\endcsname}}
 
 \let\doingrootsetupnamed\plusone    % \setuplayout[name][key=value]
 \let\doingrootsetuproot \plustwo    % \setuplayout      [key=value]
@@ -421,7 +422,7 @@
         \expandafter\noexpand\csname everyswitch#2\endcsname
         \expandafter\noexpand\csname everysetup#2root\endcsname}}
 
-\unexpanded\def\mult_interfaces_install_auto_setup_handler#1#2#3#4#5#6#7#8%
+\unexpanded\def\mult_interfaces_install_auto_setup_handler#1#2#3#4#5#6#7#8#9%
   {\ifx#3\relax\let#3\empty\fi
    \unexpanded\def#2{\dotripleempty#4}%
    \unexpanded\def#6{\mult_interfaces_get_parameters{#1#3:}}%
@@ -429,19 +430,19 @@
    \def#4[##1][##2][##3]%
      {\let#8#3%
       \ifthirdargument
-        \def\mult_interfaces_with_comma_list_element####1%
+        \def#9####1%
           {\edef#3{####1}%
            \expandafter\def\csname#1#3:\s!parent\endcsname{#1##2}%
            \mult_interfaces_get_parameters{#1#3:}[##3]% always sets parent
            \the#5}%
-        \processcommalist[##1]\mult_interfaces_with_comma_list_element
+        \processcommalist[##1]#9%
       \else\ifsecondargument
-        \def\mult_interfaces_with_comma_list_element####1%
+        \def#9####1%
           {\edef#3{####1}%
            #7% checks parent and sets if needed
            \mult_interfaces_get_parameters{#1#3:}[##2]%
            \the#5}%
-        \processcommalist[##1]\mult_interfaces_with_comma_list_element
+        \processcommalist[##1]#9%
       \else
         \let#3\empty
         \mult_interfaces_get_parameters{#1:}[##1]%
@@ -459,7 +460,8 @@
         \expandafter\noexpand\csname everysetup#2\endcsname
         \expandafter\noexpand\csname setupcurrent#2\endcsname
         \expandafter\noexpand\csname check#2parent\endcsname
-        \expandafter\noexpand\csname saved_setup_current#2\endcsname}}
+        \expandafter\noexpand\csname saved_setup_current#2\endcsname
+        \expandafter\noexpand\csname nested_setup_current#2\endcsname}}
 
 \unexpanded\def\installbasicparameterhandler#1#2%
   {\installparameterhandler    {#1}{#2}%