From 83f07109df427a0e2cf93ae62e9761db80f15eb4 Mon Sep 17 00:00:00 2001 From: fred Date: Wed, 27 Mar 2002 00:18:29 +0000 Subject: [PATCH] lilypond-1.3.87 --- input/bugs/broken-cresc.ly | 5 --- input/bugs/voice-switch.ly | 21 ---------- lily/a2-devnull-engraver.cc | 71 -------------------------------- lily/include/request-iterator.hh | 23 ----------- lily/request-iterator.cc | 25 ----------- 5 files changed, 145 deletions(-) delete mode 100644 input/bugs/broken-cresc.ly delete mode 100644 input/bugs/voice-switch.ly delete mode 100644 lily/a2-devnull-engraver.cc delete mode 100644 lily/include/request-iterator.hh delete mode 100644 lily/request-iterator.cc diff --git a/input/bugs/broken-cresc.ly b/input/bugs/broken-cresc.ly deleted file mode 100644 index 3580a230ff..0000000000 --- a/input/bugs/broken-cresc.ly +++ /dev/null @@ -1,5 +0,0 @@ -\score { - \notes \context Thread { - c1 \< c1 \break c1 c1 \! c1 - } -} diff --git a/input/bugs/voice-switch.ly b/input/bugs/voice-switch.ly deleted file mode 100644 index d515666e94..0000000000 --- a/input/bugs/voice-switch.ly +++ /dev/null @@ -1,21 +0,0 @@ -\score{ - \context Staff < - \context Voice=one\skip 1; - \context Voice=two\skip 1; - \context Voice=one \partcombine Voice - \context Thread=one \notes\relative c'' { - c2 c2 - c2 c2 - } - \context Thread=two \notes\relative c'' { - b2 a4 () a - a2 a4 () a - - } - > - \paper{ - linewidth=140.\mm; - } -} - - diff --git a/lily/a2-devnull-engraver.cc b/lily/a2-devnull-engraver.cc deleted file mode 100644 index 32aa7d958a..0000000000 --- a/lily/a2-devnull-engraver.cc +++ /dev/null @@ -1,71 +0,0 @@ -/* - a2-devnull-engraver.cc -- implement A2_devnull_engraver - - source file of the GNU LilyPond music typesetter - - (c) 2000 Jan Nieuwenhuizen -*/ - -#include "engraver.hh" -#include "item.hh" -#include "musical-request.hh" -#include "translator-group.hh" - -class A2_devnull_engraver : public Engraver -{ -public: - VIRTUAL_COPY_CONS (Translator); - -protected: - virtual void acknowledge_element (Score_element_info); - virtual bool do_try_music (Music *); -}; - -ADD_THIS_TRANSLATOR (A2_devnull_engraver); -/* - Maybe this is too crude. - It would probably be better to have a devnull engraver in StaffContext, - that acknowledges stuff and suicides it. - */ -bool -A2_devnull_engraver::do_try_music (Music *m) -{ - if (1 //daddy_trans_l_->id_str_ == "two" - && (to_boolean (get_property ("unison")) - || to_boolean (get_property ("unisilence")))) - { - /* - We mustn't junk Rest requests - */ - if (Span_req *s = dynamic_cast (m)) - { - if (s->span_type_str_ == "slur" - || s->span_type_str_ == "beam" - || s->span_type_str_ == "crescendo" - || s->span_type_str_ == "decrescendo") - { - return true; - } - return false; - } - else if (Tie_req *t = dynamic_cast (m)) - { - return true; - } - else if (Text_script_req *d = dynamic_cast (m)) - { - return true; - } - } - return false; -} - -void -A2_devnull_engraver::acknowledge_element (Score_element_info i) -{ - if (daddy_trans_l_->id_str_ == "two" - && (to_boolean (get_property ("unison")) - || to_boolean (get_property ("unisilence"))) - && to_boolean (get_property ("soloADue"))) - i.elem_l_->suicide (); -} diff --git a/lily/include/request-iterator.hh b/lily/include/request-iterator.hh deleted file mode 100644 index ea2b07b026..0000000000 --- a/lily/include/request-iterator.hh +++ /dev/null @@ -1,23 +0,0 @@ -/* - request-iterator.hh -- declare Request_iterator - - source file of the GNU LilyPond music typesetter - - (c) 2000 Han-Wen Nienhuys - - */ - -#ifndef REQUEST_ITERATOR_HH -#define REQUEST_ITERATOR_HH - -#include "music-iterator.hh" - -class Simple_music_iterator : public Music_iterator -{ -public: -protected: - virtual void do_process_and_next (Moment ); -}; - -#endif /* REQUEST_ITERATOR_HH */ - diff --git a/lily/request-iterator.cc b/lily/request-iterator.cc deleted file mode 100644 index 51c7604281..0000000000 --- a/lily/request-iterator.cc +++ /dev/null @@ -1,25 +0,0 @@ -/* - request-iterator.cc -- implement Simple_music_iterator - - source file of the GNU LilyPond music typesetter - - (c) 2000 Han-Wen Nienhuys - - */ -#include "request-iterator.hh" -#include "music.hh" -#include "input.hh" - -void -Simple_music_iterator::do_process_and_next (Moment m) -{ - if (first_b_) - { - bool g= try_music (music_l_); - if (!g) - music_l_->origin ()->warning (_f ("Junking music: `%s'", classname(music_l_))); - - first_b_ = false; - } - Music_iterator::do_process_and_next (m); -} -- 2.39.5