* flower/include/pqueue.hh: Derive from std::vector.

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

diff --git a/lily/include/context.hh b/lily/include/context.hh
index ce954e664008f90bc845f48927d4e45aea720c79..5c3b93fa14b1b28350ce891b98fff0e175d7ebf4 100644 (file)
--- a/lily/include/context.hh
+++ b/lily/include/context.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2004--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2004--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef CONTEXT_HH
@@ -30,8 +30,8 @@ private:
   int iterator_count_;
   bool init_;
 
-  map<String, int> grob_counts_;
-  map<String, int> context_counts_;
+  map<std::string, int> grob_counts_;
+  map<std::string, int> context_counts_;
 
 protected:
   Object_key const *key_;
@@ -43,18 +43,19 @@ protected:
   SCM accepts_list_;
   SCM aliases_;
   Translator_group *implementation_;
-  String id_string_;
+  std::string id_string_;
 
   friend class Context_def;
   void clear_key_disambiguations ();
 
 public:
-  Object_key const *get_key () const;
-  Object_key const *get_grob_key (String);
-  Object_key const *get_context_key (String, String);
+  Object_key const *key () const { return key_; }
+  Object_key const *create_grob_key (std::string);
+  Object_key const *get_grob_key (std::string);
+  Object_key const *get_context_key (std::string, std::string);
 
-  Context *create_context (Context_def *, String, SCM);
-  String id_string () const { return id_string_; }
+  Context *create_context (Context_def *, std::string, SCM);
+  std::string id_string () const { return id_string_; }
   SCM children_contexts () const { return context_list_; }
   SCM default_child_context_name () const;
 
@@ -71,7 +72,7 @@ public:
 
   Context *remove_context (Context *trans);
   void check_removal ();
-  String context_name () const;
+  std::string context_name () const;
   SCM context_name_symbol () const;
   Global_context *get_global_context () const;
 
@@ -88,10 +89,10 @@ public:
   bool try_music (Music *);
 
   Context *find_create_context (SCM context_name,
-                               String id, SCM ops);
+                               std::string id, SCM ops);
   Context *create_unique_context (SCM context_name,
                                  SCM ops);
-  Link_array<Context> path_to_acceptable_context (SCM alias,
+  Link_array__Context_ path_to_acceptable_context (SCM alias,
                                                  Output_def *) const;
 };
 
@@ -105,7 +106,7 @@ void execute_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,
-                            SCM type_sym, String id);
+                            SCM type_sym, std::string id);
 bool melisma_busy (Context *);
 
 Context *get_voice_to_lyrics (Context *lyrics);
@@ -115,6 +116,7 @@ DECLARE_UNSMOB (Context, context);
 
 Moment measure_position (Context const *context);
 Rational measure_length (Context const *context);
+void set_context_property_on_children (Context *trans, SCM sym, SCM val);
 
 #endif /* CONTEXT_HH */