From c27c2b33cdc0851ad15a7c0d7893fa05b2bd6abb Mon Sep 17 00:00:00 2001
From: fred <fred>
Date: Fri, 29 Nov 1996 00:03:38 +0000
Subject: [PATCH] lilypond-0.0.13

---
 hdr/linestaff.hh |  2 +-
 hdr/lookup.hh    |  2 +-
 hdr/symbol.hh    | 12 ------------
 src/pstaff.cc    |  5 +++++
 src/symbol.cc    | 18 ------------------
 5 files changed, 7 insertions(+), 32 deletions(-)

diff --git a/hdr/linestaff.hh b/hdr/linestaff.hh
index 891269dd9d..c11d781a14 100644
--- a/hdr/linestaff.hh
+++ b/hdr/linestaff.hh
@@ -6,6 +6,6 @@ struct Linestaff : PStaff {
 
 /****************/
     
-    Symbol get_stafsym(Real width)const;
+    void brew_molecule(Real width);
     Linestaff(int, PScore*);   
 };
diff --git a/hdr/lookup.hh b/hdr/lookup.hh
index 14ed92f6b8..29b4aa9c5b 100644
--- a/hdr/lookup.hh
+++ b/hdr/lookup.hh
@@ -12,7 +12,7 @@ struct Lookup {
     /****************/
     Real internote();
     void parse (Text_db&t);
-    Parametric_symbol *linestaff(int n);
+    Symbol linestaff(int n, Real w);
 
     Symbol beam_element(int,int,Real=0);
     /// round slope to closest TeXslope
diff --git a/hdr/symbol.hh b/hdr/symbol.hh
index 4f26e04e66..3c664dfbaa 100644
--- a/hdr/symbol.hh
+++ b/hdr/symbol.hh
@@ -12,16 +12,4 @@ struct Symbol {
     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(){}
-};
-
 #endif
diff --git a/src/pstaff.cc b/src/pstaff.cc
index 255fceeadd..ba7789c91b 100644
--- a/src/pstaff.cc
+++ b/src/pstaff.cc
@@ -1,4 +1,9 @@
 #include "pstaff.hh"
+#include "molecule.hh"
+PStaff::~PStaff()
+{
+    delete stafsym;
+}
 
 PStaff::PStaff(PScore*ps)
 {
diff --git a/src/symbol.cc b/src/symbol.cc
index 02723e19b0..ce9507f8b8 100644
--- a/src/symbol.cc
+++ b/src/symbol.cc
@@ -13,22 +13,4 @@ Symbol::Symbol(String s, Box b)
     tex = s;
 }
 
-/****************************************************************/
-
-Symbol
-Parametric_symbol::eval(String args1)const
-{
-    svec<String> a;
-    a.add(args1);
-    return eval(a);
-}
-
-Symbol
-Parametric_symbol::eval(String args1,String arg2)const
-{
-    svec<String> a;
-    a.add(args1);
-    a.add(arg2);
-    return eval(a);
-}
 
-- 
2.39.5