X-Git-Url: https://git.donarmstrong.com/lilypond.git?a=blobdiff_plain;f=src%2Fsimplewalker.cc;h=33ddf1ea69ef1d00847e165e9027964e0299fe0f;hb=fe3f57f573545248c6245ebeff71884c23c35a84;hp=21ed11573af506ead3bdbd1089fffad83bccf698;hpb=c8374706587ab2ba89c9355efb0d926ae9a9eaef;p=lilypond.git

diff --git a/src/simplewalker.cc b/src/simplewalker.cc
index 21ed11573a..33ddf1ea69 100644
--- a/src/simplewalker.cc
+++ b/src/simplewalker.cc
@@ -185,7 +185,7 @@ Simple_walker::process_requests()
 
 	if (sl->spantype == Span_req::START) {
 	    if  (find_slur(sl->elt_l_->voice_ )>=0)
-		error_t("Too many slurs in voice", col()->when());
+		error_t("Too many slurs in voice", *col()->tdescription_);
 	    pending_slur_reqs.add(sl);
 	    pending_slurs.add(new Slur);
 	}
@@ -206,7 +206,7 @@ Simple_walker::process_requests()
     if (beam_) {
 	if (!stem_)
 	    WARN <<"beamed note should have a stem (t = " 
-		  <<String(c->when())<<"\n";
+		  <<String(c->when())<<")\n";
 	else
 	    beam_->add(stem_);
 
@@ -219,6 +219,7 @@ Simple_walker::process_requests()
     }
 
     if (c->beam_&& c->beam_->spantype == Span_req::STOP) {
+	default_grouping.extend(current_grouping->interval());
 	beam_->set_grouping(default_grouping, *current_grouping);
 	pscore_->typeset_spanner(beam_, s->theline);
 
@@ -251,7 +252,7 @@ Simple_walker::process_requests()
 	if (sl->spantype == Span_req::STOP) {
 	    int idx = find_slur(sl->elt_l_->voice_);
 	    if (idx < 0)
-		error_t("can't find slur to end; ", c->when());
+		error_t("can't find slur to end; ", *c->tdescription_);
 	    
 	    pscore_->typeset_spanner(pending_slurs[idx],
 				     s->theline);