* lily/paper-outputter.cc (output_expr):

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

diff --git a/lily/paper-score.cc b/lily/paper-score.cc
index 0e68e231713e4180aaa446f5e08140a4318b0786..9202095e17aceae65fa377aa146431265b84c86f 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,38 +19,43 @@
 #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"
 
+#include "stencil.hh"
+#include "paper-book.hh"
+#include "ly-module.hh"
+
 Paper_score::Paper_score ()
 {
-  paper_ =0;
-  outputter_ =0;
+  paper_ = 0;
+  outputter_ = 0;
   system_ = 0;
   main_smob_ = SCM_EOL;
+  lines_ = SCM_EOL;
+  book_title_ = 0;
+  score_title_ = 0;
+}
+
+Paper_score::Paper_score (Paper_score const &s)
+  : Music_output (s)
+{
+  assert (false);
 }
 
+
 void
-Paper_score::typeset_line (System *l)
+Paper_score::typeset_line (System *line)
 {
   if (!system_)
-    {
-      system_ = l;             // ugh.
-    }
-  main_smob_ = gh_cons (l->self_scm (), main_smob_);
-  l->pscore_ = this;
+    /* ugh. */
+    system_ = line;
 
-  /*
-    We don't unprotect l->self_scm (), we haven't got any place else to
-    protect it from collection.  */
+  main_smob_ = gh_cons (line->self_scm (), main_smob_);
+  line->pscore_ = this;
 
-}
-
-Paper_score::Paper_score (Paper_score const &s)
-  : Music_output (s)
-{
-  assert (false);
+  scm_gc_unprotect_object (line->self_scm ());
 }
 
 Array<Column_x_positions>
@@ -66,70 +72,87 @@ Paper_score::calc_breaking ()
   return sol;
 }
 
-/*
-  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.
-   */
+  /* FIXME: Check out why we need this - removing gives assertion failures
+     down the road.
+     
+     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 ();
+  lines_ = system_->get_lines ();
 
-  progress_indication ("\n");
+  // FIXME: ...
+  outputter_ = paper_->get_paper_outputter (outname);
 
-  if (global_header)
-    {
+  progress_indication ("\n");
 
-      outputter_->output_scope (global_header, "lilypond");
-      outputter_->write_header_fields_to_file (global_header);
-    }
+  SCM scopes = SCM_EOL;
   if (header_)
-    {
-      outputter_->output_scope (header_, "lilypond");
-      outputter_->write_header_fields_to_file (header_);
-    }
+    scopes = scm_cons (header_, scopes);
+  if (global_input_file->header_ && global_input_file->header_ != header_)
+    scopes = scm_cons (global_input_file->header_, scopes);
   
-  outputter_->output_comment (_ ("Outputting Score, defined at: "));
-  outputter_->output_comment (origin_string_);
-
-  if (paper_->variable_tab_)
-    outputter_->output_scope (paper_->variable_tab_, "lilypondpaper");
-
-  SCM scm = scm_list_n (ly_symbol2scm ("header-end"), SCM_UNDEFINED);
-  outputter_->output_scheme (scm);
-
-  system_->output_lines ();
-
-  scm = scm_list_n (ly_symbol2scm ("end-output"), SCM_UNDEFINED);
-  outputter_->output_scheme (scm);
+  outputter_->output_metadata (scopes, paper_);
+
+#ifdef PAGE_LAYOUT
+  SCM make_title = scm_primitive_eval (ly_symbol2scm ("make-title"));
+  SCM b = ly_modules_lookup (scopes, ly_symbol2scm ("bookTitle"));
+  if (b != SCM_UNDEFINED && scm_variable_bound_p (b) == SCM_BOOL_T)
+    book_title_
+      = unsmob_stencil (gh_call2 (make_title, paper_->self_scm (),
+                                 scm_variable_ref (b)));
+  
+  SCM s = ly_modules_lookup (scopes, ly_symbol2scm ("scoreTitle"));
+  if (s != SCM_UNDEFINED && scm_variable_bound_p (s) == SCM_BOOL_T)
+    score_title_
+      = unsmob_stencil (gh_call2 (make_title, paper_->self_scm (),
+                                 scm_variable_ref (s)));
+  
+#if 0
+  // FIXME: 
+  delete system_;
+  system_ = 0;
+#endif
+  
+  /* Ugh: caller (Score) should do this, but does not know our flavor
+     (paper or midi).  */
+  paper_book->paper_scores_.push (this);
+#else
+  output ();
+#endif  
+}
 
+void
+Paper_score::output ()
+{
+  outputter_->output_header (paper_);
+  
+  int line_count = SCM_VECTOR_LENGTH ((SCM) lines_);
+  for (int i = 0; i < line_count; i++)
+    outputter_->output_line (scm_vector_ref (lines_, scm_int2num (i)),
+                            i == line_count - 1);
+  
+  outputter_->output_scheme (scm_list_1 (ly_symbol2scm ("end-output")));
   progress_indication ("\n");
 
+#if 0  
   // huh?
   delete outputter_;
   outputter_ = 0;
-  
-  if (verbose_global_b)
-    ly_display_scm (scm_gc_stats ()); 
+#endif  
 }