(music-descriptions): remove

[lilypond.git] / lily / context-def.cc

diff --git a/lily/context-def.cc b/lily/context-def.cc
index b049215ddb77634450cd842f7d7a1381d6dd2c42..fc9466fb1a6beaf67b86a6c6f582ea6708b36727 100644 (file)
--- a/lily/context-def.cc
+++ b/lily/context-def.cc
@@ -26,6 +26,7 @@ Context_def::Context_def ()
   translator_mods_ = SCM_EOL;
   property_ops_ = SCM_EOL;
   context_name_ = SCM_EOL;
+  default_child_ = SCM_EOL;
   description_ = SCM_EOL;
 
   smobify_self ();
@@ -43,10 +44,12 @@ Context_def::Context_def (Context_def const &s)
   property_ops_ = SCM_EOL;
   context_name_ = SCM_EOL;
   description_ = SCM_EOL;
+  default_child_ = SCM_EOL;
 
   smobify_self ();
   description_ = s.description_;
 
+  default_child_ = s.default_child_;
   accept_mods_ = s.accept_mods_;
   property_ops_ = s.property_ops_;
   translator_mods_ = s.translator_mods_;
@@ -85,6 +88,7 @@ Context_def::mark_smob (SCM smob)
   scm_gc_mark (me->translator_mods_);
   scm_gc_mark (me->property_ops_);
   scm_gc_mark (me->translator_group_type_);
+  scm_gc_mark (me->default_child_);
 
   return me->context_name_;
 }
@@ -99,16 +103,23 @@ Context_def::add_context_mod (SCM mod)
       return;
     }
 
+  /*
+    other modifiers take symbols as argument. 
+  */
   SCM sym = scm_cadr (mod);
   if (scm_is_string (sym))
     sym = scm_string_to_symbol (sym);
 
-  if (ly_symbol2scm ("consists") == tag
+  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'",
+       error (_f ("program has no such type: `%s'",
                   ly_symbol2string (sym).to_str0 ()));
       else
        translator_mods_ = scm_cons (scm_list_2 (tag, sym), translator_mods_);
@@ -129,7 +140,7 @@ Context_def::add_context_mod (SCM mod)
   else if (ly_symbol2scm ("context-name") == tag)
     context_name_ = sym;
   else
-    programming_error ("Unknown context mod tag.");
+    programming_error ("unknown context mod tag");
 }
 
 SCM
@@ -152,9 +163,36 @@ Context_def::get_accepted (SCM user_mod) const
       else if (tag == ly_symbol2scm ("denies"))
        acc = scm_delete_x (sym, acc);
     }
+
+  SCM def = get_default_child (user_mod);
+  if (scm_is_symbol (def))
+    {
+      if (scm_memq (def, acc))
+       acc = scm_delete_x (def, acc);
+      acc = scm_cons (def, acc);
+    }
+  
   return acc;
 }
 
+
+SCM
+Context_def::get_default_child (SCM user_mod) const
+{
+  SCM name = default_child_;
+  for (SCM s = user_mod; scm_is_pair (s); s = scm_cdr (s))
+    {
+      SCM entry = scm_car (s);
+      if (scm_car (entry) == ly_symbol2scm ("default-child"))
+       {
+         name = scm_cadr (entry);
+         break;
+       }
+    }
+
+  return name;
+}
+
 Link_array<Context_def>
 Context_def::path_to_acceptable_context (SCM type_sym, Output_def *odef) const
 {
@@ -173,7 +211,7 @@ Context_def::path_to_acceptable_context (SCM type_sym, Output_def *odef) const
     {
       /* do not check aliases, because \context Staff should not
         create RhythmicStaff. */
-      if (ly_c_equal_p (accepteds[i]->get_context_name (), type_sym))
+      if (ly_is_equal (accepteds[i]->get_context_name (), type_sym))
        {
          best_result.push (accepteds[i]);
          return best_result;
@@ -189,12 +227,9 @@ Context_def::path_to_acceptable_context (SCM type_sym, Output_def *odef) const
        = g->path_to_acceptable_context (type_sym, odef);
       if (result.size () && result.size () < best_depth)
        {
+         best_depth = result.size ();
          result.insert (g, 0);
          best_result = result;
-
-         /* this following line was added in 1.9.3, but hsould've been
-            there all along... Let's hope it doesn't cause nightmares.  */
-         best_depth = result.size ();
        }
     }
 
@@ -230,14 +265,13 @@ Context_def::get_translator_names (SCM user_mod) const
 SCM
 filter_performers (SCM ell)
 {
-  for (SCM *tail = &ell; scm_is_pair (*tail); tail = SCM_CDRLOC (*tail))
+  SCM *tail = &ell;
+  for (SCM p = ell; scm_is_pair (p); p = scm_cdr (p))
     {
       if (dynamic_cast<Performer *> (unsmob_translator (scm_car (*tail))))
-       {
-         *tail = scm_cdr (*tail);
-         if (!scm_is_pair (*tail))
-           break;
-       }
+       *tail = scm_cdr (*tail);
+      else
+       tail = SCM_CDRLOC(*tail);
     }
   return ell;
 }
@@ -246,14 +280,12 @@ SCM
 filter_engravers (SCM ell)
 {
   SCM *tail = &ell;
-  for (; scm_is_pair (*tail); tail = SCM_CDRLOC (*tail))
+  for (SCM p = ell; scm_is_pair (p); p = scm_cdr (p))
     {
       if (dynamic_cast<Engraver *> (unsmob_translator (scm_car (*tail))))
-       {
-         *tail = scm_cdr (*tail);
-         if (!scm_is_pair (*tail))
-           break;
-       }
+       *tail = scm_cdr (*tail);
+      else
+       tail = SCM_CDRLOC(*tail);
     }
   return ell;
 }
@@ -306,6 +338,12 @@ Context_def::instantiate (SCM ops, Object_key const *key)
        }
     }
 
+
+  /*
+    Ugh,  todo: should just make a private
+    copy of Context_def with the user mods.
+  */
+
   g->simple_trans_list_ = trans_list;
 
   tg->implementation_ = g->self_scm ();
@@ -320,7 +358,7 @@ Context_def::instantiate (SCM ops, Object_key const *key)
   scm_gc_unprotect_object (g->self_scm ());
 
   tg->accepts_list_ = get_accepted (ops);
-
+    
   return tg;
 }