X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmark-engraver.cc;h=51add1233e0c72ff1ae1d0833c167db3944509d8;hb=aa2b5b377586a52fcb6b14d4dd464b94f6738560;hp=52a68359534fced1677bf1088d46d763ff7af96b;hpb=e0af94bb8939bc6f4998db6294010baa77139092;p=lilypond.git

diff --git a/lily/mark-engraver.cc b/lily/mark-engraver.cc
index 52a6835953..51add1233e 100644
--- a/lily/mark-engraver.cc
+++ b/lily/mark-engraver.cc
@@ -18,7 +18,6 @@
 */
 
 #include <cctype>
-using namespace std;
 
 #include "engraver.hh"
 
@@ -140,17 +139,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"));