(measure_position): measure_position() is now a

[lilypond.git] / lily / context.cc

diff --git a/lily/context.cc b/lily/context.cc
index e88fd27f5af5c2d0b35ef239c97119f3ce8ee23d..bf70e7a28cf874265f3948d887d1d8dfa094d91c 100644 (file)
--- a/lily/context.cc
+++ b/lily/context.cc
@@ -8,6 +8,7 @@
 
 #include "context.hh"
 
+#include "program-option.hh"
 #include "context-def.hh"
 #include "ly-smobs.icc"
 #include "main.hh"
@@ -35,7 +36,9 @@ Context::check_removal ()
       trg->check_removal ();
       if (trg->is_removable ())
        {
-         recurse_over_translators (trg, &Translator::finalize, UP);
+         recurse_over_translators (trg, &Translator::finalize,
+                                   &Translator_group::finalize,
+                                   UP);
          remove_context (trg);
        }
     }
@@ -67,13 +70,14 @@ Context::add_context (Context *t)
       scm_gc_unprotect_object (ts);
       Context_def *td = unsmob_context_def (t->definition_);
 
-      /*
-       this can not move before add_context (), because \override
-       operations require that we are in the hierarchy.
-      */
+      /* This cannot move before add_context (), because \override
+        operations require that we are in the hierarchy.  */
       td->apply_default_property_operations (t);
 
-      recurse_over_translators (t, &Translator::initialize, DOWN);
+      recurse_over_translators (t,
+                               &Translator::initialize,
+                               &Translator_group::initialize,
+                               DOWN);
     }
 }
 
@@ -90,7 +94,7 @@ Context::Context (Object_key const *key)
   init_ = false;
   aliases_ = SCM_EOL;
   iterator_count_ = 0;
-  implementation_ = SCM_EOL;
+  implementation_ = 0;
   properties_scm_ = SCM_EOL;
   accepts_list_ = SCM_EOL;
   context_list_ = SCM_EOL;
@@ -99,7 +103,9 @@ Context::Context (Object_key const *key)
   smobify_self ();
   properties_scm_ = (new Scheme_hash_table)->self_scm ();
   scm_gc_unprotect_object (properties_scm_);
-  scm_gc_unprotect_object (key_->self_scm ());
+
+  if (key_)
+    scm_gc_unprotect_object (key_->self_scm ());
 }
 
 /* TODO:  this shares code with find_create_context ().  */
