Fix some bugs in the dynamic engraver and PostScript backend

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

diff --git a/lily/paper-score.cc b/lily/paper-score.cc
index f84ac9218a0c51de6aa4b16a8de6926037e92851..8dfbc38939b4f1c8a57ed4d1137d6adf88045a2f 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,13 +22,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)
@@ -52,17 +55,48 @@ Paper_score::typeset_system (System *system)
 
   systems_ = scm_cons (system->self_scm (), systems_);
   system->pscore_ = this;
-
+  system->layout_ = layout_;
   system->unprotect ();
 }
 
-Array<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);
+    }
+
+  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;
+
+  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;
@@ -84,16 +118,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.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 *
@@ -109,7 +138,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_;
 }
+