* lily/include/music.hh (class Music): include SCM init argument.

[lilypond.git] / lily / grob-property.cc

diff --git a/lily/grob-property.cc b/lily/grob-property.cc
index 2ea216668a0802fd21f8f75edc81b3a9f2f6d143..bfe2eb5aa4c16c4cd4e7bf0856c895a45e96b7a1 100644 (file)
--- a/lily/grob-property.cc
+++ b/lily/grob-property.cc
@@ -2,32 +2,28 @@
   Implement storage and manipulation of grob properties.
  */
 
-#include <string.h>
+#include <cstring>
 #include <math.h>
 
 #include "main.hh"
 #include "input-smob.hh"
-
 #include "group-interface.hh"
 #include "misc.hh"
 #include "paper-score.hh"
-#include "paper-def.hh"
-#include "grob.hh"
-
+#include "output-def.hh"
 #include "spanner.hh"
 #include "item.hh"
 #include "misc.hh"
 #include "item.hh"
 
 
-
 SCM
 Grob::get_property_alist_chain (SCM def) const
 {
-  return  scm_list_n (mutable_property_alist_,
-                     immutable_property_alist_,
-                     def,
-                     SCM_UNDEFINED);
+  return scm_list_n (mutable_property_alist_,
+                    immutable_property_alist_,
+                    def,
+                    SCM_UNDEFINED);
 }
 
 
@@ -37,7 +33,7 @@ Grob::get_property_alist_chain (SCM def) const
 
     set_prop (name,cons (thing, get_prop (name)))
 
-  since it can reuse the handle returned by scm_assq().
+  since it can reuse the handle returned by scm_assq ().
 */
 void
 Grob::add_to_list_property (SCM sym, SCM thing) 
@@ -48,7 +44,7 @@ Grob::add_to_list_property (SCM sym, SCM thing)
 
   if (handle != SCM_BOOL_F)
     {
-      gh_set_cdr_x (handle, gh_cons (thing, gh_cdr (handle)));
+      scm_set_cdr_x (handle, scm_cons (thing, scm_cdr (handle)));
     }
   else
     {
@@ -57,10 +53,10 @@ Grob::add_to_list_property (SCM sym, SCM thing)
        mutable prop list.
       */
       handle = scm_sloppy_assq (sym, immutable_property_alist_);
-      SCM tail = (handle != SCM_BOOL_F) ? gh_cdr(handle) : SCM_EOL;
-      SCM val = gh_cons (thing, tail);
+      SCM tail = (handle != SCM_BOOL_F) ? scm_cdr (handle) : SCM_EOL;
+      SCM val = scm_cons (thing, tail);
 
-      mutable_property_alist_ = gh_cons (gh_cons (sym, val),
+      mutable_property_alist_ = scm_cons (scm_cons (sym, val),
                                         mutable_property_alist_);
     }
 }
@@ -69,56 +65,54 @@ Grob::add_to_list_property (SCM sym, SCM thing)
 extern void check_interfaces_for_property (Grob const *me, SCM sym);
 
 void
-Grob::internal_set_grob_property (SCM s, SCM v)
+Grob::internal_set_property (SCM s, SCM v)
 {
-  /*
-    Perhaps we simply do the assq_set, but what the heck.
-   */
-  if (!live())
-    return ; 
-
-#ifndef NDEBUG
-  if (internal_type_checking_global_b)
+  /* Perhaps we simply do the assq_set, but what the heck. */
+  if (!is_live ())
+    return;
+
+  if (do_internal_type_checking_global)
     {
-      assert (type_check_assignment (s, v, ly_symbol2scm ("backend-type?")));
-      check_interfaces_for_property(this, s);
+      if (!type_check_assignment (s, v, ly_symbol2scm ("backend-type?")))
+       abort ();
+      check_interfaces_for_property (this, s);
     }
-#endif
 
   mutable_property_alist_ = scm_assq_set_x (mutable_property_alist_, s, v);
 }
 
 
 SCM
-Grob::internal_get_grob_property (SCM sym) const
+Grob::internal_get_property (SCM sym) const
 {
   SCM s = scm_sloppy_assq (sym, mutable_property_alist_);
   if (s != SCM_BOOL_F)
-    return ly_cdr (s);
+    return scm_cdr (s);
 
   s = scm_sloppy_assq (sym, immutable_property_alist_);
   
-#ifndef NDEBUG
-  if (internal_type_checking_global_b && gh_pair_p (s))
+  if (do_internal_type_checking_global && scm_is_pair (s))
     {
-      assert (type_check_assignment (sym, gh_cdr (s), ly_symbol2scm ("backend-type?")));
-      check_interfaces_for_property(this, sym);
+      if (!type_check_assignment (sym, scm_cdr (s),
+                                 ly_symbol2scm ("backend-type?")))
+       abort ();
+
+      check_interfaces_for_property (this, sym);
     }
-#endif
 
-  return (s == SCM_BOOL_F) ? SCM_EOL : ly_cdr (s); 
+  return (s == SCM_BOOL_F) ? SCM_EOL : scm_cdr (s); 
 }
 
 void
 Grob::substitute_mutable_properties (SCM crit, SCM orig)
 {
-  set_break_subsititution(crit);
+  set_break_subsititution (crit);
   mutable_property_alist_ = substitute_mutable_property_alist (orig);
 }
 
 
 bool
-Grob::live () const
+Grob::is_live () const
 {
   return immutable_property_alist_ != SCM_EOL;
 }