X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpaper-score.cc;h=047e880f3c1fc085ce2899f1efd65c03fc842b51;hb=2f19ea6bdfd30afec339c5695b9e2df4df755896;hp=2c1f0797d0f86c59ce746fc046f3bc61a27a97fd;hpb=acc010618d71bafb682daa6e426e862308b93b5f;p=lilypond.git

diff --git a/lily/paper-score.cc b/lily/paper-score.cc
index 2c1f0797d0..047e880f3c 100644
--- a/lily/paper-score.cc
+++ b/lily/paper-score.cc
@@ -3,13 +3,14 @@
 
   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 "gourlay-breaking.hh"
+#include "book.hh"
+#include "international.hh"
 #include "main.hh"
 #include "misc.hh"
 #include "output-def.hh"
@@ -20,13 +21,14 @@
 #include "stencil.hh"
 #include "system.hh"
 #include "warn.hh"
+#include "constrained-breaking.hh"
 
 Paper_score::Paper_score (Output_def *layout)
 {
   layout_ = layout;
   system_ = 0;
   systems_ = SCM_EOL;
-  paper_systems_ = SCM_EOL;
+  paper_systems_ = SCM_BOOL_F;
 }
 
 Paper_score::Paper_score (Paper_score const &s)
@@ -35,10 +37,11 @@ Paper_score::Paper_score (Paper_score const &s)
   assert (false);
 }
 
-
 void
 Paper_score::derived_mark () const
 {
+  if (layout_)
+    scm_gc_mark (layout_->self_scm ());
   scm_gc_mark (systems_);
   scm_gc_mark (paper_systems_);
 }
@@ -51,22 +54,61 @@ Paper_score::typeset_system (System *system)
 
   systems_ = scm_cons (system->self_scm (), systems_);
   system->pscore_ = this;
+  system->layout_ = layout_;
+  system->unprotect ();
+}
+
+
+vector<vsize>
+Paper_score::find_break_indices () const
+{
+  vector<Grob*> all = root_system ()->columns ();
+  vector<vsize> retval;
+
+  for (vsize i = 0; i < all.size (); i++)
+    {
+      Item *it = dynamic_cast<Item*> (all[i]);
+      if (Paper_column::is_breakable (all[i])
+	  && (i == 0 || it->find_prebroken_piece (LEFT))
+	  && (i == all.size () - 1 || it->find_prebroken_piece (RIGHT)))
+	retval.push_back (i);
+    }
+
+  cols_ = all;
+  break_indices_ = retval;
+
+  return retval;
+}
+
+vector<vsize>
+Paper_score::get_break_indices () const
+{
+  if (break_indices_.empty ())
+    find_break_indices ();
+  return break_indices_;
+}
 
-  scm_gc_unprotect_object (system->self_scm ());
+vector<Grob*>
+Paper_score::get_columns () const
+{
+  if (cols_.empty ())
+    find_break_indices ();
+  return cols_;
 }
 
-Array<Column_x_positions>
+vector<Column_x_positions>
 Paper_score::calc_breaking ()
 {
-  Break_algorithm *algorithm = 0;
-  Array<Column_x_positions> sol;
+  Constrained_breaking algorithm (this);
+  vector<Column_x_positions> sol;
+
+  message (_ ("Calculating line breaks...") + " ");
 
-  algorithm = new Gourlay_breaking;
-  algorithm->set_pscore (this);
-  sol = algorithm->solve ();
-  delete algorithm;
+  int system_count = robust_scm2int (layout ()->c_variable ("system-count"), 0);
+  if (system_count)
+    algorithm.resize (system_count);
 
-  return sol;
+  return algorithm.solve ();
 }
 
 void
@@ -74,25 +116,20 @@ Paper_score::process ()
 {
   if (be_verbose_global)
     message (_f ("Element count %d (spanners %d) ",
-			     system_->element_count (),
-			     system_->spanner_count ()));
+		 system_->element_count (),
+		 system_->spanner_count ()));
 
-  message (_ ("Preprocessing graphical objects...") + " ");
+  message (_ ("Preprocessing graphical objects..."));
 
   /* FIXME: Check out why we need this - removing gives assertion failures
      down the road.
 
      doubly, also done in Score_engraver */
-  Link_array<Grob> pc (system_->columns ());
-  pc[0]->set_property ("breakable", SCM_BOOL_T);
-  pc.top ()->set_property ("breakable", SCM_BOOL_T);
+  vector<Grob*> pc (system_->columns ());
+  pc[0]->set_property ("line-break-permission", ly_symbol2scm ("allow"));
+  pc.back ()->set_property ("line-break-permission", ly_symbol2scm ("allow"));
 
   system_->pre_processing ();
-
-  Array<Column_x_positions> breaking = calc_breaking ();
-  system_->break_into_pieces (breaking);
-
-  paper_systems_ = system_->get_paper_systems ();
 }
 
 System *
@@ -106,10 +143,17 @@ Paper_score::layout () const
 {
   return layout_;
 }
-  
 
 SCM
-Paper_score::get_paper_systems () const
+Paper_score::get_paper_systems ()
 {
+  if (paper_systems_ == SCM_BOOL_F)
+    {
+      vector<Column_x_positions> breaking = calc_breaking ();
+      system_->break_into_pieces (breaking);
+      message (_ ("Drawing systems...") + " ");
+      paper_systems_ = system_->get_paper_systems ();
+    }
   return paper_systems_;
 }
+