X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpage-breaking.cc;h=8c3b8fb799196b6964ef59a5d5741c00729bba4a;hb=be6b730dd95980628b6419b9a3b42fc88efdf970;hp=c431c1ea25299dd4ad9d1e6d6552259a691b308a;hpb=c986001bd54ba9703309577fb596a98aa782ba86;p=lilypond.git

diff --git a/lily/page-breaking.cc b/lily/page-breaking.cc
index c431c1ea25..8c3b8fb799 100644
--- a/lily/page-breaking.cc
+++ b/lily/page-breaking.cc
@@ -4,7 +4,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2006 Joe Neeman <joeneeman@gmail.com>
+  (c) 2006--2007 Joe Neeman <joeneeman@gmail.com>
 */
 
 #include "page-breaking.hh"
@@ -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));
 	}
     }
 }