X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fvertical-align-engraver.cc;h=65cf6e7f772d7af5086ccbe6bfab11a94664a1d7;hb=d01d7bd0752a3d141de5a1fb2905d30efbcd8970;hp=9a6e3afa30c8e58aff8e92e3168c23d504fa3755;hpb=b4af54cb24ef6879771323ee0797862a96be885e;p=lilypond.git

diff --git a/lily/vertical-align-engraver.cc b/lily/vertical-align-engraver.cc
index 9a6e3afa30..65cf6e7f77 100644
--- a/lily/vertical-align-engraver.cc
+++ b/lily/vertical-align-engraver.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1997--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1997--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -20,9 +20,9 @@
 #include "context.hh"
 #include "paper-column.hh"
 #include "align-interface.hh"
-#include "span-bar.hh"
 #include "axis-group-interface.hh"
 #include "engraver.hh"
+#include "international.hh"
 #include "spanner.hh"
 #include "pointer-group-interface.hh"
 #include "grob-array.hh"
@@ -50,20 +50,21 @@ protected:
 
 ADD_ACKNOWLEDGER (Vertical_align_engraver, axis_group);
 ADD_TRANSLATOR (Vertical_align_engraver,
-		/* doc */
-		"Catch groups (staves, lyrics lines, etc.) and stack them"
-		" vertically.",
+                /* doc */
+                "Catch groups (staves, lyrics lines, etc.) and stack them"
+                " vertically.",
 
-		/* create */
-		"VerticalAlignment ",
+                /* create */
+                "VerticalAlignment ",
 
-		/* read */
-		"alignAboveContext "
-		"alignBelowContext ",
+                /* read */
+                "alignAboveContext "
+                "alignBelowContext "
+                "hasAxisGroup ",
 
-		/* write */
-		""
-		);
+                /* write */
+                ""
+               );
 
 Vertical_align_engraver::Vertical_align_engraver ()
 {
@@ -87,8 +88,15 @@ Vertical_align_engraver::initialize ()
 void
 Vertical_align_engraver::process_music ()
 {
-  if (!valign_)
+  if (!valign_ && !scm_is_null (id_to_group_hashtab_))
     {
+      if (to_boolean (get_property ("hasAxisGroup")))
+        {
+          warning (_ ("Ignoring Vertical_align_engraver in VerticalAxisGroup"));
+          id_to_group_hashtab_ = SCM_EOL;
+          return;
+        }
+      
       top_level_ = to_boolean (get_property ("topLevelAlignment"));
 
       valign_ = make_spanner (top_level_ ? "VerticalAlignment" : "StaffGrouper", SCM_EOL);
@@ -113,20 +121,23 @@ 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)
-    && !to_boolean (i.grob ()->get_property ("no-alignment"))
-    && 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_axis_group (Grob_info i)
 {
+  if (scm_is_null (id_to_group_hashtab_))
+    return;
+
   if (top_level_ && qualifies (i))
     {
       string id = i.context ()->id_string ();
 
       scm_hash_set_x (id_to_group_hashtab_, ly_string2scm (id),
-		      i.grob ()->self_scm ());
+                      i.grob ()->self_scm ());
 
       SCM before_id = i.context ()->get_property ("alignAboveContext");
       SCM after_id = i.context ()->get_property ("alignBelowContext");
@@ -138,35 +149,40 @@ Vertical_align_engraver::acknowledge_axis_group (Grob_info i)
       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);
-		  added->set_property ("staff-affinity", scm_from_int (DOWN));
-		  break;
-		}
-	      else if (arr[i] == after_grob)
-		{
-		  arr.insert (arr.begin () + i + 1, added);
-		  added->set_property ("staff-affinity", scm_from_int (UP));
-		  break;
-		}
-	    }
-	}
+        {
+          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);
+
+                  /* Only set staff affinity if it already has one.  That way we won't
+                     set staff-affinity on things that don't want it (like staves). */
+                  if (scm_is_number (added->get_property ("staff-affinity")))
+                    added->set_property ("staff-affinity", scm_from_int (DOWN));
+                  break;
+                }
+              else if (arr[i] == after_grob)
+                {
+                  arr.insert (arr.begin () + i + 1, added);
+                  if (scm_is_number (added->get_property ("staff-affinity")))
+                    added->set_property ("staff-affinity", scm_from_int (UP));
+                  break;
+                }
+            }
+        }
     }
   else if (qualifies (i))
     {
       Pointer_group_interface::add_grob (valign_, ly_symbol2scm ("elements"), i.grob ());
       if (!unsmob_grob (i.grob ()->get_object ("staff-grouper")))
-	i.grob ()->set_object ("staff-grouper", valign_->self_scm ());
+        i.grob ()->set_object ("staff-grouper", valign_->self_scm ());
     }
 }