* 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

diff --git a/ChangeLog b/ChangeLog
index 0e8b212ff677d9d19bf2c8987eab4b8d2e072966..beae11eebc7477f6c67a1a51de895f79a7f111f2 100644 (file)
--- 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 003fa15c9b28d0b45853498165a24d8554c721e3..aa7d918c8ea01aff71f2feb267248ec38d1f6f9f 100644 (file)
--- 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 5d11fb1bc25598220004ae7fd3408f47d456e7fb..f8726a864709386c9efdea83193d554150e4ebbd 100644 (file)
--- 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 05b7d5eb2c74de0863bf720945892709b57e463b..e2a2d7746741d7fc83d7f03ba36f887003ca56c1 100644 (file)
--- 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)