lilypond-0.1.7

diff --git a/lily/break.cc b/lily/break.cc
index 1ef5c4bc6f48b41b63831e14c942e0b9c4889e82..8edb91a8b669785fac6fc04a3396d4e2274a20ae 100644 (file)
--- a/lily/break.cc
+++ b/lily/break.cc
@@ -120,7 +120,7 @@ Break_algorithm::Break_algorithm()
 }
 
 void
-Break_algorithm::set_pscore(PScore*s)
+Break_algorithm::set_pscore(Paper_score*s)
 {
     pscore_l_ = s;
     linelength = s->paper_l_->linewidth_f();

diff --git a/lily/include/break.hh b/lily/include/break.hh
index e016a8806afa7ca008952f74edd10f725659445f..0a9fafe68cf461118b4b6fcc84545a80d2304797 100644 (file)
--- a/lily/include/break.hh
+++ b/lily/include/break.hh
@@ -36,7 +36,7 @@ struct Col_stats
 class Break_algorithm {
 protected:
 
-    PScore *pscore_l_;
+    Paper_score *pscore_l_;
     Real linelength;
 
     /// search all pcols which are breakable.
@@ -69,7 +69,7 @@ public:
     Line_spacer* (*get_line_spacer)();
     
     Break_algorithm();
-    void set_pscore(PScore*);
+    void set_pscore(Paper_score*);
 
     /// check if the spacing/breaking problem is well-stated
     void problem_OK()const;

diff --git a/lily/span-bar-grav.cc b/lily/span-bar-grav.cc
index a6d40fdd9c69bea88f13e90510a6c3dc95b57f1f..8e2663a2655770581b308c323208cf4684650b42 100644 (file)
--- a/lily/span-bar-grav.cc
+++ b/lily/span-bar-grav.cc
@@ -25,8 +25,10 @@ Span_bar_engraver::get_span_bar_p()const
 void
 Span_bar_engraver::acknowledge_element(Score_elem_info i)
 {
-    if ( i.origin_grav_l_arr_.size() > 1 && 
-        i.elem_l_->is_type_b( Bar::static_name() ) ) {
+    int depth = i.origin_grav_l_arr_.size();
+    if ( depth > 1
+        && i.elem_l_->is_type_b( Bar::static_name() ) ) 
+    {
        bar_l_arr_.push( (Bar*)i.elem_l_->item() );
        
        if (bar_l_arr_.size() >= 2 && !spanbar_p_) {
@@ -46,7 +48,7 @@ Span_bar_engraver::do_pre_move_processing()
        for (int i=0; i < bar_l_arr_.size() ; i++)
            spanbar_p_->add(bar_l_arr_[i]);
        spanbar_p_->set( valign_l_ );
-       typeset_breakable_item(spanbar_p_);
+       typeset_element(spanbar_p_);
        spanbar_p_ =0;
     }
     bar_l_arr_.set_size( 0);