lilypond-0.0.13

diff --git a/hdr/linestaff.hh b/hdr/linestaff.hh
index 891269dd9d496ba63873a7b88a932884f41df9a0..c11d781a145948b478b168808cb75db4854862a3 100644 (file)
--- 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 14ed92f6b80a7c523ac9f3ddbf88656ae0f7195a..29b4aa9c5baa6ce856abc04df16df10fcb715461 100644 (file)
--- 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 4f26e04e662ec8453116e68b2714aace617ebcf3..3c664dfbaa3a13b873a41a5f5197c97311578f1f 100644 (file)
--- 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 255fceeaddb53225544f86f07ec61f7d8116994e..ba7789c91bf505ca721ed658dcfa749fedbb1d50 100644 (file)
--- 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 02723e19b0100a34a2474d0181d8105fe302b9ea..ce9507f8b830d6dd9572034011d84fb1f4bdeffb 100644 (file)
--- 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);
-}