CG: Add note about `git stash'.

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

diff --git a/lily/include/context.hh b/lily/include/context.hh
index 648a52ae3b7f089a2f9d6248ca1c1507f7660464..8b464f7175b95a7afd1009c423ba15ca4576dfdd 100644 (file)
--- a/lily/include/context.hh
+++ b/lily/include/context.hh
@@ -1,20 +1,32 @@
 /*
-  context.hh -- declare  Context
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 2004--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 2004--2007 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/>.
 */
 
 #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
 {
@@ -122,8 +134,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,
@@ -136,7 +151,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. */