From 3b1656ebdeec13bb0f1591205b0a62e339676c63 Mon Sep 17 00:00:00 2001 From: fred Date: Tue, 26 Mar 2002 21:51:35 +0000 Subject: [PATCH] lilypond-1.1.9 --- input/test/repeat.fly | 1 - lily/chord-iterator.cc | 89 ---------------------------------- lily/include/chord-iterator.hh | 31 ------------ 3 files changed, 121 deletions(-) delete mode 100644 input/test/repeat.fly delete mode 100644 lily/chord-iterator.cc delete mode 100644 lily/include/chord-iterator.hh diff --git a/input/test/repeat.fly b/input/test/repeat.fly deleted file mode 100644 index a41926a8a6..0000000000 --- a/input/test/repeat.fly +++ /dev/null @@ -1 +0,0 @@ -a b c d \repeat 2 { { c c c c d d d d e e e e } } \alternative { { e e e e } { e e e g } } c c c c c c c c diff --git a/lily/chord-iterator.cc b/lily/chord-iterator.cc deleted file mode 100644 index 1f61364c2b..0000000000 --- a/lily/chord-iterator.cc +++ /dev/null @@ -1,89 +0,0 @@ -/* - Simultaneous_music-iter.cc -- implement Simultaneous_music_iterator - - source file of the GNU LilyPond music typesetter - - (c) 1997--1998 Han-Wen Nienhuys -*/ - -#include "translator-group.hh" -#include "debug.hh" -#include "chord-iterator.hh" - -#include "music-list.hh" - - -void -Simultaneous_music_iterator::construct_children() -{ - int j = 0; - for (PCursor i (simultaneous_music_l ()->music_p_list_p_->top()); - i.ok(); j++, i++) - { - Music_iterator * mi = get_iterator_p (i.ptr()); - if (mi->ok()) - { - if (simultaneous_music_l ()->translator_type_str_.empty_b ()) - set_translator (mi->report_to_l()->ancestor_l (0)); - children_p_list_.bottom().add (mi); - } - else - delete mi; - } -} - - -void -Simultaneous_music_iterator::do_print() const -{ -#ifndef NPRINT - for (PCursor i (children_p_list_.top()); i.ok (); i++) - { - i->print(); - } -#endif -} - -void -Simultaneous_music_iterator::do_process_and_next (Moment until) -{ - for (PCursor i (children_p_list_.top()); i.ok ();) - { - if (i->next_moment() == until) - { - i->process_and_next (until); - } - if (!i->ok()) - delete i.remove_p(); - else - i++; - } - Music_iterator::do_process_and_next (until); -} - - - - -Moment -Simultaneous_music_iterator::next_moment() const -{ - Moment next; - next.set_infinite (1); - for (PCursor i (children_p_list_.top()); i.ok (); i++) - next = next next_moment() ; - return next; -} - - - -bool -Simultaneous_music_iterator::ok() const -{ - return children_p_list_.size(); -} - -Simultaneous_music* -Simultaneous_music_iterator::simultaneous_music_l ()const -{ - return ( Simultaneous_music *) music_l_; -} diff --git a/lily/include/chord-iterator.hh b/lily/include/chord-iterator.hh deleted file mode 100644 index 6b689e945d..0000000000 --- a/lily/include/chord-iterator.hh +++ /dev/null @@ -1,31 +0,0 @@ -/* - chord-iter.hh -- declare Chord_iterator - - source file of the GNU LilyPond music typesetter - - (c) 1997--1998 Han-Wen Nienhuys -*/ - - -#ifndef Simultaneous_music_ITER_HH -#define Simultaneous_music_ITER_HH - - -#include "music-iterator.hh" -#include "plist.hh" - -class Simultaneous_music_iterator : public Music_iterator -{ - Simultaneous_music *simultaneous_music_l() const; - Pointer_list children_p_list_; -public: - // construction is public -protected: - virtual void do_print() const; - virtual void construct_children(); - virtual void do_process_and_next (Moment); - virtual Moment next_moment() const; - virtual bool ok() const; -}; - -#endif // Simultaneous_music_ITER_HH -- 2.39.5