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

diff --git a/lily/vertical-align-engraver.cc b/lily/vertical-align-engraver.cc
index d711396a6f..0d07a509df 100644
--- a/lily/vertical-align-engraver.cc
+++ b/lily/vertical-align-engraver.cc
@@ -3,7 +3,7 @@
 
   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"
@@ -37,12 +37,20 @@ protected:
 
 ADD_ACKNOWLEDGER (Vertical_align_engraver, axis_group);
 ADD_TRANSLATOR (Vertical_align_engraver,
-		"Catch groups (staffs, lyrics lines, etc.) and stack "
-		"them vertically.",
-		/* create */ "VerticalAlignment",
-		/* accept */ "",
-		/* read */ "",
-		/* write */ "");
+		/* doc */
+		"Catch groups (staves, lyrics lines, etc.) and stack them"
+		" vertically.",
+
+		/* create */
+		"VerticalAlignment ",
+
+		/* read */
+		"alignAboveContext "
+		"alignBelowContext ",
+
+		/* write */
+		""
+		);
 
 Vertical_align_engraver::Vertical_align_engraver ()
 {
@@ -69,7 +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_axis (valign_, Y_AXIS);
+      Align_interface::set_ordered (valign_);
     }
 }
 
@@ -89,7 +97,9 @@ 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);
+    && !i.grob ()->get_parent (Y_AXIS)
+    && !to_boolean (i.grob ()->get_property ("no-alignment"))
+    && Axis_group_interface::has_axis (i.grob (), Y_AXIS);
 }
 
 void
@@ -97,9 +107,9 @@ Vertical_align_engraver::acknowledge_axis_group (Grob_info i)
 {
   if (qualifies (i))
     {
-      String id = i.context ()->id_string ();
+      string id = i.context ()->id_string ();
 
-      scm_hash_set_x (id_to_group_hashtab_, scm_makfrom0str (id.to_str0 ()),
+      scm_hash_set_x (id_to_group_hashtab_, ly_string2scm (id),
 		      i.grob ()->self_scm ());
 
       SCM before_id = i.context ()->get_property ("alignAboveContext");
@@ -111,25 +121,25 @@ Vertical_align_engraver::acknowledge_axis_group (Grob_info i)
       Grob *before_grob = unsmob_grob (before);
       Grob *after_grob = unsmob_grob (after);
 
-      Align_interface::add_element (valign_, i.grob (),
-				    get_property ("verticalAlignmentChildCallback"));
-
+      Align_interface::add_element (valign_, i.grob ());
+	
       if (before_grob || after_grob)
 	{
 	  Grob_array *ga = unsmob_grob_array (valign_->get_object ("elements"));
-	  Link_array<Grob> &arr = ga->array_reference ();
+	  vector<Grob*> &arr = ga->array_reference ();
 
-	  Grob *added = arr.pop ();
-	  for (int i = 0; i < arr.size (); i++)
+	  Grob *added = arr.back ();
+	  arr.pop_back ();
+	  for (vsize i = 0; i < arr.size (); i++)
 	    {
 	      if (arr[i] == before_grob)
 		{
-		  arr.insert (added, i);
+		  arr.insert (arr.begin () + i, added);
 		  break;
 		}
 	      else if (arr[i] == after_grob)
 		{
-		  arr.insert (added, i + 1);
+		  arr.insert (arr.begin () + i + 1, added);
 		  break;
 		}
 	    }