release: 1.3.50

[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..a184e36131e2fee6ba6cc9b35e3a4450f1b59918 100644 (file)
--- a/lily/align-note-column-engraver.cc
+++ b/lily/align-note-column-engraver.cc
@@ -3,22 +3,25 @@
   
   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"
 
 /**
-   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_;
+  Grace_align_item * align_item_p_;
   Note_column * now_column_l_;
   Local_key_item * accidental_l_;
 
@@ -43,6 +46,8 @@ void
 Align_note_column_engraver::do_creation_processing ()
 {
   align_item_p_ = new Grace_align_item;
+  side_position (align_item_p_).set_axis (X_AXIS);
+  side_position (align_item_p_).set_direction (LEFT);  
   // needed  for setting font size.
   announce_element (Score_element_info (align_item_p_, 0));
 }
@@ -50,6 +55,13 @@ Align_note_column_engraver::do_creation_processing ()
 void
 Align_note_column_engraver::do_removal_processing ()
 {
+  SCM al = get_property ("graceAlignPosition");
+  if (isdir_b (al))
+    {
+      Direction d = to_dir (al);
+      directional_element (align_item_p_).set (d);
+    }
+  
   typeset_element (align_item_p_);
   align_item_p_ =0;
 }
@@ -79,18 +91,21 @@ Align_note_column_engraver::process_acknowledged ()
         B. it has no pscore_l_ field.
 
       */
-      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 (align_item_p_).add_element (now_column_l_);
       now_column_l_ =0;
     }
 }
@@ -103,3 +118,4 @@ Align_note_column_engraver::do_post_move_processing ()
 }
 
 ADD_THIS_TRANSLATOR(Align_note_column_engraver);
+