X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fcontext.cc;h=36e506cd7e01d88891b57ac5c68f6817183eafc5;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=15bd3c5fb84a0a8c03deae29d0a9119fe8bf3a05;hpb=9c62c7293a657743e212d8ab279b5d100a9c75a3;p=lilypond.git

diff --git a/lily/context.cc b/lily/context.cc
index 15bd3c5fb8..36e506cd7e 100644
--- a/lily/context.cc
+++ b/lily/context.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2004--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2004--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "context.hh"
@@ -104,17 +104,12 @@ Context::create_unique_context (SCM name, string id, SCM operations)
   if (gthis && gthis->get_score_context ())
     return gthis->get_score_context ()->create_unique_context (name, id, operations);
 
-  /*
-    TODO: use accepts_list_.
-  */
-  vector<Context_def*> path
-    = unsmob_context_def (definition_)->path_to_acceptable_context (name, get_output_def ());
-
+  vector<Context_def*> path = path_to_acceptable_context (name);
   if (path.size ())
     {
       Context *current = this;
 
-      // start at 1.  The first one (index 0) will be us.
+      // Iterate through the path and create all of the implicit contexts.
       for (vsize i = 0; i < path.size (); i++)
 	{
 	  SCM ops = SCM_EOL;
@@ -167,11 +162,7 @@ Context::find_create_context (SCM n, string id, SCM operations)
       return tg;
     }
 
-  /*
-    TODO: use accepts_list_.
-  */
-  vector<Context_def*> path
-    = unsmob_context_def (definition_)->path_to_acceptable_context (n, get_output_def ());
+  vector<Context_def*> path = path_to_acceptable_context (n);
 
   if (path.size ())
     {
@@ -261,8 +252,8 @@ Context::create_context_from_event (SCM sev)
   SCM type_scm = ev->get_property ("type");
   string type = ly_symbol2string (type_scm);
   
-  vector<Context_def*> path
-    = unsmob_context_def (definition_)->path_to_acceptable_context (type_scm, get_output_def ());
+  vector<Context_def*> path = path_to_acceptable_context (type_scm);
+
   if (path.size () != 1)
     {
       programming_error (_f ("Invalid CreateContext event: Cannot create %s context", type.c_str ()));
@@ -312,6 +303,25 @@ Context::create_context_from_event (SCM sev)
   		     ly_symbol2scm ("creator"), sev);
 }
 
+vector<Context_def*>
+Context::path_to_acceptable_context (SCM name) const
+{
+  // 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"))
+      {
+	SCM elt = scm_list_2 (scm_caar (s), scm_string_to_symbol (scm_cadar (s)));
+	accepts = scm_cons (elt, accepts);
+      }
+
+  return unsmob_context_def (definition_)->path_to_acceptable_context (name,
+								       get_output_def (),
+								       accepts);
+								       
+}
+
 Context *
 Context::create_context (Context_def *cdef,
 			 string id,
@@ -460,19 +470,16 @@ Context::add_alias (SCM sym)
   aliases_ = scm_cons (sym, aliases_);
 }
 
+/* we don't (yet) instrument context properties */
 void
-Context::internal_set_property (SCM sym, SCM val
-#ifndef NDEBUG
-				, char const *file, int line, char const *fun
-#endif
-				)
+Context::instrumented_set_property (SCM sym, SCM val, const char*, int, const char*)
 {
-#ifndef NDEBUG
-  (void) file;
-  (void) line;
-  (void) fun;
-#endif
+  internal_set_property (sym, val);
+}
 
+void
+Context::internal_set_property (SCM sym, SCM val)
+{
   if (do_internal_type_checking_global)
     assert (type_check_assignment (sym, val, ly_symbol2scm ("translation-type?")));
 
@@ -702,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)
@@ -720,7 +756,7 @@ melisma_busy (Context *tr)
   SCM melisma_properties = tr->get_property ("melismaBusyProperties");
   bool busy = false;
 
-  for (; scm_is_pair (melisma_properties);
+  for (; !busy && scm_is_pair (melisma_properties);
        melisma_properties = scm_cdr (melisma_properties))
     busy = busy || to_boolean (tr->internal_get_property (scm_car (melisma_properties)));