(deep-WWW-clean): Remove wiki-dump. Fixes web-clean target.

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

diff --git a/lily/paper-score.cc b/lily/paper-score.cc
index b5f5e2d193ae080dda08d303415101ff337f70de..013694388ca1d093788efee20bfa7ebe0170ca3d 100644 (file)
--- a/lily/paper-score.cc
+++ b/lily/paper-score.cc
@@ -3,21 +3,20 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1996--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #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 "misc.hh"
@@ -27,16 +26,16 @@ Paper_score::Paper_score ()
 {
   paper_l_ =0;
   outputter_l_ =0;
-  line_l_ = 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;
@@ -74,7 +73,7 @@ void
 Paper_score::process ()
 {
   if (verbose_global_b)
-    progress_indication ( _f("Element count %d ",  line_l_->element_count ()));
+    progress_indication (_f ("Element count %d ",  system_->element_count ()));
 
   
   progress_indication (_ ("Preprocessing elements...") + " ");
@@ -82,50 +81,51 @@ Paper_score::process ()
   /*
     Be sure to set breakability on first & last column.
    */
-  Link_array<Grob> pc (line_l_->column_l_arr ());
+  Link_array<Grob> pc (system_->column_l_arr ());
   
   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_ = paper_l_->paper_outputter_p ();
 ;
   outputter_l_->output_header ();
   outputter_l_->output_version ();
-  
-  if (header_global_p)
-    outputter_l_->output_scope (header_global_p, "lilypond");
-  if (header_l_)
-    outputter_l_->output_scope (header_l_, "lilypond");
 
-  outputter_l_->output_comment (_ ("Outputting Score, defined at: "));
-  outputter_l_->output_comment (origin_str_);
+  progress_indication ("\n");
 
-  if (paper_l_->scope_p_)
-    outputter_l_->output_scope (paper_l_->scope_p_, "lilypondpaper");
+  if (global_header_p)
+    {
 
-  SCM scm;
-  if (experimental_features_global_b)
+      outputter_l_->output_scope (global_header_p, "lilypond");
+      outputter_l_->write_header_fields_to_file (global_header_p);
+    }
+  if (header_l_)
     {
-      SCM scm = gh_list (ly_symbol2scm ("experimental-on"), SCM_UNDEFINED);
-      outputter_l_->output_scheme (scm);
+      outputter_l_->output_scope (header_l_, "lilypond");
+      outputter_l_->write_header_fields_to_file (header_l_);
     }
-  scm = gh_list (ly_symbol2scm ("header-end"), SCM_UNDEFINED);
+  
+  outputter_l_->output_comment (_ ("Outputting Score, defined at: "));
+  outputter_l_->output_comment (origin_str_);
+
+  if (paper_l_->variable_tab_)
+    outputter_l_->output_scope (paper_l_->variable_tab_, "lilypondpaper");
+
+  SCM scm = scm_list_n (ly_symbol2scm ("header-end"), SCM_UNDEFINED);
   outputter_l_->output_scheme (scm);
 
-  line_l_->output_lines ();
+  system_->output_lines ();
 
-  scm = gh_list (ly_symbol2scm ("end-output"), SCM_UNDEFINED);
+  scm = scm_list_n (ly_symbol2scm ("end-output"), SCM_UNDEFINED);
   outputter_l_->output_scheme (scm);
 
   progress_indication ("\n");
 
-  outputter_l_->output_score_header_fields (paper_l_);
-    
   // huh?
   delete outputter_l_;
   outputter_l_ = 0;