* lily/output-def-scheme.cc: new file.

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

diff --git a/lily/grob-property.cc b/lily/grob-property.cc
index f6bfac3f16d40ed9c330fb3d24a80a0dbbfafd65..ddba069a2e4f60d46e150fb0e3140bff7765686c 100644 (file)
--- a/lily/grob-property.cc
+++ b/lily/grob-property.cc
@@ -2,7 +2,7 @@
   Implement storage and manipulation of grob properties.
  */
 
-#include <string.h>
+#include <cstring>
 #include <math.h>
 
 #include "main.hh"
@@ -11,7 +11,6 @@
 #include "misc.hh"
 #include "paper-score.hh"
 #include "output-def.hh"
-#include "grob.hh"
 #include "spanner.hh"
 #include "item.hh"
 #include "misc.hh"
@@ -45,7 +44,7 @@ Grob::add_to_list_property (SCM sym, SCM thing)
 
   if (handle != SCM_BOOL_F)
     {
-      scm_set_cdr_x (handle, scm_cons (thing, ly_cdr (handle)));
+      scm_set_cdr_x (handle, scm_cons (thing, scm_cdr (handle)));
     }
   else
     {
@@ -54,7 +53,7 @@ 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) ? ly_cdr (handle) : SCM_EOL;
+      SCM tail = (handle != SCM_BOOL_F) ? scm_cdr (handle) : SCM_EOL;
       SCM val = scm_cons (thing, tail);
 
       mutable_property_alist_ = scm_cons (scm_cons (sym, val),
@@ -88,20 +87,20 @@ 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_);
   
   if (internal_type_checking_global_b && scm_is_pair (s))
     {
-      if (!type_check_assignment (sym, ly_cdr (s),
+      if (!type_check_assignment (sym, scm_cdr (s),
                                  ly_symbol2scm ("backend-type?")))
        abort ();
 
       check_interfaces_for_property (this, sym);
     }
 
-  return (s == SCM_BOOL_F) ? SCM_EOL : ly_cdr (s); 
+  return (s == SCM_BOOL_F) ? SCM_EOL : scm_cdr (s); 
 }
 
 void