X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fbreak-align-engraver.cc;h=e462297fc8bdf057ec0ec53ee53d8608d9c34f7e;hb=7a748b8d385139bf3c68d1370a119d277d92134b;hp=cbc7db0b0d03488c381dd8984b034e4971f794b6;hpb=5cbe821608ec464ea8f418cba15f012b9b1cad80;p=lilypond.git diff --git a/lily/break-align-engraver.cc b/lily/break-align-engraver.cc index cbc7db0b0d..e462297fc8 100644 --- a/lily/break-align-engraver.cc +++ b/lily/break-align-engraver.cc @@ -3,12 +3,12 @@ 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" @@ -16,64 +16,54 @@ class Break_align_engraver : public Engraver { - Item *align_l_; + Item *align_; Protected_scm column_alist_; + Item *left_edge_; + + void add_to_group (SCM,Item*); protected: - virtual void do_removal_processing (); - 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); - Break_align_interface::add_element (align_l_,e); - typeset_element (e); + Grob * e = unsmob_grob (smob); + Break_align_interface::add_element (align_,e); + typeset_grob (e); } void -Break_align_engraver::do_removal_processing () +Break_align_engraver::finalize () { column_alist_ = SCM_EOL; } void -Break_align_engraver::do_pre_move_processing () +Break_align_engraver::stop_translation_timestep () { - SCM order = get_property ("breakAlignOrder"); - for (; gh_pair_p (order); order = gh_cdr (order)) + for (SCM p = column_alist_; ly_c_pair_p (p); p = ly_cdr (p)) { - 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)); - } + SCM pair = ly_car (p); + add_column (ly_cdr (pair)); } + column_alist_ = SCM_EOL; - for (SCM p = column_alist_; gh_pair_p (p); p = gh_cdr (p)) + if (align_) { - SCM pair = gh_car (p); - add_column (gh_cdr (pair)); + typeset_grob (align_); + align_ = 0; } - - - column_alist_ = SCM_EOL; - - if (align_l_) + if (left_edge_) { - typeset_element (align_l_); - align_l_ = 0; + typeset_grob (left_edge_); + left_edge_ = 0; } } @@ -81,78 +71,80 @@ Break_align_engraver::do_pre_move_processing () Break_align_engraver::Break_align_engraver () { column_alist_ = SCM_EOL; - align_l_ =0; + left_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->get_elt_property ("breakable"); + SCM bp=item->get_property ("breakable"); bool breakable = (to_boolean (bp)); if (!breakable) return ; - SCM align_name = item_l->get_elt_property ("break-align-symbol"); - if (!gh_symbol_p (align_name)) + SCM align_name = item->get_property ("break-align-symbol"); + if (!ly_c_symbol_p (align_name)) return ; - if (!align_l_) + if (!align_) { - align_l_ = new Item (get_property ("BreakAlignment")); - Break_align_interface::set_interface (align_l_); - announce_element (align_l_,0); - - SCM edge_sym = ly_symbol2scm ("Left_edge_item"); - Item * edge = new Item (get_property ("LeftEdge")); - - /* - We must have left-edge in the middle. Instrument-names - are left to left-edge, so they don't enter the staff. - */ - align_l_->set_elt_property ("self-alignment-X", edge->self_scm ()); - + align_ = make_item ("BreakAlignment"); - /* - If the element is empty, it will be ignored in the break - alignment stuff. + announce_grob (align_, SCM_EOL); - TODO: switch off ignoring empty stuff? - */ - edge->set_extent_callback (Score_element::point_dimension_callback_proc, X_AXIS); - - align_l_->set_elt_property ("self-alignment-X", edge->self_scm ()); - - announce_element (edge, 0); - column_alist_ = scm_assoc_set_x (column_alist_, edge_sym, edge->self_scm ()); + Context*origin = inf.origin_contexts (this)[0]; + left_edge_ = make_item_from_properties (origin, + ly_symbol2scm ("LeftEdge")); + add_to_group (left_edge_->get_property ("break-align-symbol"), + left_edge_); + announce_grob (left_edge_, SCM_EOL); } + + add_to_group (align_name, item); + } +} - SCM s = scm_assoc (align_name, column_alist_); - - Item * group = 0; - - if (s != SCM_BOOL_F) - { - Score_element *e = unsmob_element (gh_cdr(s)); - group = dynamic_cast (e); - } - else - { - group = new Item (get_property ("BreakAlignGroup")); +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::set_interface (group); - Axis_group_interface::set_axes (group, 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_elt_property ("break-align-symbol", align_name); - group->set_parent (align_l_, Y_AXIS); - announce_element (group, 0); - column_alist_ = scm_assoc_set_x (column_alist_, align_name, group->self_scm ()); + group->set_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 ()); - } - Axis_group_interface::add_element (group, item_l); } + Axis_group_interface::add_element (group, item); } + +ENTER_DESCRIPTION (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 */ "");