Merge branch 'master' of ssh+git://hanwen@git.sv.gnu.org/srv/git/lilypond

[lilypond.git] / lily / page-breaking.cc

diff --git a/lily/page-breaking.cc b/lily/page-breaking.cc
index c431c1ea25299dd4ad9d1e6d6552259a691b308a..76cecc03c39fce34f590b036f21b3cf5d409efce 100644 (file)
--- a/lily/page-breaking.cc
+++ b/lily/page-breaking.cc
@@ -255,7 +255,7 @@ Page_breaking::find_chunks_and_breaks (Break_predicate is_break)
     {
       if (all_[i].pscore_)
        {
-         vector<Grob*> cols = all_[i].pscore_->root_system ()->columns ();
+         vector<Grob*> cols = all_[i].pscore_->root_system ()->used_columns ();
          vector<vsize> line_breaker_columns;
          line_breaker_columns.push_back (0);
 
@@ -277,8 +277,7 @@ Page_breaking::find_chunks_and_breaks (Break_predicate is_break)
              if ((break_point || chunk_end) && !last)
                line_breaker_columns.push_back (j);
            }
-         line_breaking_.push_back (Constrained_breaking (line_breaker_columns));
-         line_breaking_.back ().set_pscore (all_[i].pscore_);
+         line_breaking_.push_back (Constrained_breaking (all_[i].pscore_, line_breaker_columns));
        }
       else
        {
@@ -287,7 +286,7 @@ Page_breaking::find_chunks_and_breaks (Break_predicate is_break)
            breaks_.push_back (Break_position (i));
 
          chunks_.push_back (Break_position (i));
-         line_breaking_.push_back (Constrained_breaking ());
+         line_breaking_.push_back (Constrained_breaking (NULL));
        }
     }
 }