Imported Upstream version 2.14.2

[lilypond.git] / lily / context.cc

diff --git a/lily/context.cc b/lily/context.cc
index b2ada8fe7f19d3d71c1a565344e6ec3603e60f22..0d7fbe35f6d1ffa65deba31f35405d22897bb030 100644 (file)
--- a/lily/context.cc
+++ b/lily/context.cc
@@ -1,9 +1,20 @@
 /*
-  context.cc -- implement Context
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 2004--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 2004--2009 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
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "context.hh"
@@ -103,7 +114,7 @@ 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);
 
-  vector<Context_def*> path = path_to_acceptable_context (name);
+  vector<Context_def *> path = path_to_acceptable_context (name);
   if (path.size ())
     {
       Context *current = this;
@@ -157,7 +168,7 @@ Context::find_create_context (SCM n, string id, SCM operations)
 
   if (n == ly_symbol2scm ("Bottom"))
     {
-      Context *tg = get_default_interpreter ();
+      Context *tg = get_default_interpreter (id);
       return tg;
     }
 
@@ -375,7 +386,7 @@ Context::is_bottom_context () const
 }
 
 Context *
-Context::get_default_interpreter ()
+Context::get_default_interpreter (string context_id)
 {
   if (!is_bottom_context ())
     {
@@ -390,8 +401,8 @@ Context::get_default_interpreter ()
          t = unsmob_context_def (this->definition_);
        }
 
-      Context *tg = create_context (t, "", SCM_EOL);
-      return tg->get_default_interpreter ();
+      Context *tg = create_context (t, context_id, SCM_EOL);
+      return tg->get_default_interpreter (context_id);
     }
   return this;
 }
@@ -479,10 +490,13 @@ Context::instrumented_set_property (SCM sym, SCM val, const char*, int, const ch
 void
 Context::internal_set_property (SCM sym, SCM val)
 {
+  bool type_check_ok = type_check_assignment (sym, val, ly_symbol2scm ("translation-type?"));
+
   if (do_internal_type_checking_global)
-    assert (type_check_assignment (sym, val, ly_symbol2scm ("translation-type?")));
+    assert (type_check_ok);
 
-  properties_dict ()->set (sym, val);
+  if (type_check_ok)
+    properties_dict ()->set (sym, val);
 }
 
 /*
@@ -761,3 +775,13 @@ melisma_busy (Context *tr)
 
   return busy;
 }
+
+bool
+check_repeat_count_visibility (Context const *context, SCM count)
+{
+  SCM proc = context->get_property ("repeatCountVisibility");
+  return (ly_is_procedure (proc)
+         && to_boolean (scm_call_2 (proc,
+                                    count,
+                                    context->self_scm ())));
+}