X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fgrob-property.cc;h=f351d1ba362f6b8126a18311487d9fc2d1609c85;hb=78fab0cd2b9f3f568e9b97b313e33f28d7077223;hp=46d032c64f8800d0431551490084cd180eecf6ed;hpb=9f3cd80128759b22321f41060eb5c53853ac0667;p=lilypond.git

diff --git a/lily/grob-property.cc b/lily/grob-property.cc
index 46d032c64f..f351d1ba36 100644
--- 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"
@@ -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_);
     }
 }
@@ -69,7 +69,7 @@ void
 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)
@@ -92,9 +92,9 @@ Grob::internal_get_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 ();
 
@@ -113,7 +113,7 @@ Grob::substitute_mutable_properties (SCM crit, SCM orig)
 
 
 bool
-Grob::live () const
+Grob::is_live () const
 {
   return immutable_property_alist_ != SCM_EOL;
 }