X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fbar-number-engraver.cc;h=144076439c6e27fb787a6d50251cf3c2e7ea7ab0;hb=39db15840e1dbfbe7898d4c7fa09112fc6c3f819;hp=f0411cfb7bd700343e59e0885b62ec5976df77f5;hpb=123b51c50a462b14d3cbffe2f354eaa8ec772dc2;p=lilypond.git diff --git a/lily/bar-number-engraver.cc b/lily/bar-number-engraver.cc index f0411cfb7b..144076439c 100644 --- a/lily/bar-number-engraver.cc +++ b/lily/bar-number-engraver.cc @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 1997--2011 Han-Wen Nienhuys + Copyright (C) 1997--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 @@ -62,8 +62,10 @@ Bar_number_engraver::listen_alternative (Stream_event *ev) alternative_event_ = ev; int current_barnumber = robust_scm2int (get_property ("currentBarNumber"), 0); Direction alternative_dir = robust_scm2dir (ev->get_property ("alternative-dir"), CENTER); - bool make_alternative = get_property ("alternativeNumberingStyle") == ly_symbol2scm ("numbers") - || get_property ("alternativeNumberingStyle") == ly_symbol2scm ("numbers-with-letters"); + bool make_alternative = scm_is_eq (get_property ("alternativeNumberingStyle"), + ly_symbol2scm ("numbers")) + || scm_is_eq (get_property ("alternativeNumberingStyle"), + ly_symbol2scm ("numbers-with-letters")); if (make_alternative) { /* @@ -100,7 +102,7 @@ Bar_number_engraver::process_music () create_items (); SCM alternative_style = get_property ("alternativeNumberingStyle"); string text_tag = ""; - if (alternative_style == ly_symbol2scm ("numbers-with-letters")) + if (scm_is_eq (alternative_style, ly_symbol2scm ("numbers-with-letters"))) { if (alternative_event_) {