X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fvertical-align-engraver.cc;h=520a1225c4be95a0cea3ff483d88dbf9b6bcd068;hb=5e3f01b8ce09646a55838687ba4f1f38e2989afb;hp=e9ab261d74fb7df6449eccc0ee940ee0a06c1ed7;hpb=2c22efe5a46a37065b10c3f51c5d7db00d07d318;p=lilypond.git

diff --git a/lily/vertical-align-engraver.cc b/lily/vertical-align-engraver.cc
index e9ab261d74..520a1225c4 100644
--- a/lily/vertical-align-engraver.cc
+++ b/lily/vertical-align-engraver.cc
@@ -1,9 +1,20 @@
 /*
-  vertical-align-engraver.cc -- implement Vertical_align_engraver
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1997--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.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
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "context.hh"
@@ -33,21 +44,32 @@ protected:
   void process_music ();
   virtual void finalize ();
   virtual void initialize ();
+
+  bool top_level_;
 };
 
 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 ()
 {
   valign_ = 0;
   id_to_group_hashtab_ = SCM_EOL;
+  top_level_ = false;
 }
 
 void
@@ -67,8 +89,11 @@ Vertical_align_engraver::process_music ()
 {
   if (!valign_)
     {
-      valign_ = make_spanner ("VerticalAlignment", SCM_EOL);
+      top_level_ = to_boolean (get_property ("topLevelAlignment"));
+
+      valign_ = make_spanner (top_level_ ? "VerticalAlignment" : "StaffGrouper", SCM_EOL);
       valign_->set_bound (LEFT, unsmob_grob (get_property ("currentCommandColumn")));
+      Align_interface::set_ordered (valign_);
     }
 }
 
@@ -88,18 +113,20 @@ 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_axis_group (Grob_info i)
 {
-  if (qualifies (i))
+  if (top_level_ && 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 ()),
-		      i.grob ()->self_scm ());
+      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");
@@ -110,28 +137,41 @@ 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 ();
-
-	  Grob *added = arr.pop ();
-	  for (int i = 0; i < arr.size (); i++)
-	    {
-	      if (arr[i] == before_grob)
-		{
-		  arr.insert (added, i);
-		  break;
-		}
-	      else if (arr[i] == after_grob)
-		{
-		  arr.insert (added, i + 1);
-		  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 ());
     }
 }