release: 1.5.21

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

diff --git a/lily/paper-score.cc b/lily/paper-score.cc
index c90f8ca0ff87c6e0dfb0eff8f199f55c46a4bba5..73a3c2ee16e9d8b61aaf4e672565f3bb46b39fb8 100644 (file)
--- a/lily/paper-score.cc
+++ b/lily/paper-score.cc
@@ -3,12 +3,12 @@
 
   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"
 #include "debug.hh"
-#include "lookup.hh"
+#include "font-metric.hh"
 #include "spanner.hh"
 #include "paper-def.hh"
 #include "line-of-score.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"
@@ -27,16 +26,24 @@ Paper_score::Paper_score ()
 {
   paper_l_ =0;
   outputter_l_ =0;
-  line_l_ = new Line_of_score;
-  element_smob_list_ = SCM_EOL;
-  typeset_line (line_l_);
+  line_l_ = 0;
+  main_smob_ = SCM_EOL;
 }
 
 void
 Paper_score::typeset_line (Line_of_score *l)
 {
-  line_l_->pscore_l_ = this;
-  element_smob_list_ = gh_cons (l->self_scm_, element_smob_list_);
+  if (!line_l_)
+    {
+      line_l_ = l;             // ugh.
+    }
+  main_smob_ = gh_cons (l->self_scm (), main_smob_);
+  l->pscore_l_ = this;
+
+  /*
+    We don't unprotect l->self_scm (), we haven't got any place else to
+    protect it from collection.  */
+
 }
 
 Paper_score::Paper_score (Paper_score const &s)
@@ -59,8 +66,6 @@ Paper_score::calc_breaking ()
   return sol;
 }
 
-
-
 /*
   urg. clean me
  */
@@ -68,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...") + " ");
@@ -76,48 +81,55 @@ Paper_score::process ()
   /*
     Be sure to set breakability on first & last column.
    */
-  Link_array<Paper_column> pc (line_l_->column_l_arr ());
+  Link_array<Grob> pc (line_l_->column_l_arr ());
   
-  pc[0]->set_elt_property ("breakable", SCM_BOOL_T);
-  pc.top ()->set_elt_property ("breakable", SCM_BOOL_T);
+  pc[0]->set_grob_property ("breakable", SCM_BOOL_T);
+  pc.top ()->set_grob_property ("breakable", SCM_BOOL_T);
 
   line_l_->pre_processing ();
  
   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, "mudela");
-  if (header_l_)
-    outputter_l_->output_scope (header_l_, "mudela");
+  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);
+    }
+  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_, "mudelapaper");
+    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 = scm_list_n (ly_symbol2scm ("header-end"), SCM_UNDEFINED);
   outputter_l_->output_scheme (scm);
-  
-  line_l_->output_lines ();
 
+  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;
+  
+  if (verbose_global_b)
+    ly_display_scm (scm_gc_stats ()); 
 }