X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fcontext.hh;h=be2a4d79b16b15f21443c8c73f185c6d59523aa9;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=2cb0280ea128cb59076f7ce1d07463358fd007c2;hpb=87eedcd59f4082cb0841528ad5bc82cb1d1191e3;p=lilypond.git

diff --git a/lily/include/context.hh b/lily/include/context.hh
index 2cb0280ea1..be2a4d79b1 100644
--- a/lily/include/context.hh
+++ b/lily/include/context.hh
@@ -3,18 +3,19 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2004--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2004--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef CONTEXT_HH
 #define CONTEXT_HH
 
+#include "duration.hh"
+#include "lily-proto.hh"
 #include "listener.hh"
 #include "moment.hh"
+#include "scm-hash.hh"
 #include "std-vector.hh"
 #include "virtual-methods.hh"
-#include "scm-hash.hh"
-#include "lily-proto.hh"
 
 class Context
 {
@@ -85,11 +86,8 @@ public:
   Context *where_defined (SCM name_sym, SCM *value) const;
   void unset_property (SCM var_sym);
 
-#ifndef NDEBUG
-  void internal_set_property (SCM var_sym, SCM value, char const *file, int line, char const *fun);
-#else
+  void instrumented_set_property (SCM, SCM, const char*, int, const char*);
   void internal_set_property (SCM var_sym, SCM value);
-#endif
 
   Context *create_context (Context_def *, string, SCM);
   DECLARE_LISTENER (create_context_from_event);
@@ -117,8 +115,7 @@ public:
 				string id, SCM ops);
   Context *create_unique_context (SCM context_name, string context_id,
 				  SCM ops);
-  vector<Context*> path_to_acceptable_context (SCM alias,
-						  Output_def *) const;
+  vector<Context_def*> path_to_acceptable_context (SCM alias) const;
 };
 
 /*
@@ -126,8 +123,11 @@ public:
 */
 
 void apply_property_operations (Context *tg, SCM pre_init_ops);
+void execute_revert_property (Context *context,
+			      SCM context_property,
+			      SCM grob_property_path);
 void execute_pushpop_property (Context *trg, SCM prop, SCM eltprop, SCM val);
-void execute_general_pushpop_property (Context *context,
+void sloppy_general_pushpop_property (Context *context,
 				       SCM context_property, SCM grob_property_path, SCM val);
 SCM updated_grob_properties (Context *tg, SCM sym);
 Context *find_context_below (Context *where,
@@ -140,7 +140,9 @@ Grob *get_current_rest (Context *voice);
 DECLARE_UNSMOB (Context, context);
 
 Moment measure_position (Context const *context);
+Moment measure_position (Context const *context, Duration const *dur);
 Rational measure_length (Context const *context);
+int measure_number (Context const *context);
 void set_context_property_on_children (Context *trans, SCM sym, SCM val);
 
 /* Shorthand for creating and broadcasting stream events. */
@@ -150,5 +152,9 @@ void set_context_property_on_children (Context *trans, SCM sym, SCM val);
   ctx->internal_send_stream_event (ly_symbol2scm (type), origin, props);	\
 }
 
+SCM nested_property_alist (SCM alist, SCM prop_path, SCM value);
+SCM nested_property_revert_alist (SCM alist, SCM prop_path);
+SCM evict_from_alist (SCM, SCM, SCM);
+
 #endif /* CONTEXT_HH */