Imported Upstream version 2.14.2

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

diff --git a/lily/spacing-options.cc b/lily/spacing-options.cc
index 916408aa7335af66d84c2d52ee15046a251b6ff9..934acb20cc2bf0a803ccecaf910000755197254a 100644 (file)
--- a/lily/spacing-options.cc
+++ b/lily/spacing-options.cc
@@ -1,16 +1,29 @@
 /*
-  spacing-options.cc -- implement Spacing_options 
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 2006--2011 Han-Wen Nienhuys <hanwen@lilypond.org>
 
-  (c) 2006 Han-Wen Nienhuys <hanwen@lilypond.org>
 
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include "spacing-options.hh"
 #include "spacing-spanner.hh"
 #include "grob.hh"
 #include "misc.hh"
 #include "moment.hh"
+#include "spanner.hh"
 
 void
 Spacing_options::init_from_grob (Grob *me)
@@ -33,7 +46,6 @@ Spacing_options::init_from_grob (Grob *me)
     global_shortest_ = shortest_dur.main_part_;
   else
     global_shortest_ = shortest_dur.grace_part_;
-
 }
 
 Spacing_options::Spacing_options ()
@@ -55,8 +67,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_;
 
@@ -91,7 +102,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_;
     }