2003 -> 2004

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

diff --git a/lily/paper-score.cc b/lily/paper-score.cc
index d6af7039ca25057404be5f68968f862cec2bbe06..28962bf440ba36cf670269ab36164ac488d7d034 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--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1996--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "score.hh"
@@ -42,12 +42,10 @@ Paper_score::typeset_line (System *l)
   main_smob_ = gh_cons (l->self_scm (), main_smob_);
   l->pscore_ = this;
 
-  /*
-    We don't unprotect l->self_scm (), we haven't got any place else to
-    protect it from collection.  */
-
+  scm_gc_unprotect_object (l->self_scm());
 }
 
+
 Paper_score::Paper_score (Paper_score const &s)
   : Music_output (s)
 {
@@ -72,7 +70,7 @@ Paper_score::calc_breaking ()
   urg. clean me
  */
 void
-Paper_score::process ()
+Paper_score::process (String outname)
 {
   if (verbose_global_b)
     progress_indication (_f ("Element count %d (spanners %d) ",
@@ -95,7 +93,7 @@ Paper_score::process ()
   Array<Column_x_positions> breaking = calc_breaking ();
   system_->break_into_pieces (breaking);
   
-  outputter_ = paper_->get_paper_outputter ();
+  outputter_ = paper_->get_paper_outputter (outname);
   outputter_->output_header ();
   outputter_->output_version ();
 
@@ -112,9 +110,6 @@ Paper_score::process ()
       outputter_->output_scope (header_, "lilypond");
       outputter_->write_header_fields_to_file (header_);
     }
-  
-  outputter_->output_comment (_ ("Outputting Score, defined at: "));
-  outputter_->output_comment (origin_string_);
 
   outputter_->output_scope (paper_->scope_, "lilypondpaper");