From: fred Date: Sun, 24 Mar 2002 19:53:02 +0000 (+0000) Subject: lilypond-0.1.7 X-Git-Tag: release/1.5.59~4163 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=5c0334254accceaac1f4e1dad2090c427d3f0f1b;p=lilypond.git lilypond-0.1.7 --- diff --git a/lily/include/head-grav.hh b/lily/include/head-grav.hh index 2a5b2be280..57711a27be 100644 --- a/lily/include/head-grav.hh +++ b/lily/include/head-grav.hh @@ -9,17 +9,22 @@ #define HEADGRAV_HH #include "engraver.hh" -struct Note_head_engraver : Engraver { +/** + make balls and rests + */ +class Note_head_engraver : public Engraver { Note_head* note_p_; Rhythmic_req * note_req_l_; - /* *************** */ +public: Note_head_engraver(); + DECLARE_MY_RUNTIME_TYPEINFO; +protected: virtual bool do_try_request(Request *req_l) ; virtual void do_process_requests(); virtual void do_pre_move_processing(); virtual void do_post_move_processing(); - DECLARE_MY_RUNTIME_TYPEINFO; + }; diff --git a/lily/include/input-translator.hh b/lily/include/input-translator.hh index b2883a30cf..49f44bec01 100644 --- a/lily/include/input-translator.hh +++ b/lily/include/input-translator.hh @@ -24,7 +24,10 @@ struct Input_translator_list : public Pointer_list ~Input_translator_list(){} }; -struct Input_translator : Input { +/** Define a intereter for music. This is an runtime interface to the + typesystem */ +class Input_translator : public Input { +public: Input_translator_list contains_itrans_p_list_; Array consists_str_arr_; Array alias_str_arr_; diff --git a/lily/include/key-item.hh b/lily/include/key-item.hh index a1ab3dc6d4..b980e3ff0f 100644 --- a/lily/include/key-item.hh +++ b/lily/include/key-item.hh @@ -19,7 +19,6 @@ struct Key_item : Item { bool default_b_; - /* *************** */ DECLARE_MY_RUNTIME_TYPEINFO; SCORE_ELEM_CLONE(Key_item); @@ -27,6 +26,7 @@ struct Key_item : Item { void add(int pitch, int acc); void read(const Key_engraver&); void set_c_position(int); +protected: virtual void do_pre_processing(); Molecule* brew_molecule_p()const; }; diff --git a/lily/include/local-key-item.hh b/lily/include/local-key-item.hh index 2d4ed66e8f..7316df60e7 100644 --- a/lily/include/local-key-item.hh +++ b/lily/include/local-key-item.hh @@ -21,20 +21,26 @@ struct Local_acc { TODO: update item if Items are removed + + TODO + + figure out private/public + */ -struct Local_key_item : Item { +class Local_key_item : public Item { +public: DECLARE_MY_RUNTIME_TYPEINFO; Array accs; Link_array support_items_; int c0_position; - /* *************** */ + Local_key_item(int c0position); void add_support(Item*); void add(int oct, int pitch, int acc); void add(Melodic_req*); -public: +protected: virtual void do_pre_processing(); virtual void do_substitute_dependency(Score_elem*,Score_elem*); virtual Molecule* brew_molecule_p()const; diff --git a/lily/include/midi-def.hh b/lily/include/midi-def.hh index 13073251ab..89a7543567 100644 --- a/lily/include/midi-def.hh +++ b/lily/include/midi-def.hh @@ -16,6 +16,7 @@ /** + definitions for midi output. Rather empty */ struct Midi_def { // ugh! @@ -25,7 +26,6 @@ struct Midi_def { /// output file name String outfile_str_; - Assoc *real_vars_p_; Input_translator* itrans_p_; /// duration of whole note @@ -37,11 +37,9 @@ struct Midi_def { Real duration_to_seconds_f(Moment); Global_translator* get_global_translator_p() const; - Real get_var( String s ) const; int get_tempo_i( Moment moment ); void print() const; void set( Input_translator* itrans_p ); - void set_var( String s, Real r ); void set_tempo( Moment moment, int count_per_minute_i ); }; diff --git a/lily/include/music.hh b/lily/include/music.hh index 41531a7902..63ce4b8799 100644 --- a/lily/include/music.hh +++ b/lily/include/music.hh @@ -17,18 +17,22 @@ #include "lily-proto.hh" #include "string.hh" -/** In Lily, everything that has a length and a pitch (which can be - transposed) is considered "music", +/** + Anything which has length or pitch. + + In Lily, everything that can be thought to have a length and a pitch + (which has a duration which can be transposed) is considered "music", Music is hierarchical: - @seealso Music_list + @see Music_list + */ class Music:public Input { public: Music_list * parent_music_l_; - /** what kind of iterator needed to walk this music? This doesn't + /** The kind of iterator needed to walk this music. This doesn't make sense for simple (ie non-list) music, but it does no harm here. Yes, it did harm Music_list: you can forget to copy it. diff --git a/lily/include/spanner.hh b/lily/include/spanner.hh index 30a72290c0..79e1bd4cfd 100644 --- a/lily/include/spanner.hh +++ b/lily/include/spanner.hh @@ -10,7 +10,7 @@ #include "lily-proto.hh" #include "score-elem.hh" -/** a symbol which is attached between two columns. A spanner is a +/** A symbol which is attached between two columns. A spanner is a symbol which spans across several columns, so its final appearance can only be calculated after the breaking problem is solved.