* Documentation/topdocs/NEWS.tely (Top): simplify NEWS entry, add

[lilypond.git] / lily / slur-scoring.cc

diff --git a/lily/slur-scoring.cc b/lily/slur-scoring.cc
index 6005bc076ba3095faad119bb2318f7abbf4b1463..88d528e34f10bc25242dbd96a88c818b54d70d0a 100644 (file)
--- a/lily/slur-scoring.cc
+++ b/lily/slur-scoring.cc
@@ -430,12 +430,20 @@ Slur_score_state::get_best_curve ()
     }
 
 #if DEBUG_SLUR_SCORING
-  configurations_[opt_idx]->score_card_ += to_string ("=%.2f", opt);
-  configurations_[opt_idx]->score_card_ += to_string ("i%d", opt_idx);
-
+  if (opt_idx >= 0)
+    {
+      configurations_[opt_idx]->score_card_ += to_string ("=%.2f", opt);
+      configurations_[opt_idx]->score_card_ += to_string ("i%d", opt_idx);
+    }
+  else
+    {
+      programming_error ("No optimal slur found. Guessing 0.");
+      opt_idx = 0;
+    }
+  
   // debug quanting
   slur_->set_property ("quant-score",
-                      scm_makfrom0str (configurations_[opt_idx]->score_card_.to_str0 ()));
+                      scm_makfrom0str (configurations_[opt_idx]->score_card_.c_str ()));
 
 #endif
 
@@ -530,6 +538,7 @@ Slur_score_state::get_base_attachments () const
              && !Stem::is_invisible (stem)
              && extremes_[d].stem_dir_ == dir_
              && Stem::get_beaming (stem, -d)
+             && Stem::get_beam (stem)
              && (!spanner_less (slur_, Stem::get_beam (stem))
                  || has_same_beam_))
            y = extremes_[d].stem_extent_[Y_AXIS][dir_];