* scm/define-markup-commands.scm (smallcaps): New markup command.

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

diff --git a/lily/paper-score.cc b/lily/paper-score.cc
index 0e68e231713e4180aaa446f5e08140a4318b0786..79a826693081d958f03944b3ba53c02d03cd940a 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--2004 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,15 +38,14 @@ Paper_score::typeset_line (System *l)
     {
       system_ = l;             // ugh.
     }
+
   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)
 {
@@ -70,51 +70,49 @@ 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 ",  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.
+    Check out why we need this - removing gives assertion failures
+    down the road.
    */
-  Link_array<Grob> pc (system_->columns ());
+  { /* doubly, also done in Score_engraver */
+    Link_array<Grob> pc (system_->columns ());
   
-  pc[0]->set_grob_property ("breakable", SCM_BOOL_T);
-  pc.top ()->set_grob_property ("breakable", SCM_BOOL_T);
+    pc[0]->set_property ("breakable", SCM_BOOL_T);
+    pc.top ()->set_property ("breakable", SCM_BOOL_T);
+  }
 
   system_->pre_processing ();
  
   Array<Column_x_positions> breaking = calc_breaking ();
   system_->break_into_pieces (breaking);
   
-  outputter_ = paper_->get_paper_outputter ();
-;
-  outputter_->output_header ();
-  outputter_->output_version ();
+  outputter_ = paper_->get_paper_outputter (outname);
 
   progress_indication ("\n");
 
-  if (global_header)
-    {
+  SCM scopes = SCM_EOL;
 
-      outputter_->output_scope (global_header, "lilypond");
-      outputter_->write_header_fields_to_file (global_header);
-    }
+  /*
+    Last one first.
+   */
   if (header_)
-    {
-      outputter_->output_scope (header_, "lilypond");
-      outputter_->write_header_fields_to_file (header_);
-    }
-  
-  outputter_->output_comment (_ ("Outputting Score, defined at: "));
-  outputter_->output_comment (origin_string_);
+    scopes = scm_cons (header_, scopes);
 
-  if (paper_->variable_tab_)
-    outputter_->output_scope (paper_->variable_tab_, "lilypondpaper");
+  if (global_input_file->header_ && global_input_file->header_ != header_)
+    scopes = scm_cons (global_input_file->header_, scopes);
+  
+  outputter_->output_metadata (scopes, paper_);
+  outputter_->output_music_output_def (paper_);
 
   SCM scm = scm_list_n (ly_symbol2scm ("header-end"), SCM_UNDEFINED);
   outputter_->output_scheme (scm);
@@ -129,7 +127,4 @@ Paper_score::process ()
   // huh?
   delete outputter_;
   outputter_ = 0;
-  
-  if (verbose_global_b)
-    ly_display_scm (scm_gc_stats ()); 
 }