release: 1.3.117

[lilypond.git] / lily / align-note-column-engraver.cc

diff --git a/lily/align-note-column-engraver.cc b/lily/align-note-column-engraver.cc
index 162d74441ce85b9beb9116d0fd82ffce18df6ab0..0f7f67afabd434477d4aed6600019cfe13e8f309 100644 (file)
--- a/lily/align-note-column-engraver.cc
+++ b/lily/align-note-column-engraver.cc
@@ -15,6 +15,7 @@
 #include "directional-element-interface.hh"
 #include "side-position-interface.hh"
 #include "local-key-item.hh"
+#include "paper-def.hh"
 
 /**
    Catch notes, and put them in a row. Used for aligning grace notes.
@@ -22,14 +23,14 @@
 class Align_note_column_engraver: public Engraver
 {
   Item * align_item_p_;
-  Score_element * now_column_l_;
-  Score_element * accidental_l_;
+  Grob * now_column_l_;
+  Grob * accidental_l_;
 
-  virtual void process_acknowledged ();
-  virtual void do_post_move_processing ();
-  virtual void do_creation_processing ();
-  virtual void do_removal_processing ();
-  virtual void acknowledge_element (Score_element_info);
+  virtual void create_grobs ();
+  virtual void start_translation_timestep ();
+  virtual void initialize ();
+  virtual void finalize ();
+  virtual void acknowledge_grob (Grob_info);
 public:
   VIRTUAL_COPY_CONS(Translator);
   Align_note_column_engraver ();
@@ -43,19 +44,19 @@ Align_note_column_engraver::Align_note_column_engraver()
 }
 
 void
-Align_note_column_engraver::do_creation_processing ()
+Align_note_column_engraver::initialize ()
 {
-  align_item_p_ = new Item (get_property ("basicGraceAlignItemProperties"));
+  align_item_p_ = new Item (get_property ("GraceAlignment"));
   Grace_align_item::set_interface (align_item_p_);
   Side_position::set_axis (align_item_p_, X_AXIS);
   Side_position::set_direction (align_item_p_, LEFT);
   
   // needed  for setting font size.
-  announce_element (align_item_p_, 0);
+  announce_grob (align_item_p_, 0);
 }
 
 void
-Align_note_column_engraver::do_removal_processing ()
+Align_note_column_engraver::finalize ()
 {
   SCM al = get_property ("graceAlignPosition");
   if (isdir_b (al))
@@ -64,12 +65,12 @@ Align_note_column_engraver::do_removal_processing ()
       Directional_element_interface::set (align_item_p_,d);
     }
   
-  typeset_element (align_item_p_);
+  typeset_grob (align_item_p_);
   align_item_p_ =0;
 }
 
 void
-Align_note_column_engraver::acknowledge_element (Score_element_info inf)
+Align_note_column_engraver::acknowledge_grob (Grob_info inf)
 {
   if (Note_column::has_interface(inf.elem_l_))
     {
@@ -81,7 +82,7 @@ Align_note_column_engraver::acknowledge_element (Score_element_info inf)
     }
 }
 void
-Align_note_column_engraver::process_acknowledged ()
+Align_note_column_engraver::create_grobs ()
 {
   if (now_column_l_ && accidental_l_)
     {
@@ -96,27 +97,32 @@ Align_note_column_engraver::process_acknowledged ()
         UGH UGH: separate note-spacing into  separate class,  and
         use that to space grace notes.  
       */
-      SCM grsp = get_property ("graceAccidentalSpace");
+      SCM grsp = get_property ("graceAccidentalSpace") ;
       if (gh_number_p(grsp))
        {
          /*
            ugh.
          */
          Real extra_space = gh_scm2double(grsp);
-         SCM e = gh_cons (gh_double2scm (-extra_space), gh_double2scm (0.0));
-         now_column_l_->set_elt_property ("extra-space", e);
+         SCM e = gh_cons (gh_double2scm (-extra_space),
+                          gh_double2scm (0.0));
+         now_column_l_->set_grob_property ("extra-space", e);
        }
     }
 
+  if (now_column_l_ && !align_item_p_)
+    programming_error ("Align_note_column_engraver:: urg\n");
+  else
+      
   if (now_column_l_)
     {
-      Align_interface::add_element (align_item_p_,now_column_l_);
+      Align_interface::add_element (align_item_p_,now_column_l_, Align_interface::alignment_callback_proc);
       now_column_l_ =0;
     }
 }
 
 void
-Align_note_column_engraver::do_post_move_processing ()
+Align_note_column_engraver::start_translation_timestep ()
 {
   now_column_l_ =0;
   accidental_l_ =0;