X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fcontext-def.cc;h=fb5657b6ed0aec0520bb0cb19f1e7d48dc92b1dd;hb=9e781b7dc83b60a543ce218aa1a5f139f74c760f;hp=fb8208acdd38b1dc8ace2b76554915a2127e1494;hpb=6d200fec9e5ab155aaad6b6a751715906e0655fc;p=lilypond.git

diff --git a/lily/context-def.cc b/lily/context-def.cc
index fb8208acdd..fb5657b6ed 100644
--- a/lily/context-def.cc
+++ b/lily/context-def.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2000--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 2000--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
@@ -93,6 +93,9 @@ Context_def::print_smob (SCM smob, SCM port, scm_print_state *)
 
   scm_puts ("#<Context_def ", port);
   scm_display (me->context_name_, port);
+  scm_puts (" ", port);
+  string loc = me->origin ()->location_string ();
+  scm_puts (loc.c_str (), port);
   scm_puts (">", port);
   return 1;
 }
@@ -100,7 +103,7 @@ Context_def::print_smob (SCM smob, SCM port, scm_print_state *)
 SCM
 Context_def::mark_smob (SCM smob)
 {
-  ASSERT_LIVE_IS_ALLOWED ();
+  ASSERT_LIVE_IS_ALLOWED (smob);
 
   Context_def *me = (Context_def *) SCM_CELL_WORD_1 (smob);
 
@@ -146,7 +149,8 @@ Context_def::add_context_mod (SCM mod)
   else if (ly_symbol2scm ("pop") == tag
            || ly_symbol2scm ("push") == tag
            || ly_symbol2scm ("assign") == tag
-           || ly_symbol2scm ("unset") == tag)
+           || ly_symbol2scm ("unset") == tag
+           || ly_symbol2scm ("apply") == tag)
     property_ops_ = scm_cons (mod, property_ops_);
   else if (ly_symbol2scm ("alias") == tag)
     context_aliases_ = scm_cons (sym, context_aliases_);
@@ -295,8 +299,8 @@ Context_def::get_translator_names (SCM user_mod) const
         l1 = scm_cons (arg, l1);
       else if (ly_symbol2scm ("remove") == tag
                && (scm_is_pair (arg)
-		   || ly_is_procedure (arg)
-		   || get_translator (arg)))
+                   || ly_is_procedure (arg)
+                   || get_translator (arg)))
         l1 = scm_delete_x (arg, l1);
     }
 
@@ -312,6 +316,7 @@ Context_def::instantiate (SCM ops)
   context->definition_mods_ = ops;
   context->aliases_ = context_aliases_;
   context->accepts_list_ = get_accepted (ops);
+  context->default_child_ = get_default_child (ops);
 
   return context;
 }
@@ -338,6 +343,10 @@ Context_def::to_alist () const
                             get_translator_names (SCM_EOL)), ell);
   ell = scm_cons (scm_cons (ly_symbol2scm ("description"), description_), ell);
   ell = scm_cons (scm_cons (ly_symbol2scm ("aliases"), context_aliases_), ell);
+  ell = scm_cons (scm_cons (ly_symbol2scm ("accepts"), get_accepted (SCM_EOL)),
+                  ell);
+  if (scm_is_symbol (default_child_))
+    ell = scm_acons (ly_symbol2scm ("default-child"), default_child_, ell);
   ell = scm_cons (scm_cons (ly_symbol2scm ("accepts"), get_accepted (SCM_EOL)),
                   ell);
   ell = scm_cons (scm_cons (ly_symbol2scm ("property-ops"), property_ops_),
@@ -373,8 +382,20 @@ Context_def::lookup (SCM sym) const
   return SCM_UNDEFINED;
 }
 
+bool
+Context_def::is_alias (SCM sym) const
+{
+  if (scm_is_eq (sym, ly_symbol2scm ("Bottom")))
+    return !scm_is_symbol (get_default_child (SCM_EOL));
+
+  if (scm_is_eq (sym, get_context_name ()))
+    return true;
+
+  return scm_is_true (scm_c_memq (sym, context_aliases_));
+}
+
 LY_DEFINE (ly_context_def_lookup, "ly:context-def-lookup",
-	   2, 1, 0, (SCM def, SCM sym, SCM val),
+           2, 1, 0, (SCM def, SCM sym, SCM val),
            "Return the value of @var{sym} in output definition @var{def}"
            " (e.g., @code{\\paper}).  If no value is found, return"
            " @var{val} or @code{'()} if @var{val} is undefined.")
@@ -397,9 +418,9 @@ LY_DEFINE (ly_context_def_lookup, "ly:context-def-lookup",
 }
 
 LY_DEFINE (ly_context_def_modify, "ly:context-def-modify",
-	   2, 0, 0, (SCM def, SCM mod),
-	   "Return the result of applying the context-mod @var{mod} to"
-	   " the context definition @var{def}.  Does not change @var{def}.")
+           2, 0, 0, (SCM def, SCM mod),
+           "Return the result of applying the context-mod @var{mod} to"
+           " the context definition @var{def}.  Does not change @var{def}.")
 {
   LY_ASSERT_SMOB (Context_def, def, 1);
   LY_ASSERT_SMOB (Context_mod, mod, 2);