? Documentation/out ? Documentation/out-www ? Documentation/bibliography/out ? Documentation/bibliography/out-www ? Documentation/misc/out ? Documentation/misc/out-www ? Documentation/pictures/out ? Documentation/pictures/out-www ? Documentation/topdocs/out ? Documentation/topdocs/out-www ? Documentation/user/out ? Documentation/user/out-www ? buildscripts/out ? buildscripts/out-www ? cygwin/out ? cygwin/out-www ? elisp/out ? elisp/out-www ? flower/out ? flower/out-www ? flower/include/out ? flower/include/out-www ? input/out ? input/out-www ? input/mutopia/out ? input/mutopia/out-www ? input/mutopia/E.Satie/out ? input/mutopia/E.Satie/out-www ? input/mutopia/F.Schubert/out ? input/mutopia/F.Schubert/out-www ? input/mutopia/J.S.Bach/out ? input/mutopia/J.S.Bach/out-www ? input/mutopia/R.Schumann/out ? input/mutopia/R.Schumann/out-www ? input/mutopia/W.A.Mozart/out ? input/mutopia/W.A.Mozart/out-www ? input/no-notation/out ? input/no-notation/out-www ? input/regression/out ? input/regression/out-www ? input/test/out ? input/test/out-www ? input/tutorial/out ? input/tutorial/out-www ? lily/foo.pdf ? lily/foo.ps ? lily/out ? lily/out-www ? lily/include/out ? lily/include/out-www ? ly/out ? ly/out-www ? make/out ? make/out-www ? mf/feta-alphabet11.600pk ? mf/feta-alphabet13.600pk ? mf/feta-alphabet14.600pk ? mf/feta-alphabet16.600pk ? mf/feta-alphabet18.600pk ? mf/feta-alphabet20.600pk ? mf/feta-alphabet23.600pk ? mf/feta-alphabet26.600pk ? mf/feta-braces-a.600pk ? mf/feta-braces-b.600pk ? mf/feta-braces-c.600pk ? mf/feta-braces-d.600pk ? mf/feta-braces-e.600pk ? mf/feta-braces-f.600pk ? mf/feta-braces-g.600pk ? mf/feta-braces-h.600pk ? mf/feta-braces-i.600pk ? mf/feta11.600pk ? mf/feta13.600pk ? mf/feta14.600pk ? mf/feta16.600pk ? mf/feta18.600pk ? mf/feta20.600pk ? mf/feta23.600pk ? mf/feta26.600pk ? mf/out ? mf/out-www ? mf/parmesan11.600pk ? mf/parmesan13.600pk ? mf/parmesan14.600pk ? mf/parmesan16.600pk ? mf/parmesan18.600pk ? mf/parmesan20.600pk ? mf/parmesan23.600pk ? mf/parmesan26.600pk ? po/out ? po/out-www ? ps/out ? ps/out-www ? python/out ? python/out-www ? scm/out ? scm/out-www ? scripts/os ? scripts/out ? scripts/out-www ? scripts/string ? scripts/sys ? stepmake/out ? stepmake/out-www ? stepmake/bin/out ? stepmake/bin/out-www ? stepmake/stepmake/out ? stepmake/stepmake/out-www ? tex/out ? tex/out-www ? vim/out ? vim/out-www Index: lily/parser.yy =================================================================== RCS file: /sources/lilypond/lilypond/lily/parser.yy,v retrieving revision 1.517 diff -u -r1.517 parser.yy --- lily/parser.yy 13 Jun 2006 22:01:19 -0000 1.517 +++ lily/parser.yy 26 Jun 2006 06:35:44 -0000 @@ -262,7 +262,7 @@ %token CONTEXT_DEF_IDENTIFIER %token DRUM_PITCH %token DURATION_IDENTIFIER -%token EVENT_IDENTIFIER +%token POST_EVENT_IDENTIFIER %token FRACTION %token LYRICS_STRING %token LYRIC_MARKUP_IDENTIFIER @@ -1624,7 +1624,7 @@ m->set_spot (@$); $$ = m->unprotect (); } - | EVENT_IDENTIFIER { + | POST_EVENT_IDENTIFIER { $$ = $1; } | tremolo_type { @@ -2392,10 +2392,10 @@ unsmob_music (*destination)-> set_property ("origin", make_input (last_input_)); - bool is_event = scm_memq (ly_symbol2scm ("event"), mus->get_property ("types")) + // ES todo: post-events should be stream events + bool is_post_event = scm_memq (ly_symbol2scm ("post-event"), mus->get_property ("types")) != SCM_BOOL_F; - - return is_event ? EVENT_IDENTIFIER : MUSIC_IDENTIFIER; + return is_post_event ? POST_EVENT_IDENTIFIER : MUSIC_IDENTIFIER; } else if (unsmob_duration (sid)) { *destination = unsmob_duration (sid)->smobbed_copy (); return DURATION_IDENTIFIER; Index: scm/define-music-types.scm =================================================================== RCS file: /sources/lilypond/lilypond/scm/define-music-types.scm,v retrieving revision 1.81 diff -u -r1.81 define-music-types.scm --- scm/define-music-types.scm 5 Jun 2006 13:57:05 -0000 1.81 +++ scm/define-music-types.scm 26 Jun 2006 06:35:44 -0000 @@ -15,7 +15,7 @@ Syntax: @address@hidden, where x is one of \\ppp, \\pp, \\p, \\mp, \\mf, \\f, \\ff, \\fff.") - (types . (general-music event dynamic-event absolute-dynamic-event)) + (types . (general-music event dynamic-event absolute-dynamic-event post-event)) )) (ApplyContext . ( @@ -44,7 +44,7 @@ Syntax: @address@hidden") - (types . (general-music arpeggio-event event)) + (types . (general-music arpeggio-event event post-event)) )) ;; todo: use articulation-event for slur as well. @@ -59,7 +59,7 @@ is an articulation (such as @code{-.}, @code{->}, @code{\\tenuto}, @code{\\downbow}). See the user manual for details.") - (types . (general-music event articulation-event script-event)) + (types . (general-music event articulation-event script-event post-event)) )) (AutoChangeMusic . ( @@ -88,7 +88,7 @@ Syntax for manual control: c8-[ c c-] c8") - (types . (general-music event beam-event span-event)) + (types . (general-music event beam-event span-event post-event)) )) (BreakEvent . ( @@ -103,7 +103,7 @@ Syntax: @var{note}\\breathe.") - (types . (general-music event breathing-event)) + (types . (general-music event breathing-event post-event)) )) (BusyPlayingEvent . ( @@ -144,25 +144,25 @@ ... @var{note}\\rc (you can also use \\<, \\!, \\cresc, and \\endcresc. See the user manual for details.).") - (types . (general-music dynamic-event crescendo-event event)) + (types . (general-music dynamic-event crescendo-event event post-event)) )) (DecrescendoEvent . ( (description . "See @ref{CrescendoEvent}.") - (types . (general-music dynamic-event decrescendo-event event)) + (types . (general-music dynamic-event decrescendo-event event post-event)) )) (ExtenderEvent . ( (description . "Extend lyrics.") - (types . (general-music extender-event event)) + (types . (general-music extender-event event post-event)) )) (Event . ( - (description . "Atomic music event.") + (description . "Unspecified music event.") (types . (general-music event)) )) @@ -178,17 +178,17 @@ (FingerEvent . ( (description . "Specify what finger to use for this note.") - (types . (general-music fingering-event event)) + (types . (general-music fingering-event event post-event)) )) (BeamForbidEvent . ( (description . "Specify that a note may not auto-beamed ") - (types . (general-music event beam-forbid-event)) + (types . (general-music event beam-forbid-event post-event)) )) (GlissandoEvent . ( (description . "Start a glissando on this note.") - (types . (general-music glissando-event event)) + (types . (general-music glissando-event event post-event)) )) (GraceMusic @@ -202,18 +202,18 @@ (NoteGroupingEvent . ( (description . "Start or stop grouping brackets.") - (types . (general-music event note-grouping-event)) + (types . (general-music event note-grouping-event post-event)) )) (HarmonicEvent . ( (description . "Mark a note as harmonic") - (types . (general-music event harmonic-event)) + (types . (general-music event harmonic-event post-event)) )) (HyphenEvent . ( (description . "A hyphen between lyric syllables.") - (types . (general-music hyphen-event event)) + (types . (general-music hyphen-event event post-event)) )) (KeyChangeEvent @@ -229,7 +229,7 @@ Syntax: @var{note}\\laissezVibrer.") - (types . (general-music event laissez-vibrer-event)) + (types . (general-music event laissez-vibrer-event post-event)) )) (LigatureEvent . ( @@ -279,7 +279,7 @@ (description . "Start or stop a melisma. Syntax: @code{c4\\melisma d\\melismaEnd}.") - (types . (general-music melisma-span-event event)) + (types . (general-music melisma-span-event event post-event)) )) (MultiMeasureRestEvent @@ -358,8 +358,8 @@ . ( (description . "Start or end phrasing slur. -Syntax NOTE \\( and \\) NOTE") - (types . (general-music span-event event phrasing-slur-event)) +Syntax NOTE \\( and NOTE \\)") + (types . (general-music span-event event phrasing-slur-event post-event)) )) (PropertySet @@ -417,7 +417,7 @@ (RepeatTieEvent . ( (description . "Ties for starting a second volta bracket.") - (types . (general-music event repeat-tie-event)) + (types . (general-music event repeat-tie-event post-event)) )) (RestEvent . ( @@ -488,7 +488,7 @@ Syntax NOTE( and NOTE) ") - (types . (general-music span-event event slur-event)) + (types . (general-music span-event event slur-event post-event)) )) (StaffSpanEvent @@ -506,13 +506,13 @@ (TextSpanEvent . ( (description . "Start a text spanner like 8va.....|") - (types . (general-music span-event event text-span-event)) + (types . (general-music span-event event text-span-event post-event)) )) (TrillSpanEvent . ( (description . "Start a trill spanner tr~~~") - (types . (general-music span-event event trill-span-event)) + (types . (general-music span-event event trill-span-event post-event)) )) (TransposedMusic @@ -541,7 +541,7 @@ (TupletEvent . ( (description . "Used internally to signal where tuplet brackets start and stop.") - (types . (tuplet-spanner-event span-event event general-music)) + (types . (tuplet-spanner-event span-event event general-music post-event)) )) (UnrelativableMusic @@ -567,7 +567,7 @@ . ( (description . "Add an articulation mark to a note. ") - (types . (general-music event)) + (types . (general-music event post-event)) )) (SkipMusic @@ -602,25 +602,25 @@ . ( (description . "Event for anything that is started at a different time than stopped.") - (types . (general-music event)) + (types . (general-music event post-event)) )) (SustainEvent . ( (description . "Depress or release sustain pedal. ") - (types . (general-music event pedal-event sustain-pedal-event)) + (types . (general-music event pedal-event sustain-pedal-event span-event post-event)) )) (SostenutoEvent . ( (description . "Depress or release sostenuto pedal. ") - (types . (general-music event pedal-event sostenuto-pedal-event)) + (types . (general-music event pedal-event sostenuto-pedal-event span-event post-event)) )) (UnaCordaEvent . ( (description . "Depress or release una-corda pedal.") - (types . (general-music event pedal-event una-corda-pedal-event)) + (types . (general-music event pedal-event una-corda-pedal-event span-event post-event)) )) (StringNumberEvent @@ -629,7 +629,7 @@ Syntax: @address@hidden") - (types . (general-music string-number-event event)) + (types . (general-music string-number-event event post-event)) )) (MetronomeChangeEvent @@ -641,23 +641,23 @@ (TextScriptEvent . ( (description . "") - (types . (general-music script-event text-script-event event)) + (types . (general-music script-event text-script-event event post-event)) )) (TieEvent . ( (description . "A tie. Entered as @var{note}-~.") - (types . (general-music tie-event event)) + (types . (general-music tie-event event post-event)) )) (TremoloEvent . ( (description . "Un measured tremolo.") - (types . (general-music event tremolo-event)) + (types . (general-music event tremolo-event post-event)) )) (TremoloSpanEvent . ( (description . "Tremolo over two stems") - (types . (general-music event span-event tremolo-span-event)) + (types . (general-music event span-event tremolo-span-event post-event)) )) (VoiceSeparator