* THANKS: add Don.

* lily/slur-scoring.cc (get_base_attachments): use
robust_relative_extent. This fixes problems with empty paper-columns.

diff --git a/ChangeLog b/ChangeLog
index 5234f88e0b8175798aac8d6a7c24957070e69605..35aec5feaf042d6c3c52a96f41160e914a61e38b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-02-13  Han-Wen Nienhuys  <hanwen@xs4all.nl>
+
+       * THANKS: add Don.
+
+       * lily/slur-scoring.cc (get_base_attachments): use
+       robust_relative_extent. This fixes problems with empty paper-columns. 
+
 2006-02-12  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
        * Documentation/topdocs/NEWS.tely (Top): document \new syntax.

diff --git a/THANKS b/THANKS
index 6aa8fb83be1ccb96d65ddf0f3d9755fee1375d6b..1c8563a4c9fb02ff7a97c1f7424e84f545400574 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -57,6 +57,7 @@ Chris Sawer
 Christian Ebert
 Darius Blasband
 Donald Axel
+Don Blaheta
 Edward Neeman
 Eduardo Vieira
 Erlend Aasland

diff --git a/lily/slur-scoring.cc b/lily/slur-scoring.cc
index 4e96c9322db75b8c55c4a2d4d863a3bab213f0d0..5e24008e69a3c6c1fc2e488cddcd87086b1d24dc 100644 (file)
--- a/lily/slur-scoring.cc
+++ b/lily/slur-scoring.cc
@@ -128,7 +128,7 @@ broken_trend_y (Slur_score_state const &state, Direction hdir)
   if (Spanner *mother = dynamic_cast<Spanner *> (state.slur_->original ()))
     {
       vsize k = broken_spanner_index (state.slur_);
-      int j = k + hdir;
+      int j = int (k) + hdir;
       if (j < 0 || j >= mother->broken_intos_.size ())
        return by;
 
@@ -164,7 +164,7 @@ Slur_score_state::set_next_direction ()
   if (Spanner *mother = dynamic_cast<Spanner *> (slur_->original ()))
     {
       vsize k = broken_spanner_index (slur_);
-      int j = k + 1;
+      vsize j = k + 1;
       if (j < 0 || j >= mother->broken_intos_.size ())
        return;
 
@@ -564,7 +564,7 @@ Slur_score_state::get_base_attachments () const
        {
          Real x, y;
          if (d == RIGHT)
-           x = extremes_[d].bound_->extent (common_[X_AXIS], X_AXIS)[d];
+           x = robust_relative_extent (extremes_[d].bound_, common_[X_AXIS], X_AXIS)[d];
          else
            x = slur_->get_broken_left_end_align ();
          Grob *col = (d == LEFT) ? columns_[0] : columns_.back ();