lilypond-1.1.40

diff --git a/NEWS b/NEWS
index 1306606e521e2dd01357e4e04bdb1ba2fc872068..5f04e3e2de109e6d08ccdc762f724d0bbd4eea8d 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,21 @@
-pl 39
+pl 39.mb2
+       - added more mensural style time signatures, old3/4, old6/8, old9/8
+       - redesigned old6/4, old9/4
+       - Updated refman.yo, lilypond-regtest.doc, clefs.ly, time.fly
+
+pl 39.hwn1
+       - consified mi2mu (pl 37.jcn1)
+
+pl 39.mb1
+       - bf: invisible clefs don't take any space, moved _8 below clef
+       - updated incipit example and macro
+
+pl 39.uu1
+       - delete graphical objects  in reverse
+       - faq updates.
+
+********
+pl 39 (april 12)
        - \property textstyle -> textStyle
 
 pl 38.tca1

diff --git a/flower/include/array.hh b/flower/include/array.hh
index f8194c27899ccebb31e07558f06f17ae517fa3cf..10f38ec0bfdb2bc971f932d478a76b6be29e6930 100644 (file)
--- a/flower/include/array.hh
+++ b/flower/include/array.hh
@@ -111,6 +111,10 @@ public:
       return Tarray;
     }
 
+  T const *access_array () const
+    {
+      return array_p_;
+    }
   void operator=(Array const & src) 
     {
       set_size (src.size_);

diff --git a/flower/include/parray.hh b/flower/include/parray.hh
index ee529a5316cb923f184e99384472e6059e58c74b..94d2e319e32e4a9d6ab9d5274b28a4f204da21f5 100644 (file)
--- a/flower/include/parray.hh
+++ b/flower/include/parray.hh
@@ -36,6 +36,12 @@ class Link_array : private Array<void *>
 public:
   Link_array()
     {}
+
+  Link_array(T * const *tp, int n)
+    : Array<void*> ((void **)tp, n)
+    {
+    }
+
   Link_array (Link_array<T> const &src)
     : Array<void*> (src)
     {
@@ -123,6 +129,10 @@ public:
   Array<void*>::empty;
   Array<void*>::reverse;
   Array<void*>::tighten_maxsize;
+  T ** access_array () const
+    {
+      return (T**) Array<void*>::access_array();
+    }
   T * get (int i)
     {
       return (T*) Array<void*>::get (i);
@@ -186,5 +196,16 @@ Link_array<T>::sort (int (*compare)(T *const&,T *const&),
   sort (compare, last+1, upper);
 }
 
+template<class T>
+void
+junk_pointer_array (Link_array<T> &a)
+{
+  for (int i=0; i < a.size ();  i++)
+    {
+      delete a[i];
+    }
+  a.clear ();
+}
+
 #endif // PARRAY_HH
 

diff --git a/lily/rhythmic-grouping.cc b/lily/rhythmic-grouping.cc
index 0a95845f6323807c3330ad2add8826e90232a257..487d03a5b981628441c08d682244c99b1f7b10b5 100644 (file)
--- a/lily/rhythmic-grouping.cc
+++ b/lily/rhythmic-grouping.cc
@@ -229,8 +229,7 @@ void
 Rhythmic_grouping::junk()
 {
   delete interval_;
-  for (int i=0; i < children.size(); i++)
-    delete children[i];
+  junk_pointer_array (children);
   init();
 }
 

diff --git a/lily/score.cc b/lily/score.cc
index 7c4fbd5a8472c600d16151020e7615c8fa7c7084..7f0016f2b9cf24d50efd320bbe894b0cfbae8660 100644 (file)
--- a/lily/score.cc
+++ b/lily/score.cc
@@ -42,8 +42,7 @@ Score::Score (Score const &s)
 Score::~Score()
 {
   delete header_p_;
-  for (int i=0; i < def_p_arr_.size (); i++)
-    delete def_p_arr_[i];
+  junk_pointer_array (def_p_arr_);
   delete music_p_;
 }
 

diff --git a/lily/scores.cc b/lily/scores.cc
index 5991ae6839d51b67e9943c0bd30d16ca6a230ce6..5d97d4fef5762293a8ad726ec83571ad8dfa3958 100644 (file)
--- a/lily/scores.cc
+++ b/lily/scores.cc
@@ -92,11 +92,8 @@ do_scores()
 void
 clear_scores ()
 {
-  for (int i=0; i < score_global_array.size(); i++)
-    {
-      delete score_global_array[i];
-    }
-  score_global_array.clear();
+  junk_pointer_array (score_global_array);
+
   inclusion_global_array.clear ();
   delete  header_global_p ;
   header_global_p =0;