X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpart-combine-engraver.cc;h=eaae218c1b17a1700a10a394960b1000c1abffac;hb=b1a041c2c5b46e4f3ad654cbcfb712c267031863;hp=c6a3176f4711feec3b537607034d73f84ca967b4;hpb=4a401ca1c60f428daa242dbdd102fdb3f327ebfb;p=lilypond.git diff --git a/lily/part-combine-engraver.cc b/lily/part-combine-engraver.cc index c6a3176f47..eaae218c1b 100644 --- a/lily/part-combine-engraver.cc +++ b/lily/part-combine-engraver.cc @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 2000--2011 Jan Nieuwenhuizen + Copyright (C) 2000--2015 Jan Nieuwenhuizen Han-Wen Nienhuys @@ -79,13 +79,13 @@ Part_combine_engraver::Part_combine_engraver () void Part_combine_engraver::create_item (Stream_event *ev) { - SCM what = ev->get_property ("class"); + SCM what = scm_car (ev->get_property ("class")); SCM text = SCM_EOL; - if (what == ly_symbol2scm ("solo-one-event")) + if (scm_is_eq (what, ly_symbol2scm ("solo-one-event"))) text = get_property ("soloText"); - else if (what == ly_symbol2scm ("solo-two-event")) + else if (scm_is_eq (what, ly_symbol2scm ("solo-two-event"))) text = get_property ("soloIIText"); - else if (what == ly_symbol2scm ("unisono-event")) + else if (scm_is_eq (what, ly_symbol2scm ("unisono-event"))) text = get_property ("aDueText"); if (Text_interface::is_markup (text))