X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpaper-score.cc;h=c34e80c50287afcd3071e159823f8d5256ef5db6;hb=75eebcb49e52d296b1da3e1074e0825d2c780db4;hp=79a826693081d958f03944b3ba53c02d03cd940a;hpb=12186b6828aee7aa298076d684835d629b757f2a;p=lilypond.git

diff --git a/lily/paper-score.cc b/lily/paper-score.cc
index 79a8266930..c34e80c502 100644
--- a/lily/paper-score.cc
+++ b/lily/paper-score.cc
@@ -3,62 +3,66 @@
 
   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 "gourlay-breaking.hh"
-#include "paper-outputter.hh"
-#include "input-file-results.hh"
+#include "main.hh"
 #include "misc.hh"
-#include "all-font-metrics.hh"
+#include "output-def.hh"
+#include "paper-book.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;
-  outputter_ =0;
+  layout_ = layout;
   system_ = 0;
-  main_smob_ = SCM_EOL;
+  systems_ = SCM_EOL;
+  paper_systems_ = SCM_EOL;
 }
 
-void
-Paper_score::typeset_line (System *l)
+Paper_score::Paper_score (Paper_score const &s)
+  : Music_output (s)
 {
-  if (!system_)
-    {
-      system_ = l;		// ugh.
-    }
-
-  main_smob_ = gh_cons (l->self_scm (), main_smob_);
-  l->pscore_ = this;
-
-  scm_gc_unprotect_object (l->self_scm());
+  assert (false);
 }
 
+void
+Paper_score::derived_mark () const
+{
+  if (layout_)
+    scm_gc_mark (layout_->self_scm ());
+  scm_gc_mark (systems_);
+  scm_gc_mark (paper_systems_);
+}
 
-Paper_score::Paper_score (Paper_score const &s)
-  : Music_output (s)
+void
+Paper_score::typeset_system (System *system)
 {
-  assert (false);
+  if (!system_)
+    system_ = system;
+
+  systems_ = scm_cons (system->self_scm (), systems_);
+  system->pscore_ = this;
+  system->layout_ = layout_;
+  system->unprotect ();
 }
 
 Array<Column_x_positions>
 Paper_score::calc_breaking ()
 {
-  Break_algorithm *algorithm=0;
+  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;
@@ -66,65 +70,46 @@ Paper_score::calc_breaking ()
   return sol;
 }
 
-/*
-  urg. clean me
- */
 void
-Paper_score::process (String outname)
+Paper_score::process ()
 {
-  if (verbose_global_b)
-    progress_indication (_f ("Element count %d (spanners %d) ",
-			     system_->element_count (),
-			     system_->spanner_count ()));
-
-  
-  progress_indication (_ ("Preprocessing graphical objects...") + " ");
-
-  /*
-    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);
-  }
+  if (be_verbose_global)
+    message (_f ("Element count %d (spanners %d) ",
+		 system_->element_count (),
+		 system_->spanner_count ()));
 
-  system_->pre_processing ();
- 
-  Array<Column_x_positions> breaking = calc_breaking ();
-  system_->break_into_pieces (breaking);
-  
-  outputter_ = paper_->get_paper_outputter (outname);
-
-  progress_indication ("\n");
+  message (_ ("Preprocessing graphical objects...") + " ");
 
-  SCM scopes = SCM_EOL;
+  /* FIXME: Check out why we need this - removing gives assertion failures
+     down the road.
 
-  /*
-    Last one first.
-   */
-  if (header_)
-    scopes = scm_cons (header_, scopes);
+     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);
 
-  if (global_input_file->header_ && global_input_file->header_ != header_)
-    scopes = scm_cons (global_input_file->header_, scopes);
-  
-  outputter_->output_metadata (scopes, paper_);
-  outputter_->output_music_output_def (paper_);
+  system_->pre_processing ();
 
-  SCM scm = scm_list_n (ly_symbol2scm ("header-end"), SCM_UNDEFINED);
-  outputter_->output_scheme (scm);
+  Array<Column_x_positions> breaking = calc_breaking ();
+  system_->break_into_pieces (breaking);
 
-  system_->output_lines ();
+  paper_systems_ = system_->get_paper_systems ();
+}
 
-  scm = scm_list_n (ly_symbol2scm ("end-output"), SCM_UNDEFINED);
-  outputter_->output_scheme (scm);
+System *
+Paper_score::root_system () const
+{
+  return system_;
+}
 
-  progress_indication ("\n");
+Output_def *
+Paper_score::layout () const
+{
+  return layout_;
+}
 
-  // huh?
-  delete outputter_;
-  outputter_ = 0;
+SCM
+Paper_score::get_paper_systems () const
+{
+  return paper_systems_;
 }