* scm/define-grobs.scm: uniform naming for definitions and output

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

diff --git a/lily/paper-score.cc b/lily/paper-score.cc
index fc0c5933b549c266dbc6d1315543b952f4eaa279..d6af7039ca25057404be5f68968f862cec2bbe06 100644 (file)
--- a/lily/paper-score.cc
+++ b/lily/paper-score.cc
@@ -3,9 +3,10 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1996--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
+#include "score.hh"
 #include "main.hh"
 #include "warn.hh"
 #include "font-metric.hh"
@@ -18,7 +19,7 @@
 #include "scm-hash.hh"
 #include "gourlay-breaking.hh"
 #include "paper-outputter.hh"
-#include "file-results.hh"
+#include "input-file-results.hh"
 #include "misc.hh"
 #include "all-font-metrics.hh"
 
@@ -37,6 +38,7 @@ Paper_score::typeset_line (System *l)
     {
       system_ = l;             // ugh.
     }
+
   main_smob_ = gh_cons (l->self_scm (), main_smob_);
   l->pscore_ = this;
 
@@ -73,10 +75,12 @@ void
 Paper_score::process ()
 {
   if (verbose_global_b)
-    progress_indication (_f ("Element count %d ",  system_->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.
@@ -92,18 +96,17 @@ Paper_score::process ()
   system_->break_into_pieces (breaking);
   
   outputter_ = paper_->get_paper_outputter ();
-;
   outputter_->output_header ();
   outputter_->output_version ();
 
   progress_indication ("\n");
 
-  if (global_header)
+  if (global_input_file->header_)
     {
-
-      outputter_->output_scope (global_header, "lilypond");
-      outputter_->write_header_fields_to_file (global_header);
+      outputter_->output_scope (global_input_file->header_, "lilypond");
+      outputter_->write_header_fields_to_file (global_input_file->header_);
     }
+  
   if (header_)
     {
       outputter_->output_scope (header_, "lilypond");
@@ -113,8 +116,7 @@ Paper_score::process ()
   outputter_->output_comment (_ ("Outputting Score, defined at: "));
   outputter_->output_comment (origin_string_);
 
-  if (paper_->variable_tab_)
-    outputter_->output_scope (paper_->variable_tab_, "lilypondpaper");
+  outputter_->output_scope (paper_->scope_, "lilypondpaper");
 
   SCM scm = scm_list_n (ly_symbol2scm ("header-end"), SCM_UNDEFINED);
   outputter_->output_scheme (scm);