merge

[lilypond.git] / lily / include / script-column.hh

diff --git a/lily/include/script-column.hh b/lily/include/script-column.hh
index 0bbb6625663f81dbad05a4def57dde9ffebfabe3..d4b121072657b6481297720be2621c16cebfd5e8 100644 (file)
--- a/lily/include/script-column.hh
+++ b/lily/include/script-column.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1999--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef Script_COLUMN_HH
@@ -12,12 +12,16 @@
 #include "lily-guile.hh"
 #include "lily-proto.hh"
 
+#include "std-vector.hh"
+
 class Script_column
 {
 public:
-  static void add_staff_sided (Grob *, Item *);
+  static void add_side_positioned (Grob *, Grob *);
   DECLARE_SCHEME_CALLBACK (before_line_breaking, (SCM));
+  DECLARE_SCHEME_CALLBACK (row_before_line_breaking, (SCM));
   static bool has_interface (Grob *);
+  static void order_grobs (vector<Grob*> grobs);
 
 };