* configure.in (--enable-std-vector): New option.

[lilypond.git] / lily / paper-score.cc

diff --git a/lily/paper-score.cc b/lily/paper-score.cc
index 3855b65f1a61319cce68d5def3107aed26db2ddf..6bc05c4e13807c2e3bd3ebdebd1a6cc771e9d161 100644 (file)
--- a/lily/paper-score.cc
+++ b/lily/paper-score.cc
@@ -3,13 +3,15 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1996--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #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"
 #include "output-def.hh"
@@ -56,11 +58,11 @@ Paper_score::typeset_system (System *system)
   system->unprotect ();
 }
 
-Array<Column_x_positions>
+std::vector<Column_x_positions>
 Paper_score::calc_breaking ()
 {
   Break_algorithm *algorithm = 0;
-  Array<Column_x_positions> sol;
+  std::vector<Column_x_positions> sol;
 
   algorithm = new Gourlay_breaking;
   algorithm->set_pscore (this);
@@ -86,11 +88,11 @@ Paper_score::process ()
      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);
+  pc.back ()->set_property ("breakable", SCM_BOOL_T);
 
   system_->pre_processing ();
 
-  Array<Column_x_positions> breaking = calc_breaking ();
+  std::vector<Column_x_positions> breaking = calc_breaking ();
   system_->break_into_pieces (breaking);
 
   paper_systems_ = system_->get_paper_systems ();