Merge branch 'jneeman' of git+ssh://jneem@git.sv.gnu.org/srv/git/lilypond into jneeman

[lilypond.git] / lily / include / lilypond-key.hh

diff --git a/lily/include/lilypond-key.hh b/lily/include/lilypond-key.hh
index afdb72f6daac8335903cc5816694a62429062759..4196ffd5f2d24580f092fcb872f8c28a6a2f0b36 100644 (file)
--- a/lily/include/lilypond-key.hh
+++ b/lily/include/lilypond-key.hh
@@ -1,10 +1,9 @@
 /*
-  lilypond-key.hh -- declare Lilypond_{grob,context}_key
+  lilypond-key.hh -- declare Lilypond_{grob, context}_key
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2004 Han-Wen Nienhuys <hanwen@xs4all.nl>
-
+  (c) 2004--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef LILYPOND_KEY_HH
@@ -13,47 +12,66 @@
 #include "object-key.hh"
 #include "lily-proto.hh"
 #include "moment.hh"
-#include "string.hh"
 
 class Lilypond_grob_key : public Object_key
 {
   Object_key const *context_;
   Moment creation_moment_;
-  String grob_name_;
+  string grob_name_;
   int disambiguation_count_;
 
 public:
-  Lilypond_grob_key(Object_key const *context,
-                   Moment start,
-                   String name, int);
+  Lilypond_grob_key (Object_key const *context,
+                    Moment start,
+                    string name, int);
 
+  static Object_key *from_scheme (SCM);
 protected:
   virtual int get_type () const;
-  virtual void derived_mark () const; 
-  virtual int do_compare (Object_key const* a) const;
+  virtual void derived_mark () const;
+  virtual int do_compare (Object_key const *a) const;
+  virtual SCM as_scheme () const;
 };
 
 class Lilypond_context_key : public Object_key
 {
   Object_key const *parent_context_;
   Moment start_moment_;
-  String context_name_;
-  String id_;
+  string context_name_;
+  string id_;
   int disambiguation_count_;
 
 public:
-  Lilypond_context_key (Object_key const * parent,
+  Lilypond_context_key (Object_key const *parent,
                        Moment start,
-                       String type,
-                       String id,
-                       int count);
+                       string type,
+                       string id,
+                       int count);
 
+  static Object_key *from_scheme (SCM);
 protected:
   virtual int get_type () const;
-  virtual int do_compare (Object_key const* a) const;
-  virtual void derived_mark () const; 
+  virtual int do_compare (Object_key const *a) const;
+  virtual void derived_mark () const;
+  virtual SCM as_scheme () const;
 };
 
+class Lilypond_general_key : public Object_key
+{
+  Object_key const *parent_;
+  string name_;
+  int disambiguation_count_;
+public:
+  Lilypond_general_key (Object_key const *parent, string name,
+                       int count);
+
+  static Object_key *from_scheme (SCM);
+protected:
+  virtual int get_type () const;
+  virtual int do_compare (Object_key const *a) const;
+  virtual void derived_mark () const;
+  virtual SCM as_scheme () const;
+};
 
 #endif /* LILYPOND_KEY_HH */