lilypond-0.0.6

diff --git a/proto.hh b/proto.hh
index ba93e7a52671d4e8e7248b1b0faeb414be9e5e3a..268eda6b5332e1479b321594c22e577f43192eb7 100644 (file)
--- a/proto.hh
+++ b/proto.hh
@@ -69,7 +69,6 @@ struct Staff_column;
 struct Staff;
 struct Command;
 struct Symbol;
-struct Stretchable_symbol;
 struct Output;
 struct Text_gob;
 struct Voice;
@@ -83,8 +82,9 @@ class Mixed_qp;
 class Paperdef;
 class Score_commands;
 class Parametric_symbol;
-
-
+struct Lookup;
+struct Symtables;
+struct Symtable;
 
 #endif // PROTO_HH
 

diff --git a/symbol.cc b/symbol.cc
index d67049cefa89f51cb6680c6130c12a62a8e62ea3..907f1d7282d34bd33111b76f5340b51c3a326bd6 100644 (file)
--- a/symbol.cc
+++ b/symbol.cc
@@ -30,6 +30,3 @@ Parametric_symbol::eval(String args1,String arg2)const
     return eval(a);
 }
 
-Parametric_symbol::~Parametric_symbol()
-{
-}

diff --git a/symbol.hh b/symbol.hh
index 6d6ed1acbe6304d0762bdbba4c18c2911248632d..4f26e04e662ec8453116e68b2714aace617ebcf3 100644 (file)
--- a/symbol.hh
+++ b/symbol.hh
@@ -2,6 +2,7 @@
 #define SYMBOL_HH
 #include "string.hh"
 #include "boxes.hh"
+#include "proto.hh"
 
 struct Symbol {
     String tex;
@@ -12,11 +13,15 @@ struct Symbol {
 };
 
 struct Parametric_symbol {    
+    Symtables*symtables_;      // indirection 
+
+    /*****************/
     
+    Parametric_symbol(Symtables*s) { symtables_ = s; }
     Symbol eval(String args1) const; // convenience
     Symbol eval(String args1,String arg2) const; // convenience
     virtual Symbol eval(svec<String> args)const =0;
-    virtual ~Parametric_symbol();    
+    virtual ~Parametric_symbol(){}
 };
 
 #endif