X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpaper-score.cc;h=d668536341368190308a8ce41eee790ddeca03ab;hb=4790df2a2c3cdcd14479e8ece60a99ab803f6197;hp=1eab7f80f6bc4b54db8cdb55d60f47f415ff191b;hpb=4cd5fde58781f8ea5e2e071674cbe0499eb1232e;p=lilypond.git

diff --git a/lily/paper-score.cc b/lily/paper-score.cc
index 1eab7f80f6..d668536341 100644
--- a/lily/paper-score.cc
+++ b/lily/paper-score.cc
@@ -3,34 +3,32 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1996--2007 Han-Wen Nienhuys <hanwen@xs4all.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 "all-font-metrics.hh"
+#include "book.hh"
+#include "international.hh"
+#include "main.hh"
+#include "misc.hh"
+#include "output-def.hh"
+#include "paper-book.hh"
 #include "paper-column.hh"
 #include "scm-hash.hh"
-#include "gourlay-breaking.hh"
-//#include "paper-outputter.hh"
-#include "input-file-results.hh"
-#include "misc.hh"
-#include "all-font-metrics.hh"
-
+#include "score.hh"
 #include "stencil.hh"
-#include "paper-book.hh"
-#include "ly-module.hh"
+#include "system.hh"
+#include "warn.hh"
+#include "constrained-breaking.hh"
 
-Paper_score::Paper_score ()
+Paper_score::Paper_score (Output_def *layout)
 {
-  paper_ = 0;
+  layout_ = layout;
   system_ = 0;
+  systems_ = SCM_EOL;
+  paper_systems_ = SCM_BOOL_F;
 }
 
 Paper_score::Paper_score (Paper_score const &s)
@@ -40,58 +38,121 @@ Paper_score::Paper_score (Paper_score const &s)
 }
 
 void
-Paper_score::typeset_line (System *system)
+Paper_score::derived_mark () const
+{
+  if (layout_)
+    scm_gc_mark (layout_->self_scm ());
+  scm_gc_mark (systems_);
+  scm_gc_mark (paper_systems_);
+}
+
+void
+Paper_score::typeset_system (System *system)
 {
   if (!system_)
     system_ = system;
 
-  systems_ = gh_cons (system->self_scm (), systems_);
+  systems_ = scm_cons (system->self_scm (), systems_);
   system->pscore_ = this;
+  system->layout_ = layout_;
+  system->unprotect ();
+}
+
+
+vector<vsize>
+Paper_score::find_break_indices () const
+{
+  vector<Grob*> all = root_system ()->used_columns ();
+  vector<vsize> retval;
+
+  for (vsize i = 0; i < all.size (); i++)
+    {
+      Item *it = dynamic_cast<Item*> (all[i]);
+      if (Paper_column::is_breakable (all[i])
+	  && (i == 0 || it->find_prebroken_piece (LEFT))
+	  && (i == all.size () - 1 || it->find_prebroken_piece (RIGHT)))
+	retval.push_back (i);
+    }
+
+  cols_ = all;
+  break_indices_ = retval;
+
+  return retval;
+}
 
-  scm_gc_unprotect_object (system->self_scm ());
+vector<vsize>
+Paper_score::get_break_indices () const
+{
+  if (break_indices_.empty ())
+    find_break_indices ();
+  return break_indices_;
 }
 
-Array<Column_x_positions>
+vector<Grob*>
+Paper_score::get_columns () const
+{
+  if (cols_.empty ())
+    find_break_indices ();
+  return cols_;
+}
+
+vector<Column_x_positions>
 Paper_score::calc_breaking ()
 {
-  Break_algorithm *algorithm=0;
-  Array<Column_x_positions> sol;
+  Constrained_breaking algorithm (this);
+  vector<Column_x_positions> sol;
+
+  message (_ ("Calculating line breaks...") + " ");
 
-  algorithm = new Gourlay_breaking ;
-  algorithm->set_pscore (this);
-  sol = algorithm->solve ();
-  delete algorithm;
+  int system_count = robust_scm2int (layout ()->c_variable ("system-count"), 0);
+  if (system_count)
+    return algorithm.solve (0, VPOS, system_count);
 
-  return sol;
+  return algorithm.best_solution (0, VPOS);
 }
 
-SCM
-Paper_score::process (String)
+void
+Paper_score::process ()
 {
-  if (verbose_global_b)
-    progress_indication (_f ("Element count %d (spanners %d) ",
-			     system_->element_count (),
-			     system_->spanner_count ()));
-
-  progress_indication (_ ("Preprocessing graphical objects...") + " ");
-
-  /* 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);
-    
+  if (be_verbose_global)
+    message (_f ("Element count %d (spanners %d) ",
+		 system_->element_count (),
+		 system_->spanner_count ()));
+
+  message (_ ("Preprocessing graphical objects..."));
+
   system_->pre_processing ();
- 
-  Array<Column_x_positions> breaking = calc_breaking ();
-  system_->break_into_pieces (breaking);
-  SCM lines = system_->get_lines ();
-  progress_indication ("\n");
+}
 
-  /* Only keep result stencils in lines_, *title_; delete all grobs.  */
-  systems_ = SCM_EOL;
-  
-  return lines;
+System *
+Paper_score::root_system () const
+{
+  return system_;
+}
+
+Output_def *
+Paper_score::layout () const
+{
+  return layout_;
+}
+
+SCM
+Paper_score::get_paper_systems ()
+{
+  if (paper_systems_ == SCM_BOOL_F)
+    {
+      vector<Column_x_positions> breaking = calc_breaking ();
+      system_->break_into_pieces (breaking);
+      message (_ ("Drawing systems...") + " ");
+      system_->do_break_substitution_and_fixup_refpoints ();
+      paper_systems_ = system_->get_paper_systems ();
+    }
+  return paper_systems_;
+}
+
+
+Paper_score *
+unsmob_paper_score (SCM x)
+{
+  return dynamic_cast<Paper_score*> (unsmob_music_output (x));
 }