X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fvertical-align-engraver.cc;h=0d07a509dfbc864db37dffe53ed6ff8e7a6d5fac;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=33c0f1a98a16f25bc7d27bab4f4dbf3fa18c9c81;hpb=58bcc84c9480dae1b21bc24d8396b91fe19e0131;p=lilypond.git

diff --git a/lily/vertical-align-engraver.cc b/lily/vertical-align-engraver.cc
index 33c0f1a98a..0d07a509df 100644
--- a/lily/vertical-align-engraver.cc
+++ b/lily/vertical-align-engraver.cc
@@ -3,8 +3,9 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
+
 #include "context.hh"
 #include "paper-column.hh"
 #include "align-interface.hh"
@@ -12,22 +13,61 @@
 #include "axis-group-interface.hh"
 #include "engraver.hh"
 #include "spanner.hh"
+#include "pointer-group-interface.hh"
+#include "grob-array.hh"
+
+#include "translator.icc"
 
 class Vertical_align_engraver : public Engraver
 {
   Spanner *valign_;
   bool qualifies (Grob_info) const;
+  SCM id_to_group_hashtab_;
+
 public:
   TRANSLATOR_DECLARATIONS (Vertical_align_engraver);
+  DECLARE_ACKNOWLEDGER (axis_group);
+
 protected:
-  virtual void acknowledge_grob (Grob_info);
-  virtual void process_music ();
+  virtual void derived_mark () const;
+  void process_music ();
   virtual void finalize ();
+  virtual void initialize ();
 };
 
+ADD_ACKNOWLEDGER (Vertical_align_engraver, axis_group);
+ADD_TRANSLATOR (Vertical_align_engraver,
+		/* doc */
+		"Catch groups (staves, lyrics lines, etc.) and stack them"
+		" vertically.",
+
+		/* create */
+		"VerticalAlignment ",
+
+		/* read */
+		"alignAboveContext "
+		"alignBelowContext ",
+
+		/* write */
+		""
+		);
+
 Vertical_align_engraver::Vertical_align_engraver ()
 {
   valign_ = 0;
+  id_to_group_hashtab_ = SCM_EOL;
+}
+
+void
+Vertical_align_engraver::derived_mark () const
+{
+  scm_gc_mark (id_to_group_hashtab_);
+}
+
+void
+Vertical_align_engraver::initialize ()
+{
+  id_to_group_hashtab_ = scm_c_make_hash_table (11);
 }
 
 void
@@ -37,6 +77,7 @@ Vertical_align_engraver::process_music ()
     {
       valign_ = make_spanner ("VerticalAlignment", SCM_EOL);
       valign_->set_bound (LEFT, unsmob_grob (get_property ("currentCommandColumn")));
+      Align_interface::set_ordered (valign_);
     }
 }
 
@@ -55,23 +96,53 @@ Vertical_align_engraver::qualifies (Grob_info i) const
 {
   int sz = i.origin_contexts ((Translator *)this).size ();
 
-  return sz > 0 && Axis_group_interface::has_interface (i.grob_)
-    && !i.grob_->get_parent (Y_AXIS) && Axis_group_interface::has_axis (i.grob_, Y_AXIS);
+  return sz > 0 && Axis_group_interface::has_interface (i.grob ())
+    && !i.grob ()->get_parent (Y_AXIS)
+    && !to_boolean (i.grob ()->get_property ("no-alignment"))
+    && Axis_group_interface::has_axis (i.grob (), Y_AXIS);
 }
 
 void
-Vertical_align_engraver::acknowledge_grob (Grob_info i)
+Vertical_align_engraver::acknowledge_axis_group (Grob_info i)
 {
   if (qualifies (i))
     {
-      Align_interface::add_element (valign_, i.grob_, get_property ("verticalAlignmentChildCallback"));
+      string id = i.context ()->id_string ();
+
+      scm_hash_set_x (id_to_group_hashtab_, ly_string2scm (id),
+		      i.grob ()->self_scm ());
+
+      SCM before_id = i.context ()->get_property ("alignAboveContext");
+      SCM after_id = i.context ()->get_property ("alignBelowContext");
+
+      SCM before = scm_hash_ref (id_to_group_hashtab_, before_id, SCM_BOOL_F);
+      SCM after = scm_hash_ref (id_to_group_hashtab_, after_id, SCM_BOOL_F);
+
+      Grob *before_grob = unsmob_grob (before);
+      Grob *after_grob = unsmob_grob (after);
+
+      Align_interface::add_element (valign_, i.grob ());
+	
+      if (before_grob || after_grob)
+	{
+	  Grob_array *ga = unsmob_grob_array (valign_->get_object ("elements"));
+	  vector<Grob*> &arr = ga->array_reference ();
+
+	  Grob *added = arr.back ();
+	  arr.pop_back ();
+	  for (vsize i = 0; i < arr.size (); i++)
+	    {
+	      if (arr[i] == before_grob)
+		{
+		  arr.insert (arr.begin () + i, added);
+		  break;
+		}
+	      else if (arr[i] == after_grob)
+		{
+		  arr.insert (arr.begin () + i + 1, added);
+		  break;
+		}
+	    }
+	}
     }
 }
-
-ADD_TRANSLATOR (Vertical_align_engraver,
-		/* descr */ "Catch Vertical axis groups and stack them.",
-		/* creats*/ "VerticalAlignment",
-		/* accepts */ "",
-		/* acks  */ "axis-group-interface",
-		/* reads */ "",
-		/* write */ "");