X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fhorizontal-bracket-engraver.cc;h=446c5ba27499650f9ebe9aaeebc41287b82575c5;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=15a4b575650c16f539a41b31b49806f440478141;hpb=49cae4a7b28489a51e8c97dc33fc64cf83ea25e7;p=lilypond.git

diff --git a/lily/horizontal-bracket-engraver.cc b/lily/horizontal-bracket-engraver.cc
index 15a4b57565..446c5ba274 100644
--- a/lily/horizontal-bracket-engraver.cc
+++ b/lily/horizontal-bracket-engraver.cc
@@ -4,7 +4,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2002--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2002--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "engraver.hh"
@@ -12,6 +12,9 @@
 #include "note-column.hh"
 #include "pointer-group-interface.hh"
 #include "side-position-interface.hh"
+#include "stream-event.hh"
+#include "spanner.hh"
+#include "item.hh"
 
 #include "translator.icc"
 
@@ -19,24 +22,32 @@ class Horizontal_bracket_engraver : public Engraver
 {
 public:
   TRANSLATOR_DECLARATIONS (Horizontal_bracket_engraver);
-  Link_array__Spanner_ bracket_stack_;
-  Link_array__Music_ events_;
+  vector<Spanner*> bracket_stack_;
+  vector<Stream_event*> events_;
   vsize pop_count_;
   vsize push_count_;
 
-  virtual bool try_music (Music *);
   void stop_translation_timestep ();
   void process_music ();
   DECLARE_ACKNOWLEDGER (note_column);
+  DECLARE_TRANSLATOR_LISTENER (note_grouping);
 };
 
 ADD_ACKNOWLEDGER (Horizontal_bracket_engraver, note_column);
 ADD_TRANSLATOR (Horizontal_bracket_engraver,
-		"Create horizontal brackets over notes for musical analysis purposes.",
-		"HorizontalBracket",
-		"note-grouping-event",
+		/* doc */
+		"Create horizontal brackets over notes for musical analysis"
+		" purposes.",
+
+		/* create */
+		"HorizontalBracket ",
+
+		/* read */
 		"",
-		"");
+
+		/* write */
+		""
+		);
 
 Horizontal_bracket_engraver::Horizontal_bracket_engraver ()
 {
@@ -44,31 +55,26 @@ Horizontal_bracket_engraver::Horizontal_bracket_engraver ()
   push_count_ = 0;
 }
 
-bool
-Horizontal_bracket_engraver::try_music (Music *m)
+IMPLEMENT_TRANSLATOR_LISTENER (Horizontal_bracket_engraver, note_grouping);
+void
+Horizontal_bracket_engraver::listen_note_grouping (Stream_event *ev)
 {
-  if (m->is_mus_type ("note-grouping-event"))
+  Direction d = to_dir (ev->get_property ("span-direction"));
+
+  if (d == STOP)
+    {
+      pop_count_++;
+      if (pop_count_ > bracket_stack_.size ())
+	ev->origin ()->warning (_ ("do not have that many brackets"));
+    }
+  else
     {
-      Direction d = to_dir (m->get_property ("span-direction"));
-
-      if (d == STOP)
-	{
-	  pop_count_++;
-	  if (pop_count_ > bracket_stack_.size ())
-	    m->origin ()->warning (_ ("don't have that many brackets"));
-	}
-      else
-	{
-	  push_count_++;
-	  events_.push_back (m);
-	}
-
-      if (pop_count_ && push_count_)
-	m->origin ()->warning (_ ("conflicting note group events"));
-
-      return true;
+      push_count_++;
+      events_.push_back (ev);
     }
-  return false;
+
+  if (pop_count_ && push_count_)
+    ev->origin ()->warning (_ ("conflicting note group events"));
 }
 
 void