*** empty log message ***

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

diff --git a/lily/paper-score.cc b/lily/paper-score.cc
index f392455a898d9eeff2a2a528b6b76a3c3fd75cf7..a3a30d094a6d9fc4f990f6867755c347db70972b 100644 (file)
--- a/lily/paper-score.cc
+++ b/lily/paper-score.cc
@@ -3,59 +3,52 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1996--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
-#include "score.hh"
-#include "main.hh"
-#include "warn.hh"
-#include "font-metric.hh"
-#include "spanner.hh"
-#include "paper-def.hh"
-#include "system.hh"
-#include "paper-column.hh"
 #include "paper-score.hh"
-#include "paper-column.hh"
-#include "scm-hash.hh"
+
+#include "all-font-metrics.hh"
 #include "gourlay-breaking.hh"
-#include "paper-outputter.hh"
-#include "input-file-results.hh"
+#include "main.hh"
 #include "misc.hh"
-#include "all-font-metrics.hh"
+#include "output-def.hh"
+#include "paper-book.hh"
+#include "paper-column.hh"
+#include "scm-hash.hh"
+#include "score.hh"
+#include "stencil.hh"
+#include "system.hh"
+#include "warn.hh"
 
 Paper_score::Paper_score ()
 {
-  paper_ =0;
-  outputter_ =0;
+  layout_ = 0;
   system_ = 0;
-  main_smob_ = SCM_EOL;
+}
+
+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 *system)
 {
   if (!system_)
-    {
-      system_ = l;             // ugh.
-    }
+    system_ = system;
 
-  main_smob_ = gh_cons (l->self_scm (), main_smob_);
-  l->pscore_ = this;
+  systems_ = scm_cons (system->self_scm (), systems_);
+  system->pscore_ = this;
 
-  scm_gc_unprotect_object (l->self_scm ());
-}
-
-
-Paper_score::Paper_score (Paper_score const &s)
-  : Music_output (s)
-{
-  assert (false);
+  scm_gc_unprotect_object (system->self_scm ());
 }
 
 Array<Column_x_positions>
 Paper_score::calc_breaking ()
 {
-  Break_algorithm *algorithm=0;
+  Break_algorithm *algorithm = 0;
   Array<Column_x_positions> sol;
 
   algorithm = new Gourlay_breaking ;
@@ -66,63 +59,36 @@ Paper_score::calc_breaking ()
   return sol;
 }
 
-/*
-  urg. clean me
- */
-void
-Paper_score::process (String outname)
+SCM
+Paper_score::process (String)
 {
-  if (verbose_global_b)
+  if (be_verbose_global)
     progress_indication (_f ("Element count %d (spanners %d) ",
                             system_->element_count (),
                             system_->spanner_count ()));
 
-  
   progress_indication (_ ("Preprocessing graphical objects...") + " ");
 
-  /*
-    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_property ("breakable", SCM_BOOL_T);
-    pc.top ()->set_property ("breakable", SCM_BOOL_T);
-  }
-
+  /* 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_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 (outname);
-
+  SCM lines = system_->get_lines ();
+#if 0
+  /* gourlay:do_solve also prints newline.  */
   progress_indication ("\n");
-
-  SCM scopes = SCM_EOL;
-
-  if (header_)
-    scopes = scm_cons (header_, scopes);
-  if (global_input_file->header_ && global_input_file->header_ != header_)
-    scopes = scm_cons (global_input_file->header_, scopes);
+#endif
   
-  outputter_->output_metadata (scopes, paper_);
-  outputter_->output_music_output_def (paper_);
-  outputter_->output_scheme (scm_list_1 (ly_symbol2scm ("header-end")));
-
-  outputter_
-    ->output_scheme (scm_list_2 (ly_symbol2scm ("define-fonts"),
-                                ly_quote_scm (paper_->font_descriptions ())));
-
-  outputter_->output_scheme (scm_list_2 (ly_symbol2scm ("make-title"),
-                                        ly_quote_scm (outputter_->file_)));
-  system_->output_lines ();
-  outputter_->output_scheme (scm_list_1 (ly_symbol2scm ("end-output")));
-
-  progress_indication ("\n");
-
-  // huh?
-  delete outputter_;
-  outputter_ = 0;
+  /* Only keep result stencils in lines_, *title_; delete all grobs.  */
+  systems_ = SCM_EOL;
+  
+  return lines;
 }