Issue 2232: fix MIDI output of abutting (de)crescendi

diff --git a/input/regression/midi/crescendo-abutting.ly b/input/regression/midi/crescendo-abutting.ly
new file mode 100644 (file)
index 0000000..da0ff4f
--- /dev/null
+++ b/input/regression/midi/crescendo-abutting.ly
@@ -0,0 +1,10 @@
+\version "2.19.44"
+
+\header {
+  texidoc="One (de)crescendo ends as the next begins."
+}
+
+\score {
+   { c\< c\> c\! }
+   \midi {}
+}

diff --git a/lily/dynamic-performer.cc b/lily/dynamic-performer.cc
index 75b153ace894f1ee13a17ad1583e0d8cdd9a0025..5ce67f0463d67176de80df71d0016d997ea704cb 100644 (file)
--- a/lily/dynamic-performer.cc
+++ b/lily/dynamic-performer.cc
@@ -103,9 +103,10 @@ Dynamic_performer::equalize_volume (Real volume)
 void
 Dynamic_performer::process_music ()
 {
-  if (span_events_[STOP] || script_event_)
+  if (span_events_[START] || span_events_[STOP] || script_event_)
     {
-      // End of a dynamic spanner, or an explicit dynamic script event.
+      // End the previous spanner when a new one begins or at an explicit stop
+      // or absolute dynamic.
       finished_span_dynamic_ = span_dynamic_;
       span_dynamic_ = 0;
     }