X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Fcompletion-rest-engraver.cc;h=56e11a5d1df0e2185b12e49329f917a74f56fa88;hb=dbd5303d22165bb103b3b19721b3c2b166523b37;hp=2d7dcfb8e5d2eb8c6c249e42ac147df1bcbc05a3;hpb=20dcc09b9736369830680250fb20ca12ca053ba5;p=lilypond.git

diff --git a/lily/completion-rest-engraver.cc b/lily/completion-rest-engraver.cc
index 2d7dcfb8e5..56e11a5d1d 100644
--- a/lily/completion-rest-engraver.cc
+++ b/lily/completion-rest-engraver.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1997--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1997--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
                            Jan Nieuwenhuizen <janneke@gnu.org>
 
   LilyPond is free software: you can redistribute it and/or modify
@@ -58,7 +58,6 @@ using namespace std;
 class Completion_rest_engraver : public Engraver
 {
   vector<Item *> rests_;
-  vector<Item *> prev_rests_;
   vector<Stream_event *> rest_events_;
   Moment rest_end_mom_;
   bool is_first_;
@@ -119,7 +118,7 @@ Completion_rest_engraver::next_moment (Rational const &note_len)
   if (unit)
     {
       Rational const now_unit = e->main_part_ / unit->main_part_;
-      if (now_unit.den() > 1)
+      if (now_unit.den () > 1)
         {
           /*
             within a unit - go to the end of that
@@ -178,34 +177,31 @@ Completion_rest_engraver::process_music ()
     return;
 
   Duration rest_dur;
-  Duration appearance;
   Duration *orig = 0;
   if (left_to_do_)
     {
       /*
-        rest that rest_dur may be strictly less than left_to_do_
+        note that rest_dur may be strictly less than left_to_do_
         (say, if left_to_do_ == 5/8)
       */
-      if (factor_.denominator () == 1 && factor_ > Rational (1, 1))
-        rest_dur = Duration (left_to_do_, false);
-      else
-        rest_dur = Duration (left_to_do_ / factor_, false).compressed (factor_);
-      appearance = Duration (left_to_do_, false);
+      rest_dur = Duration (left_to_do_ / factor_, false).compressed (factor_);
     }
   else
     {
       orig = unsmob_duration (rest_events_[0]->get_property ("duration"));
       rest_dur = *orig;
-      factor_ = rest_dur.factor ();
+      SCM factor = get_property ("completionFactor");
+      if (ly_is_procedure (factor))
+        factor = scm_call_2 (factor,
+                             context ()->self_scm (),
+                             rest_dur.smobbed_copy ());
+      factor_ = robust_scm2rational (factor, rest_dur.factor());
       left_to_do_ = orig->get_length ();
     }
   Moment nb = next_moment (rest_dur.get_length ());
   if (nb.main_part_ && nb < rest_dur.get_length ())
     {
-      if (factor_.denominator () == 1 && factor_.numerator () > 1)
-        rest_dur = Duration (nb.main_part_, false);
-      else
-        rest_dur = Duration (nb.main_part_ / factor_, false).compressed (factor_);
+      rest_dur = Duration (nb.main_part_ / factor_, false).compressed (factor_);
     }
 
   do_nothing_until_ = now.main_part_ + rest_dur.get_length ();
@@ -243,8 +239,6 @@ Completion_rest_engraver::process_music ()
 void
 Completion_rest_engraver::stop_translation_timestep ()
 {
-  if (rests_.size ())
-    prev_rests_ = rests_;
   rests_.clear ();
 }
 
@@ -255,7 +249,6 @@ Completion_rest_engraver::start_translation_timestep ()
   if (rest_end_mom_.main_part_ <= now.main_part_)
     {
       rest_events_.clear ();
-      prev_rests_.clear ();
     }
   context ()->set_property ("restCompletionBusy",
                             ly_bool2scm (rest_events_.size ()));
@@ -274,6 +267,7 @@ ADD_TRANSLATOR (Completion_rest_engraver,
                 "Rest ",
 
                 /* read */
+                "completionFactor "
                 "completionUnit "
                 "middleCPosition "
                 "measurePosition "