From 17e872f43e6b4ea35c4cb970e7f874b9498b0b38 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Tue, 8 Aug 2006 22:06:02 +0000 Subject: [PATCH] (PATCH_LEVEL): bump. --- ChangeLog | 7 +++++++ THANKS | 1 + VERSION | 2 +- lily/coherent-ligature-engraver.cc | 31 ------------------------------ lily/dynamic-performer.cc | 2 +- lily/include/box.hh | 1 + lily/translator.cc | 3 --- 7 files changed, 11 insertions(+), 36 deletions(-) diff --git a/ChangeLog b/ChangeLog index 349164c488..a352e1bb5e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ +2006-08-09 Han-Wen Nienhuys + + * VERSION (PATCH_LEVEL): bump. + 2006-08-08 Han-Wen Nienhuys + * stepmake/aclocal.m4: better version check; handle fooX.Y + binaries too. + * ly/performer-init.ly: instrument name fixup. * input/manual/chord-names-jazz.ly (banterProperties): diff --git a/THANKS b/THANKS index 0fe6f802f2..2e8039816e 100644 --- a/THANKS +++ b/THANKS @@ -64,6 +64,7 @@ Lee T. Wilkirson Mark Dewey Markus Schneider Michael Meixner +Michael Welsh Duggan Orm Finnendahl Paul Scott Quentin Spencer diff --git a/VERSION b/VERSION index d15511f6ad..6839e1d0aa 100644 --- a/VERSION +++ b/VERSION @@ -1,6 +1,6 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=2 MINOR_VERSION=9 -PATCH_LEVEL=14 +PATCH_LEVEL=15 MY_PATCH_LEVEL= diff --git a/lily/coherent-ligature-engraver.cc b/lily/coherent-ligature-engraver.cc index 957106d4d7..a4815f0b8a 100644 --- a/lily/coherent-ligature-engraver.cc +++ b/lily/coherent-ligature-engraver.cc @@ -71,37 +71,6 @@ * example, Ligature_bracket_engraver does not share any of this code. */ -/* - * TODO: Let superflous space after each ligature collapse. The - * following code should help in doing so (though it does not yet - * fully work). Just put the following code into - * Spacing_spanner::do_measure (). I put it temporarily here as memo - * until it really works and I also get Han-Wen's/Jan's permission to - * add it to the spacing spanner code. - */ -#if 0 /* experimental code to collapse spacing after ligature */ -SCM incr_scm = lc->get_property ("forced-spacing"); -if (incr_scm != SCM_EOL) /* (Paper_column::is_musical (l)) */ - { - me->warning (_f ("gotcha: ptr=%ul", lc));//debug - ly_display_scm (lc->self_scm ()); - Real distance; - if (incr_scm != SCM_EOL) - distance = scm_to_double (incr_scm); - else - { - me->warning (_ ("distance undefined, assuming 0.1")); - distance = 0.1; - } - me->warning (_f ("distance=%f", distance));//debug - Real inverse_strength = 1.0; - Spaceable_grob::add_spring (lc, rc, distance, inverse_strength); - if (Item *rb = r->find_prebroken_piece (LEFT)) - Spaceable_grob::add_spring (lc, rb, distance, inverse_strength); - - continue; - } -#endif /* * TODO: move this function to class Item? diff --git a/lily/dynamic-performer.cc b/lily/dynamic-performer.cc index 1289051bbb..ad0859e09a 100644 --- a/lily/dynamic-performer.cc +++ b/lily/dynamic-performer.cc @@ -77,7 +77,7 @@ Dynamic_performer::process_music () SCM s = get_property ("midiInstrument"); if (!scm_is_string (s)) - s = get_property ("instrument"); + s = get_property ("instrumentName"); if (!scm_is_string (s)) s = scm_makfrom0str ("piano"); diff --git a/lily/include/box.hh b/lily/include/box.hh index a8119664b7..b6f933af9b 100644 --- a/lily/include/box.hh +++ b/lily/include/box.hh @@ -24,6 +24,7 @@ public: Offset center () const; void translate (Offset o); + /// smallest box enclosing #b# void set_empty (); void add_point (Offset); diff --git a/lily/translator.cc b/lily/translator.cc index 3bb01cac65..e3c973ebbe 100644 --- a/lily/translator.cc +++ b/lily/translator.cc @@ -183,9 +183,6 @@ Translator::add_translator_listener (translator_listener_record **listener_list, name = replace_all (name, '_', '-'); name += "-event"; - /* It's OK to use scm_gc_protect_object for protection, because r is - statically allocated. */ - // NO it's damn not !!!! --hwn SCM class_sym = scm_str2symbol (name.c_str ()); add_listened_event_class (class_sym); -- 2.39.2