* scm/lily.scm (ly:all-stencil-expressions):

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

diff --git a/lily/horizontal-bracket-engraver.cc b/lily/horizontal-bracket-engraver.cc
index f4c819aa2956b8e907314624ab55875d71554f14..494a90bc5017c0aed6d671b8126c0d3c66056a93 100644 (file)
--- 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 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+(c) 2002--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 
  */
 
@@ -16,20 +16,19 @@ 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);
 };
 
-ENTER_DESCRIPTION(Horizontal_bracket_engraver,
+ENTER_DESCRIPTION (Horizontal_bracket_engraver,
                  "Create horizontal brackets over notes for musical analysis purposes.",
                  "HorizontalBracket",
                  "note-grouping-event",
@@ -37,31 +36,25 @@ ENTER_DESCRIPTION(Horizontal_bracket_engraver,
                  "",
                  "");
 
-Horizontal_bracket_engraver::Horizontal_bracket_engraver()
+Horizontal_bracket_engraver::Horizontal_bracket_engraver ()
 {
   pop_count_ = 0;
   push_count_ = 0;
 }
 
-void
-Horizontal_bracket_engraver::start_translation_timestep()
-{
-  pop_count_ = 0;
-  push_count_ = 0;
-}
 
 bool
 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."));
+         if (pop_count_ > bracket_stack_.size ())
+           m->origin ()->warning (_("Don't have that many brackets."));
        }
       else
        {
@@ -70,7 +63,7 @@ Horizontal_bracket_engraver::try_music (Music *m)
        }
       
       if (pop_count_ && push_count_)
-       m->origin()->warning (_("Conflicting note group events."));
+       m->origin ()->warning (_("Conflicting note group events."));
 
       return true;
     }
@@ -82,7 +75,7 @@ Horizontal_bracket_engraver::acknowledge_grob (Grob_info gi)
 {
   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_);
          Pointer_group_interface::add_grob (bracket_stack_[i],
@@ -98,10 +91,9 @@ Horizontal_bracket_engraver::process_music ()
 {
   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.
@@ -118,9 +110,11 @@ 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;
 }