patch::: 1.5.40.jcn1

[lilypond.git] / lily / include / grob.hh

diff --git a/lily/include/grob.hh b/lily/include/grob.hh
index e9665ea31b6057f4b75d96cdc740ca0f290f4998..98c0b7ae82bd38ebd739a1d5e70474c0c05e9b39 100644 (file)
--- a/lily/include/grob.hh
+++ b/lily/include/grob.hh
@@ -1,7 +1,7 @@
 /*
   grob.hh -- declare Grob
 
-  (c) 1996-1999--2001 Han-Wen Nienhuys
+  (c) 1996-1999--2002 Han-Wen Nienhuys
 */
 
 #ifndef STAFFELEM_HH
@@ -73,6 +73,8 @@ public:
   void set_immutable_grob_property (const char * , SCM val);
   void set_immutable_grob_property (SCM key, SCM val);
 #endif
+
+  void warning (String);
   
   void set_elt_pointer (const char*, SCM val);
   friend class Property_engraver; //  UGHUGHUGH.
@@ -176,11 +178,14 @@ public:
    */
   void set_parent (Grob* e, Axis);
   
-  Grob *parent_l (Axis a) const {   return  dim_cache_[a].parent_l_; }
+  Grob *get_parent (Axis a) const {   return  dim_cache_[a].parent_l_; }
   DECLARE_SCHEME_CALLBACK (fixup_refpoint, (SCM));
 };
 
 DECLARE_UNSMOB(Grob,grob);
+Spanner* unsmob_spanner (SCM );
+Item* unsmob_item (SCM );
+
 
 #endif // STAFFELEM_HH