release: 1.5.29

[lilypond.git] / lily / include / spacing-spanner.hh

diff --git a/lily/include/spacing-spanner.hh b/lily/include/spacing-spanner.hh
index f0f81dde7612c38c72117665dd79cede71db83ac..ec088024e2a31bd4e66f4cf617cad699fdd71012 100644 (file)
--- a/lily/include/spacing-spanner.hh
+++ b/lily/include/spacing-spanner.hh
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
@@ -11,41 +11,18 @@
 #define SPACING_SPANNER_HH
 
 #include "spanner.hh"
+#include "spring.hh"
 
-/**
-   Read-only properties
-
-   maximum-duration-for-spacing -- rational: space as if a duration of
-     this type is available in this measure.
-
-
-   
-   Read properties from paper-column
-
-   dir-list -- list of stem directions
-
-   shortest-playing-duration -- duration of the shortest playing in that column.
-
-   shortest-starter-duration -- duration of the shortest notes that starts
-     exactly in that column.
-
-   contains-grace -- boolean. Used to widen entries for grace notes.
-
-   extra-space --  pair of distances
-
-   stretch-distance -- pair of distances
- */
 class Spacing_spanner
 {
 public:
-  static void set_interface (Score_element*);
-  static void do_measure (Score_element*,Link_array<Score_element>) ;
-
-  DECLARE_SCHEME_CALLBACK(set_springs, (SCM ));
-  static Real stem_dir_correction (Score_element*,Score_element*,Score_element*)  ;
-  static Real default_bar_spacing (Score_element*,Score_element*,Score_element*,Moment)  ;
-  static Real note_spacing (Score_element*,Score_element*,Score_element*,Moment)  ;
-  static Real get_duration_space (Score_element*,Moment dur, Moment shortest) ;
+  static void set_interface (Grob*);
+  static void do_measure (Grob*,Link_array<Grob> const &) ;
+  static void stretch_to_regularity (Grob*, Array<Spring> *, Link_array<Grob> const &);
+  DECLARE_SCHEME_CALLBACK (set_springs, (SCM ));
+  static Real default_bar_spacing (Grob*,Grob*,Grob*,Moment)  ;
+  static Real note_spacing (Grob*,Grob*,Grob*,Moment)  ;
+  static Real get_duration_space (Grob*,Moment dur, Moment shortest) ;
 };
 
 #endif /* SPACING_SPANNER_HH */