X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fbreak-align-engraver.cc;h=a9787ef377b48e9492f8f747569f93974592fcd9;hb=68cf7ef0e80c31fbe977f1aa3be601482440684e;hp=ed16e886b9aa9b95a9a2e4acea24fb0b96598427;hpb=2fd5f86de0500ecd9a3f47a2540c3b304f835ef4;p=lilypond.git diff --git a/lily/break-align-engraver.cc b/lily/break-align-engraver.cc index ed16e886b9..a9787ef377 100644 --- a/lily/break-align-engraver.cc +++ b/lily/break-align-engraver.cc @@ -1,121 +1,135 @@ -/* - break-align-engraver.cc -- implement Break_align_engraver - +/* + break-align-engraver.cc -- implement Break_align_engraver + source file of the GNU LilyPond music typesetter - - (c) 1999 Han-Wen Nienhuys - -*/ + (c) 1999--2005 Han-Wen Nienhuys +*/ #include "engraver.hh" #include "protected-scm.hh" -#include "break-align-item.hh" -#include "axis-group-item.hh" +#include "break-align-interface.hh" +#include "align-interface.hh" +#include "axis-group-interface.hh" +#include "context.hh" +#include "translator-group.hh" class Break_align_engraver : public Engraver { - Break_align_item *align_l_; - Protected_scm column_alist_; + Item *align_; + SCM column_alist_; + Item *left_edge_; + + void add_to_group (SCM, Item *); protected: - virtual void acknowledge_element(Score_element_info i); - virtual void do_pre_move_processing (); + virtual void acknowledge_grob (Grob_info i); + virtual void stop_translation_timestep (); + virtual void derived_mark () const; void add_column (SCM); - + public: - VIRTUAL_COPY_CONS(Translator); - Break_align_engraver (); + TRANSLATOR_DECLARATIONS (Break_align_engraver); }; -ADD_THIS_TRANSLATOR (Break_align_engraver); - void Break_align_engraver::add_column (SCM smob) { - Score_element * e = unsmob_element (smob); - align_l_->add_element (e); - typeset_element (e); + Grob *e = unsmob_grob (smob); + Break_align_interface::add_element (align_, e); } void -Break_align_engraver::do_pre_move_processing () +Break_align_engraver::stop_translation_timestep () { - SCM order = get_property ("breakAlignOrder", 0); - for (; gh_pair_p (order); order = gh_cdr (order)) - { - SCM p = scm_assoc ( gh_car (order), column_alist_); - if (gh_pair_p (p)) - { - add_column (gh_cdr (p)); - column_alist_ = scm_assoc_remove_x (column_alist_, gh_car (order)); - } - } - - for (SCM p = column_alist_; gh_pair_p (p); p = gh_cdr (p)) + for (SCM p = column_alist_; scm_is_pair (p); p = scm_cdr (p)) { - SCM pair = gh_car (p); - add_column (gh_cdr (pair)); + SCM pair = scm_car (p); + add_column (scm_cdr (pair)); } - - column_alist_ = SCM_EOL; - if (align_l_) - { - typeset_element (align_l_); - align_l_ = 0; - } + align_ = 0; + left_edge_ = 0; } - Break_align_engraver::Break_align_engraver () { column_alist_ = SCM_EOL; - align_l_ =0; + left_edge_ = 0; + align_ = 0; +} + +void +Break_align_engraver::derived_mark () const +{ + scm_gc_mark (column_alist_); } void -Break_align_engraver::acknowledge_element (Score_element_info inf) +Break_align_engraver::acknowledge_grob (Grob_info inf) { - if (Item * item_l = dynamic_cast (inf.elem_l_)) + if (Item *item = dynamic_cast (inf.grob_)) { - if (item_l->empty_b (X_AXIS) || item_l->parent_l (X_AXIS)) + /* + Removed check for item->empty (X_AXIS). --hwn 20/1/04 + */ + if (item->get_parent (X_AXIS)) return; - SCM bp=item_l->remove_elt_property ("breakable"); + SCM bp = item->get_property ("breakable"); bool breakable = (to_boolean (bp)); if (!breakable) - return ; + return; - SCM al = item_l->remove_elt_property ("break-aligned"); - if (!gh_boolean_p (al ) || !gh_scm2bool (al)) - return ; + SCM align_name = item->get_property ("break-align-symbol"); + if (!scm_is_symbol (align_name)) + return; - - if (!align_l_) + if (!align_) { - align_l_ = new Break_align_item; - align_l_->set_elt_property ("breakable", SCM_BOOL_T); - announce_element (Score_element_info (align_l_,0)); + align_ = make_item ("BreakAlignment", SCM_EOL); + + Context *origin = inf.origin_contexts (this)[0]; + left_edge_ = make_item_from_properties (dynamic_cast (origin->implementation ()), + ly_symbol2scm ("LeftEdge"), + SCM_EOL, + "LeftEdge"); + add_to_group (left_edge_->get_property ("break-align-symbol"), + left_edge_); } - SCM name = ly_str02scm (inf.elem_l_->name()); - SCM s = scm_assoc (name, column_alist_); + add_to_group (align_name, item); + } +} - Axis_group_item * group = 0; - if (s != SCM_BOOL_F) - { - Score_element *e = unsmob_element (gh_cdr(s)); - group = dynamic_cast (e); - } - else - { - group = new Axis_group_item; - group->set_axes (X_AXIS,X_AXIS); - group->set_elt_property ("origin", name); - group->set_parent (align_l_, Y_AXIS); - announce_element (Score_element_info (group, 0)); - column_alist_ = scm_assoc_set_x (column_alist_, name, group->self_scm_); - } - group->add_element (item_l); +void +Break_align_engraver::add_to_group (SCM align_name, Item *item) +{ + SCM s = scm_assoc (align_name, column_alist_); + Item *group = 0; + + if (s != SCM_BOOL_F) + { + Grob *e = unsmob_grob (scm_cdr (s)); + group = dynamic_cast (e); } + else + { + group = make_item ("BreakAlignGroup", item->self_scm ()); + + group->set_property ("break-align-symbol", align_name); + group->set_parent (align_, Y_AXIS); + + column_alist_ = scm_assoc_set_x (column_alist_, align_name, group->self_scm ()); + } + Axis_group_interface::add_element (group, item); } + +ADD_TRANSLATOR (Break_align_engraver, + "Align grobs with corresponding @code{break-align-symbols} into " + "groups, and order the groups according to @code{breakAlignOrder}. " + "The left edge of the alignment gets a separate group, with a symbol @code{left-edge}. ", + /* creats*/ "BreakAlignment BreakAlignGroup LeftEdge", + /* accepts */ "", + /* acks */ "break-aligned-interface", + /* reads */ "", + /* write */ "");