From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Fri, 11 Mar 2005 22:22:42 +0000 (+0000)
Subject: (find_rods): oops. Fix the real
X-Git-Tag: release/2.5.16~34
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=f073a4c418c0b19fe6bb4c665f68db8ac3a25a6e;p=lilypond.git

(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 182a19c60b..b119012f29 100644
--- 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 fb9eb8ae26..71bf4dd5d7 100644
--- 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 d2b46405b2..1bbd3b5aa7 100644
--- 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))))