X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpaper-score.cc;h=3e41930daa21b7e6886d9e01a3f531cde9a29346;hb=b07ef7805ea536741e20c3d1b8fc1bc463a844ba;hp=b5f5e2d193ae080dda08d303415101ff337f70de;hpb=2007f11f76fb92b495ac33621539aa481873302a;p=lilypond.git

diff --git a/lily/paper-score.cc b/lily/paper-score.cc
index b5f5e2d193..3e41930daa 100644
--- a/lily/paper-score.cc
+++ b/lily/paper-score.cc
@@ -3,133 +3,141 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1996--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
-#include "main.hh"
-#include "debug.hh"
-#include "font-metric.hh"
-#include "spanner.hh"
-#include "paper-def.hh"
-#include "line-of-score.hh"
-#include "paper-column.hh"
 #include "paper-score.hh"
-#include "paper-column.hh"
-#include "scope.hh"
+
+#include "all-font-metrics.hh"
+#include "book.hh"
 #include "gourlay-breaking.hh"
-#include "paper-stream.hh"
-#include "paper-outputter.hh"
-#include "file-results.hh"
+#include "international.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"
+#include "constrained-breaking.hh"
+
+Paper_score::Paper_score (Output_def *layout)
+{
+  layout_ = layout;
+  system_ = 0;
+  systems_ = SCM_EOL;
+  paper_systems_ = SCM_EOL;
+}
 
-Paper_score::Paper_score ()
+Paper_score::Paper_score (Paper_score const &s)
+  : Music_output (s)
 {
-  paper_l_ =0;
-  outputter_l_ =0;
-  line_l_ = 0;
-  main_smob_ = SCM_EOL;
+  assert (false);
 }
 
 void
-Paper_score::typeset_line (Line_of_score *l)
+Paper_score::derived_mark () const
 {
-  if (!line_l_)
-    {
-      line_l_ = l;		// ugh.
-    }
-  main_smob_ = gh_cons (l->self_scm (), main_smob_);
-  l->pscore_l_ = this;
+  if (layout_)
+    scm_gc_mark (layout_->self_scm ());
+  scm_gc_mark (systems_);
+  scm_gc_mark (paper_systems_);
+}
 
-  /*
-    We don't unprotect l->self_scm (), we haven't got any place else to
-    protect it from collection.  */
+void
+Paper_score::typeset_system (System *system)
+{
+  if (!system_)
+    system_ = system;
 
+  systems_ = scm_cons (system->self_scm (), systems_);
+  system->pscore_ = this;
+  system->layout_ = layout_;
+  system->unprotect ();
 }
 
-Paper_score::Paper_score (Paper_score const &s)
-  : Music_output (s)
+
+vector<int>
+Paper_score::find_break_indices () const
 {
-  assert (false);
+  vector<Grob*> all = root_system ()->columns ();
+  vector<int> retval;
+
+  for (vsize i = 0; i < all.size (); i++)
+    if (Item::is_breakable (all[i]))
+      retval.push_back (i);
+
+  return retval;
 }
 
-Array<Column_x_positions>
+
+vector<Column_x_positions>
 Paper_score::calc_breaking ()
 {
-  Break_algorithm *algorithm_p=0;
-  Array<Column_x_positions> sol;
-
-  algorithm_p = new Gourlay_breaking ;
-  algorithm_p->set_pscore (this);
-  sol = algorithm_p->solve ();
-  delete algorithm_p;
+  Break_algorithm *algorithm = 0;
+  vector<Column_x_positions> sol;
+  
+  int system_count = robust_scm2int (layout ()->c_variable ("system-count"), 0);
+  if (system_count)
+    {
+      Constrained_breaking *b = new Constrained_breaking;
+      b->resize (system_count);
+      algorithm = b;
+    }
+  else
+    algorithm = new Gourlay_breaking;
+  
+  algorithm->set_pscore (this);
+  sol = algorithm->solve ();
+  delete algorithm;
 
   return sol;
 }
 
-/*
-  urg. clean me
- */
 void
 Paper_score::process ()
 {
-  if (verbose_global_b)
-    progress_indication ( _f("Element count %d ",  line_l_->element_count ()));
+  if (be_verbose_global)
+    message (_f ("Element count %d (spanners %d) ",
+		 system_->element_count (),
+		 system_->spanner_count ()));
 
-  
-  progress_indication (_ ("Preprocessing elements...") + " ");
+  message (_ ("Preprocessing graphical objects...") + " ");
 
-  /*
-    Be sure to set breakability on first & last column.
-   */
-  Link_array<Grob> pc (line_l_->column_l_arr ());
-  
-  pc[0]->set_grob_property ("breakable", SCM_BOOL_T);
-  pc.top ()->set_grob_property ("breakable", SCM_BOOL_T);
+  /* FIXME: Check out why we need this - removing gives assertion failures
+     down the road.
 
-  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_->output_header ();
-  outputter_l_->output_version ();
-  
-  if (header_global_p)
-    outputter_l_->output_scope (header_global_p, "lilypond");
-  if (header_l_)
-    outputter_l_->output_scope (header_l_, "lilypond");
+     doubly, also done in Score_engraver */
+  vector<Grob*> pc (system_->columns ());
+  pc[0]->set_property ("breakable", SCM_BOOL_T);
+  pc.back ()->set_property ("breakable", SCM_BOOL_T);
 
-  outputter_l_->output_comment (_ ("Outputting Score, defined at: "));
-  outputter_l_->output_comment (origin_str_);
+  system_->pre_processing ();
 
-  if (paper_l_->scope_p_)
-    outputter_l_->output_scope (paper_l_->scope_p_, "lilypondpaper");
+  vector<Column_x_positions> breaking = calc_breaking ();
+  system_->break_into_pieces (breaking);
 
-  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);
-  outputter_l_->output_scheme (scm);
-
-  line_l_->output_lines ();
+  paper_systems_ = system_->get_paper_systems ();
+}
 
-  scm = gh_list (ly_symbol2scm ("end-output"), SCM_UNDEFINED);
-  outputter_l_->output_scheme (scm);
+System *
+Paper_score::root_system () const
+{
+  return system_;
+}
 
-  progress_indication ("\n");
+Output_def *
+Paper_score::layout () const
+{
+  return layout_;
+}
 
-  outputter_l_->output_score_header_fields (paper_l_);
-    
-  // huh?
-  delete outputter_l_;
-  outputter_l_ = 0;
-  
-  if (verbose_global_b)
-    ly_display_scm (scm_gc_stats ()); 
+SCM
+Paper_score::get_paper_systems () const
+{
+  return paper_systems_;
 }
+