X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Ftie-formatting-problem.cc;h=c4e8a22eb9fc30854393ff1c7c20462dc0d36a43;hb=fe5a93b2c25a8db0149795b6abf6e3e79dfdd750;hp=b157d4794c114f9845c24978fe84d182592e2ab0;hpb=f0978ed121192fee9bdf2453a325d98693148acf;p=lilypond.git diff --git a/lily/tie-formatting-problem.cc b/lily/tie-formatting-problem.cc index b157d4794c..c4e8a22eb9 100644 --- a/lily/tie-formatting-problem.cc +++ b/lily/tie-formatting-problem.cc @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 2005--2011 Han-Wen Nienhuys + Copyright (C) 2005--2012 Han-Wen Nienhuys LilyPond is free software: you can redistribute it and/or modify @@ -149,8 +149,9 @@ Tie_formatting_problem::set_column_chord_outline (vector bounds, else { if (use_horizontal_spacing_ || !Stem::get_beam (stem)) - stem_end_position = Stem::stem_end_position (stem) * staff_space * .5; + stem_end_position = stem->extent (stem, Y_AXIS)[get_grob_direction (stem)]; else + // May want to change this to the stem's pure height... stem_end_position = Stem::note_head_positions (stem)[get_grob_direction (stem)] * staff_space * .5; } @@ -173,7 +174,7 @@ Tie_formatting_problem::set_column_chord_outline (vector bounds, Grob *flag = Stem::flag (stem); if (flag) { - Grob* commony = stem->common_refpoint (flag, Y_AXIS); + Grob *commony = stem->common_refpoint (flag, Y_AXIS); boxes.push_back (Box (flag->extent (x_refpoint_, X_AXIS), flag->extent (commony, Y_AXIS))); } @@ -442,7 +443,8 @@ Tie_configuration * Tie_formatting_problem::get_configuration (int pos, Direction dir, Drul_array columns, bool tune_dy) const { - int key_components[] = + int key_components[] + = { pos, dir, columns[LEFT], columns[RIGHT] };