X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fcontext-def.cc;h=31b821655c3074958fd907e97d56a41743c98081;hb=09bf9a18185476020686ff65b5d70b57051be780;hp=a810159aa326d601cb75f950f9f7e4e3c0e0a3a3;hpb=edf17353d89f4f6bd831466262402bb9151a26ca;p=lilypond.git

diff --git a/lily/context-def.cc b/lily/context-def.cc
index a810159aa3..31b821655c 100644
--- a/lily/context-def.cc
+++ b/lily/context-def.cc
@@ -1,9 +1,9 @@
 /*
-  translator-def.cc -- implement Context_def
+  context-def.cc -- implement Context_def
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2000--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2000--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 /* TODO: should junk this class an replace by
@@ -123,12 +123,11 @@ Context_def::add_context_mod (SCM mod)
   if (ly_symbol2scm ("default-child") == tag)
     default_child_ = sym;
   else if (ly_symbol2scm ("consists") == tag
-	   || ly_symbol2scm ("consists-end") == tag
 	   || ly_symbol2scm ("remove") == tag)
     {
       if (!get_translator (sym))
-	error (_f ("program has no such type: `%s'",
-		   ly_symbol2string (sym).c_str ()));
+	warning (_f ("program has no such type: `%s'",
+		     ly_symbol2string (sym).c_str ()));
       else
 	translator_mods_ = scm_cons (scm_list_2 (tag, sym), translator_mods_);
     }
@@ -205,8 +204,24 @@ Context_def::get_default_child (SCM user_mod) const
   The ADDITIONAL_ACCEPTS parameter is a list of additional contexts that this
   specific context def (but not any of the child context defs) should accept.
 */
+vector<Context_def *>
+Context_def::path_to_acceptable_context (SCM type_sym,
+					 Output_def *odef,
+					 SCM additional_accepts) const
+{
+  set<const Context_def *> seen;
+  return internal_path_to_acceptable_context (type_sym, odef, additional_accepts, &seen);
+}
+
+/*
+The SEEN parameter is a set which keeps track of visited contexts, allowing
+contexts of the same type to be nested.
+*/
 vector<Context_def*>
-Context_def::path_to_acceptable_context (SCM type_sym, Output_def *odef, SCM additional_accepts) const
+Context_def::internal_path_to_acceptable_context (SCM type_sym,
+						  Output_def *odef,
+						  SCM additional_accepts,
+						  set<const Context_def *> *seen) const
 {
   assert (scm_is_symbol (type_sym));
 
@@ -230,20 +245,25 @@ Context_def::path_to_acceptable_context (SCM type_sym, Output_def *odef, SCM add
 	}
     }
 
+  seen->insert (this);
   vsize best_depth = INT_MAX;
   for (vsize i = 0; i < accepteds.size (); i++)
     {
       Context_def *g = accepteds[i];
 
-      vector<Context_def*> result
-	= g->path_to_acceptable_context (type_sym, odef, SCM_EOL);
-      if (result.size () && result.size () < best_depth)
+      if (!seen->count (g))
 	{
-	  best_depth = result.size ();
-	  result.insert (result.begin (), g);
-	  best_result = result;
+	  vector<Context_def*> result
+	    = g->internal_path_to_acceptable_context (type_sym, odef, SCM_EOL, seen);
+	  if (result.size () && result.size () < best_depth)
+	    {
+	      best_depth = result.size ();
+	      result.insert (result.begin (), g);
+	      best_result = result;
+	    }
 	}
     }
+  seen->erase (this);
 
   return best_result;
 }
@@ -265,7 +285,8 @@ Context_def::get_translator_names (SCM user_mod) const
 
       if (ly_symbol2scm ("consists") == tag)
 	l1 = scm_cons (arg, l1);
-      else if (ly_symbol2scm ("remove") == tag)
+      else if (ly_symbol2scm ("remove") == tag
+	       && get_translator (arg))
 	l1 = scm_delete_x (arg, l1);
     }