From: fred Date: Fri, 29 Nov 1996 00:33:46 +0000 (+0000) Subject: lilypond-0.0.13 X-Git-Tag: release/1.5.59~6735 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=668624815d36ec4ce84806040e163d2443d0fd6d;p=lilypond.git lilypond-0.0.13 --- diff --git a/hdr/parseconstruct.hh b/hdr/parseconstruct.hh index 81401852bc..ab50c15a1b 100644 --- a/hdr/parseconstruct.hh +++ b/hdr/parseconstruct.hh @@ -1,19 +1,11 @@ #include "proto.hh" -template -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&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); Request* get_request(char); -Command*get_clef_interpret_command(String w); + diff --git a/src/linestaff.cc b/src/linestaff.cc index a52954e6f4..6d3985cb8b 100644 --- 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); } + + + + + + +