From a497efbce1531b035384a9eb22d963f759428c5f Mon Sep 17 00:00:00 2001
From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Sat, 16 Sep 2006 21:43:22 +0000
Subject: [PATCH] * scm/define-grobs.scm (all-grob-descriptions): oops, typo:
 use spanner::set-spacing-ronds

* scm/define-grobs.scm (all-grob-descriptions): add
springs-and-rods
---
 ChangeLog            |  5 +++++
 lily/paper-column.cc |  5 ++++-
 lily/spanner.cc      | 10 +++++++---
 scm/define-grobs.scm |  3 ++-
 4 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 0e8b212ff6..beae11eebc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2006-09-16  Han-Wen Nienhuys  <hanwen@lilypond.org>
 
+	* scm/define-grobs.scm (all-grob-descriptions): oops, typo:
+	use spanner::set-spacing-ronds
+
+	* lily/note-column.cc: reformat.
+
 	* lily/rest-collision.cc (calc_positioning_done): fix whole/half
 	step positioning for note/rest combinations.
 
diff --git a/lily/paper-column.cc b/lily/paper-column.cc
index 003fa15c9b..aa7d918c8e 100644
--- a/lily/paper-column.cc
+++ b/lily/paper-column.cc
@@ -83,7 +83,10 @@ bool
 Paper_column::less_than (Grob *const &a,
 			 Grob *const &b)
 {
-  return dynamic_cast<Paper_column*> (a)->rank_ < dynamic_cast<Paper_column*> (b)->rank_;
+  Paper_column *pa = dynamic_cast<Paper_column*> (a);
+  Paper_column *pb = dynamic_cast<Paper_column*> (b);
+  
+  return pa->rank_ < pb->rank_;
 }
 
 Moment
diff --git a/lily/spanner.cc b/lily/spanner.cc
index 5d11fb1bc2..f8726a8647 100644
--- a/lily/spanner.cc
+++ b/lily/spanner.cc
@@ -327,10 +327,14 @@ Spanner::set_spacing_rods (SCM smob)
   Spanner *sp = dynamic_cast<Spanner *> (me);
   r.item_drul_[LEFT] = sp->get_bound (LEFT);
   r.item_drul_[RIGHT] = sp->get_bound (RIGHT);
-  r.distance_
-    = robust_scm2double (me->get_property ("minimum-length"), 0);
 
-  r.add_to_cols ();
+  SCM num_length = me->get_property ("minimum-length");
+  if (scm_is_number (num_length))
+    {
+      r.distance_ = robust_scm2double (num_length, 0);
+      r.add_to_cols ();
+    }
+  
   return SCM_UNSPECIFIED;
 }
 
diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index 05b7d5eb2c..e2a2d77467 100644
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -1690,7 +1690,7 @@
     (Tie
      . (
 	(control-points . ,ly:tie::calc-control-points)
-	(springs-and-rods . ,ly:spacing-spanner::set-springs)
+	(springs-and-rods . ,ly:spanner::set-spacing-rods)
 	(avoid-slur . inside)
 	(direction . ,ly:tie::calc-direction)
 	(stencil . ,ly:tie::print)
@@ -1713,6 +1713,7 @@
 		    (outer-tie-vertical-gap . 0.25)
 		    (multi-tie-region-size . 1)
 		    (between-length-limit . 1.0)))
+	
 	(thickness . 1.2)
 	(line-thickness . 0.8)
 	(meta . ((class . Spanner)
-- 
2.39.2