Merge with master

[lilypond.git] / lily / include / line-spanner.hh

diff --git a/lily/include/line-spanner.hh b/lily/include/line-spanner.hh
index e125a12c02b104c259a12b79c9d6473e4c6ba40a..ceff6f6a999a51ce259f62aa9282498461516804 100644 (file)
--- a/lily/include/line-spanner.hh
+++ b/lily/include/line-spanner.hh
@@ -3,20 +3,22 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2000 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 2000--2007 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
-
 #ifndef LINE_SPANNER_HH
 #define LINE_SPANNER_HH
 
-#include "lily-guile.hh"
+#include "lily-proto.hh"
+#include "grob-interface.hh"
 
 class Line_spanner
 {
 public:
-  DECLARE_SCHEME_CALLBACK (brew_molecule, (SCM));
-  static SCM line_atom (Grob* me, Real dx, Real dy);
+  DECLARE_SCHEME_CALLBACK (print, (SCM));
+  DECLARE_SCHEME_CALLBACK (after_line_breaking, (SCM));
+  static Stencil line_stencil (Grob *me, Offset f, Offset t);
+  DECLARE_GROB_INTERFACE();
 
 private:
   static Offset get_broken_offset (Grob *me, Direction dir);