X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpaper-score.cc;h=3e41930daa21b7e6886d9e01a3f531cde9a29346;hb=b07ef7805ea536741e20c3d1b8fc1bc463a844ba;hp=c1487c89b26553f459d265502939296ee297e198;hpb=34881554afeaf03a55a3a983caf9cfeaaf3ea060;p=lilypond.git

diff --git a/lily/paper-score.cc b/lily/paper-score.cc
index c1487c89b2..3e41930daa 100644
--- a/lily/paper-score.cc
+++ b/lily/paper-score.cc
@@ -3,30 +3,33 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996--2004 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 "font-metric.hh"
+#include "book.hh"
 #include "gourlay-breaking.hh"
-#include "ly-module.hh"
+#include "international.hh"
 #include "main.hh"
 #include "misc.hh"
 #include "output-def.hh"
 #include "paper-book.hh"
 #include "paper-column.hh"
-#include "paper-score.hh"
 #include "scm-hash.hh"
 #include "score.hh"
-#include "spanner.hh"
 #include "stencil.hh"
 #include "system.hh"
 #include "warn.hh"
+#include "constrained-breaking.hh"
 
-Paper_score::Paper_score ()
+Paper_score::Paper_score (Output_def *layout)
 {
-  layout_ = 0;
+  layout_ = layout;
   system_ = 0;
+  systems_ = SCM_EOL;
+  paper_systems_ = SCM_EOL;
 }
 
 Paper_score::Paper_score (Paper_score const &s)
@@ -36,24 +39,57 @@ Paper_score::Paper_score (Paper_score const &s)
 }
 
 void
-Paper_score::typeset_line (System *system)
+Paper_score::derived_mark () const
+{
+  if (layout_)
+    scm_gc_mark (layout_->self_scm ());
+  scm_gc_mark (systems_);
+  scm_gc_mark (paper_systems_);
+}
+
+void
+Paper_score::typeset_system (System *system)
 {
   if (!system_)
     system_ = system;
 
   systems_ = scm_cons (system->self_scm (), systems_);
   system->pscore_ = this;
+  system->layout_ = layout_;
+  system->unprotect ();
+}
+
 
-  scm_gc_unprotect_object (system->self_scm ());
+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;
 }
 
-Array<Column_x_positions>
+
+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;
@@ -61,36 +97,47 @@ Paper_score::calc_breaking ()
   return sol;
 }
 
-SCM
-Paper_score::process (String)
+void
+Paper_score::process ()
 {
-  if (verbose_global_b)
-    progress_indication (_f ("Element count %d (spanners %d) ",
-			     system_->element_count (),
-			     system_->spanner_count ()));
+  if (be_verbose_global)
+    message (_f ("Element count %d (spanners %d) ",
+		 system_->element_count (),
+		 system_->spanner_count ()));
 
-  progress_indication (_ ("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 ());
+  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);
-  SCM lines = system_->get_lines ();
-#if 0
-  /* gourlay:do_solve also prints newline.  */
-  progress_indication ("\n");
-#endif
-  
-  /* Only keep result stencils in lines_, *title_; delete all grobs.  */
-  systems_ = SCM_EOL;
-  
-  return lines;
+
+  paper_systems_ = system_->get_paper_systems ();
+}
+
+System *
+Paper_score::root_system () const
+{
+  return system_;
 }
+
+Output_def *
+Paper_score::layout () const
+{
+  return layout_;
+}
+
+SCM
+Paper_score::get_paper_systems () const
+{
+  return paper_systems_;
+}
+