Merge branch 'lilypond/translation' of ssh://git.sv.gnu.org/srv/git/lilypond into...

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

diff --git a/lily/include/grob.hh b/lily/include/grob.hh
index 433ea7ec436a363bd3d40cab9ae70e8493b74c09..3a724c8d95ac5141e233584d2752d50bdc51a840 100644 (file)
--- a/lily/include/grob.hh
+++ b/lily/include/grob.hh
@@ -3,7 +3,7 @@
 
   source file of the LilyPond music typesetter
 
-  (c) 1996--2007 Han-Wen Nienhuys
+  (c) 1996--2009 Han-Wen Nienhuys
 */
 
 #ifndef GROB_HH
@@ -118,7 +118,7 @@ public:
   /* extents */
   Interval extent (Grob *refpoint, Axis) const;
   void flush_extent_cache (Axis);
-  Interval pure_height (Grob *refpoint, int start_col, int end_col);
+  virtual Interval pure_height (Grob *refpoint, int start_col, int end_col);
   Interval maybe_pure_extent (Grob *refpoint, Axis, bool pure, int start, int end);
 
   /* refpoints */
@@ -128,6 +128,7 @@ public:
   void fixup_refpoint ();
 
   virtual Interval_t<int> spanned_rank_interval () const;
+  bool check_cross_staff (Grob *common);
 };
 
 /* smob utilities */
@@ -146,6 +147,7 @@ Interval robust_relative_extent (Grob *, Grob *, Axis);
 /* offset/extent callbacks. */
 void add_offset_callback (Grob *g, SCM proc, Axis a);
 void chain_offset_callback (Grob *g, SCM proc, Axis a);
+void chain_callback (Grob *g, SCM proc, SCM sym);
 SCM axis_offset_symbol (Axis a);
 SCM axis_parent_positioning (Axis a);