X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fspacing-basic.cc;h=dd4003739012957e64e9db7d9af9800227992f04;hb=refs%2Fheads%2Fdon%2Ffix_configure_ac;hp=bed086a72cefab0672589b0042cfb0e5f3bb1f14;hpb=a93cdac09beaeb940a1776a5177fb823d1fa8337;p=lilypond.git

diff --git a/lily/spacing-basic.cc b/lily/spacing-basic.cc
index bed086a72c..dd40037390 100644
--- a/lily/spacing-basic.cc
+++ b/lily/spacing-basic.cc
@@ -1,9 +1,20 @@
 /*
-  spacing-basic.cc -- implement Spacing_spanner, simplistic spacing routines
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 2005--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 2005--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  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-spanner.hh"
@@ -30,64 +41,72 @@ Spring
 Spacing_spanner::standard_breakable_column_spacing (Grob *me, Item *l, Item *r, Spacing_options const *options)
 {
   Real min_dist = max (0.0, Paper_column::minimum_distance (l, r));
-  Real ideal;
 
   if (Paper_column::is_breakable (l) && Paper_column::is_breakable (r))
     {
       Moment *dt = unsmob_moment (l->get_property ("measure-length"));
       Moment mlen (1);
       if (dt)
-	mlen = *dt;
+        mlen = *dt;
 
       Real incr = robust_scm2double (me->get_property ("spacing-increment"), 1);
+      Real space = incr * double (mlen.main_part_ / options->global_shortest_) * 0.8;
+      Spring spring = Spring (min_dist + space, min_dist);
 
-      ideal = min_dist + incr * double (mlen.main_part_ / options->global_shortest_) * 0.8;
+      /*
+        By default, the spring will have an inverse_stretch_strength of space+min_dist.
+        However, we don't want stretchability to scale with min_dist or else an
+        empty first measure on a line (which has a large min_dist because of the clef)
+        will stretch much more than an empty measure later in the line.
+      */
+      spring.set_inverse_stretch_strength (space);
+      return spring;
     }
-  else
+
+  Moment dt = Paper_column::when_mom (r) - Paper_column::when_mom (l);
+  Real ideal;
+
+  if (dt == Moment (0, 0))
     {
-      Moment dt = Paper_column::when_mom (r) - Paper_column::when_mom (l);
-
-      if (dt == Moment (0, 0))
-	{
-	  /*
-	    In this case, Staff_spacing should handle the job,
-	    using dt when it is 0 is silly.
-	  */
-	  ideal = min_dist + 0.5;
-	}
-      else
-	ideal = min_dist + options->get_duration_space (dt.main_part_);
+      /*
+        In this case, Staff_spacing should handle the job,
+        using dt when it is 0 is silly.
+      */
+      ideal = min_dist + 0.5;
     }
+  else
+    ideal = min_dist + options->get_duration_space (dt.main_part_);
+
   return Spring (ideal, min_dist);
 }
 
 Moment *
 get_measure_length (Grob *column)
 {
-  Grob * sys = column->get_parent (X_AXIS);
+  Grob *sys = column->get_parent (X_AXIS);
 
   extract_grob_set (sys, "columns", cols);
 
   vsize col_idx = Paper_column::get_rank (column);
-  
+
   do
     {
       if (Moment *len = unsmob_moment (cols[col_idx]->get_property ("measure-length")))
-	{
-	  return len;
-	}
+        {
+          return len;
+        }
     }
   while (col_idx-- != 0);
-  
+
   return 0;
 }
 
 Real
-Spacing_spanner::note_spacing (Grob *me, Grob *lc, Grob *rc,
-			       Spacing_options const *options)
+Spacing_spanner::note_spacing (Grob * /* me */,
+                               Grob *lc,
+                               Grob *rc,
+                               Spacing_options const *options)
 {
-  (void) me;
-  
   Moment shortest_playing_len = 0;
   SCM s = lc->get_property ("shortest-playing-duration");
 
@@ -119,8 +138,8 @@ Spacing_spanner::note_spacing (Grob *me, Grob *lc, Grob *rc,
       delta_t = min (delta_t, *measure_len);
 
       /*
-	The following is an extra safety measure, such that
-	the length of a mmrest event doesn't cause havoc.
+        The following is an extra safety measure, such that
+        the length of a mmrest event doesn't cause havoc.
       */
       shortest_playing_len = min (shortest_playing_len, *measure_len);
     }
@@ -134,19 +153,19 @@ Spacing_spanner::note_spacing (Grob *me, Grob *lc, Grob *rc,
   else if (delta_t.grace_part_)
     {
       /*
-	Crude hack for spacing graces: we take the shortest space
-	available (namely the space for the global shortest note), and
-	multiply that by grace-space-factor
+        Crude hack for spacing graces: we take the shortest space
+        available (namely the space for the global shortest note), and
+        multiply that by grace-space-factor
       */
       dist = options->get_duration_space (options->global_shortest_) / 2.0;
       Grob *grace_spacing = unsmob_grob (lc->get_object ("grace-spacing"));
       if (grace_spacing)
-	{
-	  Spacing_options grace_opts;
-	  grace_opts.init_from_grob (grace_spacing);
-	  dist = grace_opts.get_duration_space (delta_t.grace_part_);
-	}
-      
+        {
+          Spacing_options grace_opts;
+          grace_opts.init_from_grob (grace_spacing);
+          dist = grace_opts.get_duration_space (delta_t.grace_part_);
+        }
+
     }
 
   return dist;