* The grand 2005-2006 replace.

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

diff --git a/lily/include/slur.hh b/lily/include/slur.hh
index 5dd31b6f5cc3a9b45fafa9c86e0ddd2e3c12f915..390bde5c6f27975aa16250f49760c30fa6c78f96 100644 (file)
--- a/lily/include/slur.hh
+++ b/lily/include/slur.hh
@@ -1,32 +1,29 @@
-/* 
+/*
   slur.hh -- declare Slur
-  
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 2004 Han-Wen Nienhuys <hanwen@xs4all.nl>
-  
+
+  (c) 2004--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
-#ifndef NEW_SLUR_HH
-#define NEW_SLUR_HH
+#ifndef SLUR_HH
+#define SLUR_HH
 
 #include "lily-proto.hh"
 #include "lily-guile.hh"
 
-#define DEBUG_SLUR_QUANTING 1
-
 class Slur
 {
 public:
   static void add_column (Grob *me, Grob *col);
   static void add_extra_encompass (Grob *me, Grob *col);
   DECLARE_SCHEME_CALLBACK (print, (SCM));
-  DECLARE_SCHEME_CALLBACK (after_line_breaking, (SCM));
-  DECLARE_SCHEME_CALLBACK (height, (SCM,SCM));
-  DECLARE_SCHEME_CALLBACK (outside_slur_callback, (SCM,SCM));
+  DECLARE_SCHEME_CALLBACK (calc_control_points, (SCM));
+  DECLARE_SCHEME_CALLBACK (calc_direction, (SCM));
+  DECLARE_SCHEME_CALLBACK (height, (SCM));
+  DECLARE_SCHEME_CALLBACK (outside_slur_callback, (SCM, SCM));
   static bool has_interface (Grob *);
-  static Bezier get_curve (Grob*me);
+  static Bezier get_curve (Grob *me);
 };
 
-#endif /* NEW_SLUR_HH */
-
+#endif /* SLUR_HH */