patch::: 1.1.30.mb1: Re: LilyPond 1.1.30

[lilypond.git] / lily / multi-measure-rest-engraver.cc

diff --git a/lily/multi-measure-rest-engraver.cc b/lily/multi-measure-rest-engraver.cc
index 8dd071d6d5acbe89dd185b897644eafbb2cf3673..f3a39170c9dadcb9fe1981e6a40caa39a96e1cbe 100644 (file)
--- a/lily/multi-measure-rest-engraver.cc
+++ b/lily/multi-measure-rest-engraver.cc
@@ -1,7 +1,7 @@
 /*
   multi_measure_rest-engraver.cc -- implement Multi_measure_rest_engraver
 
-  (c) 1998 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1998--1999 Jan Nieuwenhuizen <janneke@gnu.org>
        Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
@@ -49,13 +49,13 @@ Multi_measure_rest_engraver::do_try_music (Music* req_l)
    {
      if (multi_measure_req_l_)
        if (!multi_measure_req_l_->equal_b (mr)
-          || rest_moments_[START] != now_moment ())
+          || rest_moments_[START] != now_mom ())
         return false;
   
      multi_measure_req_l_ = mr;
-     rest_moments_[START] = now_moment ();
+     rest_moments_[START] = now_mom ();
      
-     rest_moments_[STOP] = rest_moments_[START] + multi_measure_req_l_->duration_.length ();
+     rest_moments_[STOP] = rest_moments_[START] + multi_measure_req_l_->duration_.length_mom ();
      return true;
    }
  return false;
@@ -76,7 +76,7 @@ Multi_measure_rest_engraver::do_process_requests ()
 void
 Multi_measure_rest_engraver::do_pre_move_processing ()
 {
-  Moment now (now_moment ());
+  Moment now (now_mom ());
   Time_description const *time = get_staff_info().time_C_;
   if (mmrest_p_ && (now >= rest_moments_[START]) 
     && !time->whole_in_measure_
@@ -98,7 +98,7 @@ void
 Multi_measure_rest_engraver::do_post_move_processing ()
 {
   Time_description const *time = get_staff_info().time_C_;
-  Moment now (now_moment ());
+  Moment now (now_mom ());
 
   if (mmrest_p_ && !time->whole_in_measure_)
     {