X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpaper-score.cc;h=0cecb7951170d53e022523cdbdb3876493741f79;hb=90e4d7057f3857da049dfda3d130017d4719bd6b;hp=c983fe02892157aff73b20a11e01a7737bf5afa2;hpb=9d4a5bbc9687aef811a60aabd9cb839412984e96;p=lilypond.git

diff --git a/lily/paper-score.cc b/lily/paper-score.cc
index c983fe0289..0cecb79511 100644
--- a/lily/paper-score.cc
+++ b/lily/paper-score.cc
@@ -1,16 +1,26 @@
 /*
-  paper-score.cc -- implement Paper_score
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1996--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1996--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "paper-score.hh"
 
 #include "all-font-metrics.hh"
 #include "book.hh"
-#include "gourlay-breaking.hh"
 #include "international.hh"
 #include "main.hh"
 #include "misc.hh"
@@ -22,19 +32,14 @@
 #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 const &s)
-  : Music_output (s)
-{
-  assert (false);
+  paper_systems_ = SCM_BOOL_F;
 }
 
 void
@@ -58,44 +63,75 @@ Paper_score::typeset_system (System *system)
   system->unprotect ();
 }
 
-std::vector<Column_x_positions>
-Paper_score::calc_breaking ()
+void
+Paper_score::find_break_indices () const
 {
-  Break_algorithm *algorithm = 0;
-  std::vector<Column_x_positions> sol;
+  cols_ = root_system ()->used_columns ();
+  break_indices_.clear ();
+  break_ranks_.clear ();
+
+  for (vsize i = 0; i < cols_.size (); i++)
+    {
+      Item *it = dynamic_cast<Item *> (cols_[i]);
+      if (Paper_column::is_breakable (cols_[i])
+          && (i == 0 || it->find_prebroken_piece (LEFT))
+          && (i == cols_.size () - 1 || it->find_prebroken_piece (RIGHT)))
+        {
+          break_indices_.push_back (i);
+          break_ranks_.push_back (it->get_column ()->get_rank ());
+        }
+    }
+}
 
-  algorithm = new Gourlay_breaking;
-  algorithm->set_pscore (this);
-  sol = algorithm->solve ();
-  delete algorithm;
+vector<vsize>
+Paper_score::get_break_indices () const
+{
+  if (break_indices_.empty ())
+    find_break_indices ();
+  return break_indices_;
+}
 
-  return sol;
+vector<Grob *>
+Paper_score::get_columns () const
+{
+  if (cols_.empty ())
+    find_break_indices ();
+  return cols_;
 }
 
-void
-Paper_score::process ()
+vector<vsize>
+Paper_score::get_break_ranks () const
 {
-  if (be_verbose_global)
-    message (_f ("Element count %d (spanners %d) ",
-		 system_->element_count (),
-		 system_->spanner_count ()));
+  if (break_ranks_.empty ())
+    find_break_indices ();
+  return break_ranks_;
+}
 
-  message (_ ("Preprocessing graphical objects...") + " ");
+vector<Column_x_positions>
+Paper_score::calc_breaking ()
+{
+  Constrained_breaking algorithm (this);
+  vector<Column_x_positions> sol;
 
-  /* FIXME: Check out why we need this - removing gives assertion failures
-     down the road.
+  message (_ ("Calculating line breaks...") + " ");
 
-     doubly, also done in Score_engraver */
-  Link_array__Grob_ pc (system_->columns ());
-  pc[0]->set_property ("breakable", SCM_BOOL_T);
-  pc.back ()->set_property ("breakable", SCM_BOOL_T);
+  int system_count = robust_scm2int (layout ()->c_variable ("system-count"), 0);
+  if (system_count)
+    return algorithm.solve (0, VPOS, system_count);
 
-  system_->pre_processing ();
+  return algorithm.best_solution (0, VPOS);
+}
 
-  std::vector<Column_x_positions> breaking = calc_breaking ();
-  system_->break_into_pieces (breaking);
+void
+Paper_score::process ()
+{
+  debug_output (_f ("Element count %d (spanners %d) ",
+                    system_->element_count (),
+                    system_->spanner_count ()));
 
-  paper_systems_ = system_->get_paper_systems ();
+  message (_ ("Preprocessing graphical objects..."));
+
+  system_->pre_processing ();
 }
 
 System *
@@ -111,7 +147,15 @@ Paper_score::layout () const
 }
 
 SCM
-Paper_score::get_paper_systems () const
+Paper_score::get_paper_systems ()
 {
+  if (scm_is_false (paper_systems_))
+    {
+      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_;
 }