X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Fpaper-score.cc;h=a2af964b4b2d23b0416e7890b8f215f9ddaf8b3d;hb=31568c504806f35aac420a394c9eab07abd9faa7;hp=1eab7f80f6bc4b54db8cdb55d60f47f415ff191b;hpb=4cd5fde58781f8ea5e2e071674cbe0499eb1232e;p=lilypond.git

diff --git a/lily/paper-score.cc b/lily/paper-score.cc
index 1eab7f80f6..a2af964b4b 100644
--- a/lily/paper-score.cc
+++ b/lily/paper-score.cc
@@ -3,34 +3,32 @@
 
   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 "score.hh"
-#include "main.hh"
-#include "warn.hh"
-#include "font-metric.hh"
-#include "spanner.hh"
-#include "paper-def.hh"
-#include "system.hh"
-#include "paper-column.hh"
 #include "paper-score.hh"
-#include "paper-column.hh"
-#include "scm-hash.hh"
+
+#include "all-font-metrics.hh"
+#include "book.hh"
 #include "gourlay-breaking.hh"
-//#include "paper-outputter.hh"
-#include "input-file-results.hh"
+#include "international.hh"
+#include "main.hh"
 #include "misc.hh"
-#include "all-font-metrics.hh"
-
-#include "stencil.hh"
+#include "output-def.hh"
 #include "paper-book.hh"
-#include "ly-module.hh"
+#include "paper-column.hh"
+#include "scm-hash.hh"
+#include "score.hh"
+#include "stencil.hh"
+#include "system.hh"
+#include "warn.hh"
 
-Paper_score::Paper_score ()
+Paper_score::Paper_score (Output_def *layout)
 {
-  paper_ = 0;
+  layout_ = layout;
   system_ = 0;
+  systems_ = SCM_EOL;
+  paper_systems_ = SCM_EOL;
 }
 
 Paper_score::Paper_score (Paper_score const &s)
@@ -40,24 +38,33 @@ 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_ = gh_cons (system->self_scm (), systems_);
+  systems_ = scm_cons (system->self_scm (), systems_);
   system->pscore_ = this;
-
-  scm_gc_unprotect_object (system->self_scm ());
+  system->layout_ = layout_;
+  system->unprotect ();
 }
 
-Array<Column_x_positions>
+vector<Column_x_positions>
 Paper_score::calc_breaking ()
 {
-  Break_algorithm *algorithm=0;
-  Array<Column_x_positions> sol;
+  Break_algorithm *algorithm = 0;
+  vector<Column_x_positions> sol;
 
-  algorithm = new Gourlay_breaking ;
+  algorithm = new Gourlay_breaking;
   algorithm->set_pscore (this);
   sol = algorithm->solve ();
   delete algorithm;
@@ -65,33 +72,46 @@ 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 ();
-  progress_indication ("\n");
 
-  /* 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_;
 }