``slikken kreng''

[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 52ac159c93b2a6411b7bba03dc0ca2deb18f76fc..eb2fc894d53f112d09f8b4d273f88e4525e06b21 100644 (file)
--- a/lily/note-head-line-engraver.cc
+++ b/lily/note-head-line-engraver.cc
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 2000--2001 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 2000--2002 Jan Nieuwenhuizen <janneke@gnu.org>
  */
 
 #include "engraver.hh"
@@ -33,7 +33,7 @@ public:
 
 protected:
   virtual void acknowledge_grob (Grob_info);
-  virtual void create_grobs ();
+  virtual void process_acknowledged_grobs ();
   virtual void stop_translation_timestep ();
   virtual bool try_music (Music *);
 
@@ -75,16 +75,16 @@ Note_head_line_engraver::try_music (Music* m)
 void
 Note_head_line_engraver::acknowledge_grob (Grob_info info)
 {
-  if (Rhythmic_head::has_interface (info.grob_l_))
+  if (Rhythmic_head::has_interface (info.grob_))
     {
-      head_ = info.grob_l_;
+      head_ = info.grob_;
       if (to_boolean (get_property ("followVoice")))
        {
-         Translator_group  * tr = daddy_trans_l_;
-         while (tr && tr->type_str_ != "Staff")
-           tr = tr->daddy_trans_l_ ;
+         Translator_group  * tr = daddy_trans_;
+         while (tr && tr->type_string_ != "Staff")
+           tr = tr->daddy_trans_ ;
 
-         if (tr && tr->type_str_ == "Staff" && tr != last_staff_)
+         if (tr && tr->type_string_ == "Staff" && tr != last_staff_)
            {
              if (last_head_)
                follow_ = true;
@@ -96,7 +96,7 @@ Note_head_line_engraver::acknowledge_grob (Grob_info info)
 
 
 void
-Note_head_line_engraver::create_grobs ()
+Note_head_line_engraver::process_acknowledged_grobs ()
 {
   if (!line_ && (follow_ || last_req_) && last_head_ && head_
       && (last_head_ != head_))
@@ -117,10 +117,11 @@ Note_head_line_engraver::create_grobs ()
          /* Note, mustn't set y-parent of breakable symbol to simple item:
             one of the two broken parts won't have an y-parent! */
          /* X parent is set by set_bound */
-      line_->set_parent (Staff_symbol_referencer::staff_symbol_l (last_head_),
+      line_->set_parent (Staff_symbol_referencer::get_staff_symbol (last_head_),
                         Y_AXIS);
          
-      announce_grob (line_, last_req_);
+      SCM c = last_req_? last_req_->self_scm () : SCM_EOL;
+      announce_grob(line_, c);
       last_req_ = 0;   
 
       follow_ = false;