Issue 4997/7: Use Preinit for Global_context, protect output definition

[lilypond.git] / lily / include / context.hh

diff --git a/lily/include/context.hh b/lily/include/context.hh
index c4af7bce0579255dea4919f034065a00b3640bf8..2555bfe2b49e0e26519c2a1eac630a148d5026b3 100644 (file)
--- a/lily/include/context.hh
+++ b/lily/include/context.hh
@@ -33,7 +33,7 @@ class Context : public Smob<Context>
 public:
   SCM mark_smob () const;
   int print_smob (SCM, scm_print_state *) const;
-  static const char type_p_name_[];
+  static const char * const type_p_name_;
   virtual ~Context ();
 private:
   Scheme_hash_table *properties_dict () const;
@@ -51,6 +51,7 @@ private:
   Stream_event *infant_event_;
 
 protected:
+  virtual void derived_mark () const;
   Context *daddy_context_;
   /* The used Context_def */
   SCM definition_;
@@ -193,9 +194,11 @@ void set_context_property_on_children (Context *trans, SCM sym, SCM val);
   } while (0)
 
 SCM nested_property_alist (SCM alist, SCM prop_path, SCM value);
+SCM nested_property (SCM alist, SCM prop_path, SCM fallback = SCM_EOL);
 SCM nested_create_alist (SCM prop_path, SCM value);
 SCM partial_list_copy (SCM alist, SCM tail, SCM newtail);
 SCM assq_tail (SCM key, SCM alist, SCM alist_end);
+SCM assv_tail (SCM key, SCM alist, SCM alist_end);
 SCM assoc_tail (SCM key, SCM alist, SCM alist_end);
 SCM evict_from_alist (SCM, SCM, SCM);
 SCM nalist_to_alist (SCM nalist, int nested);