Release: bump version.

[lilypond.git] / lily / slur-engraver.cc

diff --git a/lily/slur-engraver.cc b/lily/slur-engraver.cc
index 96d22cd759c001f6eff7acb97c54f1ade52fe5a0..79f04d6203cf6b0f7bc41897a2c401a0b0b38064 100644 (file)
--- a/lily/slur-engraver.cc
+++ b/lily/slur-engraver.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1997--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1997--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -61,6 +61,7 @@ protected:
   DECLARE_ACKNOWLEDGER (fingering);
   DECLARE_ACKNOWLEDGER (note_column);
   DECLARE_ACKNOWLEDGER (script);
+  DECLARE_ACKNOWLEDGER (dots);
   DECLARE_ACKNOWLEDGER (text_script);
   DECLARE_ACKNOWLEDGER (tie);
   DECLARE_ACKNOWLEDGER (tuplet_number);
@@ -120,6 +121,12 @@ Slur_engraver::acknowledge_inline_accidental (Grob_info info)
   acknowledge_extra_object (info);
 }
 
+void
+Slur_engraver::acknowledge_dots (Grob_info info)
+{
+  acknowledge_extra_object (info);
+}
+
 void
 Slur_engraver::acknowledge_fingering (Grob_info info)
 {
@@ -171,13 +178,21 @@ Slur_engraver::process_music ()
 
       // Find the slur that is ended with this event (by checking the spanner-id)
       bool ended = false;
+      SCM starter = SCM_BOOL_F;
       for (vsize j = slurs_.size (); j--;)
         {
           if (id == robust_scm2string (slurs_[j]->get_property ("spanner-id"), ""))
             {
-              ended = true;
-              end_slurs_.push_back (slurs_[j]);
-              slurs_.erase (slurs_.begin () + j);
+             // We end only one slur unless several ones have been
+             // caused by the same event, like with double slurs.
+              if (!ended || scm_is_eq (starter,
+                                      slurs_[j]->get_property ("cause")))
+               {
+                 ended = true;
+                 starter = slurs_[j]->get_property ("cause");
+                 end_slurs_.push_back (slurs_[j]);
+                 slurs_.erase (slurs_.begin () + j);
+               }
             }
         }
       if (!ended)
@@ -201,8 +216,12 @@ Slur_engraver::process_music ()
           ev->origin ()->warning (_ ("already have slur"));
           start_events_.erase (start_events_.begin () + i);
         }
-      else
-        {
+    }
+  for (vsize i = start_events_.size (); i--;)
+    {
+      Stream_event *ev = start_events_[i];
+      string id = robust_scm2string (ev->get_property ("spanner-id"), "");
+
           Grob *slur = make_spanner ("Slur", ev->self_scm ());
           Direction updown = to_dir (ev->get_property ("direction"));
           slur->set_property ("spanner-id", ly_string2scm (id));
@@ -218,7 +237,6 @@ Slur_engraver::process_music ()
               set_grob_direction (slur, UP);
               slurs_.push_back (slur);
             }
-        }
     }
   set_melisma (slurs_.size ());
 }
@@ -258,6 +276,7 @@ ADD_ACKNOWLEDGER (Slur_engraver, fingering);
 ADD_ACKNOWLEDGER (Slur_engraver, note_column);
 ADD_ACKNOWLEDGER (Slur_engraver, script);
 ADD_ACKNOWLEDGER (Slur_engraver, text_script);
+ADD_ACKNOWLEDGER (Slur_engraver, dots);
 ADD_ACKNOWLEDGER (Slur_engraver, tie);
 ADD_ACKNOWLEDGER (Slur_engraver, tuplet_number);
 ADD_TRANSLATOR (Slur_engraver,