Merge remote-tracking branch 'origin/translation'

[lilypond.git] / lily / completion-rest-engraver.cc

diff --git a/lily/completion-rest-engraver.cc b/lily/completion-rest-engraver.cc
index 3f918e2d0e76e0c83a9924e1466705708d9a81a7..56e11a5d1df0e2185b12e49329f917a74f56fa88 100644 (file)
--- 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
@@ -36,6 +36,7 @@ using namespace std;
 #include "stream-event.hh"
 #include "tie.hh"
 #include "warn.hh"
+#include "misc.hh"
 
 #include "translator.icc"
 
@@ -48,7 +49,7 @@ using namespace std;
   Every time process_music () is called and there are rest events, we
   figure out how long the rest 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.
+  not cross barlines or sub-bar units.
 
   We copy the events into scratch rest events, to make sure that we get
   all durations exactly right.
@@ -57,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_;
@@ -65,7 +65,7 @@ class Completion_rest_engraver : public Engraver
   Rational do_nothing_until_;
   Rational factor_;
 
-  Moment next_barline_moment ();
+  Moment next_moment (Rational const &);
   Item *make_rest (Stream_event *);
 
 public:
@@ -100,10 +100,10 @@ Completion_rest_engraver::listen_rest (Stream_event *ev)
 }
 
 /*
-  The duration _until_ the next barline.
+  The duration _until_ the next barline or completion unit
 */
 Moment
-Completion_rest_engraver::next_barline_moment ()
+Completion_rest_engraver::next_moment (Rational const &note_len)
 {
   Moment *e = unsmob_moment (get_property ("measurePosition"));
   Moment *l = unsmob_moment (get_property ("measureLength"));
@@ -112,7 +112,40 @@ Completion_rest_engraver::next_barline_moment ()
       return Moment (0, 0);
     }
 
-  return (*l - *e);
+  Moment result = *l - *e;
+  Moment const *unit = unsmob_moment (get_property ("completionUnit"));
+
+  if (unit)
+    {
+      Rational const now_unit = e->main_part_ / unit->main_part_;
+      if (now_unit.den () > 1)
+        {
+          /*
+            within a unit - go to the end of that
+          */
+          result = unit->main_part_
+            * (Rational (1) - (now_unit - now_unit.trunc_rat ()));
+        }
+      else
+        {
+          /*
+            at the beginning of a unit:
+            take a power-of-two number of units, but not more than required,
+            since then the Duration constructor destroys the unit structure
+          */
+          if (note_len < result.main_part_)
+            result.main_part_ = note_len;
+          Rational const step_unit = result.main_part_ / unit->main_part_;
+          if (step_unit.den () < step_unit.num ())
+            {
+              int const log2
+                = intlog2 (int (step_unit.num () / step_unit.den ()));
+              result.main_part_ = unit->main_part_ * Rational (1 << log2);
+            }
+        }
+    }
+
+  return result;
 }
 
 Item *
@@ -144,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_barline_moment ();
+  Moment nb = next_moment (rest_dur.get_length ());
   if (nb.main_part_ && nb < rest_dur.get_length ())
     {
-      if (factor_.denominator () == 1 && factor_ > Rational (1, 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 ();
@@ -209,8 +239,6 @@ Completion_rest_engraver::process_music ()
 void
 Completion_rest_engraver::stop_translation_timestep ()
 {
-  if (rests_.size ())
-    prev_rests_ = rests_;
   rests_.clear ();
 }
 
@@ -221,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 ()));
@@ -240,6 +267,8 @@ ADD_TRANSLATOR (Completion_rest_engraver,
                 "Rest ",
 
                 /* read */
+                "completionFactor "
+                "completionUnit "
                 "middleCPosition "
                 "measurePosition "
                 "measureLength ",