doc fixes, rune pats

[lilypond.git] / lily / volta-engraver.cc

diff --git a/lily/volta-engraver.cc b/lily/volta-engraver.cc
index 4d03ac6ea3857575e003a4066fb99751c5974d84..acf55f371e015ffed3d94584e8c241e902a1824f 100644 (file)
--- a/lily/volta-engraver.cc
+++ b/lily/volta-engraver.cc
@@ -9,11 +9,12 @@
 
 #include "engraver.hh"
 #include "translator-group.hh"
-#include "volta-spanner.hh"
+#include "volta-bracket.hh"
 #include "item.hh"
 #include "note-column.hh"
-#include "bar.hh"
+#include "bar-line.hh"
 #include "side-position-interface.hh"
+#include "warn.hh"
 #include "staff-symbol.hh"
 
 /*
@@ -30,7 +31,7 @@ protected:
   virtual void finalize ();
   virtual void stop_translation_timestep ();
   virtual void process_music ();
-  virtual void create_grobs ();
+  virtual void process_acknowledged_grobs ();
   
   Moment started_mom_;
   Spanner *volta_span_p_;
@@ -132,14 +133,14 @@ Volta_engraver::process_music ()
   this could just as well be done in process_music (), but what the hack.
  */
 void
-Volta_engraver::create_grobs ()
+Volta_engraver::process_acknowledged_grobs ()
 {
   if (!volta_span_p_ && gh_string_p (start_str_))
     {
       started_mom_ = now_mom () ;
 
       volta_span_p_ = new Spanner (get_property ("VoltaBracket"));
-      Volta_spanner::set_interface (volta_span_p_);
+
       announce_grob (volta_span_p_, SCM_EOL);
       volta_span_p_->set_grob_property ("text", start_str_);
     }
@@ -153,14 +154,14 @@ Volta_engraver::acknowledge_grob (Grob_info i)
       if (Note_column::has_interface (item))
        {
          if (volta_span_p_)
-           Volta_spanner::add_column (volta_span_p_,item);
+           Volta_bracket_interface::add_column (volta_span_p_,item);
        }
-      if (Bar::has_interface (item))
+      if (Bar_line::has_interface (item))
        {
          if (volta_span_p_)
-           Volta_spanner::add_bar (volta_span_p_, item);
+           Volta_bracket_interface::add_bar (volta_span_p_, item);
          if (end_volta_span_p_)
-           Volta_spanner::add_bar (end_volta_span_p_ , item);
+           Volta_bracket_interface::add_bar (end_volta_span_p_ , item);
        }
     }
   else if (Staff_symbol::has_interface (i.grob_l_))