X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftie-formatting-problem.cc;h=1faa3d94454c4c59ed12ae7e8393c05cae0129dd;hb=689f63e0473f8325b63d6bba66f9a56335548303;hp=8a016bde21e1d12d6bbe05f4ecce4d34a48630e9;hpb=b0d8915af9a98f09b7d648b921f15035da92ab5e;p=lilypond.git diff --git a/lily/tie-formatting-problem.cc b/lily/tie-formatting-problem.cc index 8a016bde21..1faa3d9445 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--2014 Han-Wen Nienhuys + Copyright (C) 2005--2015 Han-Wen Nienhuys LilyPond is free software: you can redistribute it and/or modify @@ -151,7 +151,7 @@ Tie_formatting_problem::set_column_chord_outline (vector bounds, 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)] + stem_end_position = Stem::head_positions (stem)[get_grob_direction (stem)] * staff_space * .5; } @@ -1200,7 +1200,8 @@ Tie_formatting_problem::set_manual_tie_configuration (SCM manual_configs) { spec.has_manual_position_ = true; spec.manual_position_ = scm_to_double (scm_car (entry)); - spec.has_manual_delta_y_ = (scm_inexact_p (scm_car (entry)) == SCM_BOOL_T); + /* TODO: check whether inexact? is an appropriate condition here */ + spec.has_manual_delta_y_ = (scm_is_true (scm_inexact_p (scm_car (entry)))); } if (scm_is_number (scm_cdr (entry)))