X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fvertical-align-engraver.cc;h=921b35a47113ace9436136ed08664610127af9fc;hb=926115ff42def8bc1ce767029e4f03c8072994ba;hp=094967d98dc30518c576dbdc4cdf0ee0dfdf8ebd;hpb=69aa7021254529b5f399861636b33674f57aa20d;p=lilypond.git diff --git a/lily/vertical-align-engraver.cc b/lily/vertical-align-engraver.cc index 094967d98d..921b35a471 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 + Copyright (C) 1997--2015 Han-Wen Nienhuys 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" @@ -37,7 +37,7 @@ class Vertical_align_engraver : public Engraver public: TRANSLATOR_DECLARATIONS (Vertical_align_engraver); - DECLARE_ACKNOWLEDGER (axis_group); + void acknowledge_axis_group (Grob_info); protected: virtual void derived_mark () const; @@ -48,24 +48,31 @@ protected: bool top_level_; }; -ADD_ACKNOWLEDGER (Vertical_align_engraver, axis_group); +void +Vertical_align_engraver::boot () +{ + 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 () +Vertical_align_engraver::Vertical_align_engraver (Context *c) + : Engraver (c) { valign_ = 0; id_to_group_hashtab_ = SCM_EOL; @@ -87,12 +94,19 @@ 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); - valign_->set_bound (LEFT, unsmob_grob (get_property ("currentCommandColumn"))); + valign_->set_bound (LEFT, unsmob (get_property ("currentCommandColumn"))); Align_interface::set_ordered (valign_); } } @@ -102,7 +116,7 @@ Vertical_align_engraver::finalize () { if (valign_) { - valign_->set_bound (RIGHT, unsmob_grob (get_property ("currentCommandColumn"))); + valign_->set_bound (RIGHT, unsmob (get_property ("currentCommandColumn"))); valign_ = 0; } } @@ -112,21 +126,24 @@ 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); + return sz > 0 && 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_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"); @@ -134,38 +151,44 @@ Vertical_align_engraver::acknowledge_axis_group (Grob_info i) 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); + Grob *before_grob = unsmob (before); + Grob *after_grob = unsmob (after); Align_interface::add_element (valign_, i.grob ()); - + if (before_grob || after_grob) - { - Grob_array *ga = unsmob_grob_array (valign_->get_object ("elements")); - vector &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 (valign_->get_object ("elements")); + vector &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) && !unsmob_grob (i.grob ()->get_object ("staff-grouper"))) + else if (qualifies (i)) { Pointer_group_interface::add_grob (valign_, ly_symbol2scm ("elements"), i.grob ()); - i.grob ()->set_object ("staff-grouper", valign_->self_scm ()); + if (!unsmob (i.grob ()->get_object ("staff-grouper"))) + i.grob ()->set_object ("staff-grouper", valign_->self_scm ()); } }