patch::: 1.3.78.jcn1

[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 3c1ff77b427fda56fd0954bfcc778956d62490be..75fb5b94e310a4569ff68d822ed413a5cc3b7330 100644 (file)
--- a/lily/align-note-column-engraver.cc
+++ b/lily/align-note-column-engraver.cc
@@ -3,20 +3,30 @@
   
   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 "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_;
+  Item * align_item_p_;
+  Score_element * now_column_l_;
+  Score_element * 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);
@@ -28,19 +38,32 @@ public:
 Align_note_column_engraver::Align_note_column_engraver()
 {
   align_item_p_ =0;
+  now_column_l_ =0;
+  accidental_l_ =0;
 }
 
 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 (align_item_p_).set (d);
+    }
+  
   typeset_element (align_item_p_);
   align_item_p_ =0;
 }
@@ -48,10 +71,53 @@ 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_ =inf.elem_l_;
+    }
+  else if (Local_key_item::has_interface (inf.elem_l_))
     {
-      align_item_p_->add_element (n);
+      accidental_l_ = inf.elem_l_;
     }
 }
+void
+Align_note_column_engraver::process_acknowledged ()
+{
+  if (now_column_l_ && accidental_l_)
+    {
+      
+      /* Can't inspect  width of Local_key_item, since
+
+        A. it may not be fully built
+
+        B. it has no pscore_l_ field.
+
+      */
+      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);
+       }
+    }
+
+  if (now_column_l_)
+    {
+      Align_interface::add_element (align_item_p_,now_column_l_);
+      now_column_l_ =0;
+    }
+}
+
+void
+Align_note_column_engraver::do_post_move_processing ()
+{
+  now_column_l_ =0;
+  accidental_l_ =0;
+}
 
 ADD_THIS_TRANSLATOR(Align_note_column_engraver);
+