Merge branch 'origin'

[lilypond.git] / lily / context.cc

diff --git a/lily/context.cc b/lily/context.cc
index dc6216403fe3caaf42aaf8f1dac54272627293d5..c2c4a06f71a94093046da6a493066787538369e5 100644 (file)
--- a/lily/context.cc
+++ b/lily/context.cc
@@ -162,9 +162,6 @@ Context::find_create_context (SCM n, string id, SCM operations)
       return tg;
     }
 
-  /*
-    TODO: use accepts_list_.
-  */
   vector<Context_def*> path = path_to_acceptable_context (n);
 
   if (path.size ())
@@ -309,8 +306,8 @@ Context::create_context_from_event (SCM sev)
 vector<Context_def*>
 Context::path_to_acceptable_context (SCM name) const
 {
-  // definition_mods_ is a list of (symbol string), but the Context_def expects
-  // to see a list of (symbol symbol).
+  // The 'accepts elements in definition_mods_ is a list of ('accepts string),
+  // but the Context_def expects to see elements of the form ('accepts symbol).
   SCM accepts = SCM_EOL;
   for (SCM s = scm_reverse (definition_mods_); scm_is_pair (s); s = scm_cdr (s))
     if (scm_caar (s) == ly_symbol2scm ("accepts"))
@@ -712,6 +709,35 @@ measure_position (Context const *context)
   return m;
 }
 
+/* Finds the measure position after a note of length DUR that
+   begins at the current measure position. */
+Moment
+measure_position (Context const *context, Duration const *dur)
+{
+  Moment pos = measure_position (context);
+  Rational dur_length = dur ? dur->get_length () : Rational (0);
+
+  Moment end_pos = pos.grace_part_ < Rational(0)
+    ? Moment(pos.main_part_, pos.grace_part_ + dur_length)
+    : Moment(pos.main_part_ + dur_length, 0);
+
+  return end_pos;
+}
+
+int
+measure_number (Context const *context)
+{
+  SCM barnum = context->get_property ("internalBarNumber");
+  SCM smp = context->get_property ("measurePosition");
+
+  int bn = robust_scm2int (barnum, 0);
+  Moment mp = robust_scm2moment (smp, Moment (0));
+  if (mp.main_part_ < Rational (0))
+    bn--;
+
+  return bn;
+}
+
 
 void
 set_context_property_on_children (Context *trans, SCM sym, SCM val)