X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpaper-score.cc;h=d668536341368190308a8ce41eee790ddeca03ab;hb=18ad3a686c7b46eb50f8abdcd5070ed58558f66b;hp=3e41930daa21b7e6886d9e01a3f531cde9a29346;hpb=ab547077f8c694c8edf882ce58fc6ed63407ccb6;p=lilypond.git

diff --git a/lily/paper-score.cc b/lily/paper-score.cc
index 3e41930daa..d668536341 100644
--- a/lily/paper-score.cc
+++ b/lily/paper-score.cc
@@ -3,14 +3,13 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1996--2007 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"
@@ -29,7 +28,7 @@ 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)
@@ -60,41 +59,56 @@ Paper_score::typeset_system (System *system)
 }
 
 
-vector<int>
+vector<vsize>
 Paper_score::find_break_indices () const
 {
-  vector<Grob*> all = root_system ()->columns ();
-  vector<int> retval;
+  vector<Grob*> all = root_system ()->used_columns ();
+  vector<vsize> retval;
 
   for (vsize i = 0; i < all.size (); i++)
-    if (Item::is_breakable (all[i]))
-      retval.push_back (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;
+  Constrained_breaking algorithm (this);
   vector<Column_x_positions> sol;
-  
+
+  message (_ ("Calculating line breaks...") + " ");
+
   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;
-
-  return sol;
+    return algorithm.solve (0, VPOS, system_count);
+
+  return algorithm.best_solution (0, VPOS);
 }
 
 void
@@ -105,22 +119,9 @@ Paper_score::process ()
 		 system_->element_count (),
 		 system_->spanner_count ()));
 
-  message (_ ("Preprocessing graphical objects...") + " ");
-
-  /* FIXME: Check out why we need this - removing gives assertion failures
-     down the road.
-
-     doubly, also done in Score_engraver */
-  vector<Grob*> pc (system_->columns ());
-  pc[0]->set_property ("breakable", SCM_BOOL_T);
-  pc.back ()->set_property ("breakable", SCM_BOOL_T);
+  message (_ ("Preprocessing graphical objects..."));
 
   system_->pre_processing ();
-
-  vector<Column_x_positions> breaking = calc_breaking ();
-  system_->break_into_pieces (breaking);
-
-  paper_systems_ = system_->get_paper_systems ();
 }
 
 System *
@@ -136,8 +137,22 @@ 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...") + " ");
+      system_->do_break_substitution_and_fixup_refpoints ();
+      paper_systems_ = system_->get_paper_systems ();
+    }
   return paper_systems_;
 }
 
+
+Paper_score *
+unsmob_paper_score (SCM x)
+{
+  return dynamic_cast<Paper_score*> (unsmob_music_output (x));
+}