release: 1.3.40

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

diff --git a/lily/include/identifier.hh b/lily/include/identifier.hh
index 4ba4d10aefdca51f4dbf3706e9326a2425947620..002b935202b0ff1306f340c5c890368c610acaef 100644 (file)
--- a/lily/include/identifier.hh
+++ b/lily/include/identifier.hh
@@ -1,7 +1,7 @@
 /*
   identifier.hh -- part of GNU LilyPond
 
-  (c) 1996--1998 Han-Wen Nienhuys
+  (c) 1996--2000 Han-Wen Nienhuys
 */
 
 #ifndef IDENTIFIER_HH
@@ -15,11 +15,9 @@
 
 #define DECLARE_TYPE_NAME(Class)
 
-class Notename_table_identifier;
-class Translator_identifier;
+class Translator_group_identifier;
 class Music_identifier;
-class General_script_def_identifier;
-class Symtables_identifier;
+class Articulation_req_identifier;
 class Midi_def_identifier;
 class Paper_def_identifier;
 class Real_identifier;
@@ -36,7 +34,9 @@ virtual Class *  access_content_ ## Class (bool) const { error (#Class  + String
 
 
 /**
-   A declarable data structure in mudela. 
+   A declarable data structure in mudela.
+
+   TODO: use SMOBS for the union type, and junk all derived classes.
    */
 struct Identifier : public Input {
   bool init_b_;
@@ -51,11 +51,8 @@ struct Identifier : public Input {
   
   void error (String) const;
   String str () const;
-  IDACCESSOR(Translator)
-  IDACCESSOR(Notename_table)
+  IDACCESSOR(Translator_group)
   IDACCESSOR(Music)
-  IDACCESSOR(General_script_def)
-  IDACCESSOR(Symtables)
   IDACCESSOR(Midi_def)
   IDACCESSOR(Paper_def)
   IDACCESSOR(Real)
@@ -85,13 +82,11 @@ struct Class ## _identifier : Identifier {\
 }\
 
 
-DECLARE_ID_CLASS(Translator);
+DECLARE_ID_CLASS(Translator_group);
 DECLARE_ID_CLASS(Duration);
-DECLARE_ID_CLASS(Notename_table);
 DECLARE_ID_CLASS(Real);
 DECLARE_ID_CLASS(String);
 DECLARE_ID_CLASS(General_script_def);
-DECLARE_ID_CLASS(Symtables);
 DECLARE_ID_CLASS(Music);
 DECLARE_ID_CLASS(int);
 DECLARE_ID_CLASS(Score);