X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fbreak-align-engraver.cc;h=6da5ba603e104c894063ed85dfec098e1e397e83;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=76d6e891f6aa45979e398bb82fbccca2836c4d0a;hpb=bebd93c2dd0d7363f311d912ec1ed1f7dfcb36ba;p=lilypond.git diff --git a/lily/break-align-engraver.cc b/lily/break-align-engraver.cc index 76d6e891f6..6da5ba603e 100644 --- a/lily/break-align-engraver.cc +++ b/lily/break-align-engraver.cc @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 1999--2011 Han-Wen Nienhuys + Copyright (C) 1999--2015 Han-Wen Nienhuys LilyPond is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -91,20 +91,20 @@ Break_align_engraver::acknowledge_break_aligned (Grob_info inf) if (Item *item = dynamic_cast (inf.grob ())) { /* - Removed check for item->empty (X_AXIS). --hwn 20/1/04 + Removed check for item->empty (X_AXIS). --hwn 20/1/04 */ if (item->get_parent (X_AXIS)) - return; + return; if (!Item::is_non_musical (item)) - return; + return; SCM align_name = item->get_property ("break-align-symbol"); if (!scm_is_symbol (align_name)) - return; + return; if (!align_) - create_alignment (inf); + create_alignment (inf); add_to_group (align_name, item); } @@ -118,7 +118,7 @@ Break_align_engraver::create_alignment (Grob_info inf) 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 ()))); + Engraver *random_source = dynamic_cast (Translator::unsmob (scm_car (tg->get_simple_trans_list ()))); if (!random_source) random_source = this; @@ -127,7 +127,7 @@ Break_align_engraver::create_alignment (Grob_info inf) */ left_edge_ = random_source->make_item ("LeftEdge", SCM_EOL); add_to_group (left_edge_->get_property ("break-align-symbol"), - left_edge_); + left_edge_); } void @@ -138,7 +138,7 @@ Break_align_engraver::add_to_group (SCM align_name, Item *item) if (s != SCM_BOOL_F) { - Grob *e = unsmob_grob (scm_cdr (s)); + Grob *e = Grob::unsmob (scm_cdr (s)); group = dynamic_cast (e); } else @@ -158,20 +158,20 @@ Break_align_engraver::add_to_group (SCM align_name, Item *item) 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 */ - "" - ); + /* 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 */ + "" + );