X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fcontext-def.cc;h=26e79f56abfb42f77d92ce29abeb8a88bb71d337;hb=217d48d7cdefb8ad026c7ade58d1f03f17cbb47a;hp=37690fd61a096d7c8a21f7fe777924b36393d431;hpb=e344ae579fa1d81fc6c6f3049494697872fd39f9;p=lilypond.git

diff --git a/lily/context-def.cc b/lily/context-def.cc
index 37690fd61a..26e79f56ab 100644
--- a/lily/context-def.cc
+++ b/lily/context-def.cc
@@ -1,9 +1,20 @@
 /*
-  context-def.cc -- implement Context_def
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 2000--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 2000--2008 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/>.
 */
 
 /* TODO: should junk this class an replace by
@@ -55,7 +66,7 @@ Context_def::Context_def (Context_def const &s)
   smobify_self ();
 
   description_ = s.description_;
-  input_location_ = make_input (*s.origin ()); 
+  input_location_ = make_input (*s.origin ());
   default_child_ = s.default_child_;
   accept_mods_ = s.accept_mods_;
   property_ops_ = s.property_ops_;
@@ -88,7 +99,7 @@ SCM
 Context_def::mark_smob (SCM smob)
 {
   ASSERT_LIVE_IS_ALLOWED ();
-  
+
   Context_def *me = (Context_def *) SCM_CELL_WORD_1 (smob);
 
   scm_gc_mark (me->description_);
@@ -123,14 +134,9 @@ Context_def::add_context_mod (SCM mod)
   if (ly_symbol2scm ("default-child") == tag)
     default_child_ = sym;
   else if (ly_symbol2scm ("consists") == tag
-	   || ly_symbol2scm ("consists-end") == tag
 	   || ly_symbol2scm ("remove") == tag)
     {
-      if (!get_translator (sym))
-	error (_f ("program has no such type: `%s'",
-		   ly_symbol2string (sym).c_str ()));
-      else
-	translator_mods_ = scm_cons (scm_list_2 (tag, sym), translator_mods_);
+      translator_mods_ = scm_cons (scm_list_2 (tag, sym), translator_mods_);
     }
   else if (ly_symbol2scm ("accepts") == tag
 	   || ly_symbol2scm ("denies") == tag)
@@ -199,7 +205,7 @@ Context_def::get_default_child (SCM user_mod) const
    - the first element in the list defines a context that is a valid child of
      the context defined by this Context_def
    - each subsequent element in the list defines a context that is a valid child
-     of the the context defined by the preceding element in the list
+     of the context defined by the preceding element in the list
    - the last element in the list defines a context with the given name
 
   The ADDITIONAL_ACCEPTS parameter is a list of additional contexts that this
@@ -286,7 +292,8 @@ Context_def::get_translator_names (SCM user_mod) const
 
       if (ly_symbol2scm ("consists") == tag)
 	l1 = scm_cons (arg, l1);
-      else if (ly_symbol2scm ("remove") == tag)
+      else if (ly_symbol2scm ("remove") == tag
+	       && get_translator (arg))
 	l1 = scm_delete_x (arg, l1);
     }