X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fvertical-align-engraver.cc;h=650669f8c54768e41791ac488f18ae529960227c;hb=9e781b7dc83b60a543ce218aa1a5f139f74c760f;hp=7e05369f8bf4b03e9a2f605f980b9defdb4a48c7;hpb=889dc430ee110fc9f7b66d9f8768fb746bb2b12a;p=lilypond.git diff --git a/lily/vertical-align-engraver.cc b/lily/vertical-align-engraver.cc index 7e05369f8b..650669f8c5 100644 --- a/lily/vertical-align-engraver.cc +++ b/lily/vertical-align-engraver.cc @@ -1,17 +1,28 @@ /* - 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--2014 Han-Wen Nienhuys - (c) 1997--2005 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 + 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 . */ #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" @@ -33,21 +44,33 @@ 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 " + "hasAxisGroup ", + + /* write */ + "" + ); Vertical_align_engraver::Vertical_align_engraver () { valign_ = 0; id_to_group_hashtab_ = SCM_EOL; + top_level_ = false; } void @@ -65,11 +88,20 @@ Vertical_align_engraver::initialize () void Vertical_align_engraver::process_music () { - if (!valign_) + if (!valign_ && !scm_is_null (id_to_group_hashtab_)) { - valign_ = make_spanner ("VerticalAlignment", SCM_EOL); + 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"))); - Align_interface::set_axis (valign_, Y_AXIS); + Align_interface::set_ordered (valign_); } } @@ -89,18 +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) && 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 (scm_is_null (id_to_group_hashtab_)) + return; + + 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"); @@ -114,24 +151,38 @@ Vertical_align_engraver::acknowledge_axis_group (Grob_info i) Align_interface::add_element (valign_, i.grob ()); if (before_grob || after_grob) - { - Grob_array *ga = unsmob_grob_array (valign_->get_object ("elements")); - Link_array &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 &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 ()); } }