X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmark-engraver.cc;h=7db0a781cc8d993807ac51af519218ef0b48d42d;hb=b184142c53b8139a2535df1d2049129d61878d61;hp=52a68359534fced1677bf1088d46d763ff7af96b;hpb=e8d5061834a5a658c5ffd078237e9cd660069a7d;p=lilypond.git diff --git a/lily/mark-engraver.cc b/lily/mark-engraver.cc index 52a6835953..7db0a781cc 100644 --- a/lily/mark-engraver.cc +++ b/lily/mark-engraver.cc @@ -140,17 +140,11 @@ Mark_engraver::process_music () if (!scm_is_number (m)) m = get_property ("rehearsalMark"); - if (scm_is_integer (m) - && scm_is_true (scm_exact_p (m))) + if (scm_is_number (m)) { - int mark_count = scm_to_int (m); - mark_count++; - context ()->set_property ("rehearsalMark", - scm_from_int (mark_count)); + context ()->set_property ("rehearsalMark", scm_oneplus (m)); + m = scm_call_2 (proc, m, context ()->self_scm ()); } - - if (scm_is_number (m)) - m = scm_call_2 (proc, m, context ()->self_scm ()); else /* FIXME: constant error message. */ warning (_ ("rehearsalMark must have integer value"));