X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpartial-iterator.cc;h=37b2b603d55009093819c13f565e7697e98ab5ba;hb=0b544cfb7332615ef809b71b57ab656741311ae1;hp=2e38056e740ea464fa05235260e466d9a7bdd52e;hpb=144cd434d02e6d90b2fb738eeee99119a7c5e1d2;p=lilypond.git

diff --git a/lily/partial-iterator.cc b/lily/partial-iterator.cc
index 2e38056e74..37b2b603d5 100644
--- a/lily/partial-iterator.cc
+++ b/lily/partial-iterator.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2010 Neil Puttock <n.puttock@gmail.com>
+  Copyright (C) 2010--2014 Neil Puttock <n.puttock@gmail.com>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -28,24 +28,44 @@ class Partial_iterator : public Simple_music_iterator
 {
 public:
   DECLARE_SCHEME_CALLBACK (constructor, ());
- protected:
+protected:
   virtual void process (Moment);
 };
 
 void
 Partial_iterator::process (Moment m)
 {
-  if (Duration *dur
-      = unsmob_duration (get_music ()->get_property ("partial-duration")))
+  if (Duration * dur
+      = unsmob_duration (get_music ()->get_property ("duration")))
     {
-      Context *ctx = get_outlet ();
-      Moment now = ctx->now_mom ();
-      if (now.main_part_ > Rational (0))
-	get_music ()->origin ()->
-	  warning (_ ("trying to use \\partial after the start of a piece"));
-      Moment length = Moment (dur->get_length ());
-      now = Moment (0, now.grace_part_);
-      ctx->set_property ("measurePosition", (now - length).smobbed_copy ());
+      // Partial_iterator is an iterator rather than an engraver, so
+      // the active context it is getting called in does not depend on
+      // which context definition the engraver might be defined.
+      //
+      // Using where_defined to find the context where measurePosition
+      // should be overwritten does not actually work since the
+      // Timing_translator does not set measurePosition when
+      // initializing.
+
+      Context *timing = unsmob_context (scm_call_2 (ly_lily_module_constant ("ly:context-find"),
+                                                    get_outlet ()->self_scm (),
+                                                    ly_symbol2scm ("Timing")));
+
+      if (!timing)
+        programming_error ("missing Timing in \\partial");
+      else
+        {
+          Moment mp = robust_scm2moment (timing->get_property ("measurePosition"),
+                                         Rational (0));
+
+          if (mp.main_part_ > Rational (0))
+            mp.main_part_ = measure_length (timing);
+          else
+            mp.main_part_ = 0;
+
+          Moment length = Moment (dur->get_length ());
+          timing->set_property ("measurePosition", (mp - length).smobbed_copy ());
+        }
     }
   else
     programming_error ("invalid duration in \\partial");