Run `make grand-replace'.

[lilypond.git] / lily / spacing-options.cc

diff --git a/lily/spacing-options.cc b/lily/spacing-options.cc
index 9a73ad6d7f70abd51e00cd5e2031a6239c52d3c7..1dc6991fd08db68d2c1517877a3c3e1ee77e063f 100644 (file)
--- a/lily/spacing-options.cc
+++ b/lily/spacing-options.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2006 Han-Wen Nienhuys <hanwen@lilypond.org>
+  (c) 2006--2008 Han-Wen Nienhuys <hanwen@lilypond.org>
 
 */
 
@@ -35,8 +35,6 @@ Spacing_options::init_from_grob (Grob *me)
     global_shortest_ = shortest_dur.main_part_;
   else
     global_shortest_ = shortest_dur.grace_part_;
-
-  columns_ = Spacing_spanner::get_columns (me);        // ugh.
 }
 
 Spacing_options::Spacing_options ()
@@ -58,8 +56,7 @@ Spacing_options::Spacing_options ()
   Get the measure wide ant for arithmetic spacing.
 */
 Real
-Spacing_options::get_duration_space (Rational d,
-                                    bool *expand_only) const
+Spacing_options::get_duration_space (Rational d) const
 {
   Real k = shortest_duration_space_;
 
@@ -94,7 +91,6 @@ Spacing_options::get_duration_space (Rational d,
       */
       Real log = log_2 (global_shortest_);
       k -= log;
-      *expand_only = false;
 
       return (log_2 (d) + k) * increment_;
     }