X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fhorizontal-bracket.cc;h=279ee0baf291bf2083f3979cd02704c09179da00;hb=f5419ce02a5ef4230b4ae5bc843d86ba7dcc3853;hp=2ad243a1d9cf606fee07cfa9b5d739b859653aa9;hpb=4bb29573149a0ffa1f881c5e38a0fe68e9e76b67;p=lilypond.git diff --git a/lily/horizontal-bracket.cc b/lily/horizontal-bracket.cc index 2ad243a1d9..279ee0baf2 100644 --- a/lily/horizontal-bracket.cc +++ b/lily/horizontal-bracket.cc @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 2002--2011 Han-Wen Nienhuys + Copyright (C) 2002--2012 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 @@ -53,8 +53,7 @@ Horizontal_bracket::make_bracket (Grob *me, = robust_scm2booldrul (me->get_property ("connect-to-neighbor"), Drul_array (false, false)); - Direction d = LEFT; - do + for (LEFT_and_RIGHT (d)) { if (connect_to_other[d]) { @@ -63,7 +62,6 @@ Horizontal_bracket::make_bracket (Grob *me, shorten[d] = 0.0; } } - while (flip (&d) != LEFT); /* ugh, Tuplet_bracket should use Horizontal_bracket, not the other way around. @@ -113,14 +111,12 @@ Horizontal_bracket::print (SCM smob) return SCM_EOL; } - Direction d = LEFT; - do + for (LEFT_and_RIGHT (d)) { Item *b = me->get_bound (d); if (b->break_status_dir ()) enclosed.push_back (b); } - while (flip (&d) != LEFT); Stencil b = make_enclosing_bracket (me, me, enclosed, X_AXIS, get_grob_direction (me)); return b.smobbed_copy ();