X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fhorizontal-bracket-engraver.cc;h=2c5f39bbbac46c60d7d3568af3f2a9419a1d9789;hb=b7f005cbf2757c8c1d3383a0ccc935cf5e3c2e38;hp=3db54efbf2b8be83529c188fca0d1e5d86bb1bc3;hpb=7aabfb20c46e0a1de41698ddc6859ccd3a6dea85;p=lilypond.git

diff --git a/lily/horizontal-bracket-engraver.cc b/lily/horizontal-bracket-engraver.cc
index 3db54efbf2..2c5f39bbba 100644
--- a/lily/horizontal-bracket-engraver.cc
+++ b/lily/horizontal-bracket-engraver.cc
@@ -1,12 +1,11 @@
-/*   
+/*
   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--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-
- */
+  (c) 2002--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+*/
 
 #include "engraver.hh"
 #include "side-position-interface.hh"
@@ -16,35 +15,27 @@ source file of the GNU LilyPond music typesetter
 class Horizontal_bracket_engraver : public Engraver
 {
 public:
-  TRANSLATOR_DECLARATIONS(Horizontal_bracket_engraver);
+  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 start_translation_timestep ();
+  virtual bool try_music (Music *);
   virtual void stop_translation_timestep ();
-  virtual  void process_music ();
-  virtual  void acknowledge_grob (Grob_info);
+  virtual void process_music ();
+  virtual void acknowledge_grob (Grob_info);
 };
 
-ENTER_DESCRIPTION(Horizontal_bracket_engraver,
-		  "Create horizontal brackets over notes for musical analysis purposes.",
-		  "HorizontalBracket",
-		  "note-grouping-event",
-		  "note-column-interface",
-		  "",
-		  "");
+ADD_TRANSLATOR (Horizontal_bracket_engraver,
+		"Create horizontal brackets over notes for musical analysis purposes.",
+		"HorizontalBracket",
+		"note-grouping-event",
+		"note-column-interface",
+		"",
+		"");
 
-Horizontal_bracket_engraver::Horizontal_bracket_engraver()
-{
-  pop_count_ = 0;
-  push_count_ = 0;
-}
-
-void
-Horizontal_bracket_engraver::start_translation_timestep()
+Horizontal_bracket_engraver::Horizontal_bracket_engraver ()
 {
   pop_count_ = 0;
   push_count_ = 0;
@@ -55,22 +46,22 @@ Horizontal_bracket_engraver::try_music (Music *m)
 {
   if (m->is_mus_type ("note-grouping-event"))
     {
-      Direction d = to_dir (m->get_mus_property ("span-direction"));
-      
+      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."));
+	  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."));
+	m->origin ()->warning (_ ("conflicting note group events"));
 
       return true;
     }
@@ -80,15 +71,15 @@ Horizontal_bracket_engraver::try_music (Music *m)
 void
 Horizontal_bracket_engraver::acknowledge_grob (Grob_info gi)
 {
-  if (Note_column::has_interface (gi.grob_))
+  if (Note_column::has_interface (gi.grob ()))
     {
-      for (int 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_);
+	  Side_position_interface::add_support (bracket_stack_[i], gi.grob ());
 	  Pointer_group_interface::add_grob (bracket_stack_[i],
-					     ly_symbol2scm ("columns"), gi.grob_);
+					     ly_symbol2scm ("columns"), gi.grob ());
 	  add_bound_item (bracket_stack_[i],
-					     gi.grob_);
+			  gi.grob ());
 	}
     }
 }
@@ -96,31 +87,30 @@ Horizontal_bracket_engraver::acknowledge_grob (Grob_info gi)
 void
 Horizontal_bracket_engraver::process_music ()
 {
-  for  (int k = 0; k < push_count_; k++)
+  for (int k = 0; k < push_count_; k++)
     {
-      Spanner * sp = new Spanner (get_property ("HorizontalBracket"));
+      Spanner *sp = make_spanner ("HorizontalBracket", events_[k]->self_scm ());
 
-      announce_grob (sp, events_[k]->self_scm());
-      for (int i = 0; i < bracket_stack_.size(); i++)
+      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);
     }
 }
 
-
 void
 Horizontal_bracket_engraver::stop_translation_timestep ()
 {
   for (int i = pop_count_; i--;)
     {
-      if (bracket_stack_.size())
-	typeset_grob (bracket_stack_.pop());
+      if (bracket_stack_.size ())
+	bracket_stack_.pop ();
     }
+  pop_count_ = 0;
+  push_count_ = 0;
 }
 
-