@@ -145,7 +151,7 @@ Context::create_unique_context (SCM n, SCM operations)
     ret = daddy_context_->create_unique_context (n, operations);
   else
     {
-      warning (_f ("Cannot find or create new `%s'",
+      warning (_f ("can't find or create new `%s'",
                   ly_symbol2string (n).to_str0 ()));
       ret = 0;
     }
@@ -209,7 +215,7 @@ Context::find_create_context (SCM n, String id, SCM operations)
     ret = daddy_context_->find_create_context (n, id, operations);
   else
     {
-      warning (_f ("Cannot find or create `%s' called `%s'",
+      warning (_f ("can't find or create `%s' called `%s'",
                   ly_symbol2string (n).to_str0 (), id));
       ret = 0;
     }
@@ -223,19 +229,22 @@ Context::create_context (Context_def *cdef,
 {
   String type = ly_symbol2string (cdef->get_context_name ());
   Object_key const *key = get_context_key (type, id);
-  Context *new_group
+  Context *new_context
     = cdef->instantiate (ops, key);
 
-  new_group->id_string_ = id;
-  add_context (new_group);
-  apply_property_operations (new_group, ops);
+  new_context->id_string_ = id;
+  add_context (new_context);
+  apply_property_operations (new_context, ops);
 
-  return new_group;
+  return new_context;
 }
 
 Object_key const *
 Context::get_context_key (String type, String id)
 {
+  if (!use_object_keys)
+    return 0;
+      
   String now_key = type + "@" + id;
 
   int disambiguation_count = 0;
@@ -255,6 +264,9 @@ Context::get_context_key (String type, String id)
 Object_key const *
 Context::get_grob_key (String name)
 {
+  if (!use_object_keys)
+    return 0;
+  
   int disambiguation_count = 0;
   if (grob_counts_.find (name) != grob_counts_.end ())
     {
@@ -278,7 +290,7 @@ SCM
 Context::default_child_context_name () const
 {
   return scm_is_pair (accepts_list_)
-    ? scm_car (scm_last_pair (accepts_list_))
+    ? scm_car (accepts_list_) 
     : SCM_EOL;
 }
 
@@ -478,10 +490,10 @@ Context::print_smob (SCM s, SCM port, scm_print_state *)
       scm_display (d->get_context_name (), port);
     }
 
-  if (Context *td = dynamic_cast<Context *> (sc))
+  if (!sc->id_string_.is_empty ())
     {
       scm_puts ("=", port);
-      scm_puts (td->id_string_.to_str0 (), port);
+      scm_puts (sc->id_string_.to_str0 (), port);
     }
 
   scm_puts (" ", port);
@@ -496,13 +508,16 @@ SCM
 Context::mark_smob (SCM sm)
 {
   Context *me = (Context *) SCM_CELL_WORD_1 (sm);
-  scm_gc_mark (me->key_->self_scm ());
+  if (me->key_)
+    scm_gc_mark (me->key_->self_scm ());
+  
   scm_gc_mark (me->context_list_);
   scm_gc_mark (me->aliases_);
   scm_gc_mark (me->definition_);
   scm_gc_mark (me->properties_scm_);
   scm_gc_mark (me->accepts_list_);
-  scm_gc_mark (me->implementation_);
+  if (me->implementation_)
+    scm_gc_mark (me->implementation_->self_scm ());
 
   return me->properties_scm_;
 }
@@ -514,7 +529,7 @@ IMPLEMENT_TYPE_P (Context, "ly:context?");
 bool
 Context::try_music (Music *m)
 {
-  Translator *t = implementation ();
+  Translator_group *t = implementation ();
   if (!t)
     return false;
 
@@ -534,7 +549,7 @@ Context::get_global_context () const
   if (daddy_context_)
     return daddy_context_->get_global_context ();
 
-  programming_error ("No Global context!");
+  programming_error ("no Global context");
   return 0;
 }
 
@@ -547,12 +562,15 @@ Context::get_parent_context () const
 Translator_group *
 Context::implementation () const
 {
-  return dynamic_cast<Translator_group *> (unsmob_translator (implementation_));
+  return implementation_;
 }
 
 void
 Context::clear_key_disambiguations ()
 {
+  if (!use_object_keys)
+    return;
+  
   grob_counts_.clear ();
   context_counts_.clear ();
   for (SCM s = context_list_; scm_is_pair (s); s = scm_cdr (s))
@@ -560,3 +578,38 @@ Context::clear_key_disambiguations ()
       unsmob_context (scm_car (s))->clear_key_disambiguations ();
     }
 }
+
+
+/*
+  Ugh. Where to put this? 
+*/
+Rational
+measure_length (Context const *context)
+{
+  SCM l = context->get_property ("measureLength");
+  Rational length (1); 
+  if (unsmob_moment (l))
+    length = unsmob_moment (l)->main_part_;
+  return length;
+}
+
+Moment
+measure_position (Context const *context)
+{
+  SCM sm = context->get_property ("measurePosition");
+
+  Moment m = 0;
+  if (unsmob_moment (sm))
+    {
+      m = *unsmob_moment (sm);
+
+      if (m.main_part_ < Rational (0))
+       {
+         Rational length (measure_length (context));
+         while (m.main_part_ < Rational (0))
+           m.main_part_ += length;
+       }
+    }
+
+  return m;
+}