X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fslur.hh;h=000c07dce82945320002b99979d1add1f787d2db;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=c71131041571062c0c815a16fe0719009d880bae;hpb=2fc177dc2401903f604f4520c7b59e1544046ed5;p=lilypond.git

diff --git a/lily/include/slur.hh b/lily/include/slur.hh
index c711310415..000c07dce8 100644
--- a/lily/include/slur.hh
+++ b/lily/include/slur.hh
@@ -1,40 +1,48 @@
 /*
-  slur.hh -- declare Slur
+  This file is part of LilyPond, the GNU music typesetter.
 
-  (c) 1996--2002 Han-Wen Nienhuys
+  Copyright (C) 2004--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
+
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #ifndef SLUR_HH
 #define SLUR_HH
 
-#include "lily-guile.hh"
 #include "lily-proto.hh"
-#include "rod.hh"
+#include "std-vector.hh"
+#include "grob-interface.hh"
 
 class Slur
 {
 public:
   static void add_column (Grob *me, Grob *col);
-  DECLARE_SCHEME_CALLBACK (brew_molecule, (SCM));
-  static void set_interface (Grob*);
-  static bool  has_interface (Grob*);
-  static Array<Offset> get_encompass_offset_arr (Grob *me);
+  static void add_extra_encompass (Grob *me, Grob *col);
+  static void replace_breakable_encompass_objects (Grob *me);
+  static void auxiliary_acknowledge_extra_object (Grob_info const &, vector<Grob *> &, vector<Grob *> &);
+  DECLARE_SCHEME_CALLBACK (print, (SCM));
+  DECLARE_SCHEME_CALLBACK (calc_control_points, (SCM));
+  DECLARE_SCHEME_CALLBACK (calc_direction, (SCM));
+  DECLARE_SCHEME_CALLBACK (pure_height, (SCM, SCM, SCM));
+  DECLARE_SCHEME_CALLBACK (height, (SCM));
+  DECLARE_SCHEME_CALLBACK (vertical_skylines, (SCM));
+  DECLARE_SCHEME_CALLBACK (outside_slur_callback, (SCM, SCM));
+  DECLARE_SCHEME_CALLBACK (pure_outside_slur_callback, (SCM, SCM, SCM, SCM));
+  DECLARE_SCHEME_CALLBACK (outside_slur_cross_staff, (SCM, SCM));
+  DECLARE_SCHEME_CALLBACK (calc_cross_staff, (SCM));
+  DECLARE_GROB_INTERFACE ();
   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 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 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);
 };
 
-#endif // SLUR_HH
-
-
+#endif /* SLUR_HH */