X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fbreak-align-engraver.cc;h=155f34d9bc0acba3287d967b3a989b5776a88b9b;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=864f01a5d58c0de5116ed5a2566306571fc9443c;hpb=1fc55f384b7be38162ff82b1eb86ca0449346f87;p=lilypond.git diff --git a/lily/break-align-engraver.cc b/lily/break-align-engraver.cc index 864f01a5d5..155f34d9bc 100644 --- a/lily/break-align-engraver.cc +++ b/lily/break-align-engraver.cc @@ -1,154 +1,159 @@ -/* - 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--2002 Han-Wen Nienhuys - - */ + + (c) 1999--2008 Han-Wen Nienhuys +*/ #include "engraver.hh" #include "protected-scm.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" +#include "item.hh" +#include "translator.icc" class Break_align_engraver : public Engraver { Item *align_; - Protected_scm column_alist_; - Item *edge_; + SCM column_alist_; + Item *left_edge_; - void add_to_group (SCM,Item*); + void add_to_group (SCM, Item *); + void create_alignment (Grob_info); 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: - TRANSLATOR_DECLARATIONS(Break_align_engraver); + TRANSLATOR_DECLARATIONS (Break_align_engraver); + DECLARE_ACKNOWLEDGER (break_aligned); + DECLARE_ACKNOWLEDGER (break_alignable); }; void -Break_align_engraver::add_column (SCM smob) +Break_align_engraver::stop_translation_timestep () { - Grob * e = unsmob_grob (smob); - Break_align_interface::add_element (align_,e); - typeset_grob (e); + column_alist_ = SCM_EOL; + + align_ = 0; + left_edge_ = 0; } -void -Break_align_engraver::finalize () +Break_align_engraver::Break_align_engraver () { column_alist_ = SCM_EOL; + left_edge_ = 0; + align_ = 0; } void -Break_align_engraver::stop_translation_timestep () +Break_align_engraver::derived_mark () const { - 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)) - { - SCM pair = ly_car (p); - add_column (ly_cdr (pair)); - } - - - column_alist_ = SCM_EOL; - - if (align_) - { - typeset_grob (align_); - align_ = 0; - } - if (edge_) - { - typeset_grob (edge_); - edge_ = 0; - } + scm_gc_mark (column_alist_); } - -Break_align_engraver::Break_align_engraver () +void +Break_align_engraver::acknowledge_break_alignable (Grob_info inf) { - column_alist_ = SCM_EOL; - edge_ = 0; - align_ = 0; + if (!align_) + create_alignment (inf); + + Grob *g = inf.grob (); + + if (!g->get_parent (X_AXIS)) + g->set_parent (align_, X_AXIS); } void -Break_align_engraver::acknowledge_grob (Grob_info inf) +Break_align_engraver::acknowledge_break_aligned (Grob_info inf) { - if (Item * item = dynamic_cast (inf.grob_)) + if (Item *item = dynamic_cast (inf.grob ())) { - if (item->empty_b (X_AXIS) || item->get_parent (X_AXIS)) + /* + Removed check for item->empty (X_AXIS). --hwn 20/1/04 + */ + if (item->get_parent (X_AXIS)) return; - SCM bp=item->get_grob_property ("breakable"); - bool breakable = (to_boolean (bp)); - if (!breakable) - return ; - - SCM align_name = item->get_grob_property ("break-align-symbol"); - if (!gh_symbol_p (align_name)) - return ; + if (!Item::is_non_musical (item)) + return; + SCM align_name = item->get_property ("break-align-symbol"); + if (!scm_is_symbol (align_name)) + return; + if (!align_) - { - align_ = new Item (get_property ("BreakAlignment")); - - announce_grob (align_, SCM_EOL); + create_alignment (inf); - edge_ = new Item (get_property ("LeftEdge")); - add_to_group (edge_->get_grob_property ("break-align-symbol"), edge_); - announce_grob(edge_, SCM_EOL); - } - add_to_group (align_name, item); } } void -Break_align_engraver::add_to_group(SCM align_name, Item*item) +Break_align_engraver::create_alignment (Grob_info inf) +{ + align_ = make_item ("BreakAlignment", SCM_EOL); + + Context *origin = inf.origin_contexts (this)[0]; + + Translator_group *tg = origin->implementation (); + Engraver *random_source = dynamic_cast (unsmob_translator (scm_car (tg->get_simple_trans_list ()))); + if (!random_source) + random_source = this; + + /* + Make left edge appear to come from same context as clef/bar-line etc. + */ + left_edge_ = random_source->make_item ("LeftEdge", SCM_EOL); + add_to_group (left_edge_->get_property ("break-align-symbol"), + left_edge_); +} + +void +Break_align_engraver::add_to_group (SCM align_name, Item *item) { SCM s = scm_assoc (align_name, column_alist_); - Item * group = 0; + Item *group = 0; if (s != SCM_BOOL_F) { - Grob *e = unsmob_grob (ly_cdr (s)); - group = dynamic_cast (e); + Grob *e = unsmob_grob (scm_cdr (s)); + group = dynamic_cast (e); } else { - group = new Item (get_property ("BreakAlignGroup")); + group = make_item ("BreakAlignGroup", item->self_scm ()); - group->set_grob_property ("break-align-symbol", align_name); + 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 ()); + Break_alignment_interface::add_element (align_, group); } 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 */ ""); +ADD_ACKNOWLEDGER (Break_align_engraver, break_aligned); +ADD_ACKNOWLEDGER (Break_align_engraver, break_alignable); +ADD_TRANSLATOR (Break_align_engraver, + /* doc */ + "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 ", + + /* read */ + "", + + /* write */ + "" + );