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

diff --git a/lily/paper-score.cc b/lily/paper-score.cc
index ebf7d256bb..79a8266930 100644
--- a/lily/paper-score.cc
+++ b/lily/paper-score.cc
@@ -3,50 +3,49 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1996--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
+#include "score.hh"
 #include "main.hh"
-#include "debug.hh"
+#include "warn.hh"
 #include "font-metric.hh"
 #include "spanner.hh"
 #include "paper-def.hh"
-#include "line-of-score.hh"
+#include "system.hh"
 #include "paper-column.hh"
 #include "paper-score.hh"
 #include "paper-column.hh"
-#include "scope.hh"
+#include "scm-hash.hh"
 #include "gourlay-breaking.hh"
-#include "paper-stream.hh"
 #include "paper-outputter.hh"
-#include "file-results.hh"
+#include "input-file-results.hh"
 #include "misc.hh"
 #include "all-font-metrics.hh"
 
 Paper_score::Paper_score ()
 {
-  paper_l_ =0;
-  outputter_l_ =0;
-  line_l_ = 0;
+  paper_ =0;
+  outputter_ =0;
+  system_ = 0;
   main_smob_ = SCM_EOL;
 }
 
 void
-Paper_score::typeset_line (Line_of_score *l)
+Paper_score::typeset_line (System *l)
 {
-  if (!line_l_)
+  if (!system_)
     {
-      line_l_ = l;		// ugh.
+      system_ = 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.  */
+  main_smob_ = gh_cons (l->self_scm (), main_smob_);
+  l->pscore_ = this;
 
+  scm_gc_unprotect_object (l->self_scm());
 }
 
+
 Paper_score::Paper_score (Paper_score const &s)
   : Music_output (s)
 {
@@ -56,13 +55,13 @@ Paper_score::Paper_score (Paper_score const &s)
 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;
 }
@@ -71,66 +70,61 @@ Paper_score::calc_breaking ()
   urg. clean me
  */
 void
-Paper_score::process ()
+Paper_score::process (String outname)
 {
   if (verbose_global_b)
-    progress_indication (_f ("Element count %d ",  line_l_->element_count ()));
+    progress_indication (_f ("Element count %d (spanners %d) ",
+			     system_->element_count (),
+			     system_->spanner_count ()));
 
   
-  progress_indication (_ ("Preprocessing elements...") + " ");
+  progress_indication (_ ("Preprocessing graphical objects...") + " ");
 
   /*
-    Be sure to set breakability on first & last column.
+    Check out why we need this - removing gives assertion failures
+    down the road.
    */
-  Link_array<Grob> pc (line_l_->column_l_arr ());
+  { /* doubly, also done in Score_engraver */
+    Link_array<Grob> pc (system_->columns ());
   
-  pc[0]->set_grob_property ("breakable", SCM_BOOL_T);
-  pc.top ()->set_grob_property ("breakable", SCM_BOOL_T);
+    pc[0]->set_property ("breakable", SCM_BOOL_T);
+    pc.top ()->set_property ("breakable", SCM_BOOL_T);
+  }
 
-  line_l_->pre_processing ();
+  system_->pre_processing ();
  
   Array<Column_x_positions> breaking = calc_breaking ();
-  line_l_->break_into_pieces (breaking);
+  system_->break_into_pieces (breaking);
   
-  outputter_l_ = paper_l_->paper_outputter_p ();
-;
-  outputter_l_->output_header ();
-  outputter_l_->output_version ();
+  outputter_ = paper_->get_paper_outputter (outname);
 
   progress_indication ("\n");
 
-  if (global_header_p)
-    {
-      Scope gh (global_header_p);
-      outputter_l_->output_scope (&gh, "lilypond");
-      outputter_l_->write_header_fields_to_file (&gh);
-    }
-  if (header_l_)
-    {
-      outputter_l_->output_scope (header_l_, "lilypond");
-      outputter_l_->write_header_fields_to_file (header_l_);
-    }
-  
-  outputter_l_->output_comment (_ ("Outputting Score, defined at: "));
-  outputter_l_->output_comment (origin_str_);
+  SCM scopes = SCM_EOL;
 
-  if (paper_l_->scope_p_)
-    outputter_l_->output_scope (paper_l_->scope_p_, "lilypondpaper");
+  /*
+    Last one first.
+   */
+  if (header_)
+    scopes = scm_cons (header_, scopes);
 
-  SCM scm = scm_listify (ly_symbol2scm ("header-end"), SCM_UNDEFINED);
-  outputter_l_->output_scheme (scm);
+  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_);
 
-  line_l_->output_lines ();
+  SCM scm = scm_list_n (ly_symbol2scm ("header-end"), SCM_UNDEFINED);
+  outputter_->output_scheme (scm);
 
-  scm = scm_listify (ly_symbol2scm ("end-output"), SCM_UNDEFINED);
-  outputter_l_->output_scheme (scm);
+  system_->output_lines ();
+
+  scm = scm_list_n (ly_symbol2scm ("end-output"), SCM_UNDEFINED);
+  outputter_->output_scheme (scm);
 
   progress_indication ("\n");
 
   // huh?
-  delete outputter_l_;
-  outputter_l_ = 0;
-  
-  if (verbose_global_b)
-    ly_display_scm (scm_gc_stats ()); 
+  delete outputter_;
+  outputter_ = 0;
 }