Merge branch 'master' into lilypond/translation

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

diff --git a/lily/include/context.hh b/lily/include/context.hh
index 8bda018544e20c03abbe88dcb6ea46d9211726e0..f0cd67c314e12e57f02d1a8caf7eb9083dcadf7c 100644 (file)
--- a/lily/include/context.hh
+++ b/lily/include/context.hh
@@ -126,7 +126,7 @@ 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,6 +140,7 @@ DECLARE_UNSMOB (Context, context);
 
 Moment measure_position (Context const *context);
 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. */