* scm/output-gnome.scm (FIXME-glyph-string): New function. Cannot

[lilypond.git] / lily / note-head-line-engraver.cc

diff --git a/lily/note-head-line-engraver.cc b/lily/note-head-line-engraver.cc
index 84e8af265201aec998793328b8b3c5b3f5ad8b06..84e3fceb726a0906fe114bbdd96b8c28514fcc42 100644 (file)
--- a/lily/note-head-line-engraver.cc
+++ b/lily/note-head-line-engraver.cc
@@ -3,19 +3,16 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 2000--2003 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 2000--2004 Jan Nieuwenhuizen <janneke@gnu.org>
  */
 
 #include "engraver.hh"
 #include "group-interface.hh"
-#include "item.hh"
-#include "event.hh"
-#include "spanner.hh"
 #include "stem.hh"
 #include "rhythmic-head.hh"
 #include "side-position-interface.hh"
 #include "staff-symbol-referencer.hh"
-#include "translator-group.hh"
+#include "context.hh"
 
 /**
    Create line-spanner grobs for lines that connect note heads.
@@ -27,7 +24,7 @@
 class Note_head_line_engraver : public Engraver
 {
 public:
-  TRANSLATOR_DECLARATIONS(Note_head_line_engraver);
+  TRANSLATOR_DECLARATIONS (Note_head_line_engraver);
 
 protected:
   virtual void acknowledge_grob (Grob_info);
@@ -36,7 +33,7 @@ protected:
 
 private:
   Spanner* line_; 
-  Translator* last_staff_;
+  Context* last_staff_;
   bool follow_;
   Grob* head_;
   Grob* last_head_;
@@ -59,11 +56,12 @@ Note_head_line_engraver::acknowledge_grob (Grob_info info)
       head_ = info.grob_;
       if (to_boolean (get_property ("followVoice")))
        {
-         Translator_group  * tr = daddy_trans_;
-         while (tr && !tr->is_alias_b (ly_symbol2scm ( "Staff")))
-           tr = tr->daddy_trans_ ;
+         Context * tr = context ();
+         while (tr && !tr->is_alias (ly_symbol2scm ( "Staff")))
+           tr = tr->get_parent_context () ;
 
-         if (tr && tr->is_alias_b (ly_symbol2scm ("Staff")) && tr != last_staff_)
+         if (tr
+             && tr->is_alias (ly_symbol2scm ("Staff")) && tr != last_staff_)
            {
              if (last_head_)
                follow_ = true;
@@ -85,12 +83,11 @@ Note_head_line_engraver::process_acknowledged_grobs ()
         Should probably store follow_ in line_, and suicide at some
         later point */
       if (follow_)
-       line_ = new Spanner (get_property ("VoiceFollower"));
+       line_ = make_spanner ("VoiceFollower", head_->self_scm ());
          
       line_->set_bound (LEFT, last_head_);
       line_->set_bound (RIGHT, head_);
       
-      announce_grob(line_, head_->self_scm ());
 
       follow_ = false;
     }
@@ -99,11 +96,7 @@ Note_head_line_engraver::process_acknowledged_grobs ()
 void
 Note_head_line_engraver::stop_translation_timestep ()
 {
-  if (line_)
-    {
-      typeset_grob (line_);
-      line_ = 0;
-    }
+  line_ = 0;
   if (head_)
     last_head_ = head_;
   head_ = 0;
@@ -112,7 +105,7 @@ Note_head_line_engraver::stop_translation_timestep ()
 
 
 
-ENTER_DESCRIPTION(Note_head_line_engraver,
+ADD_TRANSLATOR (Note_head_line_engraver,
 /* descr */       "Engrave a line between two note heads, for example a glissando.  If "
 " followVoice is set, staff switches also generate a line.",
 /* creats*/       "Glissando VoiceFollower",