Doc: CG - replace references of Google Code with Sourceforge Allura

[lilypond.git] / lily / mark-engraver.cc

diff --git a/lily/mark-engraver.cc b/lily/mark-engraver.cc
index 2d6501af0a927fbe662592a50d887b1682622636..7db0a781cc8d993807ac51af519218ef0b48d42d 100644 (file)
--- a/lily/mark-engraver.cc
+++ b/lily/mark-engraver.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1998--2011 Jan Nieuwenhuizen <janneke@gnu.org>
+  Copyright (C) 1998--2015 Jan Nieuwenhuizen <janneke@gnu.org>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -23,7 +23,6 @@ using namespace std;
 #include "engraver.hh"
 
 #include "axis-group-interface.hh"
-#include "bar-line.hh"
 #include "context.hh"
 #include "grob-array.hh"
 #include "international.hh"
@@ -141,17 +140,11 @@ Mark_engraver::process_music ()
           if (!scm_is_number (m))
             m = get_property ("rehearsalMark");
 
-          if (scm_integer_p (m) == SCM_BOOL_T
-              && scm_exact_p (m) == SCM_BOOL_T)
+          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"));