From 487ee28c2a58e7bd5cb9e85c7676057c0b32f385 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Sat, 28 Sep 2002 22:19:11 +0000 Subject: [PATCH] * lily/ : rename Request to Event --- ChangeLog | 2 + lily/accidental-engraver.cc | 2 +- lily/ambitus-engraver.cc | 10 +- lily/arpeggio-engraver.cc | 2 +- lily/auto-beam-engraver.cc | 2 +- lily/auto-change-iterator.cc | 2 +- lily/bar-check-iterator.cc | 2 +- lily/bar-engraver.cc | 2 +- lily/bar-line.cc | 2 +- lily/beam-engraver.cc | 6 +- lily/breathing-sign-engraver.cc | 2 +- lily/chord-name-engraver.cc | 2 +- lily/chord-tremolo-engraver.cc | 2 +- lily/chord.cc | 6 +- lily/completion-note-heads-engraver.cc | 6 +- lily/custos-engraver.cc | 2 +- lily/dynamic-engraver.cc | 8 +- lily/dynamic-performer.cc | 4 +- lily/extender-engraver.cc | 6 +- lily/figured-bass-engraver.cc | 2 +- lily/fingering-engraver.cc | 2 +- lily/global-translator.cc | 2 +- lily/grob-pitch-tuple.cc | 2 +- lily/hyphen-engraver.cc | 6 +- lily/include/engraver.hh | 4 +- lily/include/lily-proto.hh | 6 +- lily/include/music-list.hh | 8 +- lily/include/music-sequence.hh | 4 +- lily/include/performer.hh | 2 +- lily/include/request-chord-iterator.hh | 45 ------ lily/include/request.hh | 55 ------- lily/include/translator-group.hh | 2 +- lily/include/translator.hh | 9 -- lily/include/type-swallow-translator.hh | 6 +- lily/key-engraver.cc | 2 +- lily/lexer.ll | 4 +- lily/ligature-bracket-engraver.cc | 2 +- lily/ligature-engraver.cc | 2 +- lily/lyric-combine-music-iterator.cc | 4 +- lily/lyric-engraver.cc | 2 +- lily/lyric-performer.cc | 2 +- lily/lyric-phrasing-engraver.cc | 2 +- lily/melisma-engraver.cc | 2 +- lily/mensural-ligature-engraver.cc | 10 +- lily/multi-measure-rest-engraver.cc | 2 +- lily/new-accidental-engraver.cc | 2 +- lily/note-head-line-engraver.cc | 2 +- lily/note-head.cc | 2 +- lily/note-heads-engraver.cc | 2 +- lily/note-name-engraver.cc | 2 +- lily/note-performer.cc | 2 +- lily/output-property-music-iterator.cc | 2 +- lily/parser.yy | 113 ++++++-------- lily/part-combine-music-iterator.cc | 2 +- lily/phrasing-slur-engraver.cc | 14 +- lily/piano-pedal-engraver.cc | 2 +- lily/piano-pedal-performer.cc | 2 +- lily/porrectus-engraver.cc | 4 +- lily/request-chord-iterator.cc | 82 ---------- lily/request-chord.cc | 10 +- lily/request.cc | 198 ------------------------ lily/rest-engraver.cc | 2 +- lily/rhythmic-column-engraver.cc | 2 +- lily/script-engraver.cc | 2 +- lily/sequential-iterator.cc | 2 +- lily/simple-music-iterator.cc | 2 +- lily/slur-engraver.cc | 20 +-- lily/spacing-engraver.cc | 2 +- lily/span-dynamic-performer.cc | 2 +- lily/stem-engraver.cc | 14 +- lily/swallow-engraver.cc | 2 +- lily/tab-note-heads-engraver.cc | 2 +- lily/text-engraver.cc | 2 +- lily/text-item.cc | 2 +- lily/text-spanner-engraver.cc | 2 +- lily/thread-devnull-engraver.cc | 2 +- lily/tie-engraver.cc | 2 +- lily/tie-performer.cc | 2 +- lily/time-scaled-music-iterator.cc | 2 +- lily/tuplet-engraver.cc | 2 +- lily/type-swallow-translator.cc | 2 +- lily/voice-devnull-engraver.cc | 4 +- scm/music-types.scm | 86 +++++----- 83 files changed, 229 insertions(+), 631 deletions(-) delete mode 100644 lily/include/request-chord-iterator.hh delete mode 100644 lily/include/request.hh delete mode 100644 lily/request-chord-iterator.cc delete mode 100644 lily/request.cc diff --git a/ChangeLog b/ChangeLog index 1fd875d5cc..353d98ebeb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2002-09-28 Han-Wen Nienhuys + * lily/ : rename Request to Event + * lily/parser.yy (command_element): move clef stuff into Scheme. * lily/: rename length_mom () to get_length() diff --git a/lily/accidental-engraver.cc b/lily/accidental-engraver.cc index 803fa1a524..44f162caac 100644 --- a/lily/accidental-engraver.cc +++ b/lily/accidental-engraver.cc @@ -5,7 +5,7 @@ Modified 2001-2002 by Rune Zedeler */ -#include "request.hh" +#include "event.hh" #include "item.hh" #include "tie.hh" diff --git a/lily/ambitus-engraver.cc b/lily/ambitus-engraver.cc index 5a664a8cc2..fb153cf5e5 100644 --- a/lily/ambitus-engraver.cc +++ b/lily/ambitus-engraver.cc @@ -10,7 +10,7 @@ #include "item.hh" #include "note-head.hh" #include "staff-symbol-referencer.hh" -#include "request.hh" +#include "event.hh" #include "pitch.hh" /* @@ -45,13 +45,13 @@ * * - If a piece consists of several loosely coupled sections, should * there be multiple ambitus grobs allowed, one for each section? - * Then there probably should be some "\ambitus" request added to + * Then there probably should be some "\ambitus" event added to * mudela, stating where an ambitus grob should be placed. This * ambitus grob should then represent the ambitus in the range of time - * between this "\ambitus" request and the next one (or the end of the - * piece, if there is no more such request). To be compliant with the + * between this "\ambitus" event and the next one (or the end of the + * piece, if there is no more such event). To be compliant with the * current implementation, we might implicitly assume an "\ambitus" - * request at the beginning of the piece, but then the question where + * event at the beginning of the piece, but then the question where * to put this first ambitus grob (before/after the clef?) becomes * even more urgent. * diff --git a/lily/arpeggio-engraver.cc b/lily/arpeggio-engraver.cc index 008b8a0057..278f368543 100644 --- a/lily/arpeggio-engraver.cc +++ b/lily/arpeggio-engraver.cc @@ -9,7 +9,7 @@ #include "engraver.hh" #include "group-interface.hh" #include "item.hh" -#include "request.hh" +#include "event.hh" #include "arpeggio.hh" #include "stem.hh" #include "rhythmic-head.hh" diff --git a/lily/auto-beam-engraver.cc b/lily/auto-beam-engraver.cc index 55e47bb13c..9435bc82d5 100644 --- a/lily/auto-beam-engraver.cc +++ b/lily/auto-beam-engraver.cc @@ -8,7 +8,7 @@ */ #include "beaming.hh" -#include "request.hh" +#include "event.hh" #include "beam.hh" #include "stem.hh" #include "warn.hh" diff --git a/lily/auto-change-iterator.cc b/lily/auto-change-iterator.cc index 64f67ca43a..5bd9bc0648 100644 --- a/lily/auto-change-iterator.cc +++ b/lily/auto-change-iterator.cc @@ -10,7 +10,7 @@ #include "music.hh" #include "auto-change-iterator.hh" #include "translator-group.hh" -#include "request.hh" +#include "event.hh" diff --git a/lily/bar-check-iterator.cc b/lily/bar-check-iterator.cc index 5dd0266768..5870e7a5ef 100644 --- a/lily/bar-check-iterator.cc +++ b/lily/bar-check-iterator.cc @@ -9,7 +9,7 @@ */ #include "simple-music-iterator.hh" -#include "request.hh" +#include "event.hh" #include "translator-group.hh" /* diff --git a/lily/bar-engraver.cc b/lily/bar-engraver.cc index 8b4cc844e7..e3555f0bce 100644 --- a/lily/bar-engraver.cc +++ b/lily/bar-engraver.cc @@ -9,7 +9,7 @@ #include "bar-line.hh" #include "score-engraver.hh" -#include "request.hh" +#include "event.hh" #include "engraver-group-engraver.hh" #include "warn.hh" #include "item.hh" diff --git a/lily/bar-line.cc b/lily/bar-line.cc index 03d8f61899..43137f1c4d 100644 --- a/lily/bar-line.cc +++ b/lily/bar-line.cc @@ -192,7 +192,7 @@ Bar_line::get_staff_bar_size (SCM smob) ADD_INTERFACE (Bar_line, "bar-line-interface", "Bar line. -This is a request to print a special bar symbol. It replaces the +Print a special bar symbol. It replaces the regular bar symbol with a special symbol. The argument @var{bartype} is a string which specifies the kind of bar to print. Options are @code{:|}, diff --git a/lily/beam-engraver.cc b/lily/beam-engraver.cc index a4ad770400..78848948d9 100644 --- a/lily/beam-engraver.cc +++ b/lily/beam-engraver.cc @@ -8,7 +8,7 @@ */ #include "engraver-group-engraver.hh" #include "engraver.hh" -#include "request.hh" +#include "event.hh" #include "beam.hh" #include "stem.hh" #include "warn.hh" @@ -296,7 +296,7 @@ Beam_engraver::acknowledge_grob (Grob_info info) ENTER_DESCRIPTION(Beam_engraver, -/* descr */ "Handles Beam_requests by engraving Beams. If omitted, then notes will be +/* descr */ "Handles Beam events by engraving Beams. If omitted, then notes will be printed with flags instead of beams.", /* creats*/ "Beam", /* accepts */ "beam-event abort-event", @@ -337,7 +337,7 @@ Grace_beam_engraver::valid_end_moment () ENTER_DESCRIPTION(Grace_beam_engraver, -/* descr */ "Handles Beam_requests by engraving Beams. If omitted, then notes will +/* descr */ "Handles Beam events by engraving Beams. If omitted, then notes will be printed with flags instead of beams. Only engraves beams when we are at grace points in time. ", diff --git a/lily/breathing-sign-engraver.cc b/lily/breathing-sign-engraver.cc index 97c6cb4ecf..0fce5f1700 100644 --- a/lily/breathing-sign-engraver.cc +++ b/lily/breathing-sign-engraver.cc @@ -15,7 +15,7 @@ TODO: #include "staff-symbol-referencer.hh" #include "breathing-sign.hh" -#include "request.hh" +#include "event.hh" #include "engraver-group-engraver.hh" #include "item.hh" diff --git a/lily/chord-name-engraver.cc b/lily/chord-name-engraver.cc index 3985c2467b..44e3fb8424 100644 --- a/lily/chord-name-engraver.cc +++ b/lily/chord-name-engraver.cc @@ -9,7 +9,7 @@ #include "engraver.hh" #include "chord-name.hh" #include "chord.hh" -#include "request.hh" +#include "event.hh" #include "paper-def.hh" #include "font-interface.hh" #include "paper-def.hh" diff --git a/lily/chord-tremolo-engraver.cc b/lily/chord-tremolo-engraver.cc index bf3859264f..78cfa5d256 100644 --- a/lily/chord-tremolo-engraver.cc +++ b/lily/chord-tremolo-engraver.cc @@ -13,7 +13,7 @@ #include "stem.hh" #include "rhythmic-head.hh" #include "engraver-group-engraver.hh" -#include "request.hh" +#include "event.hh" #include "warn.hh" #include "misc.hh" #include "note-head.hh" diff --git a/lily/chord.cc b/lily/chord.cc index adc2315048..4adb398599 100644 --- a/lily/chord.cc +++ b/lily/chord.cc @@ -7,11 +7,11 @@ */ #include "chord.hh" -#include "request.hh" +#include "event.hh" #include "warn.hh" #include "music-list.hh" -#include "request.hh" +#include "event.hh" SCM @@ -363,7 +363,7 @@ Chord::get_chord (SCM tonic, SCM add, SCM sub, SCM inversion, SCM bass, SCM dur) scm_gc_unprotect_object (n->self_scm ()); } - Music * v = make_music_by_name(ly_symbol2scm ("RequestChord")); + Music * v = make_music_by_name(ly_symbol2scm ("EventChord")); v->set_mus_property ("elements", list); return v; diff --git a/lily/completion-note-heads-engraver.cc b/lily/completion-note-heads-engraver.cc index 5b89b08a97..10d6d6b688 100644 --- a/lily/completion-note-heads-engraver.cc +++ b/lily/completion-note-heads-engraver.cc @@ -8,7 +8,7 @@ #include "rhythmic-head.hh" #include "paper-def.hh" -#include "request.hh" +#include "event.hh" #include "dots.hh" #include "dot-column.hh" #include "staff-symbol-referencer.hh" @@ -21,9 +21,9 @@ How does this work? When we catch the note, we predict the end of the note. We keep the - requests living until we reach the predicted end-time. + events living until we reach the predicted end-time. - Every time process_music() is called and there are note requests, we + Every time process_music() is called and there are note events, we figure out how long the note to typeset should be. It should be no longer than what's specified, than what is left to do and it should not cross barlines. diff --git a/lily/custos-engraver.cc b/lily/custos-engraver.cc index 504b31567f..d2b16c0afe 100644 --- a/lily/custos-engraver.cc +++ b/lily/custos-engraver.cc @@ -15,7 +15,7 @@ #include "note-head.hh" #include "staff-symbol-referencer.hh" #include "warn.hh" -#include "request.hh" +#include "event.hh" /* This class implements an engraver for custos symbols. diff --git a/lily/dynamic-engraver.cc b/lily/dynamic-engraver.cc index 95eea397fe..1bad82b1f6 100644 --- a/lily/dynamic-engraver.cc +++ b/lily/dynamic-engraver.cc @@ -8,7 +8,7 @@ #include "warn.hh" #include "dimensions.hh" #include "hairpin.hh" -#include "request.hh" +#include "event.hh" #include "paper-column.hh" #include "note-column.hh" #include "item.hh" @@ -23,7 +23,7 @@ /* TODO: - * direction of text-dynamic-request if not equal to direction of + * direction of text-dynamic-event if not equal to direction of line-spanner - TODO: this engraver is too complicated. We should split it into @@ -145,9 +145,9 @@ Dynamic_engraver::process_music () } /* - During a (de)crescendo, pending request will not be cleared, + During a (de)crescendo, pending event will not be cleared, and a line-spanner will always be created, as \< \! are already - two requests. + two events. Note: line-spanner must always have at least same duration as (de)crecsendo, b.o. line-breaking. diff --git a/lily/dynamic-performer.cc b/lily/dynamic-performer.cc index ed60b2165f..cb405a599a 100644 --- a/lily/dynamic-performer.cc +++ b/lily/dynamic-performer.cc @@ -8,12 +8,12 @@ #include "performer.hh" -#include "request.hh" +#include "event.hh" #include "audio-item.hh" /* TODO: - handle multiple requests + handle multiple events */ /** diff --git a/lily/extender-engraver.cc b/lily/extender-engraver.cc index 6bde55b284..d10c12c26d 100644 --- a/lily/extender-engraver.cc +++ b/lily/extender-engraver.cc @@ -7,7 +7,7 @@ */ #include "flower-proto.hh" -#include "request.hh" +#include "event.hh" #include "lyric-extender.hh" #include "paper-column.hh" #include "item.hh" @@ -23,7 +23,7 @@ gap between syllables. We remember the last Item that come across. When we get a - request, we create the spanner, and attach the left point to the + event, we create the spanner, and attach the left point to the last lyrics, and the right point to any lyrics we receive by then. */ class Extender_engraver : public Engraver @@ -101,7 +101,7 @@ Extender_engraver::process_music () { if (!last_lyric_) { - req_->origin ()->warning (_ ("Nothing to connect extender to on the left. Ignoring extender request.")); + req_->origin ()->warning (_ ("Nothing to connect extender to on the left. Ignoring extender event.")); return; } diff --git a/lily/figured-bass-engraver.cc b/lily/figured-bass-engraver.cc index 9020cf334e..b65a03dad8 100644 --- a/lily/figured-bass-engraver.cc +++ b/lily/figured-bass-engraver.cc @@ -1,6 +1,6 @@ #include "engraver.hh" #include "text-item.hh" -#include "request.hh" +#include "event.hh" #include "item.hh" class Figured_bass_engraver : public Engraver diff --git a/lily/fingering-engraver.cc b/lily/fingering-engraver.cc index b571126763..d92719e893 100644 --- a/lily/fingering-engraver.cc +++ b/lily/fingering-engraver.cc @@ -11,7 +11,7 @@ #include "engraver.hh" #include "side-position-interface.hh" #include "item.hh" -#include "request.hh" +#include "event.hh" #include "stem.hh" #include "rhythmic-head.hh" diff --git a/lily/global-translator.cc b/lily/global-translator.cc index bbe997ce0b..56085db9e3 100644 --- a/lily/global-translator.cc +++ b/lily/global-translator.cc @@ -9,7 +9,7 @@ #include "warn.hh" #include "music.hh" -#include "request.hh" +#include "event.hh" #include "music-list.hh" #include "music-iterator.hh" #include "global-translator.hh" diff --git a/lily/grob-pitch-tuple.cc b/lily/grob-pitch-tuple.cc index f55c4f4b7f..be8dd82e4d 100644 --- a/lily/grob-pitch-tuple.cc +++ b/lily/grob-pitch-tuple.cc @@ -8,7 +8,7 @@ source file of the GNU LilyPond music typesetter */ #include "grob-pitch-tuple.hh" #include "pitch.hh" -#include "request.hh" +#include "event.hh" int compare (Grob_pitch_tuple const &a, Grob_pitch_tuple const &b) diff --git a/lily/hyphen-engraver.cc b/lily/hyphen-engraver.cc index 0ba903ee83..1eab3ad6ba 100644 --- a/lily/hyphen-engraver.cc +++ b/lily/hyphen-engraver.cc @@ -5,7 +5,7 @@ */ #include "flower-proto.hh" -#include "request.hh" +#include "event.hh" #include "hyphen-spanner.hh" #include "paper-column.hh" #include "item.hh" @@ -17,7 +17,7 @@ gap between syllables. We remember the last Item that come across. When we get a - request, we create the spanner, and attach the left point to the + event, we create the spanner, and attach the left point to the last lyrics, and the right point to any lyrics we receive by then. */ class Hyphen_engraver : public Engraver @@ -94,7 +94,7 @@ Hyphen_engraver::process_acknowledged_grobs () { if (!last_lyric_) { - req_->origin ()->warning (_ ("Nothing to connect hyphen to on the left. Ignoring hyphen request.")); + req_->origin ()->warning (_ ("Nothing to connect hyphen to on the left. Ignoring hyphen event.")); return; } diff --git a/lily/include/engraver.hh b/lily/include/engraver.hh index 6712a339bb..e9cea4fc4c 100644 --- a/lily/include/engraver.hh +++ b/lily/include/engraver.hh @@ -12,13 +12,13 @@ #include "lily-proto.hh" #include "array.hh" -#include "request.hh" +#include "event.hh" #include "grob-info.hh" #include "translator.hh" /** - a struct which processes requests, and creates the #Grob#s. + a struct which processes events, and creates the #Grob#s. It may use derived classes. */ class Engraver : public virtual Translator { diff --git a/lily/include/lily-proto.hh b/lily/include/lily-proto.hh index 194398eecd..0caeb2bd22 100644 --- a/lily/include/lily-proto.hh +++ b/lily/include/lily-proto.hh @@ -121,9 +121,9 @@ class Property_iterator; class Rational; class Relative_octave_music; class Repeated_music; -class Request; -class Request_chord; -class Request_chord_iterator; +class Event; +class Event_chord; +class Event_chord_iterator; class Scaled_font_metric; class Scheme_hash_table; class Score; diff --git a/lily/include/music-list.hh b/lily/include/music-list.hh index c2895a1fdd..a2ca4196e4 100644 --- a/lily/include/music-list.hh +++ b/lily/include/music-list.hh @@ -27,16 +27,16 @@ public: }; /** - The request is a collection of Requests. A note that you enter in lilypond is - one Request_chord, one syllable of lyrics is one Request_chord + The event is a collection of Events. A note that you enter in lilypond is + one Event_chord, one syllable of lyrics is one Event_chord */ -class Request_chord : public Simultaneous_music +class Event_chord : public Simultaneous_music { public: VIRTUAL_COPY_CONS (Music); virtual Moment start_mom () const; - Request_chord (); + Event_chord (); }; /** diff --git a/lily/include/music-sequence.hh b/lily/include/music-sequence.hh index 724ac1689c..a25465d476 100644 --- a/lily/include/music-sequence.hh +++ b/lily/include/music-sequence.hh @@ -1,7 +1,5 @@ - - /* - music-sequence.hh -- declare + music-sequence.hh -- declare Music_sequence source file of the GNU LilyPond music typesetter diff --git a/lily/include/performer.hh b/lily/include/performer.hh index 740aed658c..9b5d24ef32 100644 --- a/lily/include/performer.hh +++ b/lily/include/performer.hh @@ -10,7 +10,7 @@ #include "audio-element-info.hh" #include "array.hh" -#include "request.hh" +#include "event.hh" #include "grob-info.hh" #include "translator.hh" diff --git a/lily/include/request-chord-iterator.hh b/lily/include/request-chord-iterator.hh deleted file mode 100644 index b9eabca0da..0000000000 --- a/lily/include/request-chord-iterator.hh +++ /dev/null @@ -1,45 +0,0 @@ -/* - request-iter.hh -- declare Request_chord_iterator - - source file of the GNU LilyPond music typesetter - - (c) 1997--2002 Han-Wen Nienhuys -*/ - - -#ifndef REQUEST_ITER_HH -#define REQUEST_ITER_HH - -#include "simple-music-iterator.hh" - -/** - Walk through a Request_chord - */ -class Request_chord_iterator : public Simple_music_iterator -{ - Request_chord * get_elt () const; - /** - Find a bottom notation context to deliver requests to. - */ - virtual Translator_group* get_req_translator (); - - - /* - Since Request_chord_iterator has no list-cursor internally, we - must use a status variable to adminstrate where we are */ - - enum { NONE_DONE, START_DONE, END_DONE } status_; -public: - VIRTUAL_COPY_CONS (Music_iterator); - DECLARE_SCHEME_CALLBACK(constructor, ()); - Request_chord_iterator (); - Request_chord_iterator (Request_chord_iterator const&); - - virtual SCM get_pending_events (Moment) const; -protected: - virtual void process (Moment); - virtual void construct_children (); -}; - - -#endif // REQUEST_ITER_HH diff --git a/lily/include/request.hh b/lily/include/request.hh deleted file mode 100644 index 292028e4c6..0000000000 --- a/lily/include/request.hh +++ /dev/null @@ -1,55 +0,0 @@ -/* - request.hh -- declare Request baseclasses. - - source file of the GNU LilyPond music typesetter - - (c) 1997--2002 Han-Wen Nienhuys -*/ - -#ifndef REQUEST_HH -#define REQUEST_HH - - -#include "string.hh" -#include "moment.hh" -#include "virtual-methods.hh" -#include "input.hh" -#include "music.hh" -#include "duration.hh" -#include "pitch.hh" - -/** An atom of musical information. This is an abstract class for any - piece of music that does not contain other Music. - - - */ -class Request : public Music { -public: - Request (); - VIRTUAL_COPY_CONS (Music); - virtual void compress (Moment); - virtual void transpose (Pitch); - virtual Moment get_length () const; - virtual Pitch to_relative_octave (Pitch); -}; - - -/** - Handle key changes. -*/ -class Key_change_req : public Request -{ -public: - SCM pitch_alist (); - -protected: - VIRTUAL_COPY_CONS (Music); - bool do_equal_b (Request const * ) const; - void transpose (Pitch d); -}; - -SCM transpose_key_alist (SCM,SCM); - - - -#endif diff --git a/lily/include/translator-group.hh b/lily/include/translator-group.hh index c4582238f0..512d56cbc0 100644 --- a/lily/include/translator-group.hh +++ b/lily/include/translator-group.hh @@ -24,7 +24,7 @@ typedef void (Translator::*Method_pointer) (void); class Scheme_hash_table; -/** Make some kind of Elements from Requests. Elements are made by +/** Make some kind of Elements from Events. Elements are made by hierarchically grouped Translators */ class Translator_group : public virtual Translator { diff --git a/lily/include/translator.hh b/lily/include/translator.hh index 1e88b13451..912241ced5 100644 --- a/lily/include/translator.hh +++ b/lily/include/translator.hh @@ -70,15 +70,6 @@ public: public: Global_translator * top_translator () const; TRANSLATOR_DECLARATIONS(Translator); - /** - try to fit the request in this engraver - - @return - false: not noted, not taken. - - true: request swallowed. Don't try to put the request elsewhere. - - */ virtual bool try_music (Music *req); virtual void stop_translation_timestep (); virtual void start_translation_timestep (); diff --git a/lily/include/type-swallow-translator.hh b/lily/include/type-swallow-translator.hh index 9bb4e68aeb..a97ab6ac06 100644 --- a/lily/include/type-swallow-translator.hh +++ b/lily/include/type-swallow-translator.hh @@ -12,7 +12,7 @@ #include "translator.hh" -/** eat a certain type of request. +/** eat a certain type of event (Duh, it's good for your skin) */ class Type_swallow_translator : public virtual Translator @@ -24,7 +24,7 @@ public: VIRTUAL_COPY_CONS (Translator); }; -#define DECLARE_REQUEST_SWALLOWER(TYPE) \ +#define DECLARE_EVENT_SWALLOWER(TYPE) \ struct TYPE ## _swallow_translator : public Type_swallow_translator { \ TRANSLATOR_DECLARATIONS (TYPE ## _swallow_translator); \ }; \ @@ -32,7 +32,7 @@ struct TYPE ## _swallow_translator : public Type_swallow_translator { \ swallow_string_ = #TYPE; \ } \ ENTER_DESCRIPTION(TYPE ## _swallow_translator, \ - "Swallow requests of " #TYPE " type.", \ + "Swallow events of " #TYPE " type.", \ "", \ "general-music",\ "", \ diff --git a/lily/key-engraver.cc b/lily/key-engraver.cc index aa6488e72b..ae1dc5ddf0 100644 --- a/lily/key-engraver.cc +++ b/lily/key-engraver.cc @@ -8,7 +8,7 @@ -#include "request.hh" +#include "event.hh" #include "item.hh" #include "bar-line.hh" #include "staff-symbol-referencer.hh" diff --git a/lily/lexer.ll b/lily/lexer.ll index a08b3bfab6..b8065c3788 100644 --- a/lily/lexer.ll +++ b/lily/lexer.ll @@ -40,7 +40,7 @@ #include "parser.hh" #include "warn.hh" #include "main.hh" -#include "request.hh" +#include "event.hh" #include "version.hh" #include "lilypond-input-version.hh" #include "translator-def.hh" @@ -549,7 +549,7 @@ My_lily_lexer::identifier_type(SCM sid) } else if (Music * mus =unsmob_music (sid)) { yylval.scm = sid; - return dynamic_cast (mus) ? REQUEST_IDENTIFIER : MUSIC_IDENTIFIER; + return dynamic_cast (mus) ? EVENT_IDENTIFIER : MUSIC_IDENTIFIER; } else if (unsmob_duration (sid)) { yylval.scm = sid; return DURATION_IDENTIFIER; diff --git a/lily/ligature-bracket-engraver.cc b/lily/ligature-bracket-engraver.cc index c729c232af..9266ccce61 100644 --- a/lily/ligature-bracket-engraver.cc +++ b/lily/ligature-bracket-engraver.cc @@ -33,7 +33,7 @@ Ligature_bracket_engraver::create_ligature_spanner () } ENTER_DESCRIPTION(Ligature_bracket_engraver, -/* descr */ "Handles Ligature_requests by engraving Ligature brackets.", +/* descr */ "Handles Ligature_events by engraving Ligature brackets.", /* creats*/ "LigatureBracket", /* accepts */ "", /* acks */ "ligature-head-interface rest-interface", diff --git a/lily/ligature-engraver.cc b/lily/ligature-engraver.cc index de013610a6..bc96697c58 100644 --- a/lily/ligature-engraver.cc +++ b/lily/ligature-engraver.cc @@ -184,7 +184,7 @@ Ligature_engraver::acknowledge_grob (Grob_info info) } ENTER_DESCRIPTION (Ligature_engraver, -/* descr */ "Abstract class; a concrete subclass handles Ligature_requests by engraving Ligatures in a concrete style.", +/* descr */ "Abstract class; a concrete subclass handles Ligature_events by engraving Ligatures in a concrete style.", /* creats*/ "Ligature", /* accepts */ "ligature-event abort-event", /* acks */ "ligature-head-interface rest-interface", diff --git a/lily/lyric-combine-music-iterator.cc b/lily/lyric-combine-music-iterator.cc index 5f3598186c..77d12d4563 100644 --- a/lily/lyric-combine-music-iterator.cc +++ b/lily/lyric-combine-music-iterator.cc @@ -10,7 +10,7 @@ #include "translator-group.hh" #include "lyric-combine-music-iterator.hh" #include "lyric-combine-music.hh" -#include "request.hh" +#include "event.hh" #include "note-head.hh" #include "grob.hh" @@ -79,7 +79,7 @@ bool Lyric_combine_music_iterator::get_busy_status () const { /* - We have to use both the request and the busyGrobs queue. The + We have to use both the event and the busyGrobs queue. The busyGrobs queue doesn't contain any notes that have started this instant. */ if (try_music (busy_req)) diff --git a/lily/lyric-engraver.cc b/lily/lyric-engraver.cc index 3e04babe2a..5fa42bfdd4 100644 --- a/lily/lyric-engraver.cc +++ b/lily/lyric-engraver.cc @@ -8,7 +8,7 @@ */ #include "engraver.hh" -#include "request.hh" +#include "event.hh" #include "item.hh" #include "paper-def.hh" #include "font-metric.hh" diff --git a/lily/lyric-performer.cc b/lily/lyric-performer.cc index 3403be404c..d15a507184 100644 --- a/lily/lyric-performer.cc +++ b/lily/lyric-performer.cc @@ -6,7 +6,7 @@ (c) 1997--2002 Jan Nieuwenhuizen */ -#include "request.hh" +#include "event.hh" #include "audio-item.hh" #include "lily-proto.hh" #include "performer.hh" diff --git a/lily/lyric-phrasing-engraver.cc b/lily/lyric-phrasing-engraver.cc index 1621d21d03..14fbe9fc8b 100644 --- a/lily/lyric-phrasing-engraver.cc +++ b/lily/lyric-phrasing-engraver.cc @@ -237,7 +237,7 @@ Lyric_phrasing_engraver::acknowledge_grob (Grob_info i) This has the effect of finishing the extender under the last note of the melisma, instead of extending it to the next lyric. - Problem: the extender request is thrown at the same moment as the next lyric, + Problem: the extender event is thrown at the same moment as the next lyric, by which time we have already passed the last note of the melisma. However, the Lyric_phrasing_engraver remembers the last note, so just attach it to that, provided it was melismatic. If it was not melismatic, diff --git a/lily/melisma-engraver.cc b/lily/melisma-engraver.cc index e01d83a9f8..4da8b4a5cf 100644 --- a/lily/melisma-engraver.cc +++ b/lily/melisma-engraver.cc @@ -8,7 +8,7 @@ */ #include "engraver.hh" -#include "request.hh" +#include "event.hh" #include "grob.hh" #include "translator-group.hh" diff --git a/lily/mensural-ligature-engraver.cc b/lily/mensural-ligature-engraver.cc index 3c5e9adb92..a2631238f1 100644 --- a/lily/mensural-ligature-engraver.cc +++ b/lily/mensural-ligature-engraver.cc @@ -8,7 +8,7 @@ #include "mensural-ligature.hh" #include "ligature-engraver.hh" -#include "request.hh" +#include "event.hh" #include "warn.hh" #include "item.hh" #include "spanner.hh" @@ -61,7 +61,7 @@ * bounding box around all primitives of the ligature. * * TODO: enhance robustness: in case of an illegal ligature (e.g. the - * user requests for a ligature that contains a minima or STATE_ERROR + * user events for a ligature that contains a minima or STATE_ERROR * is reached), automatically break the ligature into smaller, valid * pieces. * @@ -153,8 +153,8 @@ Mensural_ligature_engraver::get_set_column (Item *item, Paper_column *column) /* * The following lines implement a finite state automat. Given a * sequence of durations (Longa, Brevis, Semibrevis) or - * end-of-ligature-request as input, the automat outputs a sequence of - * requests for grobs that form a proper ligature. + * end-of-ligature-event as input, the automat outputs a sequence of + * events for grobs that form a proper ligature. */ /* @@ -565,7 +565,7 @@ Mensural_ligature_engraver::acknowledge_grob (Grob_info info) } ENTER_DESCRIPTION (Mensural_ligature_engraver, -/* descr */ "Handles Mensural_ligature_requests by glueing special ligature heads together.", +/* descr */ "Handles Mensural_ligature_events by glueing special ligature heads together.", /* creats*/ "MensuralLigature", /* accepts */ "", /* acks */ "ligature-head-interface note-head-interface rest-interface", diff --git a/lily/multi-measure-rest-engraver.cc b/lily/multi-measure-rest-engraver.cc index c44c0738e8..ae355daed5 100644 --- a/lily/multi-measure-rest-engraver.cc +++ b/lily/multi-measure-rest-engraver.cc @@ -5,7 +5,7 @@ Han-Wen Nienhuys */ -#include "request.hh" +#include "event.hh" #include "multi-measure-rest.hh" #include "paper-column.hh" #include "engraver-group-engraver.hh" diff --git a/lily/new-accidental-engraver.cc b/lily/new-accidental-engraver.cc index f7b108334a..d8ae2948ae 100644 --- a/lily/new-accidental-engraver.cc +++ b/lily/new-accidental-engraver.cc @@ -9,7 +9,7 @@ */ -#include "request.hh" +#include "event.hh" #include "item.hh" #include "tie.hh" diff --git a/lily/note-head-line-engraver.cc b/lily/note-head-line-engraver.cc index 25f4a7b850..0e346e410f 100644 --- a/lily/note-head-line-engraver.cc +++ b/lily/note-head-line-engraver.cc @@ -9,7 +9,7 @@ #include "engraver.hh" #include "group-interface.hh" #include "item.hh" -#include "request.hh" +#include "event.hh" #include "spanner.hh" #include "stem.hh" #include "rhythmic-head.hh" diff --git a/lily/note-head.cc b/lily/note-head.cc index 4e60f3c5fc..e32c1a663f 100644 --- a/lily/note-head.cc +++ b/lily/note-head.cc @@ -14,7 +14,7 @@ #include "warn.hh" #include "font-interface.hh" #include "molecule.hh" -#include "request.hh" +#include "event.hh" #include "rhythmic-head.hh" #include "staff-symbol-referencer.hh" #include "lookup.hh" diff --git a/lily/note-heads-engraver.cc b/lily/note-heads-engraver.cc index afb341178e..cec76bd2ee 100644 --- a/lily/note-heads-engraver.cc +++ b/lily/note-heads-engraver.cc @@ -7,7 +7,7 @@ #include "rhythmic-head.hh" #include "paper-def.hh" -#include "request.hh" +#include "event.hh" #include "dots.hh" #include "dot-column.hh" #include "staff-symbol-referencer.hh" diff --git a/lily/note-name-engraver.cc b/lily/note-name-engraver.cc index 3d4a1833bf..7b0cf44407 100644 --- a/lily/note-name-engraver.cc +++ b/lily/note-name-engraver.cc @@ -8,7 +8,7 @@ */ #include "engraver.hh" -#include "request.hh" +#include "event.hh" #include "item.hh" class Note_name_engraver : public Engraver diff --git a/lily/note-performer.cc b/lily/note-performer.cc index 5390447402..da0ec82a6b 100644 --- a/lily/note-performer.cc +++ b/lily/note-performer.cc @@ -7,7 +7,7 @@ */ #include "performer.hh" -#include "request.hh" +#include "event.hh" #include "audio-item.hh" #include "audio-column.hh" #include "global-translator.hh" diff --git a/lily/output-property-music-iterator.cc b/lily/output-property-music-iterator.cc index a6e096d46e..80432df3f5 100644 --- a/lily/output-property-music-iterator.cc +++ b/lily/output-property-music-iterator.cc @@ -17,7 +17,7 @@ Output_property_music_iterator::process (Moment m) { bool accepted = try_music (get_music ()); if (!accepted) - get_music ()->origin ()->warning (_f ("Junking request: `%s'", + get_music ()->origin ()->warning (_f ("Junking event: `%s'", classname (get_music ()))); } diff --git a/lily/parser.yy b/lily/parser.yy index 72bc32d8ef..aef363d8e2 100644 --- a/lily/parser.yy +++ b/lily/parser.yy @@ -28,7 +28,6 @@ this. #include "translator-def.hh" #include "lily-guile.hh" -#include "change-iterator.hh" #include "misc.hh" #include "my-lily-lexer.hh" #include "paper-def.hh" @@ -37,28 +36,16 @@ this. #include "file-path.hh" #include "warn.hh" #include "dimensions.hh" - -#include "request.hh" #include "my-lily-parser.hh" #include "score.hh" -#include "music-list.hh" -#include "output-property-music-iterator.hh" -#include "property-iterator.hh" #include "input-file-results.hh" #include "input.hh" -#include "relative-music.hh" -#include "lyric-combine-music.hh" -#include "transposed-music.hh" -#include "time-scaled-music.hh" -#include "repeated-music.hh" -#include "untransposable-music.hh" #include "lilypond-input-version.hh" -#include "grace-music.hh" #include "scm-hash.hh" #include "auto-change-iterator.hh" -#include "un-relativable-music.hh" #include "chord.hh" #include "ly-modules.hh" +#include "music-sequence.hh" bool regular_identifier_b (SCM id) @@ -109,7 +96,7 @@ make_span_req (SCM name) { static SCM proc; if (!proc) - proc = scm_c_eval_string ("old-span-request->event"); + proc = scm_c_eval_string ("old-span-event->event"); SCM m = scm_call_1 (proc, name); scm_gc_protect_object (m); return unsmob_music (m); @@ -264,7 +251,7 @@ yylex (YYSTYPE *s, void * v) %token MUSIC_OUTPUT_DEF_IDENTIFIER %token NUMBER_IDENTIFIER -%token REQUEST_IDENTIFIER +%token EVENT_IDENTIFIER %token MUSIC_IDENTIFIER TRANSLATOR_IDENTIFIER %token STRING_IDENTIFIER SCM_IDENTIFIER %token RESTNAME @@ -275,10 +262,10 @@ yylex (YYSTYPE *s, void * v) %type output_def %type lilypond_header lilypond_header_body -%type open_request_parens close_request_parens open_request close_request -%type request_with_dir request_that_take_dir verbose_request +%type open_event_parens close_event_parens open_event close_event +%type event_with_dir event_that_take_dir verbose_event %type sub_quotes sup_quotes -%type simple_element request_chord command_element Simple_music Composite_music +%type simple_element event_chord command_element Simple_music Composite_music %type Repeated_music %type Alternative_music %type tremolo_type @@ -289,7 +276,7 @@ yylex (YYSTYPE *s, void * v) %type steno_duration optional_notemode_duration multiplied_duration %type verbose_duration -%type pre_requests post_requests +%type pre_events post_events %type gen_text_def %type steno_pitch pitch absolute_pitch %type explicit_pitch steno_tonic_pitch @@ -306,17 +293,17 @@ yylex (YYSTYPE *s, void * v) %type Music_list %type music_output_def_body %type shorthand_command_req -%type post_request +%type post_event %type command_req verbose_command_req %type extender_req %type hyphen_req -%type string_request +%type string_event %type string bare_number number_expression number_term number_factor %type score_block score_body %type translator_spec_block translator_spec_body -%type tempo_request +%type tempo_event %type notenames_body notenames_block chordmodifiers_block %type script_abbreviation @@ -463,7 +450,7 @@ identifier_init: $$ = $1->self_scm (); scm_gc_unprotect_object ($$); } - | post_request { + | post_event { $$ = $1->self_scm (); scm_gc_unprotect_object ($$); } @@ -652,7 +639,7 @@ music_output_def_body: | music_output_def_body STYLESHEET embedded_scm { dynamic_cast ($$)-> style_sheet_ = $3; } - | music_output_def_body tempo_request { + | music_output_def_body tempo_event { /* junk this ? there already is tempo stuff in music. @@ -668,7 +655,7 @@ music_output_def_body: } ; -tempo_request: +tempo_event: TEMPO steno_duration '=' bare_unsigned { $$ = MY_MAKE_MUSIC("TempoEvent"); $$->set_mus_property ("duration", $2); @@ -790,7 +777,7 @@ Simultaneous_music: ; Simple_music: - request_chord { $$ = $1; } + event_chord { $$ = $1; } | OUTPUTPROPERTY embedded_scm embedded_scm '=' embedded_scm { SCM pred = $2; if (!gh_symbol_p ($3)) @@ -1152,10 +1139,10 @@ scalar: ; -request_chord: - pre_requests { +event_chord: + pre_events { THIS->push_spot (); - } /*cont */ simple_element post_requests { + } /*cont */ simple_element post_events { Music_sequence *l = dynamic_cast ($3); $1->concat (*$4); @@ -1173,7 +1160,7 @@ request_chord: command_element: command_req { - $$ = MY_MAKE_MUSIC("RequestChord"); + $$ = MY_MAKE_MUSIC("EventChord"); $$->set_mus_property ("elements", scm_cons ($1->self_scm (), SCM_EOL)); scm_gc_unprotect_object ($1->self_scm()); @@ -1185,7 +1172,7 @@ command_element: l->set_mus_property ("span-direction", gh_int2scm (START)); l->set_spot (THIS->here_input ()); - $$ = MY_MAKE_MUSIC("RequestChord"); + $$ = MY_MAKE_MUSIC("EventChord"); $$->set_mus_property ("elements", scm_cons (l->self_scm (), SCM_EOL)); scm_gc_unprotect_object (l->self_scm()); $$->set_spot (THIS->here_input ()); @@ -1195,7 +1182,7 @@ command_element: l->set_mus_property ("span-direction", gh_int2scm (STOP)); l->set_spot (THIS->here_input ()); - $$ = MY_MAKE_MUSIC("RequestChord"); + $$ = MY_MAKE_MUSIC("EventChord"); $$->set_mus_property ("elements", scm_cons (l->self_scm (), SCM_EOL)); $$->set_spot (THIS->here_input ()); scm_gc_unprotect_object (l->self_scm()); @@ -1343,7 +1330,7 @@ verbose_command_req: $$ = skip; } - | tempo_request { + | tempo_event { $$ = $1; } | KEY DEFAULT { @@ -1359,25 +1346,25 @@ verbose_command_req: } ; -post_requests: +post_events: { $$ = new Link_array; } - | post_requests post_request { + | post_events post_event { $2->set_spot (THIS->here_input ()); $$->push ($2); } ; -post_request: - verbose_request - | request_with_dir - | close_request - | string_request +post_event: + verbose_event + | event_with_dir + | close_event + | string_event ; -string_request: +string_event: E_UNSIGNED { Music * s = MY_MAKE_MUSIC("StringNumberEvent"); s->set_mus_property ("string-number", gh_int2scm($1)); @@ -1387,9 +1374,9 @@ string_request: ; -request_that_take_dir: +event_that_take_dir: gen_text_def - | verbose_request + | verbose_event | script_abbreviation { SCM s = THIS->lexer_->lookup_identifier ("dash" + ly_scm2string ($1)); Music *a = MY_MAKE_MUSIC("ArticulationEvent"); @@ -1400,15 +1387,15 @@ request_that_take_dir: } ; -request_with_dir: - script_dir request_that_take_dir { +event_with_dir: + script_dir event_that_take_dir { $2->set_mus_property ("direction", gh_int2scm ($1)); $$ = $2; } ; -verbose_request: - REQUEST_IDENTIFIER { +verbose_event: + EVENT_IDENTIFIER { $$ = unsmob_music ($1)->clone (); $$->set_spot (THIS->here_input ()); } @@ -1562,15 +1549,15 @@ hyphen_req: } ; -close_request: - close_request_parens { +close_event: + close_event_parens { $$ = $1; dynamic_cast ($$)->set_mus_property ("span-direction", gh_int2scm (START)) ; } ; -close_request_parens: +close_event_parens: '(' { Music * s= MY_MAKE_MUSIC("SlurEvent"); $$ = s; @@ -1594,15 +1581,15 @@ close_request_parens: ; -open_request: - open_request_parens { +open_event: + open_event_parens { $$ = $1; dynamic_cast ($$)->set_mus_property ("span-direction", gh_int2scm (STOP)) ; } ; -open_request_parens: +open_event_parens: E_EXCLAMATION { Music *s = MY_MAKE_MUSIC("CrescendoEvent"); s->set_spot (THIS->here_input()); @@ -1677,11 +1664,11 @@ script_dir: | '-' { $$ = CENTER; } ; -pre_requests: +pre_events: { $$ = new Link_array; } - | pre_requests open_request { + | pre_events open_event { $$->push ($2); } ; @@ -1846,7 +1833,7 @@ figure_list: figure_spec: FIGURE_OPEN figure_list FIGURE_CLOSE { - Music * m = MY_MAKE_MUSIC("RequestChord"); + Music * m = MY_MAKE_MUSIC("EventChord"); $2 = scm_reverse_x ($2, SCM_EOL); m->set_mus_property ("elements", $2); $$ = m->self_scm (); @@ -1881,7 +1868,7 @@ simple_element: if ($2 % 2 || $3 % 2) n->set_mus_property ("force-accidental", SCM_BOOL_T); - Music *v = MY_MAKE_MUSIC("RequestChord"); + Music *v = MY_MAKE_MUSIC("EventChord"); v->set_mus_property ("elements", scm_list_n (n->self_scm (), SCM_UNDEFINED)); scm_gc_unprotect_object (n->self_scm()); @@ -1916,7 +1903,7 @@ simple_element: rest_req->set_spot (i); e = rest_req->self_scm (); } - Music * velt = MY_MAKE_MUSIC("RequestChord"); + Music * velt = MY_MAKE_MUSIC("EventChord"); velt-> set_mus_property ("elements", scm_list_n (e,SCM_UNDEFINED)); velt->set_spot (i); @@ -1933,11 +1920,11 @@ simple_element: ; sp2-> set_mus_property ("span-direction", gh_int2scm (STOP)) ; - Music *rqc1 = MY_MAKE_MUSIC("RequestChord"); + Music *rqc1 = MY_MAKE_MUSIC("EventChord"); rqc1->set_mus_property ("elements", scm_list_n (sp1->self_scm (), SCM_UNDEFINED)); - Music *rqc2 = MY_MAKE_MUSIC("RequestChord"); + Music *rqc2 = MY_MAKE_MUSIC("EventChord"); rqc2->set_mus_property ("elements", scm_list_n (sk->self_scm (), SCM_UNDEFINED));; - Music *rqc3 = MY_MAKE_MUSIC("RequestChord"); + Music *rqc3 = MY_MAKE_MUSIC("EventChord"); rqc3->set_mus_property ("elements", scm_list_n (sp2->self_scm (), SCM_UNDEFINED));; SCM ms = scm_list_n (rqc1->self_scm (), rqc2->self_scm (), rqc3->self_scm (), SCM_UNDEFINED); @@ -1952,7 +1939,7 @@ simple_element: lreq->set_mus_property ("text", $1); lreq->set_mus_property ("duration",$2); lreq->set_spot (i); - Music * velt = MY_MAKE_MUSIC("RequestChord"); + Music * velt = MY_MAKE_MUSIC("EventChord"); velt->set_mus_property ("elements", scm_list_n (lreq->self_scm (), SCM_UNDEFINED)); $$= velt; diff --git a/lily/part-combine-music-iterator.cc b/lily/part-combine-music-iterator.cc index 9a4c25b529..89e20c52cd 100644 --- a/lily/part-combine-music-iterator.cc +++ b/lily/part-combine-music-iterator.cc @@ -8,7 +8,7 @@ #include "part-combine-music-iterator.hh" #include "translator-group.hh" -#include "request.hh" +#include "event.hh" #include "music-sequence.hh" #include "lily-guile.hh" #include "warn.hh" diff --git a/lily/phrasing-slur-engraver.cc b/lily/phrasing-slur-engraver.cc index 609a707a07..6eb01c6d8d 100644 --- a/lily/phrasing-slur-engraver.cc +++ b/lily/phrasing-slur-engraver.cc @@ -4,7 +4,7 @@ (c) 1997--2002 Han-Wen Nienhuys */ -#include "request.hh" +#include "event.hh" #include "slur.hh" #include "warn.hh" #include "note-column.hh" @@ -14,7 +14,7 @@ class Phrasing_slur_engraver : public Engraver { - Link_array requestses_; + Link_array eventses_; Link_array new_phrasing_slur_reqs_; Link_array phrasing_slur_l_stack_; Link_array end_phrasing_slurs_; @@ -53,7 +53,7 @@ Phrasing_slur_engraver::try_music (Music *req) end_phrasing_slurs_[i]->suicide (); } end_phrasing_slurs_.clear (); - requestses_.clear (); + eventses_.clear (); new_phrasing_slur_reqs_.clear (); } else if (req->is_mus_type ("phrasing-slur-event")) @@ -111,9 +111,9 @@ Phrasing_slur_engraver::finalize () } phrasing_slur_l_stack_.clear (); - for (int i=0; i < requestses_.size (); i++) + for (int i=0; i < eventses_.size (); i++) { - requestses_[i]->origin ()->warning (_ ("unterminated phrasing slur")); + eventses_[i]->origin ()->warning (_ ("unterminated phrasing slur")); } } @@ -136,7 +136,7 @@ Phrasing_slur_engraver::process_acknowledged_grobs () { Grob* phrasing_slur = phrasing_slur_l_stack_.pop (); end_phrasing_slurs_.push (phrasing_slur); - requestses_.pop (); + eventses_.pop (); } } else if (d == START) @@ -146,7 +146,7 @@ Phrasing_slur_engraver::process_acknowledged_grobs () Grob* phrasing_slur = new Spanner (get_property ("PhrasingSlur")); Slur::set_interface (phrasing_slur); // can't remove. start_phrasing_slurs.push (phrasing_slur); - requestses_.push (phrasing_slur_req); + eventses_.push (phrasing_slur_req); announce_grob(phrasing_slur, phrasing_slur_req->self_scm()); } } diff --git a/lily/piano-pedal-engraver.cc b/lily/piano-pedal-engraver.cc index b68359a4d7..4140c596e0 100644 --- a/lily/piano-pedal-engraver.cc +++ b/lily/piano-pedal-engraver.cc @@ -10,7 +10,7 @@ */ #include "engraver.hh" -#include "request.hh" +#include "event.hh" #include "grob.hh" #include "item.hh" #include "lily-guile.hh" diff --git a/lily/piano-pedal-performer.cc b/lily/piano-pedal-performer.cc index 707bac9733..e989b9d192 100644 --- a/lily/piano-pedal-performer.cc +++ b/lily/piano-pedal-performer.cc @@ -8,7 +8,7 @@ #include "performer.hh" -#include "request.hh" +#include "event.hh" #include "audio-item.hh" /** diff --git a/lily/porrectus-engraver.cc b/lily/porrectus-engraver.cc index 2d9f6eef13..094ea40f80 100644 --- a/lily/porrectus-engraver.cc +++ b/lily/porrectus-engraver.cc @@ -22,7 +22,7 @@ * ligature context that encloses use of this engraver, using syntax * like: \ligature { e \~ c }. * - * TODO: Do not allow a series of adjacent porrectus requests, as in: + * TODO: Do not allow a series of adjacent porrectus events, as in: * e \~ d \~ c. * * TODO: Junk duplicate (or rather triple) implementation of @@ -31,7 +31,7 @@ #include "staff-symbol-referencer.hh" #include "porrectus.hh" -#include "request.hh" +#include "event.hh" #include "rhythmic-head.hh" #include "item.hh" diff --git a/lily/request-chord-iterator.cc b/lily/request-chord-iterator.cc deleted file mode 100644 index 009302da5d..0000000000 --- a/lily/request-chord-iterator.cc +++ /dev/null @@ -1,82 +0,0 @@ -/* - request-chord-iterator.cc -- implement Request_chord_iterator - - source file of the GNU LilyPond music typesetter - - (c) 1997--2002 Han-Wen Nienhuys -*/ - -#include "translator-group.hh" -#include "warn.hh" -#include "request-chord-iterator.hh" -#include "music-list.hh" -#include "request.hh" - -Request_chord_iterator::Request_chord_iterator () -{ -} - -Request_chord_iterator::Request_chord_iterator (Request_chord_iterator const &src) - : Simple_music_iterator (src) -{ -} - -Translator_group* -Request_chord_iterator::get_req_translator () -{ - assert (report_to ()); - if (report_to ()->is_bottom_translator_b ()) - return report_to (); - - set_translator (report_to ()->get_default_interpreter ()); - return report_to (); -} - -void -Request_chord_iterator::construct_children () -{ - Simple_music_iterator::construct_children (); - get_req_translator (); -} - -Request_chord* -Request_chord_iterator::get_elt () const -{ - return (Request_chord*) get_music (); -} - -SCM -Request_chord_iterator::get_pending_events (Moment) const -{ - SCM s = SCM_EOL; - if (last_processed_mom_ < Moment (0)) - { - Music_sequence * ms = dynamic_cast (get_music ()); - - for (SCM m = ms->music_list (); gh_pair_p (m); m = ly_cdr (m)) - { - s = gh_cons (ly_car (m) , s); - } - } - return s; -} - -void -Request_chord_iterator::process (Moment m) -{ - if (last_processed_mom_ < Moment (0)) - { - for (SCM s = dynamic_cast (get_music ())->music_list (); - gh_pair_p (s); s = ly_cdr (s)) - { - Music *mus = unsmob_music (ly_car (s)); - - bool gotcha = try_music (mus); - if (!gotcha) - mus->origin ()->warning (_f ("Junking request: `%s'", classname (mus))); - } - } - skip (m); -} - -IMPLEMENT_CTOR_CALLBACK (Request_chord_iterator); diff --git a/lily/request-chord.cc b/lily/request-chord.cc index 619c1bc406..43836dfc79 100644 --- a/lily/request-chord.cc +++ b/lily/request-chord.cc @@ -1,16 +1,16 @@ #include "pitch.hh" -#include "request-chord-iterator.hh" +#include "event-chord-iterator.hh" #include "music-list.hh" -#include "request.hh" +#include "event.hh" -Request_chord::Request_chord () +Event_chord::Event_chord () { } Moment -Request_chord::start_mom () const +Event_chord::start_mom () const { return Music::start_mom (); } -ADD_MUSIC (Request_chord); +ADD_MUSIC (Event_chord); diff --git a/lily/request.cc b/lily/request.cc deleted file mode 100644 index 0c569f93cb..0000000000 --- a/lily/request.cc +++ /dev/null @@ -1,198 +0,0 @@ -/* - request.cc -- implement Request - - source file of the GNU LilyPond music typesetter - - (c) 1996--2002 Han-Wen Nienhuys -*/ - -#include "request.hh" -#include "warn.hh" - - - - -Moment -Request::get_length () const -{ - Duration *d = unsmob_duration (get_mus_property ("duration")); - if (!d) - { - Moment m ; - return m; - } - return d->get_length (); -} - -void -Request::compress (Moment m) -{ - Duration *d = unsmob_duration (get_mus_property ("duration")); - if (d) - set_mus_property ("duration", d ->compressed (m.main_part_).smobbed_copy ()); -} - -void -Request::transpose (Pitch delta) -{ - Pitch *p = unsmob_pitch (get_mus_property ("pitch")); - if (!p) - return ; - - Pitch np = *p; - np.transpose (delta); - - if (abs (np.alteration_) > 2) - { - warning (_f ("Transposition by %s makes accidental larger than two", - delta.string ())); - } - - set_mus_property ("pitch", np.smobbed_copy ()); -} - -Pitch - Request::to_relative_octave (Pitch last) -{ - Pitch *old_pit = unsmob_pitch (get_mus_property ("pitch")); - if (old_pit) - { - Pitch new_pit = *old_pit; - new_pit.to_relative_octave (last); - set_mus_property ("pitch", new_pit.smobbed_copy ()); - - return new_pit; - } - return last; -} - -Request::Request () - : Music () -{ -} - -ADD_MUSIC(Request); -LY_DEFINE(music_duration_length, "music-duration-length", 1, 0,0, - (SCM mus), - "Extract the duration field from @var{mus}, and return the length.") -{ - Music* m = unsmob_music(mus); - SCM_ASSERT_TYPE(m, mus, SCM_ARG1, __FUNCTION__, "Music"); - - Duration *d = unsmob_duration (m->get_mus_property ("duration")); - - Moment l ; - - if (d) - { - l = d->get_length (); - } - else - programming_error("Music has no duration"); - return l.smobbed_copy(); - -} - - -LY_DEFINE(music_duration_compress, "music-duration-compress", 2, 0,0, - (SCM mus, SCM factor), - "Extract the duration field from @var{mus}, and compress it.") -{ - Music* m = unsmob_music(mus); - Moment * f = unsmob_moment (factor); - SCM_ASSERT_TYPE(m, mus, SCM_ARG1, __FUNCTION__, "Music"); - SCM_ASSERT_TYPE(f, factor, SCM_ARG2, __FUNCTION__, "Moment"); - - Duration *d = unsmob_duration (m->get_mus_property ("duration")); - if (d) - m->set_mus_property ("duration", d->compressed (f->main_part_).smobbed_copy()); - return SCM_UNSPECIFIED; -} - - - - - - - -#include "request.hh" - - - -LY_DEFINE(transpose_key_alist,"transpose-key-alist", - 2, 0,0, (SCM l, SCM pitch), - "Make a new key alist of @var{l} transposed by pitch @var{pitch}") -{ - SCM newlist = SCM_EOL; - Pitch *p = unsmob_pitch (pitch); - - for (SCM s = l; gh_pair_p (s); s = ly_cdr (s)) - { - SCM key = ly_caar (s); - SCM alter = ly_cdar (s); - if (gh_pair_p (key)) - { - Pitch orig (gh_scm2int (ly_car (key)), - gh_scm2int (ly_cdr (key)), - gh_scm2int (alter)); - - orig.transpose (*p); - - SCM key = gh_cons (scm_int2num (orig.get_octave ()), - scm_int2num (orig.notename_)); - - newlist = gh_cons (gh_cons (key, scm_int2num (orig.alteration_)), - newlist); - } - else if (gh_number_p (key)) - { - Pitch orig (0, gh_scm2int (key), gh_scm2int (alter)); - orig.transpose (*p); - - key =scm_int2num (orig.notename_); - alter = scm_int2num (orig.alteration_); - newlist = gh_cons (gh_cons (key, alter), newlist); - } - } - return scm_reverse_x (newlist, SCM_EOL); -} - -void -Key_change_req::transpose (Pitch p) -{ - SCM pa = get_mus_property ("pitch-alist"); - - set_mus_property ("pitch-alist", transpose_key_alist (pa, p.smobbed_copy())); -} - - -bool -alist_equal_p (SCM a, SCM b) -{ - for (SCM s = a; - gh_pair_p (s); s = ly_cdr (s)) - { - SCM key = ly_caar (s); - SCM val = ly_cdar (s); - SCM l = scm_assoc (key, b); - - if (l == SCM_BOOL_F - || !gh_equal_p ( ly_cdr (l), val)) - - return false; - } - return true; -} - -bool -Key_change_req::do_equal_b (Request const * m )const -{ - Key_change_req const * kc =dynamic_cast (m); - - if(!kc) - return false; - return alist_equal_p (get_mus_property ("pitch-alist"), - kc->get_mus_property ("pitch-alist")); -} - -ADD_MUSIC (Key_change_req); diff --git a/lily/rest-engraver.cc b/lily/rest-engraver.cc index 8f694da5ef..a9af0ccd93 100644 --- a/lily/rest-engraver.cc +++ b/lily/rest-engraver.cc @@ -7,7 +7,7 @@ */ #include "item.hh" #include "staff-symbol-referencer.hh" -#include "request.hh" +#include "event.hh" #include "dots.hh" #include "rhythmic-head.hh" #include "engraver.hh" diff --git a/lily/rhythmic-column-engraver.cc b/lily/rhythmic-column-engraver.cc index 2861bb9cc1..960a6e942a 100644 --- a/lily/rhythmic-column-engraver.cc +++ b/lily/rhythmic-column-engraver.cc @@ -13,7 +13,7 @@ #include "stem.hh" #include "note-column.hh" #include "dot-column.hh" -#include "request.hh" +#include "event.hh" #include "item.hh" #include "group-interface.hh" diff --git a/lily/script-engraver.cc b/lily/script-engraver.cc index e7511c5579..009ee8a978 100644 --- a/lily/script-engraver.cc +++ b/lily/script-engraver.cc @@ -6,7 +6,7 @@ #include "script.hh" #include "side-position-interface.hh" -#include "request.hh" +#include "event.hh" #include "stem.hh" #include "rhythmic-head.hh" #include "engraver.hh" diff --git a/lily/sequential-iterator.cc b/lily/sequential-iterator.cc index e23b136784..9b609b1eda 100644 --- a/lily/sequential-iterator.cc +++ b/lily/sequential-iterator.cc @@ -174,7 +174,7 @@ Sequential_iterator::construct_children () swoop. */ void -Sequential_iterator::next_element (bool side_effect) +Sequential_iterator::next_element (bool) { Moment len =iter_->music_get_length () - iter_->music_start_mom (); assert (!grace_fixups_ || grace_fixups_->start_ >= here_mom_); diff --git a/lily/simple-music-iterator.cc b/lily/simple-music-iterator.cc index 55fd9540c5..2b8519fbf9 100644 --- a/lily/simple-music-iterator.cc +++ b/lily/simple-music-iterator.cc @@ -33,7 +33,7 @@ Simple_music_iterator::ok ()const TODO: remove last_processed_mom_, and the complete shit. We should only process a simple-music once, and that is at its start. - Engravers can detect and request the end-moments to be processed as + Engravers can detect and event the end-moments to be processed as well. */ diff --git a/lily/slur-engraver.cc b/lily/slur-engraver.cc index d5e9f673c1..77942bf6c8 100644 --- a/lily/slur-engraver.cc +++ b/lily/slur-engraver.cc @@ -4,7 +4,7 @@ (c) 1997--2002 Han-Wen Nienhuys */ -#include "request.hh" +#include "event.hh" #include "slur.hh" #include "warn.hh" #include "note-column.hh" @@ -17,7 +17,7 @@ */ class Slur_engraver : public Engraver { - Link_array requests_; + Link_array events_; Link_array new_slur_reqs_; Link_array slur_stack_; Link_array end_slurs_; @@ -57,7 +57,7 @@ Slur_engraver::try_music (Music *req) end_slurs_[i]->suicide (); } end_slurs_.clear (); - requests_.clear (); + events_.clear (); new_slur_reqs_.clear (); } else if (req->is_mus_type ("slur-event")) @@ -75,7 +75,7 @@ Slur_engraver::try_music (Music *req) } /* - But we swallow other slur requests. + But we swallow other slur events. */ return true; @@ -84,7 +84,7 @@ Slur_engraver::try_music (Music *req) else if (d == STOP) { /* - Swallow other requests. + Swallow other events. */ for (int j = new_slur_reqs_.size(); j--;) { @@ -136,9 +136,9 @@ Slur_engraver::finalize () } slur_stack_.clear (); - for (int i=0; i < requests_.size (); i++) + for (int i=0; i < events_.size (); i++) { - requests_[i]->origin ()->warning (_ ("unterminated slur")); + events_[i]->origin ()->warning (_ ("unterminated slur")); } } @@ -155,14 +155,14 @@ Slur_engraver::process_acknowledged_grobs () { if (slur_stack_.empty ()) /* How to shut up this warning, when Voice_devnull_engraver has - eaten start request? */ + eaten start event? */ slur_req->origin ()->warning (_f ("can't find start of slur")); else { Grob* slur = slur_stack_.pop (); end_slurs_.push (slur); - requests_.pop (); + events_.pop (); } } else if (d == START) @@ -172,7 +172,7 @@ Slur_engraver::process_acknowledged_grobs () Grob* slur = new Spanner (get_property ("Slur")); Slur::set_interface (slur); // cannot remove yet! start_slurs.push (slur); - requests_.push (slur_req); + events_.push (slur_req); announce_grob (slur, slur_req->self_scm ()); } } diff --git a/lily/spacing-engraver.cc b/lily/spacing-engraver.cc index 0e4a4fe717..24e8ab969a 100644 --- a/lily/spacing-engraver.cc +++ b/lily/spacing-engraver.cc @@ -7,7 +7,7 @@ */ -#include "request.hh" +#include "event.hh" #include "paper-column.hh" #include "engraver.hh" #include "pqueue.hh" diff --git a/lily/span-dynamic-performer.cc b/lily/span-dynamic-performer.cc index e568cae2e4..db2523d289 100644 --- a/lily/span-dynamic-performer.cc +++ b/lily/span-dynamic-performer.cc @@ -8,7 +8,7 @@ #include "performer.hh" -#include "request.hh" +#include "event.hh" #include "audio-item.hh" struct Audio_dynamic_tuple diff --git a/lily/stem-engraver.cc b/lily/stem-engraver.cc index c9d1ab58ec..86d66d237c 100644 --- a/lily/stem-engraver.cc +++ b/lily/stem-engraver.cc @@ -9,7 +9,7 @@ #include "staff-symbol-referencer.hh" #include "rhythmic-head.hh" #include "stem.hh" -#include "request.hh" +#include "event.hh" #include "misc.hh" #include "stem-tremolo.hh" #include "item.hh" @@ -72,21 +72,21 @@ Stem_engraver::acknowledge_grob (Grob_info i) { /* Stem tremolo is never applied to a note by default, - is must me requested. But there is a default for the + is must me evented. But there is a default for the tremolo value: c4:8 c c: the first and last (quarter) note bothe get one tremolo flag. */ - int requested_type = gh_scm2int (tremolo_req_->get_mus_property ("tremolo-type")); + int evented_type = gh_scm2int (tremolo_req_->get_mus_property ("tremolo-type")); SCM f = get_property ("tremoloFlags"); - if (!requested_type && gh_number_p (f)) - requested_type = gh_scm2int (f); + if (!evented_type && gh_number_p (f)) + evented_type = gh_scm2int (f); else - daddy_trans_->set_property ("tremoloFlags", gh_int2scm (requested_type)); + daddy_trans_->set_property ("tremoloFlags", gh_int2scm (evented_type)); - int tremolo_flags = intlog2 (requested_type) - 2 + int tremolo_flags = intlog2 (evented_type) - 2 - (duration_log > 2 ? duration_log - 2 : 0); if (tremolo_flags <= 0) { diff --git a/lily/swallow-engraver.cc b/lily/swallow-engraver.cc index bda9d59b14..3696bb6f26 100644 --- a/lily/swallow-engraver.cc +++ b/lily/swallow-engraver.cc @@ -10,7 +10,7 @@ /** This engraver swallows everything given to it silently. The purpose of - this is to prevent spurious "request junked" warnings. + this is to prevent spurious "event junked" warnings. */ class Swallow_engraver : public Engraver { diff --git a/lily/tab-note-heads-engraver.cc b/lily/tab-note-heads-engraver.cc index 60333dbc75..ddf956b126 100644 --- a/lily/tab-note-heads-engraver.cc +++ b/lily/tab-note-heads-engraver.cc @@ -8,7 +8,7 @@ #include "rhythmic-head.hh" #include "paper-def.hh" -#include "request.hh" +#include "event.hh" #include "dots.hh" #include "dot-column.hh" #include "staff-symbol-referencer.hh" diff --git a/lily/text-engraver.cc b/lily/text-engraver.cc index 57acc8c4c7..714ed9004b 100644 --- a/lily/text-engraver.cc +++ b/lily/text-engraver.cc @@ -11,7 +11,7 @@ #include "engraver.hh" #include "side-position-interface.hh" #include "item.hh" -#include "request.hh" +#include "event.hh" #include "stem.hh" #include "rhythmic-head.hh" diff --git a/lily/text-item.cc b/lily/text-item.cc index 3891298670..6e70076a55 100644 --- a/lily/text-item.cc +++ b/lily/text-item.cc @@ -183,7 +183,7 @@ Text_item::markup_text2molecule (Grob *me, SCM markup_text, } - /* Set extend to markup requested value. */ + /* Set extend to markup evented value. */ if (extent_b) { Box b = mol.extent_box (); diff --git a/lily/text-spanner-engraver.cc b/lily/text-spanner-engraver.cc index 294545aa45..1235bebe34 100644 --- a/lily/text-spanner-engraver.cc +++ b/lily/text-spanner-engraver.cc @@ -7,7 +7,7 @@ */ #include "dimensions.hh" -#include "request.hh" +#include "event.hh" #include "paper-column.hh" #include "note-column.hh" #include "item.hh" diff --git a/lily/thread-devnull-engraver.cc b/lily/thread-devnull-engraver.cc index 2c1e13716b..4225b22399 100644 --- a/lily/thread-devnull-engraver.cc +++ b/lily/thread-devnull-engraver.cc @@ -8,7 +8,7 @@ #include "engraver.hh" #include "item.hh" -#include "request.hh" +#include "event.hh" #include "translator-group.hh" class Thread_devnull_engraver : public Engraver diff --git a/lily/tie-engraver.cc b/lily/tie-engraver.cc index 31ef2079ba..9c71a483b8 100644 --- a/lily/tie-engraver.cc +++ b/lily/tie-engraver.cc @@ -8,7 +8,7 @@ */ -#include "request.hh" +#include "event.hh" #include "tie.hh" #include "translator-group.hh" #include "spanner.hh" diff --git a/lily/tie-performer.cc b/lily/tie-performer.cc index 7e0c41114b..b9bde30778 100644 --- a/lily/tie-performer.cc +++ b/lily/tie-performer.cc @@ -9,7 +9,7 @@ #include "audio-item.hh" -#include "request.hh" +#include "event.hh" #include "pqueue.hh" #include "performer.hh" diff --git a/lily/time-scaled-music-iterator.cc b/lily/time-scaled-music-iterator.cc index 35f0eef493..84282bc230 100644 --- a/lily/time-scaled-music-iterator.cc +++ b/lily/time-scaled-music-iterator.cc @@ -9,7 +9,7 @@ #include "time-scaled-music-iterator.hh" #include "time-scaled-music.hh" -#include "request.hh" +#include "event.hh" #include "translator-group.hh" diff --git a/lily/tuplet-engraver.cc b/lily/tuplet-engraver.cc index 3488b06fa0..88f000ead5 100644 --- a/lily/tuplet-engraver.cc +++ b/lily/tuplet-engraver.cc @@ -45,7 +45,7 @@ Tuplet_engraver::try_music (Music *c) if (c->is_mus_type ("time-scaled-music")) { Music *el = unsmob_music (c->get_mus_property ("element")); - if (el && !el->is_mus_type ("request-chord")) + if (el && !el->is_mus_type ("event-chord")) { time_scaled_musics_.push (c); Rational m = now_mom ().main_part_ + c->get_length ().main_part_; diff --git a/lily/type-swallow-translator.cc b/lily/type-swallow-translator.cc index dbdf93f488..21c4c2369d 100644 --- a/lily/type-swallow-translator.cc +++ b/lily/type-swallow-translator.cc @@ -7,7 +7,7 @@ */ #include "translator.hh" -#include "request.hh" +#include "event.hh" class Skip_req_swallow_translator : public virtual Translator { diff --git a/lily/voice-devnull-engraver.cc b/lily/voice-devnull-engraver.cc index 084d658447..3d901a0b75 100644 --- a/lily/voice-devnull-engraver.cc +++ b/lily/voice-devnull-engraver.cc @@ -8,7 +8,7 @@ #include "engraver.hh" #include "item.hh" -#include "request.hh" +#include "event.hh" #include "translator-group.hh" class Voice_devnull_engraver : public Engraver @@ -66,7 +66,7 @@ Voice_devnull_engraver::try_music (Music *m) return true; } } - /* Ugh. Should eat other requests, script etc. too. */ + /* Ugh. Should eat other events, script etc. too. */ else if (m->is_mus_type ("tie-event")) return true; } diff --git a/scm/music-types.scm b/scm/music-types.scm index 55117bf81f..03d2c60494 100644 --- a/scm/music-types.scm +++ b/scm/music-types.scm @@ -4,7 +4,7 @@ (AbortEvent . ( (description . "Abort currently running spanners.") - (internal-class-name . "Request") + (internal-class-name . "Event") (span-type . "abort") (types . (general-music event abort-event)) )) @@ -12,7 +12,7 @@ . ( (description . "Make an arpeggio on this note. Syntax: @var{note}-@code{\\arpeggio}") - (internal-class-name . "Request") + (internal-class-name . "Event") (types . (general-music arpeggio-event event)) )) @@ -22,7 +22,7 @@ . ( (description . "") - (internal-class-name . "Request") + (internal-class-name . "Event") (types . (general-music event articulation-event script-event)) )) (AutoChangeMusic @@ -44,35 +44,35 @@ . ( (description . "") - (internal-class-name . "Request") + (internal-class-name . "Event") (types . (general-music event rhythmic-event bass-figure-event)) )) (BeamEvent . ( (description . "") - (internal-class-name . "Request") + (internal-class-name . "Event") (types . (general-music event beam-event span-event)) )) (BreakEvent . ( (description . "") - (internal-class-name . "Request") + (internal-class-name . "Event") (types . (general-music break-event event)) )) (BreathingSignEvent . ( (description . "") - (internal-class-name . "Request") + (internal-class-name . "Event") (types . (general-music event breathing-event)) )) (BusyPlayingEvent . ( (description . "") - (internal-class-name . "Request") + (internal-class-name . "Event") (types . (general-music event busy-playing-event)) )) (ContextSpeccedMusic @@ -86,28 +86,28 @@ . ( (description . "") - (internal-class-name . "Request") + (internal-class-name . "Event") (types . (general-music dynamic-event crescendo-event event)) )) (DecrescendoEvent . ( (description . "") - (internal-class-name . "Request") + (internal-class-name . "Event") (types . (general-music dynamic-event decrescendo-event event)) )) (ExtenderEvent . ( (description . "") - (internal-class-name . "Request") + (internal-class-name . "Event") (types . (general-music extender-event event)) )) (GlissandoEvent . ( (description . "") - (internal-class-name . "Request") + (internal-class-name . "Event") (types . (general-music glissando-event event)) )) (GraceMusic @@ -122,7 +122,7 @@ . ( (description . "") - (internal-class-name . "Request") + (internal-class-name . "Event") (types . (general-music hyphen-event event)) )) (KeyChangeEvent @@ -146,14 +146,14 @@ (description . "A lyric syllable. Must be entered in lyrics mode, i.e. @code{\\lyrics @{ twinkle4 twinkle4 @} } .") - (internal-class-name . "Request") + (internal-class-name . "Event") (types . (general-music rhythmic-event lyric-event event)) )) (LigatureEvent . ( (description . "") - (internal-class-name . "Request") + (internal-class-name . "Event") (span-type . ligature) (types . (general-music event span-event ligature-event)) )) @@ -161,28 +161,28 @@ . ( (description . "") - (internal-class-name . "Request") + (internal-class-name . "Event") (types . (general-music mark-event event)) )) (MelismaEvent . ( (description . "") - (internal-class-name . "Request") + (internal-class-name . "Event") (types . (general-music span-event melisma-playing-event event)) )) (MelismaPlayingEvent . ( (description . "") - (internal-class-name . "Request") + (internal-class-name . "Event") (types . (general-music event)) )) (MultiMeasureRestEvent . ( (description . "Rests that may be compressed into Multi rests. Syntax @code{R2.*4} for 4 measures in 3/4 time. Note the capital R.") - (internal-class-name . "Request") + (internal-class-name . "Event") (types . (general-music event multi-measure-rest-event)) )) (Music @@ -196,7 +196,7 @@ . ( (description . "") - (internal-class-name . "Request") + (internal-class-name . "Event") (types . (general-music event note-event rhythmic-event melodic-event)) )) (OverrideProperty @@ -219,7 +219,7 @@ (PhrasingSlurEvent . ( (description . "Start or end phrasing slur. Syntax NOTE \\( and \\) NOTE") - (internal-class-name . "Request") + (internal-class-name . "Event") (types . (general-music span-event phrasing-slur-event slur-event)) )) (PropertySet @@ -243,7 +243,7 @@ . ( (description . "") - (internal-class-name . "Request") + (internal-class-name . "Event") (types . (general-music porrectus-event event)) )) (RepeatedMusic @@ -253,18 +253,18 @@ (type . repeated-music) (types . (general-music repeated-music)) )) - (Request + (Event . ( (description . "") - (internal-class-name . "Request") + (internal-class-name . "Event") (types . (general-music event)) )) (RestEvent . ( (description . "") - (internal-class-name . "Request") + (internal-class-name . "Event") (types . (general-music event rhythmic-event rest-event)) )) (SequentialMusic @@ -287,7 +287,7 @@ (SlurEvent . ( (description . "Start or end slur. Syntax NOTE( and )NOTE") - (internal-class-name . "Request") + (internal-class-name . "Event") (types . (general-music span-event slur-event)) )) @@ -312,7 +312,7 @@ (TextSpanEvent . ( (description . "Start a text spanner like 8va.....|") - (internal-class-name . "Request") + (internal-class-name . "Event") (types . (general-music span-event text-span-event)) )) (TranslatorChange @@ -362,13 +362,13 @@ )) - (RequestChord + (EventChord . ( (description . "") - (internal-class-name . "Request_chord") - (iterator-ctor . ,Request_chord_iterator::constructor) - (types . (general-music request-chord simultaneous-music)) + (internal-class-name . "Event_chord") + (iterator-ctor . ,Event_chord_iterator::constructor) + (types . (general-music event-chord simultaneous-music)) ) ) @@ -376,71 +376,71 @@ . ( (description . "") - (internal-class-name . "Request") + (internal-class-name . "Event") (types . (general-music event)) )) (SkipEvent . ( (description . "") - (internal-class-name . "Request") + (internal-class-name . "Event") (types . (general-music event rhythmic-event skip-event)) )) (SpanEvent . ( (description . "") - (internal-class-name . "Request") + (internal-class-name . "Event") (types . (general-music event)) )) (SustainPedalEvent . ( (description . "") - (internal-class-name . "Request") + (internal-class-name . "Event") (types . (general-music pedal-event sustain-pedal-event)) )) (SostenutoEvent . ( (description . "") - (internal-class-name . "Request") + (internal-class-name . "Event") (types . (general-music pedal-event sostenuto-pedal-event)) )) (UnaCordaEvent . ( (description . "") - (internal-class-name . "Request") + (internal-class-name . "Event") (types . (general-music pedal-event una-corda-pedal-event)) )) (StringNumberEvent . ( (description . "") - (internal-class-name . "Request") + (internal-class-name . "Event") (types . (general-music string-number-event event)) )) (TempoEvent . ( (description . "") - (internal-class-name . "Request") + (internal-class-name . "Event") (types . (general-music tempo-event event)) )) (TextScriptEvent . ( (description . "") - (internal-class-name . "Request") + (internal-class-name . "Event") (types . (general-music script-event text-script-event event)) )) (TieEvent . ( (description . "A tie. Entered as ~.") - (internal-class-name . "Request") + (internal-class-name . "Event") (types . (general-music tie-event event)) )) (TremoloEvent . ( (description . "Un measured tremolo.") - (internal-class-name . "Request") + (internal-class-name . "Event") (types . (general-music event tremolo-event)) )) (VoiceSeparator @@ -545,7 +545,7 @@ )) -(define-public (old-span-request->event name) +(define-public (old-span-event->event name) (let ( (entry (assoc -- 2.39.5