* scm/define-markup-commands.scm (fill-line): use

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

diff --git a/lily/paper-score.cc b/lily/paper-score.cc
index 92f27355f6ff84836701a8f00f4692d56e266067..4fafe399d6f4225b585fe0491a8e1051b7363700 100644 (file)
--- a/lily/paper-score.cc
+++ b/lily/paper-score.cc
@@ -6,32 +6,26 @@
   (c) 1996--2004 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 "ly-module.hh"
+#include "main.hh"
 #include "misc.hh"
-#include "all-font-metrics.hh"
-
-#include "stencil.hh"
+#include "output-def.hh"
 #include "paper-book.hh"
-#include "ly-module.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;
+  layout_ = 0;
   system_ = 0;
-  score_ = SCM_EOL;
 }
 
 Paper_score::Paper_score (Paper_score const &s)
@@ -46,7 +40,7 @@ Paper_score::typeset_line (System *system)
   if (!system_)
     system_ = system;
 
-  score_ = gh_cons (system->self_scm (), score_);
+  systems_ = scm_cons (system->self_scm (), systems_);
   system->pscore_ = this;
 
   scm_gc_unprotect_object (system->self_scm ());
@@ -55,7 +49,7 @@ Paper_score::typeset_line (System *system)
 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 ;
@@ -89,10 +83,13 @@ Paper_score::process (String)
   Array<Column_x_positions> breaking = calc_breaking ();
   system_->break_into_pieces (breaking);
   SCM lines = system_->get_lines ();
+#if 0
+  /* gourlay:do_solve also prints newline.  */
   progress_indication ("\n");
-
+#endif
+  
   /* Only keep result stencils in lines_, *title_; delete all grobs.  */
-  score_ = SCM_EOL;
+  systems_ = SCM_EOL;
   
   return lines;
 }