release: 0.0.62

[lilypond.git] / lily / p-score.cc

diff --git a/lily/p-score.cc b/lily/p-score.cc
index d31762e54ae94c317a1ea91b1580abe43336044c..24421334ab955f99922618156380bfd918ef9368 100644 (file)
--- a/lily/p-score.cc
+++ b/lily/p-score.cc
@@ -131,6 +131,7 @@ PScore::output(Tex_stream &ts)
        if ((lic+1).ok())
            ts << "\\interscoreline\n";
     }  
+    ts << "\n\\EndLilyPondOutput";
 }
 
 
@@ -149,7 +150,7 @@ PScore::select_items(PStaff*ps, PCol*pc)
 void
 PScore::OK()const
 {
-#ifdef NDEBUG
+#ifndef NDEBUG
     for (iter_top(cols,cc); cc.ok(); cc++)
        cc->OK();
     for (iter_top(suz,i); i.ok(); i++)
@@ -227,17 +228,21 @@ PScore::add_broken(Spanner*s)
 }
 
 void
-PScore::set_breaking(Array<Col_hpositions> breaking)
+PScore::set_breaking(Array<Col_hpositions> const &breaking)
 {
     for (int j=0; j < breaking.size(); j++) {
-       Array<PCol*> &curline(breaking[j].cols);
-       Array<Real> &config(breaking[j].config);
+       const Array<PCol*> &curline(breaking[j].cols);
+       const Array<PCol*> &errors(breaking[j].error_col_l_arr_);
+       const Array<Real> &config(breaking[j].config);
        
        Line_of_score *s_p = new Line_of_score(curline,this);
+       s_p->error_mark_b_ =  breaking[j].ugh_b_;
        lines.bottom().add(s_p);        
        for (int i=0; i < curline.size(); i++){
            curline[i]->hpos = config[i];
        }
+       for (int i=0; i < errors.size(); i++)
+           errors[i]->error_mark_b_ = true;
     }
 }
 
@@ -252,11 +257,11 @@ void
 PScore::process()
 {
     clean_cols();
-    
-    *mlog << "Preprocessing ... " <<flush;
+    print();
+    *mlog << "Preprocessing elements... " <<flush;
     preprocess();
     *mlog << "\nCalculating column positions ... " <<flush;
     calc_breaking();
-    *mlog << "\nPostprocessing ..." << endl;
+    *mlog << "\nPostprocessing elements..." << endl;
     postprocess();
 }