X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpaper-score.cc;h=de4c9fb50e1d35a54b563c32ba4d128791b8ee6e;hb=9e781b7dc83b60a543ce218aa1a5f139f74c760f;hp=e7a5f51247a9ac69ae1c6ffa603881255cc22c9f;hpb=d9f0a129bd864743b639c499366bbccf79d27323;p=lilypond.git

diff --git a/lily/paper-score.cc b/lily/paper-score.cc
index e7a5f51247..de4c9fb50e 100644
--- a/lily/paper-score.cc
+++ b/lily/paper-score.cc
@@ -1,9 +1,20 @@
 /*
-  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--2014 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"
@@ -58,26 +69,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>
@@ -88,7 +97,7 @@ Paper_score::get_break_indices () const
   return break_indices_;
 }
 
-vector<Grob*>
+vector<Grob *>
 Paper_score::get_columns () const
 {
   if (cols_.empty ())
@@ -96,41 +105,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 ()
 {
-  Constrained_breaking algorithm;
+  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)
-    algorithm.resize (system_count);
-  
-  algorithm.set_pscore (this);
-  sol = algorithm.solve ();
+    return algorithm.solve (0, VPOS, system_count);
 
-  return sol;
+  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 ()));
+  debug_output (_f ("Element count %d (spanners %d) ",
+                    system_->element_count (),
+                    system_->spanner_count ()));
 
-  message (_ ("Preprocessing graphical objects...") + " ");
-
-  /* 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 ();
 }
@@ -155,8 +160,14 @@ Paper_score::get_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_;
 }
 
+Paper_score *
+unsmob_paper_score (SCM x)
+{
+  return dynamic_cast<Paper_score *> (unsmob_music_output (x));
+}