X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Fbreak-align-engraver.cc;h=01193851b3f4853f3a5153a38dca0f46e483d59e;hb=545092a25d8ca41dc90b87482474b3719f7130a9;hp=057ea369457d3236f043768ab698f6b3a16841b0;hpb=94189ec2b8da6d7e89dc619c646a927adead9b19;p=lilypond.git diff --git a/lily/break-align-engraver.cc b/lily/break-align-engraver.cc index 057ea36945..01193851b3 100644 --- a/lily/break-align-engraver.cc +++ b/lily/break-align-engraver.cc @@ -1,158 +1,131 @@ -/* - 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--2001 Han-Wen Nienhuys - - */ + + (c) 1999--2005 Han-Wen Nienhuys +*/ #include "engraver.hh" #include "protected-scm.hh" -#include "break-align-item.hh" -#include "item.hh" +#include "break-align-interface.hh" #include "align-interface.hh" #include "axis-group-interface.hh" +#include "context.hh" +#include "translator-group.hh" +#include "translator.icc" class Break_align_engraver : public Engraver { - Item *align_l_; - Protected_scm column_alist_; + Item *align_; + SCM column_alist_; + Item *left_edge_; + + void add_to_group (SCM, Item *); protected: - virtual void finalize (); - virtual void acknowledge_grob(Grob_info i); - virtual void stop_translation_timestep (); - void add_column (SCM); - + void stop_translation_timestep (); + virtual void derived_mark () const; public: - VIRTUAL_COPY_CONS(Translator); - Break_align_engraver (); + TRANSLATOR_DECLARATIONS (Break_align_engraver); + DECLARE_ACKNOWLEDGER (break_aligned); }; - - -ADD_THIS_TRANSLATOR(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); -} - -void -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)) - { - 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)) - { - SCM pair = gh_car (p); - add_column (gh_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) +Break_align_engraver::derived_mark () const { - if (Item * item_l = dynamic_cast (inf.elem_l_)) + scm_gc_mark (column_alist_); +} + +void +Break_align_engraver::acknowledge_break_aligned (Grob_info inf) +{ + 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)) - return ; + return; - if (!align_l_) + SCM align_name = item->get_property ("break-align-symbol"); + if (!scm_is_symbol (align_name)) + return; + + if (!align_) { - align_l_ = new Item (get_property ("BreakAlignment")); - Break_align_interface::set_interface (align_l_); - announce_grob (align_l_,0); + align_ = make_item ("BreakAlignment", SCM_EOL); - SCM edge_sym = ly_symbol2scm ("Left_edge_item"); - Item * edge = new Item (get_property ("LeftEdge")); + Context *origin = inf.origin_contexts (this)[0]; - /* - 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 ()); - + Translator_group *tg = origin->implementation (); + Engraver *random_source = dynamic_cast (unsmob_translator (scm_car (tg->get_simple_trans_list ()))); /* - If the element is empty, it will be ignored in the break - alignment stuff. - - TODO: switch off ignoring empty stuff? + Make left edge appear to come from same context as clef/bar-line etc. */ - edge->set_extent_callback (Grob::point_dimension_callback_proc, X_AXIS); - - 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 ()); + left_edge_ = make_item_from_properties (random_source, + ly_symbol2scm ("LeftEdge"), + SCM_EOL, + "LeftEdge"); + add_to_group (left_edge_->get_property ("break-align-symbol"), + left_edge_); } - SCM s = scm_assoc (align_name, column_alist_); + add_to_group (align_name, item); + } +} - Item * group = 0; +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 (gh_cdr(s)); - group = dynamic_cast (e); - } - else - { - group = new Item (get_property ("BreakAlignGroup")); + if (s != SCM_BOOL_F) + { + Grob *e = unsmob_grob (scm_cdr (s)); + group = dynamic_cast (e); + } + else + { + group = make_item ("BreakAlignGroup", item->self_scm ()); - Axis_group_interface::set_interface (group); - Axis_group_interface::set_axes (group, X_AXIS,X_AXIS); + group->set_property ("break-align-symbol", align_name); + group->set_parent (align_, Y_AXIS); - 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 ()); + column_alist_ = scm_assoc_set_x (column_alist_, align_name, group->self_scm ()); - } - Axis_group_interface::add_element (group, item_l); + Break_align_interface::add_element (align_, group); } + Axis_group_interface::add_element (group, item); } +ADD_ACKNOWLEDGER (Break_align_engraver, break_aligned); +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}. ", + /* create */ "BreakAlignment BreakAlignGroup LeftEdge", + /* accept */ "", + /* read */ "", + /* write */ "");