Merge branch 'master' of /home/jcharles/GIT/Lily/. into translation

[lilypond.git] / lily / context.cc

diff --git a/lily/context.cc b/lily/context.cc
index 491ea8f0d864e4ffc0cbe729f5b0e0d4d8f25b12..718ef311225dfb0062e8e079990231496a49fbfd 100644 (file)
--- a/lily/context.cc
+++ b/lily/context.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2004--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 2004--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -44,7 +44,7 @@ Context::check_removal ()
 {
   for (SCM p = context_list_; scm_is_pair (p); p = scm_cdr (p))
     {
-      Context *ctx = unsmob_context (scm_car (p));
+      Context *ctx = Context::unsmob (scm_car (p));
 
       ctx->check_removal ();
       if (ctx->is_removable ())
@@ -176,7 +176,7 @@ Context::find_create_context (SCM n, const string &id, SCM operations)
       SCM score_name = default_child_context_name ();
       SCM score_def = find_context_def (get_output_def (), score_name);
 
-      if (Context_def *cd = unsmob_context_def (score_def))
+      if (Context_def *cd = Context_def::unsmob (score_def))
         {
           if (cd->is_alias (n))
             return create_context (cd, id, operations);
@@ -236,14 +236,14 @@ IMPLEMENT_LISTENER (Context, acknowledge_infant);
 void
 Context::acknowledge_infant (SCM sev)
 {
-  infant_event_ = unsmob_stream_event (sev);
+  infant_event_ = Stream_event::unsmob (sev);
 }
 
 IMPLEMENT_LISTENER (Context, set_property_from_event);
 void
 Context::set_property_from_event (SCM sev)
 {
-  Stream_event *ev = unsmob_stream_event (sev);
+  Stream_event *ev = Stream_event::unsmob (sev);
 
   SCM sym = ev->get_property ("symbol");
   if (scm_is_symbol (sym))
@@ -267,7 +267,7 @@ IMPLEMENT_LISTENER (Context, unset_property_from_event);
 void
 Context::unset_property_from_event (SCM sev)
 {
-  Stream_event *ev = unsmob_stream_event (sev);
+  Stream_event *ev = Stream_event::unsmob (sev);
 
   SCM sym = ev->get_property ("symbol");
   type_check_assignment (sym, SCM_EOL, ly_symbol2scm ("translation-type?"));
@@ -282,7 +282,7 @@ IMPLEMENT_LISTENER (Context, create_context_from_event);
 void
 Context::create_context_from_event (SCM sev)
 {
-  Stream_event *ev = unsmob_stream_event (sev);
+  Stream_event *ev = Stream_event::unsmob (sev);
 
   string id = ly_scm2string (ev->get_property ("id"));
   SCM ops = ev->get_property ("ops");
@@ -328,7 +328,7 @@ Context::create_context_from_event (SCM sev)
 
   new_context->unprotect ();
 
-  Context_def *td = unsmob_context_def (new_context->definition_);
+  Context_def *td = Context_def::unsmob (new_context->definition_);
 
   /* This cannot move before add_context (), because \override
      operations require that we are in the hierarchy.  */
@@ -353,7 +353,7 @@ Context::path_to_acceptable_context (SCM name) const
         accepts = scm_cons (elt, accepts);
       }
 
-  return unsmob_context_def (definition_)->path_to_acceptable_context (name,
+  return Context_def::unsmob (definition_)->path_to_acceptable_context (name,
          get_output_def (),
          scm_reverse_x (accepts, SCM_EOL));
 
@@ -383,7 +383,7 @@ Context::create_context (Context_def *cdef,
 
   assert (infant_event_);
   SCM infant_scm = infant_event_->get_property ("context");
-  Context *infant = unsmob_context (infant_scm);
+  Context *infant = Context::unsmob (infant_scm);
 
   if (!infant || infant->get_parent_context () != this)
     {
@@ -419,11 +419,11 @@ Context::get_default_interpreter (const string &context_id)
       SCM st = find_context_def (get_output_def (), nm);
 
       string name = ly_symbol2string (nm);
-      Context_def *t = unsmob_context_def (st);
+      Context_def *t = Context_def::unsmob (st);
       if (!t)
         {
           warning (_f ("cannot find or create: `%s'", name.c_str ()));
-          t = unsmob_context_def (this->definition_);
+          t = Context_def::unsmob (this->definition_);
         }
       if (scm_is_symbol (t->get_default_child (SCM_EOL)))
         {
@@ -459,6 +459,19 @@ Context::where_defined (SCM sym, SCM *value) const
   return (daddy_context_) ? daddy_context_->where_defined (sym, value) : 0;
 }
 
+/* Quick variant of where_defined.  Checks only the context itself. */
+
+bool
+Context::here_defined (SCM sym, SCM *value) const
+{
+#ifndef NDEBUG
+  if (profile_property_accesses)
+    note_property_access (&context_property_lookup_table, sym);
+#endif
+
+  return properties_dict ()->try_retrieve (sym, value);
+}
+
 /*
   return SCM_EOL when not found.
 */
@@ -548,8 +561,8 @@ IMPLEMENT_LISTENER (Context, change_parent);
 void
 Context::change_parent (SCM sev)
 {
-  Stream_event *ev = unsmob_stream_event (sev);
-  Context *to = unsmob_context (ev->get_property ("context"));
+  Stream_event *ev = Stream_event::unsmob (sev);
+  Context *to = Context::unsmob (ev->get_property ("context"));
 
   disconnect_from_parent ();
   to->add_context (this);
@@ -594,7 +607,7 @@ find_context_below (Context *where,
   for (SCM s = where->children_contexts ();
        !found && scm_is_pair (s); s = scm_cdr (s))
     {
-      Context *tr = unsmob_context (scm_car (s));
+      Context *tr = Context::unsmob (scm_car (s));
 
       found = find_context_below (tr, type, id);
     }
@@ -611,7 +624,7 @@ Context::properties_as_alist () const
 SCM
 Context::context_name_symbol () const
 {
-  Context_def *td = unsmob_context_def (definition_);
+  Context_def *td = Context_def::unsmob (definition_);
   return td->get_context_name ();
 }
 
@@ -657,7 +670,7 @@ Context::print_smob (SCM s, SCM port, scm_print_state *)
 
   scm_puts ("#<", port);
   scm_puts (sc->class_name (), port);
-  if (Context_def *d = unsmob_context_def (sc->definition_))
+  if (Context_def *d = Context_def::unsmob (sc->definition_))
     {
       scm_puts (" ", port);
       scm_display (d->get_context_name (), port);
@@ -733,8 +746,8 @@ measure_length (Context const *context)
 {
   SCM l = context->get_property ("measureLength");
   Rational length (1);
-  if (unsmob_moment (l))
-    length = unsmob_moment (l)->main_part_;
+  if (Moment::unsmob (l))
+    length = Moment::unsmob (l)->main_part_;
   return length;
 }
 
@@ -744,9 +757,9 @@ measure_position (Context const *context)
   SCM sm = context->get_property ("measurePosition");
 
   Moment m = 0;
-  if (unsmob_moment (sm))
+  if (Moment::unsmob (sm))
     {
-      m = *unsmob_moment (sm);
+      m = *Moment::unsmob (sm);
 
       if (m.main_part_ < Rational (0))
         {
@@ -794,7 +807,7 @@ set_context_property_on_children (Context *trans, SCM sym, SCM val)
   trans->set_property (sym, ly_deep_copy (val));
   for (SCM p = trans->children_contexts (); scm_is_pair (p); p = scm_cdr (p))
     {
-      Context *trg = unsmob_context (scm_car (p));
+      Context *trg = Context::unsmob (scm_car (p));
       set_context_property_on_children (trg, sym, ly_deep_copy (val));
     }
 }