Run `make grand-replace'.

[lilypond.git] / lily / horizontal-bracket-engraver.cc

diff --git a/lily/horizontal-bracket-engraver.cc b/lily/horizontal-bracket-engraver.cc
index 748871f5838f4477068635b4997ca52b8473bd74..446c5ba27499650f9ebe9aaeebc41287b82575c5 100644 (file)
--- a/lily/horizontal-bracket-engraver.cc
+++ b/lily/horizontal-bracket-engraver.cc
@@ -1,40 +1,53 @@
-/*   
+/*
   horizontal-bracket-engraver.cc -- implement
-    Horizontal_bracket_engraver
+  Horizontal_bracket_engraver
 
-source file of the GNU LilyPond music typesetter
+  source file of the GNU LilyPond music typesetter
 
-(c) 2002--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-
- */
+  (c) 2002--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
 
 #include "engraver.hh"
-#include "side-position-interface.hh"
+#include "international.hh"
 #include "note-column.hh"
-#include "group-interface.hh"
+#include "pointer-group-interface.hh"
+#include "side-position-interface.hh"
+#include "stream-event.hh"
+#include "spanner.hh"
+#include "item.hh"
+
+#include "translator.icc"
 
 class Horizontal_bracket_engraver : public Engraver
 {
 public:
   TRANSLATOR_DECLARATIONS (Horizontal_bracket_engraver);
-  Link_array<Spanner> bracket_stack_;
-  Link_array<Music> events_;
-  int pop_count_;
-  int push_count_;
-
-  virtual  bool try_music (Music*);
-  virtual void stop_translation_timestep ();
-  virtual  void process_music ();
-  virtual  void acknowledge_grob (Grob_info);
+  vector<Spanner*> bracket_stack_;
+  vector<Stream_event*> events_;
+  vsize pop_count_;
+  vsize push_count_;
+
+  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",
-                 "note-column-interface",
-                 "",
-                 "");
+               /* doc */
+               "Create horizontal brackets over notes for musical analysis"
+               " purposes.",
+
+               /* create */
+               "HorizontalBracket ",
+
+               /* read */
+               "",
+
+               /* write */
+               ""
+               );
 
 Horizontal_bracket_engraver::Horizontal_bracket_engraver ()
 {
@@ -42,79 +55,62 @@ 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 (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
-Horizontal_bracket_engraver::acknowledge_grob (Grob_info gi)
+Horizontal_bracket_engraver::acknowledge_note_column (Grob_info gi)
 {
-  if (Note_column::has_interface (gi.grob_))
+  for (vsize i = 0; i < bracket_stack_.size (); i++)
     {
-      for (int i = 0;  i < bracket_stack_.size (); i++)
-       {
-         Side_position_interface::add_support (bracket_stack_[i], gi.grob_);
-         Pointer_group_interface::add_grob (bracket_stack_[i],
-                                            ly_symbol2scm ("columns"), gi.grob_);
-         add_bound_item (bracket_stack_[i],
-                                            gi.grob_);
-       }
+      Side_position_interface::add_support (bracket_stack_[i], gi.grob ());
+      Pointer_group_interface::add_grob (bracket_stack_[i],
+                                        ly_symbol2scm ("columns"), gi.grob ());
+      add_bound_item (bracket_stack_[i],
+                     gi.grob ());
     }
 }
 
 void
 Horizontal_bracket_engraver::process_music ()
 {
-  for  (int k = 0; k < push_count_; k++)
+  for (vsize k = 0; k < push_count_; k++)
     {
-      Spanner * sp = make_spanner ("HorizontalBracket", events_[k]->self_scm ());
-
-      for (int i = 0; i < bracket_stack_.size (); i++)
-       {
-         /*
-           sp is the smallest, it should be added to the bigger brackets.
-          */
-         Side_position_interface::add_support (bracket_stack_[i], sp);
-       }
-      bracket_stack_.push (sp);
+      Spanner *sp = make_spanner ("HorizontalBracket", events_[k]->self_scm ());
+
+      for (vsize i = 0; i < bracket_stack_.size (); i++)
+       /* sp is the smallest, it should be added to the bigger brackets.  */
+       Side_position_interface::add_support (bracket_stack_[i], sp);
+      bracket_stack_.push_back (sp);
     }
 }
 
-
 void
 Horizontal_bracket_engraver::stop_translation_timestep ()
 {
   for (int i = pop_count_; i--;)
-    {
-      if (bracket_stack_.size ())
-       bracket_stack_.pop ();
-    }
+    if (bracket_stack_.size ())
+      bracket_stack_.pop_back ();
   pop_count_ = 0;
   push_count_ = 0;
 }
 
-