X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpaper-score.cc;h=800aa132ed77023f08d0388d5e9c4c7933de4124;hb=39a23d0f6910fd0359655518ce05ad0f6bc5f73f;hp=5e754287507b804595f1fa6cc195bb8d72e5abdb;hpb=c5402461ab1d1cdbaa684b0e55d4851f0e28e37a;p=lilypond.git

diff --git a/lily/paper-score.cc b/lily/paper-score.cc
index 5e75428750..800aa132ed 100644
--- a/lily/paper-score.cc
+++ b/lily/paper-score.cc
@@ -3,48 +3,28 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1996--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
-#include "main.hh"
-#include "debug.hh"
-#include "font-metric.hh"
-#include "spanner.hh"
-#include "paper-def.hh"
-#include "line-of-score.hh"
-#include "paper-column.hh"
 #include "paper-score.hh"
-#include "paper-column.hh"
-#include "scope.hh"
+
+#include "all-font-metrics.hh"
 #include "gourlay-breaking.hh"
-#include "paper-stream.hh"
-#include "paper-outputter.hh"
-#include "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_l_ =0;
-  outputter_l_ =0;
-  line_l_ = 0;
-  main_smob_ = SCM_EOL;
-}
-
-void
-Paper_score::typeset_line (Line_of_score *l)
-{
-  if (!line_l_)
-    {
-      line_l_ = l;		// ugh.
-    }
-  main_smob_ = gh_cons (l->self_scm (), main_smob_);
-  l->pscore_l_ = this;
-
-  /*
-    We don't unprotect l->self_scm (), we haven't got any place else to
-    protect it from collection.  */
-
+  layout_ = 0;
+  system_ = 0;
 }
 
 Paper_score::Paper_score (Paper_score const &s)
@@ -53,83 +33,60 @@ Paper_score::Paper_score (Paper_score const &s)
   assert (false);
 }
 
+void
+Paper_score::typeset_line (System *system)
+{
+  if (!system_)
+    system_ = system;
+
+  systems_ = scm_cons (system->self_scm (), systems_);
+  system->pscore_ = this;
+
+  scm_gc_unprotect_object (system->self_scm ());
+}
+
 Array<Column_x_positions>
 Paper_score::calc_breaking ()
 {
-  Break_algorithm *algorithm_p=0;
+  Break_algorithm *algorithm = 0;
   Array<Column_x_positions> sol;
 
-  algorithm_p = new Gourlay_breaking ;
-  algorithm_p->set_pscore (this);
-  sol = algorithm_p->solve ();
-  delete algorithm_p;
+  algorithm = new Gourlay_breaking;
+  algorithm->set_pscore (this);
+  sol = algorithm->solve ();
+  delete algorithm;
 
   return sol;
 }
 
+SCM
+Paper_score::process (String)
+{
+  if (be_verbose_global)
+    message (_f ("Element count %d (spanners %d) ",
+			     system_->element_count (),
+			     system_->spanner_count ()));
 
+  message (_ ("Preprocessing graphical objects...") + " ");
 
-/*
-  urg. clean me
- */
-void
-Paper_score::process ()
-{
-  if (verbose_global_b)
-    progress_indication ( _f("Element count %d ",  line_l_->element_count ()));
+  /* FIXME: Check out why we need this - removing gives assertion failures
+     down the road.
 
-  
-  progress_indication (_ ("Preprocessing elements...") + " ");
+     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);
 
-  /*
-    Be sure to set breakability on first & last column.
-   */
-  Link_array<Score_element> pc (line_l_->column_l_arr ());
-  
-  pc[0]->set_elt_property ("breakable", SCM_BOOL_T);
-  pc.top ()->set_elt_property ("breakable", SCM_BOOL_T);
+  system_->pre_processing ();
 
-  line_l_->pre_processing ();
- 
   Array<Column_x_positions> breaking = calc_breaking ();
-  line_l_->break_into_pieces (breaking);
-  
-  outputter_l_ = new Paper_outputter (paper_l_->paper_stream_p ());
-;
-  outputter_l_->output_header ();
-  outputter_l_->output_version();
-  
-  if (header_global_p)
-    outputter_l_->output_scope (header_global_p, "mudela");
-  if (header_l_)
-    outputter_l_->output_scope (header_l_, "mudela");
-
-  outputter_l_->output_comment (_ ("Outputting Score, defined at: "));
-  outputter_l_->output_comment (origin_str_);
-
-  if (paper_l_->scope_p_)
-    outputter_l_->output_scope (paper_l_->scope_p_, "mudelapaper");
-
-  SCM scm;
-  if(experimental_features_global_b)
-    {
-      SCM scm = gh_list (ly_symbol2scm ("experimental-on"), SCM_UNDEFINED);
-      outputter_l_->output_scheme (scm);
-    }
-  scm = gh_list (ly_symbol2scm ("header-end"), SCM_UNDEFINED);
-  outputter_l_->output_scheme (scm);
-  
-  line_l_->output_lines ();
-
-
-  scm = gh_list (ly_symbol2scm ("end-output"), SCM_UNDEFINED);
-  outputter_l_->output_scheme (scm);
-
-  progress_indication ("\n");
-  // huh?
-  delete outputter_l_;
-  outputter_l_ = 0;
-
-  if (verbose_global_b)
-    ly_display_scm (scm_gc_stats ()); 
+  system_->break_into_pieces (breaking);
+  SCM lines = system_->get_lines ();
+
+  /*
+    retain Grobs, since they are pointed to by the point & click data
+    structures, and are not marked fully, because child -> parent
+    links aren't marked.
+   */
+  return lines;
 }