From 20faee98e6dcd976d05f02a63d485b4a50520637 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Tue, 6 Apr 1999 17:07:21 +0200 Subject: [PATCH] patch::: 1.1.38.uu1: slur collisions pl 38.uu1 - bf: clef_8 - bf: barnumbers. ******** pl 38 (april 6) --- NEWS | 6 ++++++ TODO | 1 + VERSION | 2 +- lily/bar-script-engraver.cc | 8 +++++++- lily/bar.cc | 7 ++++++- lily/clef-item.cc | 7 +++++-- lily/include/staff-info.hh | 16 ++++++++-------- lily/p-score.cc | 7 +++++-- 8 files changed, 39 insertions(+), 15 deletions(-) diff --git a/NEWS b/NEWS index 00ccefc193..1c1e56b0b9 100644 --- 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 a29d36efb1..9b607355e4 100644 --- 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 1d49b60ae6..cf74e47cf8 100644 --- 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 2fc8e86b17..7897404c65 100644 --- 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 1d572e235e..eee1ce0dae 100644 --- 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 2e65640039..a2d300f516 100644 --- 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 cbedf848ed..72ec7831da 100644 --- 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 3cb525d7d1..1e54cf941d 100644 --- 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 &to_remove, Dictionary &ty else if (dynamic_cast(e)) type_stats["Spanner"] ++; type_stats["Total"] ++; + /* + */ + // delete e; //TODO! } -- 2.39.5