X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fslur-configuration.cc;h=8e1db97d8413d3e35fdbe502738541457fae4589;hb=c7acad264e49f23e333dd66a0e1d50005c630068;hp=46e9d917a119de2c03d2c985ddbdae878b3c3431;hpb=8848da24e00c75d7de626b2ecc409fb45e87ce4a;p=lilypond.git diff --git a/lily/slur-configuration.cc b/lily/slur-configuration.cc index 46e9d917a1..8e1db97d84 100644 --- a/lily/slur-configuration.cc +++ b/lily/slur-configuration.cc @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 2004--2012 Han-Wen Nienhuys + Copyright (C) 2004--2015 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 @@ -412,14 +412,14 @@ Slur_configuration::score_extra_encompass (Slur_score_state const &state) } Real dist = 0.0; - if (info.type_ == ly_symbol2scm ("around")) + if (scm_is_eq (info.type_, ly_symbol2scm ("around"))) dist = info.extents_[Y_AXIS].distance (y); /* Have to score too: the curve enumeration is limited in its shape, and may produce curves which collide anyway. */ - else if (info.type_ == ly_symbol2scm ("inside")) + else if (scm_is_eq (info.type_, ly_symbol2scm ("inside"))) dist = state.dir_ * (y - info.extents_[Y_AXIS][state.dir_]); else programming_error ("unknown avoidance type");