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

diff --git a/lily/vertical-align-engraver.cc b/lily/vertical-align-engraver.cc
index 7b0b9900f6..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"
@@ -13,34 +13,44 @@
 #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_;  
-  
+  SCM id_to_group_hashtab_;
+
 public:
   TRANSLATOR_DECLARATIONS (Vertical_align_engraver);
+  DECLARE_ACKNOWLEDGER (axis_group);
 
 protected:
   virtual void derived_mark () const;
-  virtual void acknowledge_grob (Grob_info);
-  virtual void process_music ();
+  void process_music ();
   virtual void finalize ();
   virtual void initialize ();
 };
 
-
+ADD_ACKNOWLEDGER (Vertical_align_engraver, axis_group);
 ADD_TRANSLATOR (Vertical_align_engraver,
-		"Catch groups (staffs, lyrics lines, etc.) and stack "
-		"them vertically.",
-		/* creats*/ "VerticalAlignment",
-		/* accepts */ "",
-		/* acks  */ "axis-group-interface",
-		/* reads */ "",
-		/* write */ "");
+		/* doc */
+		"Catch groups (staves, lyrics lines, etc.) and stack them"
+		" vertically.",
+
+		/* create */
+		"VerticalAlignment ",
+
+		/* read */
+		"alignAboveContext "
+		"alignBelowContext ",
 
+		/* write */
+		""
+		);
 
 Vertical_align_engraver::Vertical_align_engraver ()
 {
@@ -51,7 +61,7 @@ Vertical_align_engraver::Vertical_align_engraver ()
 void
 Vertical_align_engraver::derived_mark () const
 {
-  scm_gc_mark (id_to_group_hashtab_); 
+  scm_gc_mark (id_to_group_hashtab_);
 }
 
 void
@@ -60,7 +70,6 @@ Vertical_align_engraver::initialize ()
   id_to_group_hashtab_ = scm_c_make_hash_table (11);
 }
 
-
 void
 Vertical_align_engraver::process_music ()
 {
@@ -68,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_);
     }
 }
 
@@ -87,54 +97,52 @@ 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
-Vertical_align_engraver::acknowledge_grob (Grob_info i)
+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");
       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);
 
+      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);
 
-      Align_interface::add_element (valign_, i.grob (),
-				    get_property ("verticalAlignmentChildCallback"));
+      Grob *before_grob = unsmob_grob (before);
+      Grob *after_grob = unsmob_grob (after);
 
-      if (unsmob_grob (before) || unsmob_grob (after))
+      Align_interface::add_element (valign_, i.grob ());
+	
+      if (before_grob || after_grob)
 	{
-	  SCM elts = valign_->get_property ("elements");
-	  SCM new_order = scm_cdr (elts);
-	  SCM *current = &new_order;
+	  Grob_array *ga = unsmob_grob_array (valign_->get_object ("elements"));
+	  vector<Grob*> &arr = ga->array_reference ();
 
-	  for (SCM s = new_order;  scm_is_pair (s); s = scm_cdr (s))
+	  Grob *added = arr.back ();
+	  arr.pop_back ();
+	  for (vsize i = 0; i < arr.size (); i++)
 	    {
-	      if (scm_car (s) == after)
+	      if (arr[i] == before_grob)
 		{
-		  *current = scm_cons (i.grob ()->self_scm(), s);
+		  arr.insert (arr.begin () + i, added);
 		  break;
 		}
-	      else if (scm_car (s) == before)
+	      else if (arr[i] == after_grob)
 		{
-		  scm_set_cdr_x (s, scm_cons (i.grob ()->self_scm (),
-					      scm_cdr (s)));
+		  arr.insert (arr.begin () + i + 1, added);
 		  break;
 		}
-
-	      current = SCM_CDRLOC (s);
 	    }
-
-	  valign_->set_property ("elements", new_order);
 	}
     }
 }