Merge commit 'origin/dev/jneeman' into systems-per-page

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

diff --git a/lily/include/spacing-options.hh b/lily/include/spacing-options.hh
index 1b5ee32db09e49170f533713927f47bb1ffd3aee..7f52d458207448b2091cd6348ca55d11e95ad280 100644 (file)
--- a/lily/include/spacing-options.hh
+++ b/lily/include/spacing-options.hh
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 2006 Han-Wen Nienhuys <hanwen@lilypond.org>
+  (c) 2006--2009 Han-Wen Nienhuys <hanwen@lilypond.org>
   
 */
 
@@ -14,6 +14,11 @@
 #include "rational.hh"
 #include "std-vector.hh"
 
+/*
+  Various options for spacing. Usually inited from SpacingSpanner, but sometimes
+  from GraceSpacing.
+ */
+
 struct Spacing_options
 {
   bool packed_;
@@ -23,10 +28,9 @@ struct Spacing_options
   Rational global_shortest_;
   Real increment_;
   Real shortest_duration_space_;
-  vector<Grob*> columns_;
   
   Spacing_options();
   void init_from_grob (Grob *me);
-  Real get_duration_space (Rational d, bool *) const;
+  Real get_duration_space (Rational d) const;
 };
 #endif /* SPACING_OPTIONS_HH */