lilypond-0.0.13

diff --git a/hdr/pstaff.hh b/hdr/pstaff.hh
index d3057af5e9ed7c3259d56552563f90d055d3ba1b..6d0bdcf34191dd0d03ec4beb7a16ae73b4f3ab45 100644 (file)
--- a/hdr/pstaff.hh
+++ b/hdr/pstaff.hh
@@ -5,9 +5,9 @@
 #include "item.hh"
 #include "symbol.hh"
 
-/// items grouped vertically.
+/// items grouped horizontally
 struct PStaff {
-    Parametric_symbol *stafsym;
+    Molecule * stafsym;
     PScore * pscore_;
     
     
@@ -15,10 +15,10 @@ struct PStaff {
     PointerList<Item*> its;
 
     /****************/
-    virtual Symbol get_stafsym(Real width)const=0; // maybe overkill
+    virtual void brew_molecule(Real width)=0; // maybe overkill
     void add(Item*i);
     PStaff(PScore*);
-    virtual ~PStaff() {}
+    virtual ~PStaff();
 };
 
 #endif

diff --git a/src/lookup.cc b/src/lookup.cc
index b9c369c0fca29615e50e61dc821c4ee4b2ca562e..018c57f9c064670dc372eb11dcd4894ead9a5b3e 100644 (file)
--- a/src/lookup.cc
+++ b/src/lookup.cc
@@ -102,27 +102,22 @@ Lookup::streepjes(int i)
 /****************************************************************/
 // bare bones.
 
-struct Linestaf_symbol : Parametric_symbol {
-    int lines;
-    Linestaf_symbol(int n, Symtables*s): Parametric_symbol(s) { lines = n;}
-    Symbol eval(svec<String>)const;
-};
-
 
 Symbol
-Linestaf_symbol::eval(svec<String> w)const
+Lookup::linestaff(int lines, Real wid) 
 {
-    Real wid = w[0].fvalue();
-
     Symbol s;
     s.dim.x = Interval(0,wid);
-    Real dy=(lines-1)*convert_dimen(5,"pt"); // TODO!
+    Real dy=(lines-1)*internote()*2;
     s.dim.y = Interval(0,dy);
+
     svec<String> a;
     a.add(lines);
-    a.add(w[0]);
+    a.add(print_dimen(wid));
+
     s.tex = (*symtables_)("param")->lookup("linestaf").tex;
     s.tex = substitute_args(s.tex, a);
+    
     return s;
 }
 
@@ -162,9 +157,3 @@ Lookup::stem(Real y1,Real y2)
 }
 
 
-Parametric_symbol *
-Lookup::linestaff(int n)
-{
-    return new Linestaf_symbol(n,symtables_);
-}
-