X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fslur.hh;h=1d900220e62557b133241fe7530cc20489ad3dcb;hb=9e781b7dc83b60a543ce218aa1a5f139f74c760f;hp=797bdc321b41646ec1f41287c37b02b997dd661f;hpb=9b40d66187029df3dca86fc5ecc65f64db315a48;p=lilypond.git

diff --git a/lily/include/slur.hh b/lily/include/slur.hh
index 797bdc321b..1d900220e6 100644
--- a/lily/include/slur.hh
+++ b/lily/include/slur.hh
@@ -1,70 +1,48 @@
 /*
-  slur.hh -- declare Slur
+  This file is part of LilyPond, the GNU music typesetter.
 
-  (c) 1996--2000 Han-Wen Nienhuys
+  Copyright (C) 2004--2014 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"
-
-/**
-
-   de-uglify-parameters -- list of 3 real constants. They define the
-     valid areas for the middle control points. Used in de_uglyfy.
-     They are a bit empirical.
-
-   details -- alist containing contaning a few magic constants.
-
-   note-columns -- list of elt pointers to note columns.
-
-   attachment -- cons of symbols, '(LEFT-TYPE . RIGHT-TYPE), where
-     both types may be alongside-stem, stem, head or loose-end
-   
-   direction -- up or down?
+#include "std-vector.hh"
+#include "grob-interface.hh"
 
-   y-free -- ? 
-   
-   control-points --
-
-   
-   
-   Read-only
-   =========
-   
-   extremity-rules --
-
-   extremity-offset-alist --
-
-   thickness --
-
-   dash -- number representing the length of the dashes.
-*/
 class Slur
 {
 public:
-  static void add_column (Score_element*me,Score_element*col);
-  DECLARE_SCHEME_CALLBACK(brew_molecule, (SCM ));
-  static void set_interface (Score_element*);
-  static bool  has_interface (Score_element*);
-  static Array<Offset> get_encompass_offset_arr (Score_element*me) ;
-  static Bezier get_curve (Score_element*me) ;
-  static Direction get_default_dir (Score_element*me) ;
-  DECLARE_SCHEME_CALLBACK(after_line_breaking, (SCM ));
-  DECLARE_SCHEME_CALLBACK(set_spacing_rods, (SCM ));
-private:  
-  static Real get_first_notecolumn_y (Score_element *me, Direction dir);
-  static Offset broken_trend_offset (Score_element *me, Direction dir);
-  static Offset get_attachment (Score_element*me,Direction dir, Score_element**common) ;
-  static void de_uglyfy (Score_element*me,Slur_bezier_bow* bb, Real default_height);
-  static void set_extremities (Score_element*me);
-  static void set_control_points (Score_element*me);
-  static Offset encompass_offset (Score_element*me,Score_element *col,Score_element**common);
+  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 (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);
 };
 
-#endif // SLUR_HH
-
-
+#endif /* SLUR_HH */