X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fspacing-spanner.hh;h=7f560e288029383199d41c30c91db8465a4844a0;hb=9f3572d98bb948c9689cd1f75401a029451fa001;hp=f39ea98bc30726fd2042cd670c1bf9e2f65f5bdb;hpb=04265f11d1f21416ccebd2dcaa1d903dc781b36e;p=lilypond.git

diff --git a/lily/include/spacing-spanner.hh b/lily/include/spacing-spanner.hh
index f39ea98bc3..7f560e2880 100644
--- a/lily/include/spacing-spanner.hh
+++ b/lily/include/spacing-spanner.hh
@@ -19,14 +19,13 @@ struct Spacing_options
   bool packed_;
   bool stretch_uniformly_;
   bool float_nonmusical_columns_;
-  bool float_grace_columns_;
   Rational global_shortest_;
   Real increment_;
   Real shortest_duration_space_;
 
-  Spacing_options();
+  void init ();
   void init_from_grob (Grob *me);
-  Real get_duration_space (Rational d, bool *) const;
+  Real get_duration_space (Moment d, bool *) const;
 };
 
 /*
@@ -45,6 +44,7 @@ public:
   static Real default_bar_spacing (Grob *, Grob *, Grob *, Moment);
   static Real note_spacing (Grob *, Grob *, Grob *, Spacing_options const *, bool *);
   static Real get_duration_space (Moment dur, Spacing_options const *, bool *);
+  static Rational find_shortest (Grob *, vector<Grob*> const &);
   static Rational effective_shortest_duration (Grob *me, vector<Grob*> const &all);
   static void breakable_column_spacing (Grob *, Item *l, Item *r, Spacing_options const *);
   static void prune_loose_columns (Grob *, vector<Grob*> *cols, Spacing_options const *);
@@ -52,10 +52,7 @@ public:
   static void set_implicit_neighbor_columns (vector<Grob*> const &cols);
   static void generate_springs (Grob *me, vector<Grob*> const &cols, Spacing_options const *);
   static void musical_column_spacing (Grob *, Item *, Item *, Spacing_options const *);
-  static vector<Grob*> get_columns (Spanner *me);
-
   DECLARE_SCHEME_CALLBACK (set_springs, (SCM));
-  DECLARE_SCHEME_CALLBACK (calc_common_shortest_duration, (SCM));
   static bool has_interface (Grob *);
 };