X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fligature-engraver.cc;h=fb6f54c7064e97d6352d73a8417b599f58822c66;hb=f7d264fa89c39f8d86e9ba5eb991ee904ce3d0be;hp=822df306ff91d55f83b1d7622b45ebcb9c1998cb;hpb=e0aab46ee287f06765b982c49fd0491ab033fce7;p=lilypond.git

diff --git a/lily/ligature-engraver.cc b/lily/ligature-engraver.cc
index 822df306ff..fb6f54c706 100644
--- a/lily/ligature-engraver.cc
+++ b/lily/ligature-engraver.cc
@@ -1,9 +1,20 @@
 /*
-  ligature-engraver.cc -- implement Ligature_engraver
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 2002--2012 Juergen Reuter <reuter@ipd.uka.de>
 
-  (c) 2002--2006 Juergen Reuter <reuter@ipd.uka.de>
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "ligature-engraver.hh"
@@ -13,8 +24,7 @@
 #include "note-head.hh"
 #include "rest.hh"
 #include "spanner.hh"
-#include "warn.hh"
-
+#include "stream-event.hh"
 #include "translator.icc"
 
 /*
@@ -77,16 +87,11 @@ Ligature_engraver::Ligature_engraver ()
   brew_ligature_primitive_proc = SCM_EOL;
 }
 
-bool
-Ligature_engraver::try_music (Music *m)
+void
+Ligature_engraver::listen_ligature (Stream_event *ev)
 {
-  if (m->is_mus_type ("ligature-event"))
-    {
-      Direction d = to_dir (m->get_property ("span-direction"));
-      events_drul_[d] = m;
-      return true;
-    }
-  return false;
+  Direction d = to_dir (ev->get_property ("span-direction"));
+  ASSIGN_EVENT_ONCE (events_drul_[d], ev);
 }
 
 void
@@ -95,15 +100,15 @@ Ligature_engraver::process_music ()
   if (events_drul_[STOP])
     {
       if (!ligature_)
-	{
-	  events_drul_[STOP]->origin ()->warning (_ ("can't find start of ligature"));
-	  return;
-	}
+        {
+          events_drul_[STOP]->origin ()->warning (_ ("cannot find start of ligature"));
+          return;
+        }
 
       if (!last_bound_)
-	events_drul_[STOP]->origin ()->warning (_ ("no right bound"));
+        events_drul_[STOP]->origin ()->warning (_ ("no right bound"));
       else
-	ligature_->set_bound (RIGHT, last_bound_);
+        ligature_->set_bound (RIGHT, last_bound_);
 
       prev_start_event_ = 0;
       finished_primitives_ = primitives_;
@@ -122,23 +127,23 @@ Ligature_engraver::process_music ()
   if (events_drul_[START])
     {
       if (ligature_)
-	{
-	  events_drul_[START]->origin ()->warning (_ ("already have a ligature"));
-	  return;
-	}
+        {
+          events_drul_[START]->origin ()->warning (_ ("already have a ligature"));
+          return;
+        }
 
       prev_start_event_ = events_drul_[START];
       ligature_ = create_ligature_spanner ();
 
       Grob *bound = unsmob_grob (get_property ("currentMusicalColumn"));
       if (!bound)
-	events_drul_[START]->origin ()->warning (_ ("no left bound"));
+        events_drul_[START]->origin ()->warning (_ ("no left bound"));
       else
-	ligature_->set_bound (LEFT, bound);
+        ligature_->set_bound (LEFT, bound);
 
       ligature_start_mom_ = now_mom ();
 
-      // TODO: dump cause into make_item/spanner. 
+      // TODO: dump cause into make_item/spanner.
       // announce_grob (ligature_, events_drul_[START]->self_scm ());
     }
 }
@@ -149,15 +154,15 @@ Ligature_engraver::stop_translation_timestep ()
   if (finished_ligature_)
     {
       if (!finished_primitives_.size ())
-	{
-	  finished_ligature_->programming_error ("Ligature_engraver::stop_translation_timestep (): "
-						 "junking empty ligature");
-	}
+        {
+          finished_ligature_->programming_error ("Ligature_engraver::stop_translation_timestep ():"
+                                                 " junking empty ligature");
+        }
       else
-	{
-	  typeset_ligature (finished_ligature_, finished_primitives_);
-	  finished_primitives_.clear ();
-	}
+        {
+          typeset_ligature (finished_ligature_, finished_primitives_);
+          finished_primitives_.clear ();
+        }
       finished_ligature_ = 0;
     }
 
@@ -188,15 +193,13 @@ Ligature_engraver::current_ligature ()
 }
 
 void
-Ligature_engraver::acknowledge_note_head (Grob_info info)
+Ligature_engraver::acknowledge_ligature_head (Grob_info info)
 {
   if (ligature_)
     {
       primitives_.push_back (info);
-      if (info.grob () && (brew_ligature_primitive_proc != SCM_EOL))
-	{
-	  info.grob ()->set_property ("stencil", brew_ligature_primitive_proc);
-	}
+      if (info.grob () && brew_ligature_primitive_proc != SCM_EOL)
+        info.grob ()->set_property ("stencil", brew_ligature_primitive_proc);
     }
 }
 
@@ -205,7 +208,7 @@ Ligature_engraver::acknowledge_rest (Grob_info info)
 {
   if (ligature_)
     {
-      info.music_cause ()->origin ()->warning (_ ("ignoring rest: ligature may not contain rest"));
+      info.event_cause ()->origin ()->warning (_ ("ignoring rest: ligature may not contain rest"));
       prev_start_event_->origin ()->warning (_ ("ligature was started here"));
       // TODO: maybe better should stop ligature here rather than
       // ignoring the rest?