X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpaper-score.cc;h=028fb37a146e080a988ef63756fb50176054d3f6;hb=0c28eb92daf07d4562f7a0e5f1ed6165868429d9;hp=c983fe02892157aff73b20a11e01a7737bf5afa2;hpb=9d4a5bbc9687aef811a60aabd9cb839412984e96;p=lilypond.git

diff --git a/lily/paper-score.cc b/lily/paper-score.cc
index c983fe0289..028fb37a14 100644
--- a/lily/paper-score.cc
+++ b/lily/paper-score.cc
@@ -10,7 +10,6 @@
 
 #include "all-font-metrics.hh"
 #include "book.hh"
-#include "gourlay-breaking.hh"
 #include "international.hh"
 #include "main.hh"
 #include "misc.hh"
@@ -22,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)
@@ -58,18 +58,57 @@ Paper_score::typeset_system (System *system)
   system->unprotect ();
 }
 
-std::vector<Column_x_positions>
+
+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_;
+}
+
+vector<Grob*>
+Paper_score::get_columns () const
+{
+  if (cols_.empty ())
+    find_break_indices ();
+  return cols_;
+}
+
+vector<Column_x_positions>
 Paper_score::calc_breaking ()
 {
-  Break_algorithm *algorithm = 0;
-  std::vector<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
@@ -86,16 +125,11 @@ Paper_score::process ()
      down the road.
 
      doubly, also done in Score_engraver */
-  Link_array__Grob_ pc (system_->columns ());
-  pc[0]->set_property ("breakable", SCM_BOOL_T);
-  pc.back ()->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 ();
-
-  std::vector<Column_x_positions> breaking = calc_breaking ();
-  system_->break_into_pieces (breaking);
-
-  paper_systems_ = system_->get_paper_systems ();
 }
 
 System *
@@ -111,7 +145,15 @@ Paper_score::layout () const
 }
 
 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_;
 }
+