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

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

diff --git a/lily/spacing-basic.cc b/lily/spacing-basic.cc
index 4387c788be52fff6718648e0f7a2e09caae045fe..63d97f265246b3eff0b5f8f74ad419838463f12b 100644 (file)
--- a/lily/spacing-basic.cc
+++ b/lily/spacing-basic.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "spacing-spanner.hh"
@@ -115,7 +115,7 @@ Spacing_spanner::note_spacing (Grob *me, Grob *lc, Grob *rc,
 
   if (! shortest_playing_len.to_bool ())
     {
-      programming_error ("can't find a ruling note at " + Paper_column::when_mom (lc).to_string ());
+      programming_error ("cannot find a ruling note at: " + Paper_column::when_mom (lc).to_string ());
       shortest_playing_len = 1;
     }
 
@@ -133,16 +133,15 @@ Spacing_spanner::note_spacing (Grob *me, Grob *lc, Grob *rc,
     property in paper-column.
   */
 
-  Moment *dt = get_measure_length (lc);
-  if (dt)
+  if (Moment *measure_len = get_measure_length (lc))
     {
-      delta_t = min (delta_t, *dt);
+      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.
       */
-      shortest_playing_len = min (shortest_playing_len, *dt);
+      shortest_playing_len = min (shortest_playing_len, *measure_len);
     }
 
   Real dist = 0.0;
@@ -165,7 +164,6 @@ Spacing_spanner::note_spacing (Grob *me, Grob *lc, Grob *rc,
        {
          Spacing_options grace_opts;
          grace_opts.init_from_grob (grace_spacing);
-
          bool bla;
          dist = grace_opts.get_duration_space (delta_t.grace_part_, &bla);
        }