release: 1.5.21

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

diff --git a/lily/paper-score.cc b/lily/paper-score.cc
index 3b4b40cc1e8540d88c9b64fe2f68f92bdcc232c3..73a3c2ee16e9d8b61aaf4e672565f3bb46b39fb8 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"
@@ -17,7 +17,6 @@
 #include "paper-column.hh"
 #include "scope.hh"
 #include "gourlay-breaking.hh"
-#include "paper-stream.hh"
 #include "paper-outputter.hh"
 #include "file-results.hh"
 #include "misc.hh"
@@ -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 ",  line_l_->element_count ()));
 
   
   progress_indication (_ ("Preprocessing elements...") + " ");
@@ -97,16 +96,18 @@ Paper_score::process ()
   outputter_l_->output_header ();
   outputter_l_->output_version ();
 
+  progress_indication ("\n");
 
   if (global_header_p)
     {
-    Scope gh (global_header_p);
-    outputter_l_->output_scope (&gh, "lilypond");
+      Scope gh (global_header_p);
+      outputter_l_->output_scope (&gh, "lilypond");
+      outputter_l_->write_header_fields_to_file (&gh);
     }
   if (header_l_)
     {
-      if (header_l_)
-       outputter_l_->output_scope (header_l_, "lilypond");
+      outputter_l_->output_scope (header_l_, "lilypond");
+      outputter_l_->write_header_fields_to_file (header_l_);
     }
   
   outputter_l_->output_comment (_ ("Outputting Score, defined at: "));
@@ -115,22 +116,16 @@ Paper_score::process ()
   if (paper_l_->scope_p_)
     outputter_l_->output_scope (paper_l_->scope_p_, "lilypondpaper");
 
-  SCM scm = gh_list (ly_symbol2scm ("header-end"), SCM_UNDEFINED);
+  SCM scm = scm_list_n (ly_symbol2scm ("header-end"), SCM_UNDEFINED);
   outputter_l_->output_scheme (scm);
 
   line_l_->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");
 
-  if (global_header_p)
-    {
-      Scope gh (global_header_p); 
-      outputter_l_->write_header_fields_to_file (&gh);
-    }
-  
   // huh?
   delete outputter_l_;
   outputter_l_ = 0;