patch::: 1.5.4.jcn5

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

diff --git a/lily/paper-score.cc b/lily/paper-score.cc
index b5f5e2d193ae080dda08d303415101ff337f70de..0a9f8114b7507744f21399a2a6ac2fc6b254b6bf 100644 (file)
--- a/lily/paper-score.cc
+++ b/lily/paper-score.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1996--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "main.hh"
@@ -74,7 +74,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 ",  line_l_->element_count ()));
 
   
   progress_indication (_ ("Preprocessing elements...") + " ");
@@ -82,7 +82,7 @@ Paper_score::process ()
   /*
     Be sure to set breakability on first & last column.
    */
-  Link_array<Grob> pc (line_l_->column_l_arr ());
+  Link_array<Item> pc (line_l_->column_l_arr ());
   
   pc[0]->set_grob_property ("breakable", SCM_BOOL_T);
   pc.top ()->set_grob_property ("breakable", SCM_BOOL_T);
@@ -92,29 +92,32 @@ Paper_score::process ()
   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_ = 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");
 
+  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_);
 
   if (paper_l_->scope_p_)
     outputter_l_->output_scope (paper_l_->scope_p_, "lilypondpaper");
 
-  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);
+  SCM scm = gh_list (ly_symbol2scm ("header-end"), SCM_UNDEFINED);
   outputter_l_->output_scheme (scm);
 
   line_l_->output_lines ();
@@ -124,8 +127,6 @@ Paper_score::process ()
 
   progress_indication ("\n");
 
-  outputter_l_->output_score_header_fields (paper_l_);
-    
   // huh?
   delete outputter_l_;
   outputter_l_ = 0;