X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpaper-score.cc;h=0cecb7951170d53e022523cdbdb3876493741f79;hb=926115ff42def8bc1ce767029e4f03c8072994ba;hp=ffad13c38b076c0b0b171f0abd24b096e1336f59;hpb=2893f2dd20c081c06c1c7356551344801f8a233a;p=lilypond.git

diff --git a/lily/paper-score.cc b/lily/paper-score.cc
index ffad13c38b..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"
@@ -32,12 +42,6 @@ Paper_score::Paper_score (Output_def *layout)
   paper_systems_ = SCM_BOOL_F;
 }
 
-Paper_score::Paper_score (Paper_score const &s)
-  : Music_output (s)
-{
-  assert (false);
-}
-
 void
 Paper_score::derived_mark () const
 {
@@ -59,26 +63,24 @@ Paper_score::typeset_system (System *system)
   system->unprotect ();
 }
 
-
-vector<vsize>
+void
 Paper_score::find_break_indices () const
 {
-  vector<Grob*> all = root_system ()->columns ();
-  vector<vsize> retval;
+  cols_ = root_system ()->used_columns ();
+  break_indices_.clear ();
+  break_ranks_.clear ();
 
-  for (vsize i = 0; i < all.size (); i++)
+  for (vsize i = 0; i < cols_.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);
+      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 ());
+        }
     }
-
-  cols_ = all;
-  break_indices_ = retval;
-
-  return retval;
 }
 
 vector<vsize>
@@ -89,7 +91,7 @@ Paper_score::get_break_indices () const
   return break_indices_;
 }
 
-vector<Grob*>
+vector<Grob *>
 Paper_score::get_columns () const
 {
   if (cols_.empty ())
@@ -97,48 +99,37 @@ Paper_score::get_columns () const
   return cols_;
 }
 
+vector<vsize>
+Paper_score::get_break_ranks () const
+{
+  if (break_ranks_.empty ())
+    find_break_indices ();
+  return break_ranks_;
+}
+
 vector<Column_x_positions>
 Paper_score::calc_breaking ()
 {
-  Break_algorithm *algorithm = 0;
+  Constrained_breaking algorithm (this);
   vector<Column_x_positions> sol;
 
   message (_ ("Calculating line breaks...") + " ");
 
   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;
+    return algorithm.solve (0, VPOS, system_count);
+
+  return algorithm.best_solution (0, VPOS);
 }
 
 void
 Paper_score::process ()
 {
-  if (be_verbose_global)
-    message (_f ("Element count %d (spanners %d) ",
-		 system_->element_count (),
-		 system_->spanner_count ()));
-
-  message (_ ("Preprocessing graphical objects...") + " ");
+  debug_output (_f ("Element count %d (spanners %d) ",
+                    system_->element_count (),
+                    system_->spanner_count ()));
 
-  /* FIXME: Check out why we need this - removing gives assertion failures
-     down the road.
-
-     doubly, also done in Score_engraver */
-  vector<Grob*> pc (system_->columns ());
-  pc[0]->set_property ("line-break-permission", ly_symbol2scm ("allow"));
-  pc.back ()->set_property ("line-break-permission", ly_symbol2scm ("allow"));
+  message (_ ("Preprocessing graphical objects..."));
 
   system_->pre_processing ();
 }
@@ -158,13 +149,13 @@ Paper_score::layout () const
 SCM
 Paper_score::get_paper_systems ()
 {
-  if (paper_systems_ == SCM_BOOL_F)
+  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_;
 }
-