From: fred Date: Sun, 24 Mar 2002 19:31:55 +0000 (+0000) Subject: lilypond-0.0.32 X-Git-Tag: release/1.5.59~5381 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=c175a8a26dc502317388db5b3eb97b6536858497;p=lilypond.git lilypond-0.0.32 --- diff --git a/hdr/barreg.hh b/hdr/barreg.hh new file mode 100644 index 0000000000..0b99ec0a52 --- /dev/null +++ b/hdr/barreg.hh @@ -0,0 +1,30 @@ +/* + barreg.hh -- declare Bar_register + + source file of the LilyPond music typesetter + + (c) 1997 Han-Wen Nienhuys +*/ + + +#ifndef BARREG_HH +#define BARREG_HH +#include "register.hh" + +/** + generate bars. Either user ("|:"), or default (new measure) + */ +class Bar_register : public Request_register { + void split_bar(Bar *& pre, Bar * no, Bar * &post); +public: + Bar_req * bar_req_l_; + Bar * bar_p_; + + virtual bool try_request(Request *req_l); + virtual void process_request(); + virtual void do_pre_move_process(); + virtual void do_post_move_process(); + Bar_register(Complex_walker*); +}; + +#endif // BARREG_HH diff --git a/hdr/inputmusic.hh b/hdr/inputmusic.hh index 0a1d95cfc6..13e8f4a365 100644 --- a/hdr/inputmusic.hh +++ b/hdr/inputmusic.hh @@ -18,6 +18,7 @@ struct Voice_list : public PointerList { /** + A set voices. Input_music is anything that can simply be regarded as/converted to a set of voices "cooperating" or independant. It has some basic characteristics that real music has too: @@ -26,8 +27,6 @@ struct Voice_list : public PointerList { - a pitch (it can be transposed) */ - - struct Input_music { virtual Voice_list convert()const=0; virtual Moment length()const=0; @@ -75,7 +74,7 @@ struct Complex_music : Input_music { /** - voice like. + A voice like list of music. different music forms which start after each other ( concatenated, stacked "horizontally ) diff --git a/src/meter.cc b/src/meter.cc index 8c4af23818..4f06b6469e 100644 --- a/src/meter.cc +++ b/src/meter.cc @@ -13,6 +13,6 @@ Molecule* Meter::brew_molecule_p()const { Symbol s = paper()->lookup_p_->meter(args); -return new Molecule(Atom(s)); + return new Molecule(Atom(s)); }