''

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

diff --git a/lily/paper-score.cc b/lily/paper-score.cc
index 734b56d005179a180e06c17b832908dd485c6605..9193e92c0abc692ecca8227c7186f3f8a32d2a6d 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--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1996--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "main.hh"
@@ -11,13 +11,12 @@
 #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"
@@ -32,7 +31,7 @@ Paper_score::Paper_score ()
 }
 
 void
-Paper_score::typeset_line (Line_of_score *l)
+Paper_score::typeset_line (System *l)
 {
   if (!line_l_)
     {
@@ -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,12 +96,13 @@ 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");
-      outputter_l_->write_header_fields_to_file (&gh);
+
+      outputter_l_->output_scope (global_header_p, "lilypond");
+      outputter_l_->write_header_fields_to_file (global_header_p);
     }
   if (header_l_)
     {
@@ -113,20 +113,19 @@ Paper_score::process ()
   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");
+  if (paper_l_->variable_tab_)
+    outputter_l_->output_scope (paper_l_->variable_tab_, "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");
 
-
   // huh?
   delete outputter_l_;
   outputter_l_ = 0;