Merge branch 'jneeman' of git+ssh://jneem@git.sv.gnu.org/srv/git/lilypond into jneeman

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

diff --git a/lily/include/tie-column.hh b/lily/include/tie-column.hh
index 3ecc0120761c506aeebdd160709d2ea471960b40..77d6d68a7809e86874dc02c92a889377f1d6abc6 100644 (file)
--- a/lily/include/tie-column.hh
+++ b/lily/include/tie-column.hh
@@ -3,24 +3,23 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2000--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2000--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef TIE_COLUMN_HH
 #define TIE_COLUMN_HH
 
+#include "grob-interface.hh"
 #include "lily-proto.hh"
-#include "lily-guile.hh"
 
 class Tie_column
 {
 public:
-  static bool has_interface (Grob *);
+  DECLARE_GROB_INTERFACE();
   static void add_tie (Grob *me, Grob *);
-  DECLARE_SCHEME_CALLBACK (after_line_breaking, (SCM));
+  DECLARE_SCHEME_CALLBACK (calc_positioning_done, (SCM));
   DECLARE_SCHEME_CALLBACK (before_line_breaking, (SCM));
   static void set_directions (Grob *me);
-  static void werner_directions (Grob *me);
   static void new_directions (Grob *me);
 };