lilypond-0.0.13

diff --git a/hdr/parseconstruct.hh b/hdr/parseconstruct.hh
index 81401852bccd2937c3d2f62b24b4aa4c9d562a7f..ab50c15a1b8ff517d99cefbc0fd07ae8ef185b3b 100644 (file)
--- a/hdr/parseconstruct.hh
+++ b/hdr/parseconstruct.hh
@@ -1,19 +1,11 @@
 #include "proto.hh"
 
-template<class T>
-struct svec;
-
 void set_default_duration(String);
 void set_default_pitch(String);
 Staff * get_new_rhythmstaff();
 Voice_element * get_note_element(String,String);
 Voice_element* get_rest_element(String,String);
-Command *  get_bar_command(Real);
 Staff * get_new_melodicstaff();
 void add_requests( Voice_element*v, svec<Request*>&req);
-Command* get_meterchange_command( int,int);
-Command* get_meter_command( Real,int,int);
-Command* get_skip_command( int,Real);
-Command* get_key_interpret_command(svec<String>);
 Request* get_request(char);
-Command*get_clef_interpret_command(String w);
+

diff --git a/src/linestaff.cc b/src/linestaff.cc
index a52954e6f4be129431182f30eb844ef168c20b7b..6d3985cb8b1621a944722c9df978f69edd53b550 100644 (file)
--- a/src/linestaff.cc
+++ b/src/linestaff.cc
@@ -1,4 +1,5 @@
 #include "linestaff.hh"
+#include "molecule.hh"
 #include "symbol.hh"
 #include "lookup.hh"
 #include "dimen.hh"
@@ -9,12 +10,18 @@ Linestaff::Linestaff(int l, PScore *s)
     : PStaff(s)
 {
     nolines = l;
-    stafsym = s->paper_->lookup_->linestaff(l); 
 }
 
-Symbol
-Linestaff::get_stafsym(Real width)const
-{  
-   String w(print_dimen(width));
-   return stafsym->eval(w);
+void
+Linestaff::brew_molecule(Real width)
+{
+    Atom a  = pscore_->paper_->lookup_->linestaff(nolines,width);
+    stafsym = new Molecule(a);    
 }
+
+
+
+
+
+
+