Run `make grand-replace'.

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

diff --git a/lily/ligature-engraver.cc b/lily/ligature-engraver.cc
index 98e840b1ffaadaaeed005192c62a978da5b7afe0..16b2222ab578243a4107e6cc697c6332ad4a73c6 100644 (file)
--- a/lily/ligature-engraver.cc
+++ b/lily/ligature-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2002--2006 Juergen Reuter <reuter@ipd.uka.de>
+  (c) 2002--2008 Juergen Reuter <reuter@ipd.uka.de>
 */
 
 #include "ligature-engraver.hh"
@@ -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
@@ -92,7 +90,7 @@ Ligature_engraver::process_music ()
     {
       if (!ligature_)
        {
-         events_drul_[STOP]->origin ()->warning (_ ("can't find start of ligature"));
+         events_drul_[STOP]->origin ()->warning (_ ("cannot find start of ligature"));
          return;
        }
 
@@ -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);
        }