X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fbreak-align-engraver.cc;h=a3ef11c0982b85f9f39d905f133c05a73704f713;hb=7e72a1e50e94a7f9738d62599de79fe7745f600c;hp=ec8495d9baf17ce207d23488b822cd07a906b1cb;hpb=ee513a2f7d18fc8d43e1c291350ed81856b0192d;p=lilypond.git diff --git a/lily/break-align-engraver.cc b/lily/break-align-engraver.cc index ec8495d9ba..a3ef11c098 100644 --- a/lily/break-align-engraver.cc +++ b/lily/break-align-engraver.cc @@ -3,68 +3,80 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Han-Wen Nienhuys + (c) 1999--2004 Han-Wen Nienhuys */ #include "engraver.hh" #include "protected-scm.hh" -#include "break-align-item.hh" +#include "break-align-interface.hh" +#include "item.hh" #include "align-interface.hh" #include "axis-group-interface.hh" + class Break_align_engraver : public Engraver { - Break_align_item *align_l_; + Item *align_; Protected_scm column_alist_; + Item *edge_; + + void add_to_group (SCM,Item*); protected: - virtual void acknowledge_element(Score_element_info i); - virtual void do_pre_move_processing (); + virtual void finalize (); + virtual void acknowledge_grob (Grob_info i); + virtual void stop_translation_timestep (); 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_interface (align_l_).add_element (e); - typeset_element (e); + Grob * e = unsmob_grob (smob); + Break_align_interface::add_element (align_,e); + typeset_grob (e); } void -Break_align_engraver::do_pre_move_processing () +Break_align_engraver::finalize () +{ + column_alist_ = SCM_EOL; +} + +void +Break_align_engraver::stop_translation_timestep () { SCM order = get_property ("breakAlignOrder"); - for (; gh_pair_p (order); order = gh_cdr (order)) + for (; gh_pair_p (order); order = ly_cdr (order)) { - SCM p = scm_assoc ( gh_car (order), column_alist_); + SCM p = scm_assoc (ly_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)); + add_column (ly_cdr (p)); + column_alist_ = scm_assoc_remove_x (column_alist_, ly_car (order)); } } - for (SCM p = column_alist_; gh_pair_p (p); p = gh_cdr (p)) + for (SCM p = column_alist_; gh_pair_p (p); p = ly_cdr (p)) { - SCM pair = gh_car (p); - add_column (gh_cdr (pair)); + SCM pair = ly_car (p); + add_column (ly_cdr (pair)); } column_alist_ = SCM_EOL; - if (align_l_) + if (align_) + { + typeset_grob (align_); + align_ = 0; + } + if (edge_) { - typeset_element (align_l_); - align_l_ = 0; + typeset_grob (edge_); + edge_ = 0; } } @@ -72,56 +84,74 @@ Break_align_engraver::do_pre_move_processing () Break_align_engraver::Break_align_engraver () { column_alist_ = SCM_EOL; - align_l_ =0; + edge_ = 0; + align_ = 0; } 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_grob_property ("breakable"); bool breakable = (to_boolean (bp)); if (!breakable) return ; - SCM al = item_l->remove_elt_property ("break-aligned"); - if (!gh_boolean_p (al ) || !gh_scm2bool (al)) + SCM align_name = item->get_grob_property ("break-align-symbol"); + if (!gh_symbol_p (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)); - } - - SCM name = ly_str02scm (inf.elem_l_->name()); - SCM s = scm_assoc (name, column_alist_); + align_ = make_item ("BreakAlignment"); - Item * group = 0; + announce_grob (align_, SCM_EOL); - if (s != SCM_BOOL_F) - { - Score_element *e = unsmob_element (gh_cdr(s)); - group = dynamic_cast (e); + edge_ = make_item ("LeftEdge"); + add_to_group (edge_->get_grob_property ("break-align-symbol"), edge_); + announce_grob(edge_, SCM_EOL); } - else - { - group = new Item; + + add_to_group (align_name, item); + } +} + +void +Break_align_engraver::add_to_group(SCM align_name, Item*item) +{ + SCM s = scm_assoc (align_name, column_alist_); + Item * group = 0; - Axis_group_interface (group).set_interface (); - Axis_group_interface (group).set_axes (X_AXIS,X_AXIS); + if (s != SCM_BOOL_F) + { + Grob *e = unsmob_grob (ly_cdr (s)); + group = dynamic_cast (e); + } + else + { + group = make_item ("BreakAlignGroup"); + + group->set_grob_property ("break-align-symbol", align_name); + group->set_parent (align_, Y_AXIS); + announce_grob(group, item->self_scm()); + + column_alist_ = scm_assoc_set_x (column_alist_, align_name, group->self_scm ()); - 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_); - } - Axis_group_interface (group).add_element (item_l); } + Axis_group_interface::add_element (group, item); } + +ENTER_DESCRIPTION(Break_align_engraver, +/* descr */ "Align grobs with corresponding break-align-symbols into groups, and order the groups according to breakAlignOrder", +/* creats*/ "BreakAlignment BreakAlignGroup LeftEdge", +/* accepts */ "", +/* acks */ "break-aligned-interface" +,/* reads */ "breakAlignOrder", +/* write */ "");