(find_rods): oops. Fix the real

culprit: always exit the loop if we find a rod, even if it has
distance < 0.

diff --git a/ChangeLog b/ChangeLog
index 182a19c60bcc883e5073a3db9063713b491d9866..b119012f2930f8475c5a8fe0f50bce6d874ab4e1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2005-03-11  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+       * lily/separating-group-spanner.cc (find_rods): oops. Fix the real
+       culprit: always exit the loop if we find a rod, even if it has
+       distance < 0. 
+
        * lily/ledger-line-spanner.cc (set_spacing_rods): rewrite to O(n)
        algorithm.
 

diff --git a/lily/separating-group-spanner.cc b/lily/separating-group-spanner.cc
index fb9eb8ae26ee6c7c28281d92d7a041952448c721..71bf4dd5d72bfedf663f971f9c0e364ee7f81852 100644 (file)
--- a/lily/separating-group-spanner.cc
+++ b/lily/separating-group-spanner.cc
@@ -59,10 +59,9 @@ Separating_group_spanner::find_rods (Item *r, SCM next, Real padding)
 
          rod.distance_ = li[RIGHT] - ri[LEFT] + padding;
 
-         if ( rod.distance_ > 0.0)
+         if (rod.distance_ > 0.0)
            rod.add_to_cols ();
-         else
-           break;
+         break;
        }
 
       /*

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index d2b46405b20099904f6fd617426e38eec2b6af9f..1bbd3b5aa748cba2fef362b494ccf44a13649b04 100644 (file)
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -574,7 +574,7 @@
        (Y-extent-callback . #f)
        (minimum-length-fraction . 0.25)
        (length-fraction . 0.25)
-       (spacing-procedure . ,Ledger_line_spanner::set_spacing_rods)
+;      (spacing-procedure . ,Ledger_line_spanner::set_spacing_rods)
        (print-function . ,Ledger_line_spanner::print)
        (layer . 0)
        (meta . ((interfaces . (spanner-interface ledger-line-interface))))