2002-09-28 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ * lily/ : rename Request to Event
+
* lily/parser.yy (command_element): move clef stuff into Scheme.
* lily/: rename length_mom () to get_length()
Modified 2001-2002 by Rune Zedeler <rz@daimi.au.dk>
*/
-#include "request.hh"
+#include "event.hh"
#include "item.hh"
#include "tie.hh"
#include "item.hh"
#include "note-head.hh"
#include "staff-symbol-referencer.hh"
-#include "request.hh"
+#include "event.hh"
#include "pitch.hh"
/*
*
* - 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.
*
#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"
*/
#include "beaming.hh"
-#include "request.hh"
+#include "event.hh"
#include "beam.hh"
#include "stem.hh"
#include "warn.hh"
#include "music.hh"
#include "auto-change-iterator.hh"
#include "translator-group.hh"
-#include "request.hh"
+#include "event.hh"
*/
#include "simple-music-iterator.hh"
-#include "request.hh"
+#include "event.hh"
#include "translator-group.hh"
/*
#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"
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{:|},
*/
#include "engraver-group-engraver.hh"
#include "engraver.hh"
-#include "request.hh"
+#include "event.hh"
#include "beam.hh"
#include "stem.hh"
#include "warn.hh"
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",
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.
",
#include "staff-symbol-referencer.hh"
#include "breathing-sign.hh"
-#include "request.hh"
+#include "event.hh"
#include "engraver-group-engraver.hh"
#include "item.hh"
#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"
#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"
*/
#include "chord.hh"
-#include "request.hh"
+#include "event.hh"
#include "warn.hh"
#include "music-list.hh"
-#include "request.hh"
+#include "event.hh"
SCM
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;
#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"
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.
#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.
#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"
/*
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
}
/*
- 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.
#include "performer.hh"
-#include "request.hh"
+#include "event.hh"
#include "audio-item.hh"
/*
TODO:
- handle multiple requests
+ handle multiple events
*/
/**
*/
#include "flower-proto.hh"
-#include "request.hh"
+#include "event.hh"
#include "lyric-extender.hh"
#include "paper-column.hh"
#include "item.hh"
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
{
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;
}
#include "engraver.hh"
#include "text-item.hh"
-#include "request.hh"
+#include "event.hh"
#include "item.hh"
class Figured_bass_engraver : public Engraver
#include "engraver.hh"
#include "side-position-interface.hh"
#include "item.hh"
-#include "request.hh"
+#include "event.hh"
#include "stem.hh"
#include "rhythmic-head.hh"
#include "warn.hh"
#include "music.hh"
-#include "request.hh"
+#include "event.hh"
#include "music-list.hh"
#include "music-iterator.hh"
#include "global-translator.hh"
*/
#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)
*/
#include "flower-proto.hh"
-#include "request.hh"
+#include "event.hh"
#include "hyphen-spanner.hh"
#include "paper-column.hh"
#include "item.hh"
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
{
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;
}
#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 {
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;
};
/**
- 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 ();
};
/**
-
-
/*
- music-sequence.hh -- declare
+ music-sequence.hh -- declare Music_sequence
source file of the GNU LilyPond music typesetter
#include "audio-element-info.hh"
#include "array.hh"
-#include "request.hh"
+#include "event.hh"
#include "grob-info.hh"
#include "translator.hh"
+++ /dev/null
-/*
- request-iter.hh -- declare Request_chord_iterator
-
- source file of the GNU LilyPond music typesetter
-
- (c) 1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-*/
-
-
-#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
+++ /dev/null
-/*
- request.hh -- declare Request baseclasses.
-
- source file of the GNU LilyPond music typesetter
-
- (c) 1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-*/
-
-#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
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 {
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 ();
#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
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); \
}; \
swallow_string_ = #TYPE; \
} \
ENTER_DESCRIPTION(TYPE ## _swallow_translator, \
- "Swallow requests of " #TYPE " type.", \
+ "Swallow events of " #TYPE " type.", \
"", \
"general-music",\
"", \
-#include "request.hh"
+#include "event.hh"
#include "item.hh"
#include "bar-line.hh"
#include "staff-symbol-referencer.hh"
#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"
} else if (Music * mus =unsmob_music (sid)) {
yylval.scm = sid;
- return dynamic_cast<Request*> (mus) ? REQUEST_IDENTIFIER : MUSIC_IDENTIFIER;
+ return dynamic_cast<Event*> (mus) ? EVENT_IDENTIFIER : MUSIC_IDENTIFIER;
} else if (unsmob_duration (sid)) {
yylval.scm = sid;
return DURATION_IDENTIFIER;
}
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",
}
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",
#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"
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))
*/
#include "engraver.hh"
-#include "request.hh"
+#include "event.hh"
#include "item.hh"
#include "paper-def.hh"
#include "font-metric.hh"
(c) 1997--2002 Jan Nieuwenhuizen <janneke@gnu.org>
*/
-#include "request.hh"
+#include "event.hh"
#include "audio-item.hh"
#include "lily-proto.hh"
#include "performer.hh"
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,
*/
#include "engraver.hh"
-#include "request.hh"
+#include "event.hh"
#include "grob.hh"
#include "translator-group.hh"
#include "mensural-ligature.hh"
#include "ligature-engraver.hh"
-#include "request.hh"
+#include "event.hh"
#include "warn.hh"
#include "item.hh"
#include "spanner.hh"
* 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.
*
/*
* 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.
*/
/*
}
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",
Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
-#include "request.hh"
+#include "event.hh"
#include "multi-measure-rest.hh"
#include "paper-column.hh"
#include "engraver-group-engraver.hh"
*/
-#include "request.hh"
+#include "event.hh"
#include "item.hh"
#include "tie.hh"
#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"
#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"
#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"
*/
#include "engraver.hh"
-#include "request.hh"
+#include "event.hh"
#include "item.hh"
class Note_name_engraver : public Engraver
*/
#include "performer.hh"
-#include "request.hh"
+#include "event.hh"
#include "audio-item.hh"
#include "audio-column.hh"
#include "global-translator.hh"
{
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 ())));
}
#include "translator-def.hh"
#include "lily-guile.hh"
-#include "change-iterator.hh"
#include "misc.hh"
#include "my-lily-lexer.hh"
#include "paper-def.hh"
#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)
{
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);
%token <scm> MUSIC_OUTPUT_DEF_IDENTIFIER
%token <scm> NUMBER_IDENTIFIER
-%token <scm> REQUEST_IDENTIFIER
+%token <scm> EVENT_IDENTIFIER
%token <scm> MUSIC_IDENTIFIER TRANSLATOR_IDENTIFIER
%token <scm> STRING_IDENTIFIER SCM_IDENTIFIER
%token <scm> RESTNAME
%type <outputdef> output_def
%type <scm> lilypond_header lilypond_header_body
-%type <music> open_request_parens close_request_parens open_request close_request
-%type <music> request_with_dir request_that_take_dir verbose_request
+%type <music> open_event_parens close_event_parens open_event close_event
+%type <music> event_with_dir event_that_take_dir verbose_event
%type <i> sub_quotes sup_quotes
-%type <music> simple_element request_chord command_element Simple_music Composite_music
+%type <music> simple_element event_chord command_element Simple_music Composite_music
%type <music> Repeated_music
%type <scm> Alternative_music
%type <i> tremolo_type
%type <scm> steno_duration optional_notemode_duration multiplied_duration
%type <scm> verbose_duration
-%type <reqvec> pre_requests post_requests
+%type <reqvec> pre_events post_events
%type <music> gen_text_def
%type <scm> steno_pitch pitch absolute_pitch
%type <scm> explicit_pitch steno_tonic_pitch
%type <scm> Music_list
%type <outputdef> music_output_def_body
%type <music> shorthand_command_req
-%type <music> post_request
+%type <music> post_event
%type <music> command_req verbose_command_req
%type <music> extender_req
%type <music> hyphen_req
-%type <music> string_request
+%type <music> string_event
%type <scm> string bare_number number_expression number_term number_factor
%type <score> score_block score_body
%type <scm> translator_spec_block translator_spec_body
-%type <music> tempo_request
+%type <music> tempo_event
%type <scm> notenames_body notenames_block chordmodifiers_block
%type <scm> script_abbreviation
$$ = $1->self_scm ();
scm_gc_unprotect_object ($$);
}
- | post_request {
+ | post_event {
$$ = $1->self_scm ();
scm_gc_unprotect_object ($$);
}
| music_output_def_body STYLESHEET embedded_scm {
dynamic_cast<Paper_def*> ($$)-> style_sheet_ = $3;
}
- | music_output_def_body tempo_request {
+ | music_output_def_body tempo_event {
/*
junk this ? there already is tempo stuff in
music.
}
;
-tempo_request:
+tempo_event:
TEMPO steno_duration '=' bare_unsigned {
$$ = MY_MAKE_MUSIC("TempoEvent");
$$->set_mus_property ("duration", $2);
;
Simple_music:
- request_chord { $$ = $1; }
+ event_chord { $$ = $1; }
| OUTPUTPROPERTY embedded_scm embedded_scm '=' embedded_scm {
SCM pred = $2;
if (!gh_symbol_p ($3))
;
-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<Music_sequence*> ($3);
$1->concat (*$4);
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());
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 ());
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());
$$ = skip;
}
- | tempo_request {
+ | tempo_event {
$$ = $1;
}
| KEY DEFAULT {
}
;
-post_requests:
+post_events:
{
$$ = new Link_array<Music>;
}
- | 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));
;
-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");
}
;
-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 ());
}
}
;
-close_request:
- close_request_parens {
+close_event:
+ close_event_parens {
$$ = $1;
dynamic_cast<Music *> ($$)->set_mus_property ("span-direction", gh_int2scm (START))
;
}
;
-close_request_parens:
+close_event_parens:
'(' {
Music * s= MY_MAKE_MUSIC("SlurEvent");
$$ = s;
;
-open_request:
- open_request_parens {
+open_event:
+ open_event_parens {
$$ = $1;
dynamic_cast<Music *> ($$)->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());
| '-' { $$ = CENTER; }
;
-pre_requests:
+pre_events:
{
$$ = new Link_array<Music>;
}
- | pre_requests open_request {
+ | pre_events open_event {
$$->push ($2);
}
;
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 ();
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());
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);
;
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);
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;
#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"
(c) 1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
-#include "request.hh"
+#include "event.hh"
#include "slur.hh"
#include "warn.hh"
#include "note-column.hh"
class Phrasing_slur_engraver : public Engraver
{
- Link_array<Music> requestses_;
+ Link_array<Music> eventses_;
Link_array<Music> new_phrasing_slur_reqs_;
Link_array<Grob> phrasing_slur_l_stack_;
Link_array<Grob> end_phrasing_slurs_;
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"))
}
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"));
}
}
{
Grob* phrasing_slur = phrasing_slur_l_stack_.pop ();
end_phrasing_slurs_.push (phrasing_slur);
- requestses_.pop ();
+ eventses_.pop ();
}
}
else if (d == START)
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());
}
}
*/
#include "engraver.hh"
-#include "request.hh"
+#include "event.hh"
#include "grob.hh"
#include "item.hh"
#include "lily-guile.hh"
#include "performer.hh"
-#include "request.hh"
+#include "event.hh"
#include "audio-item.hh"
/**
* 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
#include "staff-symbol-referencer.hh"
#include "porrectus.hh"
-#include "request.hh"
+#include "event.hh"
#include "rhythmic-head.hh"
#include "item.hh"
+++ /dev/null
-/*
- request-chord-iterator.cc -- implement Request_chord_iterator
-
- source file of the GNU LilyPond music typesetter
-
- (c) 1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-*/
-
-#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<Music_sequence*> (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<Music_sequence *> (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);
#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);
+++ /dev/null
-/*
- request.cc -- implement Request
-
- source file of the GNU LilyPond music typesetter
-
- (c) 1996--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-*/
-
-#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<Key_change_req const*> (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);
*/
#include "item.hh"
#include "staff-symbol-referencer.hh"
-#include "request.hh"
+#include "event.hh"
#include "dots.hh"
#include "rhythmic-head.hh"
#include "engraver.hh"
#include "stem.hh"
#include "note-column.hh"
#include "dot-column.hh"
-#include "request.hh"
+#include "event.hh"
#include "item.hh"
#include "group-interface.hh"
#include "script.hh"
#include "side-position-interface.hh"
-#include "request.hh"
+#include "event.hh"
#include "stem.hh"
#include "rhythmic-head.hh"
#include "engraver.hh"
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_);
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.
*/
(c) 1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
-#include "request.hh"
+#include "event.hh"
#include "slur.hh"
#include "warn.hh"
#include "note-column.hh"
*/
class Slur_engraver : public Engraver
{
- Link_array<Music> requests_;
+ Link_array<Music> events_;
Link_array<Music> new_slur_reqs_;
Link_array<Grob> slur_stack_;
Link_array<Grob> end_slurs_;
end_slurs_[i]->suicide ();
}
end_slurs_.clear ();
- requests_.clear ();
+ events_.clear ();
new_slur_reqs_.clear ();
}
else if (req->is_mus_type ("slur-event"))
}
/*
- But we swallow other slur requests.
+ But we swallow other slur events.
*/
return true;
else if (d == STOP)
{
/*
- Swallow other requests.
+ Swallow other events.
*/
for (int j = new_slur_reqs_.size(); j--;)
{
}
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"));
}
}
{
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)
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 ());
}
}
*/
-#include "request.hh"
+#include "event.hh"
#include "paper-column.hh"
#include "engraver.hh"
#include "pqueue.hh"
#include "performer.hh"
-#include "request.hh"
+#include "event.hh"
#include "audio-item.hh"
struct Audio_dynamic_tuple
#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"
{
/*
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)
{
/**
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
{
#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"
#include "engraver.hh"
#include "side-position-interface.hh"
#include "item.hh"
-#include "request.hh"
+#include "event.hh"
#include "stem.hh"
#include "rhythmic-head.hh"
}
- /* Set extend to markup requested value. */
+ /* Set extend to markup evented value. */
if (extent_b)
{
Box b = mol.extent_box ();
*/
#include "dimensions.hh"
-#include "request.hh"
+#include "event.hh"
#include "paper-column.hh"
#include "note-column.hh"
#include "item.hh"
#include "engraver.hh"
#include "item.hh"
-#include "request.hh"
+#include "event.hh"
#include "translator-group.hh"
class Thread_devnull_engraver : public Engraver
*/
-#include "request.hh"
+#include "event.hh"
#include "tie.hh"
#include "translator-group.hh"
#include "spanner.hh"
#include "audio-item.hh"
-#include "request.hh"
+#include "event.hh"
#include "pqueue.hh"
#include "performer.hh"
#include "time-scaled-music-iterator.hh"
#include "time-scaled-music.hh"
-#include "request.hh"
+#include "event.hh"
#include "translator-group.hh"
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_;
*/
#include "translator.hh"
-#include "request.hh"
+#include "event.hh"
class Skip_req_swallow_translator : public virtual Translator
{
#include "engraver.hh"
#include "item.hh"
-#include "request.hh"
+#include "event.hh"
#include "translator-group.hh"
class Voice_devnull_engraver : public Engraver
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;
}
(AbortEvent
. (
(description . "Abort currently running spanners.")
- (internal-class-name . "Request")
+ (internal-class-name . "Event")
(span-type . "abort")
(types . (general-music event abort-event))
))
. (
(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))
))
. (
(description . "")
- (internal-class-name . "Request")
+ (internal-class-name . "Event")
(types . (general-music event articulation-event script-event))
))
(AutoChangeMusic
. (
(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
. (
(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
. (
(description . "")
- (internal-class-name . "Request")
+ (internal-class-name . "Event")
(types . (general-music hyphen-event event))
))
(KeyChangeEvent
(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))
))
. (
(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
. (
(description . "")
- (internal-class-name . "Request")
+ (internal-class-name . "Event")
(types . (general-music event note-event rhythmic-event melodic-event))
))
(OverrideProperty
(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
. (
(description . "")
- (internal-class-name . "Request")
+ (internal-class-name . "Event")
(types . (general-music porrectus-event event))
))
(RepeatedMusic
(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
(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))
))
(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
))
- (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))
)
)
. (
(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
))
-(define-public (old-span-request->event name)
+(define-public (old-span-event->event name)
(let
(
(entry (assoc
projects / lilypond.git / commitdiff