lilypond-1.1.36

diff --git a/flower/include/array.hh b/flower/include/array.hh
index c8fe30f16fb36d362c016606e6aae092b76097d7..f8194c27899ccebb31e07558f06f17ae517fa3cf 100644 (file)
--- a/flower/include/array.hh
+++ b/flower/include/array.hh
@@ -123,7 +123,7 @@ public:
     }
 
   /// tighten array size_.
-  void precompute()     {
+  void tighten_maxsize()     {
     remax (size_);
   }
     

diff --git a/flower/include/parray.hh b/flower/include/parray.hh
index 16836c6a9cfb6725fd74e1233bb0a6e71a6744fa..ee529a5316cb923f184e99384472e6059e58c74b 100644 (file)
--- a/flower/include/parray.hh
+++ b/flower/include/parray.hh
@@ -121,7 +121,8 @@ public:
   Array<void*>::clear;
   Array<void*>::set_size;
   Array<void*>::empty;
-  Array<void*>::reverse;  
+  Array<void*>::reverse;
+  Array<void*>::tighten_maxsize;
   T * get (int i)
     {
       return (T*) Array<void*>::get (i);

diff --git a/lily/include/p-score.hh b/lily/include/p-score.hh
index 88e2d54f242e5c05c9296888181427d769773588..e3a5174f945c99a43dcfde2063c6754d091cdd2b 100644 (file)
--- a/lily/include/p-score.hh
+++ b/lily/include/p-score.hh
@@ -27,7 +27,9 @@ class Paper_score : public Music_output
 
   /// other elements
   Link_array<Score_element> elem_p_arr_;
-  
+
+  Link_array<Score_element> to_delete_arr_;
+  Link_array<Score_element> break_helpers_arr_;
 
 public:
   Paper_def *paper_l_;
@@ -59,7 +61,8 @@ public:
   void typeset_broken_spanner (Spanner*);
   /// add a Spanner
   void typeset_unbroken_spanner (Spanner*);
- 
+  
+  void schedule_for_delete (Score_element*);
     
   virtual ~Paper_score();
 protected: