Merge branch 'cvs-head' of ssh+git://hanwen@repo.or.cz/srv/git/lilypond into master...

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

diff --git a/lily/ligature-engraver.cc b/lily/ligature-engraver.cc
index 98e840b1ffaadaaeed005192c62a978da5b7afe0..ab7dfebadb2e4829bf2d8fa7b4d9b922b52f48c2 100644 (file)
--- a/lily/ligature-engraver.cc
+++ b/lily/ligature-engraver.cc
@@ -14,8 +14,6 @@
 #include "rest.hh"
 #include "spanner.hh"
 #include "stream-event.hh"
-#include "warn.hh"
-
 #include "translator.icc"
 
 /*
@@ -82,7 +80,7 @@ void
 Ligature_engraver::listen_ligature (Stream_event *ev)
 {
   Direction d = to_dir (ev->get_property ("span-direction"));
-  events_drul_[d] = ev;
+  ASSIGN_EVENT_ONCE (events_drul_[d], ev);
 }
 
 void
@@ -189,7 +187,7 @@ Ligature_engraver::acknowledge_note_head (Grob_info info)
   if (ligature_)
     {
       primitives_.push_back (info);
-      if (info.grob () && (brew_ligature_primitive_proc != SCM_EOL))
+      if (info.grob () && brew_ligature_primitive_proc != SCM_EOL)
        {
          info.grob ()->set_property ("stencil", brew_ligature_primitive_proc);
        }