release: 1.3.107

[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 05a51c710b0fb1b2bdca95d123838b4d7ae9d0a8..426ec31c9b0d5ca7c7a306ab87d60b91be44ef6f 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.
@@ -45,13 +46,13 @@ Align_note_column_engraver::Align_note_column_engraver()
 void
 Align_note_column_engraver::do_creation_processing ()
 {
-  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 (Score_element_info (align_item_p_, 0));
+  announce_element (align_item_p_, 0);
 }
 
 void
@@ -61,7 +62,7 @@ Align_note_column_engraver::do_removal_processing ()
   if (isdir_b (al))
     {
       Direction d = to_dir (al);
-      Directional_element_interface (align_item_p_).set (d);
+      Directional_element_interface::set (align_item_p_,d);
     }
   
   typeset_element (align_item_p_);
@@ -92,15 +93,19 @@ 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.  
       */
-      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));
+         SCM e = gh_cons (gh_double2scm (-extra_space),
+                          gh_double2scm (0.0));
          now_column_l_->set_elt_property ("extra-space", e);
        }
     }