X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fvertical-align-engraver.cc;h=921b35a47113ace9436136ed08664610127af9fc;hb=90e4d7057f3857da049dfda3d130017d4719bd6b;hp=7b0b9900f69ab5808d0aebc08c8a2558ad1f83a1;hpb=02c656d3b0cb895cc81b428d699d960746800e45;p=lilypond.git diff --git a/lily/vertical-align-engraver.cc b/lily/vertical-align-engraver.cc index 7b0b9900f6..921b35a471 100644 --- a/lily/vertical-align-engraver.cc +++ b/lily/vertical-align-engraver.cc @@ -1,57 +1,88 @@ /* - 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--2015 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" + +#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); + void acknowledge_axis_group (Grob_info); 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 (); + + bool top_level_; }; +void +Vertical_align_engraver::boot () +{ + 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 " + "hasAxisGroup ", + /* 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; + top_level_ = false; } void Vertical_align_engraver::derived_mark () const { - scm_gc_mark (id_to_group_hashtab_); + scm_gc_mark (id_to_group_hashtab_); } void @@ -60,14 +91,23 @@ Vertical_align_engraver::initialize () id_to_group_hashtab_ = scm_c_make_hash_table (11); } - void Vertical_align_engraver::process_music () { - if (!valign_) + if (!valign_ && !scm_is_null (id_to_group_hashtab_)) { - valign_ = make_spanner ("VerticalAlignment", SCM_EOL); - valign_->set_bound (LEFT, unsmob_grob (get_property ("currentCommandColumn"))); + 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 (get_property ("currentCommandColumn"))); + Align_interface::set_ordered (valign_); } } @@ -76,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; } } @@ -86,55 +126,69 @@ 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); + 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_grob (Grob_info i) +Vertical_align_engraver::acknowledge_axis_group (Grob_info i) { - if (qualifies (i)) - { - String id = i.context ()->id_string (); + if (scm_is_null (id_to_group_hashtab_)) + return; - scm_hash_set_x (id_to_group_hashtab_, scm_makfrom0str (id.to_str0 ()), - i.grob ()->self_scm ()); + 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 ()); 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); - - - Align_interface::add_element (valign_, i.grob (), - get_property ("verticalAlignmentChildCallback")); - - if (unsmob_grob (before) || unsmob_grob (after)) - { - SCM elts = valign_->get_property ("elements"); - SCM new_order = scm_cdr (elts); - SCM *current = &new_order; - - for (SCM s = new_order; scm_is_pair (s); s = scm_cdr (s)) - { - if (scm_car (s) == after) - { - *current = scm_cons (i.grob ()->self_scm(), s); - break; - } - else if (scm_car (s) == before) - { - scm_set_cdr_x (s, scm_cons (i.grob ()->self_scm (), - scm_cdr (s))); - break; - } - - current = SCM_CDRLOC (s); - } - - valign_->set_property ("elements", new_order); - } + + 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 (before); + Grob *after_grob = unsmob (after); + + Align_interface::add_element (valign_, i.grob ()); + + if (before_grob || after_grob) + { + 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)) + { + Pointer_group_interface::add_grob (valign_, ly_symbol2scm ("elements"), i.grob ()); + if (!unsmob (i.grob ()->get_object ("staff-grouper"))) + i.grob ()->set_object ("staff-grouper", valign_->self_scm ()); } }