patch::: 1.1.38.uu1: slur collisions

pl 38.uu1
	- bf: clef_8
	- bf: barnumbers.

********
pl 38 (april 6)

diff --git a/NEWS b/NEWS
index 00ccefc1932cf850f864cd36b72aa8f9f83b7e56..1c1e56b0b906fb491956f472a68ebe72d242dd7a 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,9 @@
+pl 38.uu1
+       - bf: clef_8
+       - bf: barnumbers.
+
+********
+pl 38 (april 6)
 pl 37.script2
        - bf: AFM for BlueSky AFM files.
        - \penalty = 4278 -> \penalty 4278

diff --git a/TODO b/TODO
index a29d36efb1aec98c8bd29f8dda47b48667804c2f..9b607355e4bab8c896006811619d2cb31aec79da 100644 (file)
--- a/TODO
+++ b/TODO
@@ -80,6 +80,7 @@ There are distinct ways of specifying the first two (although at
 present, they're not properly distinguished) but no distinct way to
 specify the third.  Should there be?
 . * spacing of mmrests.
+. * mem leak: redo p-score object deletion.
 
 .* Cleanups needed
 . * Beam

diff --git a/VERSION b/VERSION
index 1d49b60ae6033c74a06da39ea45d303c7bebbedb..cf74e47cf8e8be71e2f97c2768401c803f8380c8 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=1
 PATCH_LEVEL=38
-MY_PATCH_LEVEL=
+MY_PATCH_LEVEL=uu1
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.

diff --git a/lily/bar-script-engraver.cc b/lily/bar-script-engraver.cc
index 2fc8e86b177098475dc367d1b58ee49fd9ea6691..7897404c657bd1ef977ea1fcbaf8e07ae759e16e 100644 (file)
--- a/lily/bar-script-engraver.cc
+++ b/lily/bar-script-engraver.cc
@@ -13,6 +13,7 @@
 #include "g-staff-side.hh"
 #include "g-text-item.hh"
 #include "lily-guile.hh"
+#include "p-col.hh"
 
 Bar_script_engraver::Bar_script_engraver ()
 {
@@ -46,7 +47,12 @@ Bar_script_engraver::do_acknowledge_element (Item *i)
        =  &i->dim_cache_[axis_];         
 
       staff_side_p_->add_support (i);
-      i->add_dependency (staff_side_p_); // UGH. 
+
+      /*
+       How do we make sure that staff_side_p_ has a dependency from
+       someone else? We can't use i for that, 
+       */
+      get_staff_info ().command_pcol_l ()->add_dependency (staff_side_p_);
     }
 }
 

diff --git a/lily/bar.cc b/lily/bar.cc
index 1d572e235e8ec5baca5fa4c906c22b1d18e8ccf5..eee1ce0dae2146093a1197f5f2830248ad7171d4 100644 (file)
--- a/lily/bar.cc
+++ b/lily/bar.cc
@@ -24,7 +24,12 @@ void
 Bar::do_print () const
 {
 #ifndef NPRINT
-    //  DOUT << type_str_; "{[" confuse  indenter.
+  String s = type_str_;
+  if (s  == "{")
+    s = "brace";
+  if (s == "[")
+    s = "bracket";
+  DOUT << "type = " << s;
 #endif
 }
 

diff --git a/lily/clef-item.cc b/lily/clef-item.cc
index 2e6564003980975521a89b4afeade0449d0915b8..a2d300f516a8b37018a3bdf5e3a4e6553354301f 100644 (file)
--- a/lily/clef-item.cc
+++ b/lily/clef-item.cc
@@ -63,8 +63,11 @@ Clef_item::do_add_processing ()
 
          Real r = do_height ()[d] + g->extent (Y_AXIS)[-d];
          g->dim_cache_[Y_AXIS].set_offset (r);
-         g->set_elt_property (visibility_lambda_scm_sym,
-                              get_elt_property (visibility_lambda_scm_sym));
+
+         SCM my_vis = get_elt_property (visibility_lambda_scm_sym);
+         if (my_vis != SCM_BOOL_F)
+           g->set_elt_property (visibility_lambda_scm_sym, SCM_CDR (my_vis));
+                       
        }
 
     }

diff --git a/lily/include/staff-info.hh b/lily/include/staff-info.hh
index cbedf848edb0458057428af6a1c84801db673b7e..72ec7831da917f3e8e7b1f0a31cf3261e8a38ca1 100644 (file)
--- a/lily/include/staff-info.hh
+++ b/lily/include/staff-info.hh
@@ -17,14 +17,14 @@
     JUNKME.
  */
 struct Staff_info {
-    Time_description const *time_C_;
-    Rhythmic_grouping const *rhythmic_C_;
-    Score_column *musical_l_;
-    Score_column *command_l_;
-
-    Paper_column * command_pcol_l();
-    Paper_column * musical_pcol_l();
-    Staff_info();
+  Time_description const *time_C_;
+  Rhythmic_grouping const *rhythmic_C_;
+  Score_column *musical_l_;
+  Score_column *command_l_;
+
+  Paper_column * command_pcol_l();
+  Paper_column * musical_pcol_l();
+  Staff_info();
 };
 
 #endif // STAFF_INFO_HH

diff --git a/lily/p-score.cc b/lily/p-score.cc
index 3cb525d7d1b03875da4ee7513d88beb3935a91e5..1e54cf941d069d408e82b3a668b7fa838ff45393 100644 (file)
--- a/lily/p-score.cc
+++ b/lily/p-score.cc
@@ -41,10 +41,10 @@ Paper_score::Paper_score (Paper_score const &s)
 
 Paper_score::~Paper_score ()
 {
-  /*  for (int i=0; i < span_p_arr_.size (); i++)
+  for (int i=0; i < span_p_arr_.size (); i++)
     delete span_p_arr_[i];
   for (int i=0; i < elem_p_arr_.size (); i++)
-  delete elem_p_arr_[i];*/
+    delete elem_p_arr_[i];
 }
 
 void
@@ -160,6 +160,9 @@ delete_array_contents (Link_array<Score_element> &to_remove, Dictionary<int> &ty
       else if (dynamic_cast<Spanner*>(e))
        type_stats["Spanner"] ++;
       type_stats["Total"] ++;
+      /*
+       */
+      
  //      delete e; //TODO!
     }