X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpure-from-neighbor-interface.cc;h=ce202bcf82a64b397e5f220b50986aab60ba103d;hb=2ef3c498c1ed60a86c096a409665535f31e82c64;hp=e6bc924aea6a9bc21619caab5804394d8c621a70;hpb=b64dcb418b66fb57b41067381ada9127a0e7e671;p=lilypond.git diff --git a/lily/pure-from-neighbor-interface.cc b/lily/pure-from-neighbor-interface.cc index e6bc924aea..ce202bcf82 100644 --- a/lily/pure-from-neighbor-interface.cc +++ b/lily/pure-from-neighbor-interface.cc @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 2011 Mike Solomon + Copyright (C) 2011--2012 Mike Solomon LilyPond is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -33,21 +33,21 @@ Pure_from_neighbor_interface::calc_pure_relevant_grobs (SCM smob) { Grob *me = unsmob_grob (smob); extract_grob_set ((me->original () && me->original ()->is_live () - ? me->original () - : me), - "neighbors", - elts); + ? me->original () + : me), + "neighbors", + elts); vector new_elts; new_elts.insert (new_elts.end (), elts.begin (), elts.end ()); SCM neighbors_scm = me->get_object ("neighbors"); if (Grob_array::unsmob (neighbors_scm)) - { - vector &arr - = unsmob_grob_array (neighbors_scm)->array_reference (); - arr = new_elts; - } + { + vector &arr + = unsmob_grob_array (neighbors_scm)->array_reference (); + arr = new_elts; + } return Axis_group_interface::internal_calc_pure_relevant_grobs (me, "neighbors"); }