release commit

[lilypond.git] / lily / context.cc

diff --git a/lily/context.cc b/lily/context.cc
index 6f0d2fcffb156bf34e3bdc407a23f8974d548f41..6b539519e1629af16abbb30e92071835a17ba6e0 100644 (file)
--- a/lily/context.cc
+++ b/lily/context.cc
@@ -11,7 +11,7 @@
 #include "context-def.hh"
 #include "context.hh"
 #include "warn.hh"
-#include "music-output-def.hh"
+#include "output-def.hh"
 #include "scm-hash.hh"
 #include "main.hh"
 #include "ly-smobs.icc"
@@ -21,14 +21,13 @@ bool
 Context::is_removable () const
 {
   return context_list_ == SCM_EOL && ! iterator_count_ &&
-         !dynamic_cast<Score_context const*> (this)
-    ;
+         !dynamic_cast<Score_context const*> (this);
 }
 
 void
 Context::check_removal ()
 {
-  for (SCM p = context_list_; ly_c_pair_p (p); p = ly_cdr (p))
+  for (SCM p = context_list_; scm_is_pair (p); p = ly_cdr (p))
     {
       Context *trg =  unsmob_context (ly_car (p));
 
@@ -116,7 +115,7 @@ Context::find_create_context (SCM n, String id,
   if (n == ly_symbol2scm ("Bottom"))
     {
       Context* tg = get_default_interpreter ();
-      tg->id_string () = id;
+      tg->id_string_ = id;
       return tg;
     }
 
@@ -140,7 +139,7 @@ Context::find_create_context (SCM n, String id,
 
          if (i == path.size () -1)
            {
-             new_group->id_string () = id;
+             new_group->id_string_ = id;
            }
 
          current->add_context (new_group);
@@ -175,7 +174,7 @@ Context::find_create_context (SCM n, String id,
 SCM
 Context::default_child_context_name () const
 {
-  return ly_c_pair_p (accepts_list_)
+  return scm_is_pair (accepts_list_)
     ? ly_car (scm_last_pair (accepts_list_))
     : SCM_EOL;
 }
@@ -184,7 +183,7 @@ Context::default_child_context_name () const
 bool
 Context::is_bottom_context () const
 {
-  return !ly_c_symbol_p (default_child_context_name ());
+  return !scm_is_symbol (default_child_context_name ());
 }
 
 Context*
@@ -193,7 +192,7 @@ Context::get_default_interpreter ()
   if (!is_bottom_context ())
     {
       SCM nm = default_child_context_name ();
-      SCM st = get_output_def ()->find_context_def (nm);
+      SCM st = find_context_def (get_output_def (), nm);
 
       Context_def *t = unsmob_context_def (st);
       if (!t)
@@ -245,7 +244,7 @@ bool
 Context::is_alias (SCM sym) const
 {
   if (sym == ly_symbol2scm ("Bottom")
-      && !ly_c_pair_p (accepts_list_))
+      && !scm_is_pair (accepts_list_))
     return true;
   if (sym == unsmob_context_def (definition_)->get_context_name ())
     return true;
@@ -309,7 +308,7 @@ find_context_below (Context * where,
   
   Context * found = 0;
   for (SCM s = where->children_contexts ();
-       !found && ly_c_pair_p (s); s = ly_cdr (s))
+       !found && scm_is_pair (s); s = ly_cdr (s))
     {
       Context * tr = unsmob_context (ly_car (s));
 
@@ -344,7 +343,7 @@ Context::get_score_context () const
     return 0;
 }
 
-Music_output_def *
+Output_def *
 Context::get_output_def () const
 {
   return  (daddy_context_)