X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fcontext.hh;h=45e94ab9e5593f78861dff6dc48e27080eceab63;hb=a65798c5638c4d0a3b323e3e3012a754efe6984b;hp=7cd01bf5bbcba61632295be7d9a949d08e77b60c;hpb=73f6abcd0aa9a2b6f64269b1a82625d39036f3d7;p=lilypond.git

diff --git a/lily/include/context.hh b/lily/include/context.hh
index 7cd01bf5bb..45e94ab9e5 100644
--- 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--2010 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
 {
@@ -102,7 +114,7 @@ public:
   virtual Context *get_score_context () const;
   virtual Output_def *get_output_def () const;
   virtual Moment now_mom () const;
-  virtual Context *get_default_interpreter ();
+  virtual Context *get_default_interpreter (string context_id = "");
 
   bool is_alias (SCM) const;
   void add_alias (SCM);
@@ -114,8 +126,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;
 };
 
 /*
@@ -123,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,
@@ -137,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. */
@@ -147,5 +163,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 */