X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fnote-column.cc;h=867542bdbd39fe497b6da103e66572e5840ddf4c;hb=9e781b7dc83b60a543ce218aa1a5f139f74c760f;hp=b98b4c68f8079ce1178da7c2cc2883afc978eacf;hpb=5ab8335d106d736335698245af3c1b2b2455aed6;p=lilypond.git diff --git a/lily/note-column.cc b/lily/note-column.cc index b98b4c68f8..867542bdbd 100644 --- a/lily/note-column.cc +++ b/lily/note-column.cc @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 1997--2012 Han-Wen Nienhuys + Copyright (C) 1997--2014 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 @@ -40,31 +40,6 @@ using namespace std; annoying layer between (rest)collision & (note-head + stem) */ -Interval -Note_column::accidental_width (Grob *me) -{ - extract_grob_set (me, "note-heads", nhs); - vector accs; - for (vsize i = 0; i < nhs.size (); i++) - if (Grob *acc = unsmob_grob (nhs[i]->get_object ("accidental-grob"))) - accs.push_back (acc); - - Grob *common = common_refpoint_of_array (accs, me, X_AXIS); - common = common_refpoint_of_array (nhs, common, X_AXIS); - - Interval nhs_ex = Axis_group_interface::relative_group_extent (nhs, common, X_AXIS); - Interval accs_ex = Axis_group_interface::relative_group_extent (accs, common, X_AXIS); - - if (nhs_ex.is_empty ()) - return accs_ex; - - // want an empty interval here - if (accs_ex.is_empty ()) - return Interval (); - - return Interval (accs_ex[LEFT], nhs_ex[LEFT]); -} - bool Note_column::has_rests (Grob *me) {