* The grand 2005-2006 replace.

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

diff --git a/lily/paper-score.cc b/lily/paper-score.cc
index a3a30d094a6d9fc4f990f6867755c347db70972b..c34e80c50287afcd3071e159823f8d5256ef5db6 100644 (file)
--- a/lily/paper-score.cc
+++ b/lily/paper-score.cc
@@ -3,7 +3,7 @@
 
   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"
@@ -21,10 +21,12 @@
 #include "system.hh"
 #include "warn.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)
@@ -34,15 +36,24 @@ 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;
-
-  scm_gc_unprotect_object (system->self_scm ());
+  system->layout_ = layout_;
+  system->unprotect ();
 }
 
 Array<Column_x_positions>
@@ -51,7 +62,7 @@ Paper_score::calc_breaking ()
   Break_algorithm *algorithm = 0;
   Array<Column_x_positions> sol;
 
-  algorithm = new Gourlay_breaking ;
+  algorithm = new Gourlay_breaking;
   algorithm->set_pscore (this);
   sol = algorithm->solve ();
   delete algorithm;
@@ -59,36 +70,46 @@ Paper_score::calc_breaking ()
   return sol;
 }
 
-SCM
-Paper_score::process (String)
+void
+Paper_score::process ()
 {
   if (be_verbose_global)
-    progress_indication (_f ("Element count %d (spanners %d) ",
-                            system_->element_count (),
-                            system_->spanner_count ()));
+    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 ());
   pc[0]->set_property ("breakable", SCM_BOOL_T);
   pc.top ()->set_property ("breakable", SCM_BOOL_T);
-    
+
   system_->pre_processing ();
- 
+
   Array<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_;
 }