*** empty log message ***

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

diff --git a/lily/grob-property.cc b/lily/grob-property.cc
index 768f0d0724821163086fee9ea390c878eca62e06..f351d1ba362f6b8126a18311487d9fc2d1609c85 100644 (file)
--- a/lily/grob-property.cc
+++ b/lily/grob-property.cc
@@ -10,7 +10,7 @@
 #include "group-interface.hh"
 #include "misc.hh"
 #include "paper-score.hh"
-#include "paper-def.hh"
+#include "output-def.hh"
 #include "grob.hh"
 #include "spanner.hh"
 #include "item.hh"
@@ -21,10 +21,10 @@
 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);
 }
 
 
@@ -34,7 +34,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) 
@@ -45,7 +45,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, ly_cdr (handle)));
     }
   else
     {
@@ -54,10 +54,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) ? ly_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_);
     }
 }
@@ -66,15 +66,15 @@ 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 ())
+  if (!is_live ())
     return;
 
   if (internal_type_checking_global_b)
     {
-      if (type_check_assignment (s, v, ly_symbol2scm ("backend-type?")))
+      if (!type_check_assignment (s, v, ly_symbol2scm ("backend-type?")))
        abort ();
       check_interfaces_for_property (this, s);
     }
@@ -84,7 +84,7 @@ Grob::internal_set_grob_property (SCM s, SCM 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)
@@ -92,11 +92,12 @@ Grob::internal_get_grob_property (SCM sym) const
 
   s = scm_sloppy_assq (sym, immutable_property_alist_);
   
-  if (internal_type_checking_global_b && gh_pair_p (s))
+  if (internal_type_checking_global_b && ly_c_pair_p (s))
     {
-      if (!type_check_assignment (sym, gh_cdr (s),
+      if (!type_check_assignment (sym, ly_cdr (s),
                                  ly_symbol2scm ("backend-type?")))
        abort ();
+
       check_interfaces_for_property (this, sym);
     }
 
@@ -106,13 +107,13 @@ Grob::internal_get_grob_property (SCM sym) const
 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;
 }