Merge branch 'master' of ssh://jomand@git.sv.gnu.org/srv/git/lilypond into lilypond...

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

diff --git a/lily/spacing-options.cc b/lily/spacing-options.cc
index c4e40a88373de47b5219b2b73b0ad6652a23307b..f78a94a6199fc1996b4602befa57437bd1a0b8ab 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--2009 Han-Wen Nienhuys <hanwen@lilypond.org>
 
 */
 
@@ -56,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_;
 
@@ -92,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_;
     }