*** empty log message ***

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

diff --git a/lily/paper-score.cc b/lily/paper-score.cc
index f9718cbc6759cbcb735f88eb7b1992ab098dab85..3e41930daa21b7e6886d9e01a3f531cde9a29346 100644 (file)
--- a/lily/paper-score.cc
+++ b/lily/paper-score.cc
@@ -3,13 +3,15 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1996--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "paper-score.hh"
 
 #include "all-font-metrics.hh"
+#include "book.hh"
 #include "gourlay-breaking.hh"
+#include "international.hh"
 #include "main.hh"
 #include "misc.hh"
 #include "output-def.hh"
@@ -20,12 +22,12 @@
 #include "stencil.hh"
 #include "system.hh"
 #include "warn.hh"
+#include "constrained-breaking.hh"
 
 Paper_score::Paper_score (Output_def *layout)
 {
   layout_ = layout;
   system_ = 0;
-  pscore_ = 0;
   systems_ = SCM_EOL;
   paper_systems_ = SCM_EOL;
 }
@@ -41,8 +43,6 @@ Paper_score::derived_mark () const
 {
   if (layout_)
     scm_gc_mark (layout_->self_scm ());
-  if (pscore_)
-    scm_gc_mark (pscore_->self_scm ());
   scm_gc_mark (systems_);
   scm_gc_mark (paper_systems_);
 }
@@ -55,17 +55,41 @@ Paper_score::typeset_system (System *system)
 
   systems_ = scm_cons (system->self_scm (), systems_);
   system->pscore_ = this;
-  system->layout_ = pscore_->layout_;
+  system->layout_ = layout_;
   system->unprotect ();
 }
 
-Array<Column_x_positions>
+
+vector<int>
+Paper_score::find_break_indices () const
+{
+  vector<Grob*> all = root_system ()->columns ();
+  vector<int> retval;
+
+  for (vsize i = 0; i < all.size (); i++)
+    if (Item::is_breakable (all[i]))
+      retval.push_back (i);
+
+  return retval;
+}
+
+
+vector<Column_x_positions>
 Paper_score::calc_breaking ()
 {
   Break_algorithm *algorithm = 0;
-  Array<Column_x_positions> sol;
-
-  algorithm = new Gourlay_breaking;
+  vector<Column_x_positions> sol;
+  
+  int system_count = robust_scm2int (layout ()->c_variable ("system-count"), 0);
+  if (system_count)
+    {
+      Constrained_breaking *b = new Constrained_breaking;
+      b->resize (system_count);
+      algorithm = b;
+    }
+  else
+    algorithm = new Gourlay_breaking;
+  
   algorithm->set_pscore (this);
   sol = algorithm->solve ();
   delete algorithm;
@@ -87,13 +111,13 @@ Paper_score::process ()
      down the road.
 
      doubly, also done in Score_engraver */
-  Link_array<Grob> pc (system_->columns ());
+  vector<Grob*> pc (system_->columns ());
   pc[0]->set_property ("breakable", SCM_BOOL_T);
-  pc.top ()->set_property ("breakable", SCM_BOOL_T);
+  pc.back ()->set_property ("breakable", SCM_BOOL_T);
 
   system_->pre_processing ();
 
-  Array<Column_x_positions> breaking = calc_breaking ();
+  vector<Column_x_positions> breaking = calc_breaking ();
   system_->break_into_pieces (breaking);
 
   paper_systems_ = system_->get_paper_systems ();
@@ -116,3 +140,4 @@ Paper_score::get_paper_systems () const
 {
   return paper_systems_;
 }
+