X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fvertical-align-engraver.cc;h=e09d7f23c105e656f9d5ad107a811892ad5e28a9;hb=77706635f33adff837dc7af0482f51ff3f0f5cb1;hp=3e1838ae1f7cd669d0b71d5ffa3b5b4d02d982ab;hpb=210397d5e1d8a0b560bac8e683c8be957035b5b4;p=lilypond.git diff --git a/lily/vertical-align-engraver.cc b/lily/vertical-align-engraver.cc index 3e1838ae1f..e09d7f23c1 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--2010 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" @@ -13,45 +24,58 @@ #include "axis-group-interface.hh" #include "engraver.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); + DECLARE_ACKNOWLEDGER (axis_group); 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_; +}; +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 ", + /* write */ + "" + ); Vertical_align_engraver::Vertical_align_engraver () { 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 +84,16 @@ Vertical_align_engraver::initialize () id_to_group_hashtab_ = scm_c_make_hash_table (11); } - void 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_); } } @@ -86,55 +112,60 @@ 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 && 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); } void -Vertical_align_engraver::acknowledge_grob (Grob_info i) +Vertical_align_engraver::acknowledge_axis_group (Grob_info i) { - if (qualifies (i)) + if (top_level_ && qualifies (i)) { - String id = i.context ()->id_string (); - - scm_hash_set_x (id_to_group_hashtab_, scm_makfrom0str (id.to_str0 ()), - i.grob_->self_scm ()); + 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); + 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")); + Grob *before_grob = unsmob_grob (before); + Grob *after_grob = unsmob_grob (after); - if (unsmob_grob (before) || unsmob_grob (after)) + Align_interface::add_element (valign_, i.grob ()); + + if (before_grob || after_grob) { - SCM elts = valign_->get_property ("elements"); - SCM new_order = scm_cdr (elts); - SCM *current = &new_order; + Grob_array *ga = unsmob_grob_array (valign_->get_object ("elements")); + vector &arr = ga->array_reference (); - for (SCM s = new_order; scm_is_pair (s); s = scm_cdr (s)) + Grob *added = arr.back (); + arr.pop_back (); + for (vsize i = 0; i < arr.size (); i++) { - if (scm_car (s) == after) + if (arr[i] == before_grob) { - *current = scm_cons (i.grob_->self_scm(), s); + arr.insert (arr.begin () + i, added); + added->set_property ("staff-affinity", scm_from_int (DOWN)); break; } - else if (scm_car (s) == before) + else if (arr[i] == after_grob) { - scm_set_cdr_x (s, scm_cons (i.grob_->self_scm (), - scm_cdr (s))); + arr.insert (arr.begin () + i + 1, added); + added->set_property ("staff-affinity", scm_from_int (UP)); break; } - - current = SCM_CDRLOC (s); } - - valign_->set_property ("elements", new_order); } } + else if (qualifies (i)) + { + Pointer_group_interface::add_grob (valign_, ly_symbol2scm ("elements"), i.grob ()); + i.grob ()->set_object ("staff-grouper", valign_->self_scm ()); + } }