Merge with git+ssh://jneem@git.sv.gnu.org/srv/git/lilypond.git

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

diff --git a/lily/include/grob.hh b/lily/include/grob.hh
index 2ecac8bc4fd56b09cadda21009830595dff8e401..64fb7322a69f3065a907d5b9f45e08470e0978e3 100644 (file)
--- a/lily/include/grob.hh
+++ b/lily/include/grob.hh
@@ -9,6 +9,7 @@
 #ifndef GROB_HH
 #define GROB_HH
 
+#include "box.hh"
 #include "virtual-methods.hh"
 #include "dimension-cache.hh"
 #include "grob-interface.hh"
@@ -78,7 +79,7 @@ public:
   /* Properties */
   SCM get_property_alist_chain (SCM) const;
   SCM internal_get_property (SCM symbol) const;
-  SCM get_property_data (SCM symbol) const;
+  SCM internal_get_property_data (SCM symbol) const;
   SCM internal_get_object (SCM symbol) const;
   void internal_set_object (SCM sym, SCM val);
   void internal_del_property (SCM symbol);
@@ -151,4 +152,6 @@ void chain_offset_callback (Grob *g, SCM proc, Axis a);
 SCM axis_offset_symbol (Axis a);
 SCM axis_parent_positioning (Axis a);
 
+SCM call_pure_function (SCM unpure, SCM args, int start, int end);
+
 #endif /* GROB_HH */