X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpaper-score.cc;h=d6af7039ca25057404be5f68968f862cec2bbe06;hb=7979d8adaa8393daefd6585534221a93dd526758;hp=2cc6685bf389591f86fc91d7e2734996b9b28122;hpb=a0f4b682135cf77e168a7201adbb4d083a1972d4;p=lilypond.git

diff --git a/lily/paper-score.cc b/lily/paper-score.cc
index 2cc6685bf3..d6af7039ca 100644
--- a/lily/paper-score.cc
+++ b/lily/paper-score.cc
@@ -3,43 +3,44 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1996--2003 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;
+  l->pscore_ = this;
 
   /*
     We don't unprotect l->self_scm (), we haven't got any place else to
@@ -56,19 +57,17 @@ 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;
 }
 
-
-
 /*
   urg. clean me
  */
@@ -76,59 +75,66 @@ void
 Paper_score::process ()
 {
   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.
    */
-  Link_array<Score_element> pc (line_l_->column_l_arr ());
+  Link_array<Grob> pc (system_->columns ());
   
-  pc[0]->set_elt_property ("breakable", SCM_BOOL_T);
-  pc.top ()->set_elt_property ("breakable", SCM_BOOL_T);
+  pc[0]->set_grob_property ("breakable", SCM_BOOL_T);
+  pc.top ()->set_grob_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_ = 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_);
+  outputter_ = paper_->get_paper_outputter ();
+  outputter_->output_header ();
+  outputter_->output_version ();
 
-  if (paper_l_->scope_p_)
-    outputter_l_->output_scope (paper_l_->scope_p_, "mudelapaper");
+  progress_indication ("\n");
 
-  SCM scm;
-  if (experimental_features_global_b)
+  if (global_input_file->header_)
+    {
+      outputter_->output_scope (global_input_file->header_, "lilypond");
+      outputter_->write_header_fields_to_file (global_input_file->header_);
+    }
+  
+  if (header_)
     {
-      SCM scm = gh_list (ly_symbol2scm ("experimental-on"), SCM_UNDEFINED);
-      outputter_l_->output_scheme (scm);
+      outputter_->output_scope (header_, "lilypond");
+      outputter_->write_header_fields_to_file (header_);
     }
-  scm = gh_list (ly_symbol2scm ("header-end"), SCM_UNDEFINED);
-  outputter_l_->output_scheme (scm);
+  
+  outputter_->output_comment (_ ("Outputting Score, defined at: "));
+  outputter_->output_comment (origin_string_);
+
+  outputter_->output_scope (paper_->scope_, "lilypondpaper");
 
-  line_l_->output_lines ();
+  SCM scm = scm_list_n (ly_symbol2scm ("header-end"), SCM_UNDEFINED);
+  outputter_->output_scheme (scm);
 
-  scm = gh_list (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;
 
+  // huh?
+  delete outputter_;
+  outputter_ = 0;
+  
   if (verbose_global_b)
-    ly_display_scm (scm_gc_stats ()); 
+    {
+      scm_write (scm_gc_stats (), scm_current_error_port ());
+      scm_flush (scm_current_error_port ());
+    }
 }