(PATCH_LEVEL): bump.

diff --git a/ChangeLog b/ChangeLog
index 349164c4881092672c09c5820182f55e74f15f00..a352e1bb5e199b3e29857ff65d6e1d05fea0a185 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
+2006-08-09  Han-Wen Nienhuys  <hanwen@lilypond.org>
+
+       * VERSION (PATCH_LEVEL): bump.
+
 2006-08-08  Han-Wen Nienhuys  <hanwen@lilypond.org>
 
+       * 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 0fe6f802f2272e99f67e569577420c8fad5c1f67..2e8039816ee538868a0028648d68671d26d41c74 100644 (file)
--- 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 d15511f6ada74ce0a9f501f7a8d3cf2f21b83548..6839e1d0aa858176a49fee0d4690f47fe43d98e9 100644 (file)
--- 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 957106d4d7e94b97675c742faf46f7c8f418eae1..a4815f0b8a2c261134a434cffa209c65fe7763a9 100644 (file)
--- 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 1289051bbb6a7107fa5cd1cdb46d83c3d8173008..ad0859e09af90815c74629769b0192dadbd141ac 100644 (file)
--- 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 a8119664b798d4f74bfe5c3fa272eb2f98c30caa..b6f933af9b27768a32613ee1d82e809ec2f79232 100644 (file)
--- 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 3bb01cac65f62131fcd9a4b5e7089701dc76dad6..e3c973ebbedfac96b2a5d0eb21b0a449e3455714 100644 (file)
--- 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);