* lily/score.cc (Score): unprotect copy of Output_def. Plugs

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

diff --git a/lily/include/keyword.hh b/lily/include/keyword.hh
index 2db22765e0a197ea4016fe4813f8f62a1b747df6..98445d7a2ded3fb23b233c787580c65fe96661cf 100644 (file)
--- a/lily/include/keyword.hh
+++ b/lily/include/keyword.hh
@@ -1,27 +1,31 @@
 /*
   keyword.hh -- part of GNU LilyPond
 
-  (c) 1996--2000 Han-Wen Nienhuys
+  (c) 1996--2005 Han-Wen Nienhuys
 */
 
 #ifndef KEYWORD_HH
 #define KEYWORD_HH
 
+#include "array.hh"
+
 /* for the keyword table */
 struct Keyword_ent
 {
-  char const *name;
-  int     tokcode;
+  char const *name_;
+  int tokcode_;
 };
 
+/*
+  junkme, use  hash table.
+*/
 struct Keyword_table
 {
-  Keyword_ent *table;
-  int     maxkey;
+  Array<Keyword_ent> table_;
+
   Keyword_table (Keyword_ent *);
-  int     lookup (char const *s) const;
+  int lookup (char const *s) const;
 };
 
-
 #endif // KEYWORD_HH