X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fcompletion-note-heads-engraver.cc;h=62cc6fec340a113e54fd4104d74829c5ba34487b;hb=7ea5c74058200ace4b405de82e1088560aeaacb2;hp=a9caf8a7ac8cc52a9db09b49ff27a7dfb50db9aa;hpb=1b9fc29140bd1d9345f784595afd22158876dfb7;p=lilypond.git

diff --git a/lily/completion-note-heads-engraver.cc b/lily/completion-note-heads-engraver.cc
index a9caf8a7ac..62cc6fec34 100644
--- a/lily/completion-note-heads-engraver.cc
+++ b/lily/completion-note-heads-engraver.cc
@@ -1,14 +1,14 @@
 /*
   head-grav.cc -- part of GNU LilyPond
 
-  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include <ctype.h>
 
 #include "rhythmic-head.hh"
 #include "paper-def.hh"
-#include "request.hh"
+#include "event.hh"
 #include "dots.hh"
 #include "dot-column.hh"
 #include "staff-symbol-referencer.hh"
@@ -21,9 +21,9 @@
   How does this work?
 
   When we catch the note, we predict the end of the note. We keep the
-  requests living until we reach the predicted end-time.
+  events living until we reach the predicted end-time.
 
-  Every time process_music() is called and there are note requests, we
+  Every time process_music() is called and there are note events, we
   figure out how long the note to typeset should be. It should be no
   longer than what's specified, than what is left to do and it should
   not cross barlines.
@@ -73,7 +73,7 @@ Completion_heads_engraver::try_music (Music *m)
       note_reqs_.push (m);
 
       first_b_ = true;
-      Moment musiclen = m->length_mom ();
+      Moment musiclen = m->get_length ();
       Moment now = now_mom();
 
       if (now_mom ().grace_part_)
@@ -122,7 +122,7 @@ Completion_heads_engraver::find_nearest_duration (Rational length)
   /*
     this could surely be done more efficient. Left to the reader as an
     excercise.  */
-  while (d.length_mom () > length && d.duration_log () < log_limit)
+  while (d.get_length () > length && d.duration_log () < log_limit)
     {
       if (d.dot_count ())
 	{
@@ -141,7 +141,7 @@ Completion_heads_engraver::find_nearest_duration (Rational length)
       d = Duration (d.duration_log (), 0);
 
       // scale up.
-      d = d.compressed (length / d.length_mom ());
+      d = d.compressed (length / d.get_length ());
     }
   
   return d;
@@ -171,22 +171,22 @@ Completion_heads_engraver::process_music ()
       note_dur = *orig;
     }
   Moment nb = next_barline_moment ();
-  if (nb < note_dur.length_mom ())
+  if (nb < note_dur.get_length ())
     {
       note_dur = find_nearest_duration (nb.main_part_);
 
       Moment next = now;
-      next.main_part_ += note_dur.length_mom ();
+      next.main_part_ += note_dur.get_length ();
       top_engraver ()->add_moment_to_process (next);
       do_nothing_until_ = next.main_part_;
     }
 
   if (orig)
     {
-      left_to_do_ = orig->length_mom ();
+      left_to_do_ = orig->get_length ();
     }
 
-  if (orig && note_dur.length_mom() != orig->length_mom())
+  if (orig && note_dur.get_length () != orig->get_length ())
     {
       if (!scratch_note_reqs_.size ())
 	for (int i = 0; i < note_reqs_.size (); i++)
@@ -243,7 +243,7 @@ Completion_heads_engraver::process_music ()
       notes_.push (note);
     }
 
-  left_to_do_ -= note_dur.length_mom ();
+  left_to_do_ -= note_dur.get_length ();
 
 
   /*
@@ -309,9 +309,9 @@ Completion_heads_engraver::Completion_heads_engraver()
 }
 
 ENTER_DESCRIPTION(Completion_heads_engraver,
-/* descr */       "This engraver replaces
-@code{Note_heads_engraver}. It plays some trickery to
-break long notes and automatically tie them into the next measure.",
+/* descr */       "This engraver replaces "
+"@code{Note_heads_engraver}. It plays some trickery to "
+"break long notes and automatically tie them into the next measure.",
 /* creats*/       "NoteHead Dots",
 /* accepts */     "busy-playing-event note-event",
 /* acks  */      "",