X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fslur.hh;h=ee31fbff9b6ae669c00da0b5874ddd02f6fe3fa7;hb=af97c5bad52e588c6e7a9ec5554162a615be19cb;hp=cb202f1e93032f41214176105842a1f9da8af21d;hpb=fbb6d20e9f58d691ffe845284cbb4d8bacf9ca60;p=lilypond.git

diff --git a/lily/include/slur.hh b/lily/include/slur.hh
index cb202f1e93..ee31fbff9b 100644
--- a/lily/include/slur.hh
+++ b/lily/include/slur.hh
@@ -1,47 +1,47 @@
 /*
-  slur.hh -- declare Slur
+  This file is part of LilyPond, the GNU music typesetter.
 
-  (c) 1996--2000 Han-Wen Nienhuys
+  Copyright (C) 2004--2010 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 "spanner.hh"
-#include "rod.hh"
+#include "lily-proto.hh"
+#include "std-vector.hh"
+#include "grob-interface.hh"
 
-/**
-  A #Bow# which tries to drape itself around the stems too.
- */
-class Slur : public Spanner
+class Slur
 {
 public:
-  Slur ();
-  VIRTUAL_COPY_CONS(Score_element);
-
-  void add_column (Note_column*);
-
-
-protected:
-  virtual Molecule do_brew_molecule () const;
-  virtual Array<Offset> get_encompass_offset_arr () const;
-  Bezier get_curve () const;
-  Drul_array<Real> dy_f_drul_;
-  Drul_array<Real> dx_f_drul_;
-
-  virtual Direction get_default_dir () const;
-  virtual void after_line_breaking ();
-  virtual void do_add_processing ();
-  Array<Rod> get_rods () const;
-
-private:  
-  void de_uglyfy (Slur_bezier_bow* bb, Real default_height);
-  void set_extremities ();
-  void set_control_points ();
-  int cross_staff_count () const;
-  Offset encompass_offset (Note_column const* )const;
+  static void add_column (Grob *me, Grob *col);
+  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 (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);
 };
 
-#endif // SLUR_HH
-
-
+#endif /* SLUR_HH */