* SConstruct: Further development.

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

diff --git a/lily/include/slur.hh b/lily/include/slur.hh
index 7313ee7e6c32d02d46dac4162ff115ef6cc4c8c9..166c9f16317c7e8a929f697e3cf07cd316f7df52 100644 (file)
--- a/lily/include/slur.hh
+++ b/lily/include/slur.hh
@@ -1,7 +1,7 @@
 /*
   slur.hh -- declare Slur
 
-  (c) 1996--2001 Han-Wen Nienhuys
+  (c) 1996--2004 Han-Wen Nienhuys
 */
 
 #ifndef SLUR_HH
@@ -15,21 +15,21 @@ class Slur
 {
 public:
   static void add_column (Grob *me, Grob *col);
-  DECLARE_SCHEME_CALLBACK (brew_molecule, (SCM));
+  DECLARE_SCHEME_CALLBACK (print, (SCM));
   static void set_interface (Grob*);
   static bool  has_interface (Grob*);
-  static Array<Offset> get_encompass_offset_arr (Grob *me);
+  static Array<Offset> get_encompass_offsets (Grob *me);
   static Bezier get_curve (Grob *me);
   static Direction get_default_dir (Grob *me);
   DECLARE_SCHEME_CALLBACK (after_line_breaking, (SCM));
 
   DECLARE_SCHEME_CALLBACK (height, (SCM,SCM));
 private:  
-  static Real get_first_notecolumn_y (Grob *me, Direction dir);
+  static Real get_boundary_notecolumn_y (Grob *me, Direction dir);
   static Offset broken_trend_offset (Grob *me, Direction dir);
   static Offset get_attachment (Grob *me,Direction dir, Grob **common);
-  static void de_uglyfy (Grob *me,Slur_bezier_bow* bb, Real default_height);
-  static void set_extremities (Grob *me);
+  static void de_uglify (Grob *me,Slur_bezier_bow* bb, Real default_height);
+  static SCM set_extremities (Grob *me);
   static void set_control_points (Grob *me);
   static void check_slope (Grob *me);
   static Offset encompass_offset (Grob *me, Grob *col, Grob **common);