X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fbreak-align-engraver.cc;h=9c830d3fcedc53a2fab1d55c4804339cba41adec;hb=2be67678488b5829a52acdf36ab4278477375b6d;hp=a463ba7bf05063b537d0d27823e3366662d36be3;hpb=94375d04f45b415ad705fd444fdb344416f116d9;p=lilypond.git diff --git a/lily/break-align-engraver.cc b/lily/break-align-engraver.cc index a463ba7bf0..9c830d3fce 100644 --- a/lily/break-align-engraver.cc +++ b/lily/break-align-engraver.cc @@ -3,21 +3,25 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2001 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" - +#include "context.hh" +#include "translator-group.hh" 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 finalize (); virtual void acknowledge_grob (Grob_info i); @@ -25,19 +29,15 @@ protected: void add_column (SCM); public: - TRANSLATOR_DECLARATIONS(Break_align_engraver); + TRANSLATOR_DECLARATIONS (Break_align_engraver); }; - - - - void Break_align_engraver::add_column (SCM smob) { Grob * e = unsmob_grob (smob); - Break_align_interface::add_element (align_l_,e); - typeset_grob (e); + Break_align_interface::add_element (align_,e); + } void @@ -49,114 +49,95 @@ Break_align_engraver::finalize () void Break_align_engraver::stop_translation_timestep () { - SCM order = get_property ("breakAlignOrder"); - for (; gh_pair_p (order); order = ly_cdr (order)) - { - SCM p = scm_assoc (ly_car (order), column_alist_); - if (gh_pair_p (p)) - { - 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 = ly_cdr (p)) + for (SCM p = column_alist_; ly_c_pair_p (p); p = ly_cdr (p)) { SCM pair = ly_car (p); add_column (ly_cdr (pair)); } - - column_alist_ = SCM_EOL; - if (align_l_) - { - typeset_grob (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::acknowledge_grob (Grob_info inf) { - if (Item * item_l = dynamic_cast (inf.grob_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_grob_property ("breakable"); + SCM bp=item->get_property ("breakable"); bool breakable = (to_boolean (bp)); if (!breakable) return ; - SCM align_name = item_l->get_grob_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_grob (align_l_,0); - - SCM edge_sym = ly_symbol2scm ("Left_edge_item"); - Item * edge = new Item (get_property ("LeftEdge")); - - + align_ = make_item ("BreakAlignment", SCM_EOL); - /* - If the element is empty, it will be ignored in the break - alignment stuff. - - TODO: switch off ignoring empty stuff? - */ - edge->set_extent_callback (Grob::point_dimension_callback_proc, X_AXIS); - - /* - 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_grob_property ("self-alignment-X", edge->self_scm ()); - announce_grob (edge, 0); - column_alist_ = scm_assoc_set_x (column_alist_, edge_sym, edge->self_scm ()); - } - - SCM s = scm_assoc (align_name, column_alist_); - - Item * group = 0; - if (s != SCM_BOOL_F) - { - Grob *e = unsmob_grob (ly_cdr (s)); - group = dynamic_cast (e); + Context*origin = inf.origin_contexts (this)[0]; + left_edge_ = make_item_from_properties (origin->implementation (), + ly_symbol2scm ("LeftEdge"), + SCM_EOL + ); + add_to_group (left_edge_->get_property ("break-align-symbol"), + left_edge_); } - else - { - group = new Item (get_property ("BreakAlignGroup")); + + add_to_group (align_name, item); + } +} - Axis_group_interface::set_interface (group); - Axis_group_interface::set_axes (group, X_AXIS,X_AXIS); +void +Break_align_engraver::add_to_group (SCM align_name, Item*item) +{ + SCM s = scm_assoc (align_name, column_alist_); + Item * group = 0; - group->set_grob_property ("break-align-symbol", align_name); - group->set_parent (align_l_, Y_AXIS); - announce_grob (group, 0); - column_alist_ = scm_assoc_set_x (column_alist_, align_name, group->self_scm ()); + if (s != SCM_BOOL_F) + { + Grob *e = unsmob_grob (ly_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_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", -/* acks */ "grob-interface", // break-aligned-interface ? -/* reads */ "breakAlignOrder", -/* write */ ""); + +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 */ "");