From 4b6bd6265971153e18ed8af683fdada93e5840e8 Mon Sep 17 00:00:00 2001 From: fred Date: Sun, 24 Mar 2002 19:55:32 +0000 Subject: [PATCH] lilypond-0.1.11 --- lily/include/chord-iterator.hh | 33 +++++++++++ lily/include/music-iterator.hh | 96 +++++++------------------------- lily/include/request-iterator.hh | 32 +++++++++++ lily/include/voice-iterator.hh | 38 +++++++++++++ 4 files changed, 124 insertions(+), 75 deletions(-) create mode 100644 lily/include/chord-iterator.hh create mode 100644 lily/include/request-iterator.hh create mode 100644 lily/include/voice-iterator.hh diff --git a/lily/include/chord-iterator.hh b/lily/include/chord-iterator.hh new file mode 100644 index 0000000000..a3adc4a381 --- /dev/null +++ b/lily/include/chord-iterator.hh @@ -0,0 +1,33 @@ +/* + chord-iter.hh -- declare Chord_iterator + + source file of the GNU LilyPond music typesetter + + (c) 1997 Han-Wen Nienhuys +*/ + + +#ifndef CHORD_ITER_HH +#define CHORD_ITER_HH + + +#include "music-iterator.hh" +#include "plist.hh" + +class Chord_iterator : public Music_iterator +{ + const Chord *chord_C_; + Pointer_list children_p_list_; +public: + ~Chord_iterator(); + Chord_iterator (Chord const*); + DECLARE_MY_RUNTIME_TYPEINFO; +protected: + virtual void do_print() const; + virtual void construct_children(); + virtual void process_and_next (Moment); + virtual Moment next_moment() const; + virtual bool ok() const; +}; + +#endif // CHORD_ITER_HH diff --git a/lily/include/music-iterator.hh b/lily/include/music-iterator.hh index 636fc659c9..352af5f379 100644 --- a/lily/include/music-iterator.hh +++ b/lily/include/music-iterator.hh @@ -1,5 +1,5 @@ /* - music-iterator.hh -- declare {Music,Chord,Voice}_iterator + music-iterator.hh -- declare Music_iterator source file of the GNU LilyPond music typesetter @@ -14,88 +14,34 @@ #include "plist.hh" #include "varray.hh" #include "moment.hh" +#include "virtual-methods.hh" class Music_iterator { - Arrayreport_to_l_arr_; - void push_translator (Translator*); - void pop_translator(); + Arrayreport_to_l_arr_; + void push_translator (Translator*); + void pop_translator(); protected: - bool first_b_; - virtual void do_print()const; + bool first_b_; + virtual void do_print() const; - virtual Translator * get_req_translator_l(); - Music_iterator* get_iterator_p (Music*)const; - void set_translator (Translator*); - Music_iterator *daddy_iter_l_; + virtual Translator * get_req_translator_l(); + Music_iterator* get_iterator_p (Music*) const; + void set_translator (Translator*); + Music_iterator *daddy_iter_l_; public: - Translator *report_to_l()const; - DECLARE_MY_RUNTIME_TYPEINFO; + Translator *report_to_l() const; + DECLARE_MY_RUNTIME_TYPEINFO; - static Music_iterator* static_get_iterator_p (Music*,Translator*); - Music_iterator(); + static Music_iterator* static_get_iterator_p (Music*,Translator*); + Music_iterator(); - virtual void process_and_next (Moment until); - virtual Moment next_moment()const; - virtual bool ok()const; - virtual ~Music_iterator(); - virtual void construct_children(); - void print()const; -}; - - -class Chord_iterator : public Music_iterator -{ - const Chord *chord_C_; - Pointer_list children_p_list_; -public: - ~Chord_iterator(); - Chord_iterator (Chord const*); - DECLARE_MY_RUNTIME_TYPEINFO; -protected: - virtual void do_print()const; - virtual void construct_children(); - virtual void process_and_next (Moment); - virtual Moment next_moment()const; - virtual bool ok()const; -}; - -class Request_chord_iterator : public Music_iterator { - const Request_chord * elt_l_; - Moment elt_duration_; - bool last_b_; -public: - Request_chord_iterator (Request_chord*); - DECLARE_MY_RUNTIME_TYPEINFO; - -protected: - virtual void process_and_next (Moment); - virtual Moment next_moment()const; - virtual void construct_children(); - virtual bool ok()const; - virtual void do_print()const; -}; - - -class Voice_iterator : private PCursor, public Music_iterator -{ - Moment here_mom_; - const Voice * voice_C_; - Music_iterator * iter_p_; - void start_next_element(); - void leave_element(); - void set_voice_translator(); - -public: - Voice_iterator (Voice const*); - DECLARE_MY_RUNTIME_TYPEINFO; -protected: - virtual void do_print()const; - virtual void construct_children(); - ~Voice_iterator(); - virtual void process_and_next (Moment); - virtual Moment next_moment()const; - virtual bool ok()const; + virtual void process_and_next (Moment until); + virtual Moment next_moment() const; + virtual bool ok() const; + virtual ~Music_iterator(); + virtual void construct_children(); + void print() const; }; #endif // MUSIC_ITERATOR_HH diff --git a/lily/include/request-iterator.hh b/lily/include/request-iterator.hh new file mode 100644 index 0000000000..866bb7e929 --- /dev/null +++ b/lily/include/request-iterator.hh @@ -0,0 +1,32 @@ +/* + request-iter.hh -- declare Request_chord_iterator + + source file of the GNU LilyPond music typesetter + + (c) 1997 Han-Wen Nienhuys +*/ + + +#ifndef REQUEST_ITER_HH +#define REQUEST_ITER_HH + +#include "music-iterator.hh" + +class Request_chord_iterator : public Music_iterator { + const Request_chord * elt_l_; + Moment elt_duration_; + bool last_b_; +public: + Request_chord_iterator (Request_chord*); + DECLARE_MY_RUNTIME_TYPEINFO; + +protected: + virtual void process_and_next (Moment); + virtual Moment next_moment() const; + virtual void construct_children(); + virtual bool ok() const; + virtual void do_print() const; +}; + + +#endif // REQUEST_ITER_HH diff --git a/lily/include/voice-iterator.hh b/lily/include/voice-iterator.hh new file mode 100644 index 0000000000..49bfbfc553 --- /dev/null +++ b/lily/include/voice-iterator.hh @@ -0,0 +1,38 @@ +/* + voice-iter.hh -- declare Voice_iterator + + source file of the GNU LilyPond music typesetter + + (c) 1997 Han-Wen Nienhuys +*/ + + +#ifndef VOICE_ITER_HH +#define VOICE_ITER_HH + + +#include "music-iterator.hh" +#include "pcursor.hh" + +class Voice_iterator : private PCursor, public Music_iterator +{ + Moment here_mom_; + const Voice * voice_C_; + Music_iterator * iter_p_; + void start_next_element(); + void leave_element(); + void set_voice_translator(); + +public: + Voice_iterator (Voice const*); + DECLARE_MY_RUNTIME_TYPEINFO; +protected: + virtual void do_print() const; + virtual void construct_children(); + ~Voice_iterator(); + virtual void process_and_next (Moment); + virtual Moment next_moment() const; + virtual bool ok() const; +}; + +#endif // VOICE_ITER_HH -- 2.39.5