release: 1.3.88

[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 4e00da684007c3774cd6a761246147e155c5a946..162d74441ce85b9beb9116d0fd82ffce18df6ab0 100644 (file)
--- a/lily/align-note-column-engraver.cc
+++ b/lily/align-note-column-engraver.cc
@@ -3,24 +3,27 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
 #include "engraver.hh"
 #include "grace-align-item.hh"
+#include "align-interface.hh"
 #include "note-column.hh"
-#include "local-key-item.hh"
 #include "warn.hh"
+#include "directional-element-interface.hh"
+#include "side-position-interface.hh"
+#include "local-key-item.hh"
 
 /**
-   catch notes, and put them in a row.
+   Catch notes, and put them in a row. Used for aligning grace notes.
  */
 class Align_note_column_engraver: public Engraver
 {
-  Axis_align_item * align_item_p_;
-  Note_column * now_column_l_;
-  Local_key_item * accidental_l_;
+  Item * align_item_p_;
+  Score_element * now_column_l_;
+  Score_element * accidental_l_;
 
   virtual void process_acknowledged ();
   virtual void do_post_move_processing ();
@@ -42,14 +45,25 @@ Align_note_column_engraver::Align_note_column_engraver()
 void
 Align_note_column_engraver::do_creation_processing ()
 {
-  align_item_p_ = new Grace_align_item;
+  align_item_p_ = new Item (get_property ("basicGraceAlignItemProperties"));
+  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 (Score_element_info (align_item_p_, 0));
+  announce_element (align_item_p_, 0);
 }
 
 void
 Align_note_column_engraver::do_removal_processing ()
 {
+  SCM al = get_property ("graceAlignPosition");
+  if (isdir_b (al))
+    {
+      Direction d = to_dir (al);
+      Directional_element_interface::set (align_item_p_,d);
+    }
+  
   typeset_element (align_item_p_);
   align_item_p_ =0;
 }
@@ -57,13 +71,13 @@ Align_note_column_engraver::do_removal_processing ()
 void
 Align_note_column_engraver::acknowledge_element (Score_element_info inf)
 {
-  if (Note_column * n = dynamic_cast<Note_column*> (inf.elem_l_))
+  if (Note_column::has_interface(inf.elem_l_))
     {
-      now_column_l_ =n;
+      now_column_l_ =inf.elem_l_;
     }
-  else if (Local_key_item * it = dynamic_cast<Local_key_item*> (inf.elem_l_))
+  else if (Local_key_item::has_interface (inf.elem_l_))
     {
-      accidental_l_ = it;
+      accidental_l_ = inf.elem_l_;
     }
 }
 void
@@ -78,19 +92,25 @@ Align_note_column_engraver::process_acknowledged ()
 
         B. it has no pscore_l_ field.
 
+
+        UGH UGH: separate note-spacing into  separate class,  and
+        use that to space grace notes.  
       */
-      Scalar grsp = get_property ("graceAccidentalSpace", 0);
-      if (grsp.isnum_b ())
+      SCM grsp = get_property ("graceAccidentalSpace");
+      if (gh_number_p(grsp))
        {
-         Real extra_space = double(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_scm_sym, e);
+         now_column_l_->set_elt_property ("extra-space", e);
        }
     }
 
   if (now_column_l_)
     {
-      align_item_p_->add_element (now_column_l_);
+      Align_interface::add_element (align_item_p_,now_column_l_);
       now_column_l_ =0;
     }
 }
@@ -103,3 +123,4 @@ Align_note_column_engraver::do_post_move_processing ()
 }
 
 ADD_THIS_TRANSLATOR(Align_note_column_engraver);
+