patch::: 1.3.62.hwn1

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

diff --git a/lily/include/spacing-spanner.hh b/lily/include/spacing-spanner.hh
index 0b8b10586acb0c31c5f77151f84a11992697ec76..c6e4bdd7cdf628e757c06b62c6885558e33a4cf1 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 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
@@ -15,17 +15,18 @@
 class Spacing_spanner : public Spanner
 {
 public:
-  Spacing_spanner ();
+  Spacing_spanner (SCM);
+
   VIRTUAL_COPY_CONS(Score_element);
-  Score_column *scol (int) const;
-  Array<Spring> do_measure (int,int) const;
-  int col_count () const;
+  Array<Spring> do_measure (Link_array<Paper_column>) const;
+
 protected:
   virtual  Array<Spring> get_springs () const;
 
-  Real stem_dir_correction (Score_column*,Score_column*)  const;
-  Real default_bar_spacing (Score_column*,Score_column*,Moment)  const;
-  Real note_spacing (Score_column*,Score_column*,Moment)  const;  
+  Real stem_dir_correction (Paper_column*,Paper_column*)  const;
+  Real default_bar_spacing (Paper_column*,Paper_column*,Moment)  const;
+  Real note_spacing (Paper_column*,Paper_column*,Moment)  const;
+  Real get_duration_space (Moment dur, Moment shortest) const;
 };
 
 #endif /* SPACING_SPANNER_HH */