? build-stamp ? context-unique.diff ? def-rel-music-funciton.diff ? delay-music-functions.diff ? exjobb.diff3 ? fonts ? lib ? lilypond.kdevelop ? lilypond.kdevses ? os ? re ? ref1.diff ? ref2.diff ? repeat.diff ? scons.cache ? string ? sys ? Documentation/out ? Documentation/bibliography/out ? Documentation/misc/out ? Documentation/pictures/out ? Documentation/topdocs/out ? Documentation/user/out ? buildscripts/out ? cygwin/out ? debian/out ? elisp/out ? flower/out ? flower/out-scons ? flower/include/.sconsign ? flower/include/out ? input/Diagram1.dia.autosave ? input/les-nereides.pdf ? input/les-nereides.ps ? input/out ? input/typography-demo.midi ? input/typography-demo.ps ? input/mutopia/out ? input/mutopia/E.Satie/out ? input/mutopia/F.Schubert/out ? input/mutopia/J.S.Bach/out ? input/mutopia/R.Schumann/out ? input/mutopia/W.A.Mozart/out ? input/no-notation/out ? input/no-notation/parse-expressions.facit ? input/no-notation/parse-expressions.ly ? input/no-notation/parse-expressions.pdf ? input/no-notation/parse-expressions.ps ? input/no-notation/to-xml.pdf ? input/no-notation/to-xml.ps ? input/regression/chord-tremolo.pdf ? input/regression/chord-tremolo.ps ? input/regression/lyric-melisma-manual.pdf ? input/regression/lyric-melisma-manual.ps ? input/regression/lyrics-melisma-beam.pdf ? input/regression/lyrics-melisma-beam.ps ? input/regression/out ? input/regression/tuplet-nest.pdf ? input/regression/tuplet-nest.ps ? input/template/out ? input/test/out ? input/tutorial/out ? kpath-guile/out ? kpath-guile/out-scons ? lily/On ? lily/foo.pdf ? lily/foo.ps ? lily/lilypond ? lily/lilypond.gdt ? lily/lilypond.gpr ? lily/out ? lily/out-scons ? lily/parser.yy.ok ? lily/include/.sconsign ? lily/include/out ? ly/out ? make/out ? mf/feta-alphabet11.600pk ? mf/feta-alphabet11.tfm ? mf/feta-alphabet13.600pk ? mf/feta-alphabet13.tfm ? mf/feta-alphabet14.600pk ? mf/feta-alphabet14.tfm ? mf/feta-alphabet16.600pk ? mf/feta-alphabet16.tfm ? mf/feta-alphabet18.600pk ? mf/feta-alphabet18.tfm ? mf/feta-alphabet20.600pk ? mf/feta-alphabet20.tfm ? mf/feta-alphabet23.600pk ? mf/feta-alphabet23.tfm ? mf/feta-alphabet26.600pk ? mf/feta-alphabet26.tfm ? 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-scons ? 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 ? ps/out ? python/convertrules.pyc ? python/fontextract.pyc ? python/lilylib.pyc ? python/out ? scm/out ? scripts/lilypond-book-36.py ? scripts/lilypond-book.py.new ? scripts/out ? stepmake/out ? stepmake/bin/out ? stepmake/bin/packagepython.pyc ? stepmake/stepmake/out ? tex/out ? ttftool/out ? ttftool/out-scons ? ttftool/include/.sconsign ? ttftool/include/out ? vim/out Index: lily/lily-parser-scheme.cc =================================================================== RCS file: /sources/lilypond/lilypond/lily/lily-parser-scheme.cc,v retrieving revision 1.28 diff -u -r1.28 lily-parser-scheme.cc --- lily/lily-parser-scheme.cc 15 Apr 2006 07:12:33 -0000 1.28 +++ lily/lily-parser-scheme.cc 13 Jun 2006 18:01:09 -0000 @@ -11,6 +11,7 @@ #include "file-name-map.hh" #include "file-name.hh" #include "file-path.hh" +#include "input-smob.hh" #include "international.hh" #include "lily-lexer.hh" #include "lily-parser.hh" @@ -229,4 +230,20 @@ return scm_makfrom0str (p->output_basename_.c_str ()); } +LY_DEFINE (ly_parser_error, "ly:parser-error", + 2, 1, 0, (SCM parser, SCM msg, SCM input), + "Display an error message, and make the parser fail") +{ + Lily_parser *p = unsmob_lily_parser (parser); + SCM_ASSERT_TYPE (p, parser, SCM_ARG1, __FUNCTION__, "Lilypond parser"); + SCM_ASSERT_TYPE (scm_is_string (msg), msg, SCM_ARG2, __FUNCTION__, "string"); + string s = ly_scm2string (msg); + + Input *i = unsmob_input (input); + if (i) + p->parser_error (*i, s); + else + p->parser_error (s); + return parser; +} Index: lily/parser.yy =================================================================== RCS file: /sources/lilypond/lilypond/lily/parser.yy,v retrieving revision 1.516 diff -u -r1.516 parser.yy --- lily/parser.yy 30 May 2006 19:25:52 -0000 1.516 +++ lily/parser.yy 13 Jun 2006 18:01:18 -0000 @@ -114,11 +114,12 @@ - Don't use lily module, create a new module instead. - delay application of the function */ +#define LOWLEVEL_MAKE_SYNTAX(proc, args) \ + scm_apply_0 (proc, args) +/* Syntactic Sugar. */ #define MAKE_SYNTAX(name, location, ...) \ - scm_apply_0 (ly_lily_module_constant (name), scm_list_n (make_input (location), __VA_ARGS__, SCM_UNDEFINED)); + LOWLEVEL_MAKE_SYNTAX (ly_lily_module_constant (name), scm_list_n (PARSER->self_scm (), make_input (location), __VA_ARGS__, SCM_UNDEFINED)); -Music *property_op_to_music (SCM op); -SCM context_spec_music (SCM type, SCM id, SCM m, SCM ops, bool create_new); SCM get_next_unique_context_id (); SCM get_next_unique_lyrics_context_id (); @@ -132,12 +133,10 @@ -SCM make_lyric_combine_music (SCM name, SCM music); SCM make_music_relative (Pitch start, SCM music); -Music *run_music_function (Lily_parser *, SCM expr); -Music *set_property_music (SCM sym, SCM value); +SCM run_music_function (Lily_parser *, SCM expr); SCM get_first_context_id (SCM type, Music *m); -SCM make_chord (SCM pitch, SCM dur, SCM modification_list); +SCM make_chord_elements (SCM pitch, SCM dur, SCM modification_list); SCM make_chord_step (int step, int alter); SCM make_simple_markup (SCM a); bool is_duration (int t); @@ -323,14 +322,14 @@ %type tremolo_type /* Music */ -%type Composite_music -%type Grouped_music_list -%type Music -%type Prefix_composite_music -%type Repeated_music -%type Sequential_music -%type Simple_music -%type Simultaneous_music +%type composite_music +%type grouped_music_list +%type music +%type prefix_composite_music +%type repeated_music +%type sequential_music +%type simple_music +%type simultaneous_music %type chord_body %type chord_body_element %type command_element @@ -346,6 +345,7 @@ %type re_rhythmed_music %type relative_music %type simple_element +%type simple_music_property_def %type string_number_event %type tempo_event %type toplevel_music @@ -356,9 +356,9 @@ %type output_def %type paper_block -%type Alternative_music -%type Generic_prefix_music_scm -%type Music_list +%type alternative_music +%type generic_prefix_music_scm +%type music_list %type absolute_pitch %type assignment_id %type bare_number @@ -418,6 +418,7 @@ %type property_operation %type scalar %type script_abbreviation +%type simple_chord_elements %type simple_markup %type simple_string %type steno_duration @@ -502,7 +503,7 @@ ; toplevel_music: - Composite_music { + composite_music { } ; @@ -577,7 +578,7 @@ | context_def_spec_block { $$ = $1; } - | Music { + | music { $$ = $1; } | post_event { @@ -686,7 +687,7 @@ ; score_body: - Music { + music { SCM m = $1; SCM scorify = ly_lily_module_constant ("scorify-music"); SCM score = scm_call_2 (scorify, m, PARSER->self_scm ()); @@ -824,11 +825,11 @@ to have efficient append. */ -Music_list: +music_list: /* empty */ { $$ = scm_cons (SCM_EOL, SCM_EOL); } - | Music_list Music { + | music_list music { SCM s = $$; SCM c = scm_cons ($2, SCM_EOL); @@ -838,10 +839,10 @@ scm_set_car_x (s, c); /* set first cons */ scm_set_cdr_x (s, c); /* remember last cell */ } - | Music_list embedded_scm { + | music_list embedded_scm { } - | Music_list error { + | music_list error { Music *m = MY_MAKE_MUSIC("Music"); // ugh. code dup m->set_property ("error-found", SCM_BOOL_T); @@ -857,47 +858,47 @@ } ; -Music: - Simple_music - | Composite_music +music: + simple_music + | composite_music ; -Alternative_music: +alternative_music: /* empty */ { $$ = SCM_EOL; } - | ALTERNATIVE '{' Music_list '}' { + | ALTERNATIVE '{' music_list '}' { $$ = scm_car ($3); } ; -Repeated_music: - REPEAT simple_string bare_unsigned Music Alternative_music +repeated_music: + REPEAT simple_string bare_unsigned music alternative_music { $$ = MAKE_SYNTAX ("repeat", @$, $2, scm_int2num ($3), $4, $5); } ; -Sequential_music: - SEQUENTIAL '{' Music_list '}' { +sequential_music: + SEQUENTIAL '{' music_list '}' { $$ = MAKE_SYNTAX ("sequential-music", @$, scm_car ($3)); } - | '{' Music_list '}' { + | '{' music_list '}' { $$ = MAKE_SYNTAX ("sequential-music", @$, scm_car ($2)); } ; -Simultaneous_music: - SIMULTANEOUS '{' Music_list '}'{ +simultaneous_music: + SIMULTANEOUS '{' music_list '}'{ $$ = MAKE_SYNTAX ("simultaneous-music", @$, scm_car ($3)); } - | simul_open Music_list simul_close { + | simul_open music_list simul_close { $$ = MAKE_SYNTAX ("simultaneous-music", @$, scm_car ($2)); } ; -Simple_music: +simple_music: event_chord | MUSIC_IDENTIFIER | music_property_def @@ -921,14 +922,14 @@ } ; -Composite_music: - Prefix_composite_music { $$ = $1; } - | Grouped_music_list { $$ = $1; } +composite_music: + prefix_composite_music { $$ = $1; } + | grouped_music_list { $$ = $1; } ; -Grouped_music_list: - Simultaneous_music { $$ = $1; } - | Sequential_music { $$ = $1; } +grouped_music_list: + simultaneous_music { $$ = $1; } + | sequential_music { $$ = $1; } ; function_scm_argument: @@ -939,7 +940,7 @@ /* TODO: use code generation for this */ -Generic_prefix_music_scm: +generic_prefix_music_scm: MUSIC_FUNCTION { $$ = scm_list_2 ($1, make_input (@$)); } @@ -949,7 +950,7 @@ | MUSIC_FUNCTION_MARKUP full_markup { $$ = scm_list_3 ($1, make_input (@$), $2); } - | music_function_musicless_prefix Music { + | music_function_musicless_prefix music { $$ = ly_append2 ($1, scm_list_1 ($2)); } | MUSIC_FUNCTION_SCM_SCM function_scm_argument function_scm_argument { @@ -958,22 +959,22 @@ | MUSIC_FUNCTION_SCM_SCM_SCM function_scm_argument function_scm_argument function_scm_argument { $$ = scm_list_5 ($1, make_input (@$), $2, $3, $4); } - | MUSIC_FUNCTION_MARKUP_MUSIC full_markup Music { + | MUSIC_FUNCTION_MARKUP_MUSIC full_markup music { $$ = scm_list_4 ($1, make_input (@$), $2, $3); } | MUSIC_FUNCTION_MARKUP_MARKUP full_markup full_markup { $$ = scm_list_4 ($1, make_input (@$), $2, $3); } - | MUSIC_FUNCTION_MUSIC_MUSIC Music Music { + | MUSIC_FUNCTION_MUSIC_MUSIC music music { $$ = scm_list_4 ($1, make_input (@$), $2, $3); } - | MUSIC_FUNCTION_SCM_MUSIC_MUSIC function_scm_argument Music Music { + | MUSIC_FUNCTION_SCM_MUSIC_MUSIC function_scm_argument music music { $$ = scm_list_5 ($1, make_input (@$), $2, $3, $4); } - | MUSIC_FUNCTION_SCM_SCM_MUSIC_MUSIC function_scm_argument function_scm_argument Music Music { + | MUSIC_FUNCTION_SCM_SCM_MUSIC_MUSIC function_scm_argument function_scm_argument music music { $$ = scm_list_n ($1, make_input (@$), $2, $3, $4, $5, SCM_UNDEFINED); } - | MUSIC_FUNCTION_MARKUP_MUSIC_MUSIC full_markup Music Music { + | MUSIC_FUNCTION_MARKUP_MUSIC_MUSIC full_markup music music { $$ = scm_list_5 ($1, make_input (@$), $2, $3, $4); } ; @@ -986,48 +987,31 @@ ; -Prefix_composite_music: - Generic_prefix_music_scm { - $$ = run_music_function (PARSER, $1)->unprotect (); +prefix_composite_music: + generic_prefix_music_scm { + $$ = run_music_function (PARSER, $1); } - | CONTEXT simple_string optional_id optional_context_mod Music { - $$ = context_spec_music ($2, $3, $5, $4, false); + | CONTEXT simple_string optional_id optional_context_mod music { + $$ = MAKE_SYNTAX ("context-specification", @$, $2, $3, $5, $4, SCM_BOOL_F); } - | NEWCONTEXT simple_string optional_id optional_context_mod Music { - $$ = context_spec_music ($2, $3, $5, $4, true); + | NEWCONTEXT simple_string optional_id optional_context_mod music { + $$ = MAKE_SYNTAX ("context-specification", @$, $2, $3, $5, $4, SCM_BOOL_T); } - | TIMES fraction Music - { - int n = scm_to_int (scm_car ($2)); - int d = scm_to_int (scm_cdr ($2)); - - Music *m = MY_MAKE_MUSIC ("TimeScaledMusic"); - m->set_spot (@$); - - m->set_property ("element", $3); - m->set_property ("numerator", scm_from_int (n)); - m->set_property ("denominator", scm_from_int (d)); - m->compress (Moment (Rational (n,d))); - $$ = m->unprotect (); - } - | Repeated_music { $$ = $1; } - | TRANSPOSE pitch_also_in_chords pitch_also_in_chords Music { - Music *m = MY_MAKE_MUSIC ("TransposedMusic"); + | TIMES fraction music { + $$ = MAKE_SYNTAX ("time-scaled-music", @$, $2, $3); + } + | repeated_music { $$ = $1; } + | TRANSPOSE pitch_also_in_chords pitch_also_in_chords music { Pitch from = *unsmob_pitch ($2); Pitch to = *unsmob_pitch ($3); - - Music *p = unsmob_music ($4); - p->transpose (pitch_interval (from, to)); - m->set_property ("element", $4); - $$ = m->unprotect (); + SCM pitch = pitch_interval (from, to).smobbed_copy (); + $$ = MAKE_SYNTAX ("transposed-music", @$, pitch, $4); } - | mode_changing_head Grouped_music_list { + | mode_changing_head grouped_music_list { if ($1 == ly_symbol2scm ("chords")) { - Music *chm = MY_MAKE_MUSIC ("UnrelativableMusic"); - chm->set_property ("element", $2); - $$ = chm->unprotect (); + $$ = MAKE_SYNTAX ("unrelativable-music", @$, $2); } else { @@ -1035,13 +1019,11 @@ } PARSER->lexer_->pop_state (); } - | mode_changing_head_with_context optional_context_mod Grouped_music_list { - $$ = context_spec_music ($1, SCM_UNDEFINED, $3, $2, true); + | mode_changing_head_with_context optional_context_mod grouped_music_list { + $$ = MAKE_SYNTAX ("context-specification", @$, $1, SCM_EOL, $3, $2, SCM_BOOL_T); if ($1 == ly_symbol2scm ("ChordNames")) { - Music *chm = MY_MAKE_MUSIC ("UnrelativableMusic"); - chm->set_property ("element", $$); - $$ = chm->unprotect (); + $$ = MAKE_SYNTAX ("unrelativable-music", @$, $$); } PARSER->lexer_->pop_state (); } @@ -1109,11 +1091,11 @@ relative_music: - RELATIVE absolute_pitch Music { + RELATIVE absolute_pitch music { Pitch start = *unsmob_pitch ($2); $$ = make_music_relative (start, $3); } - | RELATIVE Composite_music { + | RELATIVE composite_music { Pitch middle_c (0, 0, 0); $$ = make_music_relative (middle_c, $2); } @@ -1122,8 +1104,8 @@ new_lyrics: ADDLYRICS { PARSER->lexer_->push_lyric_state (); } /*cont */ - Grouped_music_list { - /* Can also use Music at the expensive of two S/Rs similar to + grouped_music_list { + /* Can also use music at the expensive of two S/Rs similar to \repeat \alternative */ PARSER->lexer_->pop_state (); @@ -1131,56 +1113,27 @@ } | new_lyrics ADDLYRICS { PARSER->lexer_->push_lyric_state (); - } Grouped_music_list { + } grouped_music_list { PARSER->lexer_->pop_state (); $$ = scm_cons ($4, $1); } ; re_rhythmed_music: - Grouped_music_list new_lyrics { - SCM voice = $1; - SCM name = get_first_context_id (scm_makfrom0str ("Voice"), unsmob_music (voice)); - if (!scm_is_string (name)) - { - name = get_next_unique_lyrics_context_id (); - voice = context_spec_music (scm_makfrom0str ("Voice"), - name, - voice, SCM_EOL, false); - } - - SCM context = scm_makfrom0str ("Lyrics"); - Music *all = MY_MAKE_MUSIC ("SimultaneousMusic"); - - SCM lst = SCM_EOL; - for (SCM s = $2; scm_is_pair (s); s = scm_cdr (s)) - { - SCM com = make_lyric_combine_music (name, scm_car (s)); - SCM csm = context_spec_music (context, - SCM_UNDEFINED, com, SCM_EOL, true); - lst = scm_cons (csm, lst); - } - all->set_property ("elements", scm_cons (voice, - lst)); - $$ = all->unprotect (); + grouped_music_list new_lyrics { + $$ = MAKE_SYNTAX ("add-lyrics", @$, $1, scm_reverse_x ($2, SCM_EOL)); } | LYRICSTO simple_string { PARSER->lexer_->push_lyric_state (); - } Music { + } music { PARSER->lexer_->pop_state (); - SCM name = $2; - $$ = make_lyric_combine_music (name, $4); + $$ = MAKE_SYNTAX ("lyric-combine", @$, $2, $4); } ; context_change: CHANGE STRING '=' STRING { - Music *t = MY_MAKE_MUSIC ("ContextChange"); - t-> set_property ("change-to-type", scm_string_to_symbol ($2)); - t-> set_property ("change-to-id", $4); - t->set_spot (@$); - - $$ = t->unprotect (); + $$ = MAKE_SYNTAX ("context-change", @$, scm_string_to_symbol ($2), $4); } ; @@ -1244,50 +1197,46 @@ } ; -music_property_def: +simple_music_property_def: OVERRIDE context_prop_spec embedded_scm '=' scalar { - Music *m = property_op_to_music (scm_list_4 ( - ly_symbol2scm ("push"), + $$ = scm_list_5 (scm_car ($2), + ly_symbol2scm ("OverrideProperty"), scm_cadr ($2), - $5, $3)); - $$ = context_spec_music (scm_car ($2), SCM_UNDEFINED, m->unprotect (), SCM_EOL, false); + $5, $3); } | OVERRIDE context_prop_spec embedded_scm embedded_scm '=' scalar { - Music *m = property_op_to_music (scm_list_5 ( - ly_symbol2scm ("push"), + $$ = scm_list_n (scm_car ($2), + ly_symbol2scm ("OverrideProperty"), scm_cadr ($2), - $6, $4, $3)); - $$ = context_spec_music (scm_car ($2), SCM_UNDEFINED, m->unprotect (), SCM_EOL, false); + $6, $4, $3, SCM_UNDEFINED); } | REVERT context_prop_spec embedded_scm { - Music *m = property_op_to_music (scm_list_3 ( - ly_symbol2scm ("pop"), + $$ = scm_list_4 (scm_car ($2), + ly_symbol2scm ("RevertProperty"), scm_cadr ($2), - $3)); - - $$ = context_spec_music (scm_car ($2), SCM_UNDEFINED, m->unprotect (), SCM_EOL, false); + $3); } | SET context_prop_spec '=' scalar { - Music *m = property_op_to_music (scm_list_3 ( - ly_symbol2scm ("assign"), + $$ = scm_list_4 (scm_car ($2), + ly_symbol2scm ("PropertySet"), scm_cadr ($2), - $4)); - $$ = context_spec_music (scm_car ($2), SCM_UNDEFINED, m->unprotect (), SCM_EOL, false); + $4); } | UNSET context_prop_spec { - Music *m = property_op_to_music (scm_list_2 ( - ly_symbol2scm ("unset"), - scm_cadr ($2))); - $$ = context_spec_music (scm_car ($2), SCM_UNDEFINED, m->unprotect (), SCM_EOL, false); - } - | ONCE music_property_def { - Music *m = unsmob_music ($2); - SCM e = m->get_property ("element"); - unsmob_music (e)->set_property ("once", SCM_BOOL_T); - $$ = $2; + $$ = scm_list_3 (scm_car ($2), + ly_symbol2scm ("PropertyUnset"), + scm_cadr ($2)); } ; +music_property_def: + simple_music_property_def { + $$ = LOWLEVEL_MAKE_SYNTAX (ly_lily_module_constant ("property-operation"), scm_cons (PARSER->self_scm (), scm_cons2 (make_input (@$), SCM_BOOL_F, $1))); + } + | ONCE simple_music_property_def { + $$ = LOWLEVEL_MAKE_SYNTAX (ly_lily_module_constant ("property-operation"), scm_cons (PARSER->self_scm (), scm_cons2 (make_input (@$), SCM_BOOL_T, $2))); + } + ; string: STRING { @@ -1332,45 +1281,25 @@ } ; -/* - -pre_events doesn't contain anything. It is a trick: - -Adding pre_events to the simple_element -makes the choice between - - string: STRING - -and - - simple_element: STRING - -a single shift/reduction conflict. - -nevertheless, this is not very clean, and we should find a different -solution. - -*/ -pre_events: /* empty */ - ; - event_chord: - pre_events simple_element post_events { - Music *m = unsmob_music ($2); - m->protect (); - SCM elts = m->get_property ("elements"); - - elts = ly_append2 (elts, scm_reverse_x ($3, SCM_EOL)); + /* TODO: Create a special case that avoids the creation of + EventChords around simple_elements that have no post_events? + */ + simple_chord_elements post_events { + SCM elts = ly_append2 ($1, scm_reverse_x ($2, SCM_EOL)); - m->set_property ("elements", elts); + Input i; /* why is this giving wrong start location? -ns - * $2->set_spot (@$); */ + * i = @$; */ + i.set_location (@1, @2); + $$ = MAKE_SYNTAX ("event-chord", i, elts); + } + | MULTI_MEASURE_REST optional_notemode_duration post_events { Input i; - i.set_location (@2, @3); - m->set_spot (i); - $$ = m->unprotect (); + i.set_location (@1, @3); + $$ = MAKE_SYNTAX ("multi-measure-rest", i, $2, $3); } - | command_element { $$ = $1; } + | command_element | note_chord_element ; @@ -1408,11 +1337,7 @@ chord_body: chord_open chord_body_elements chord_close { - Music *m = MY_MAKE_MUSIC ("EventChord"); - m->set_spot (@$); - m->set_property ("elements", - scm_reverse_x ($2, SCM_EOL)); - $$ = m->unprotect (); + $$ = MAKE_SYNTAX ("event-chord", @$, scm_reverse_x ($2, SCM_EOL)); } ; @@ -1464,9 +1389,7 @@ $$ = n->unprotect (); } | music_function_chord_body { - Music *m = run_music_function (PARSER, $1); - m->set_spot (@$); - $$ = m->unprotect (); + $$ = run_music_function (PARSER, $1); } ; @@ -1509,76 +1432,49 @@ command_element: command_event { - Music *m = MY_MAKE_MUSIC ("EventChord"); - m->set_property ("elements", scm_cons ($1, SCM_EOL)); - Music *e = unsmob_music ($1); - e-> set_spot (@$); - m-> set_spot (@$); - $$ = m->unprotect (); + $$ = $1; } | SKIP duration_length { - Music *skip = MY_MAKE_MUSIC ("SkipMusic"); - skip->set_property ("duration", $2); - skip->set_spot (@$); - $$ = skip->unprotect (); + $$ = MAKE_SYNTAX ("skip-music", @$, $2); } | E_BRACKET_OPEN { Music *m = MY_MAKE_MUSIC ("LigatureEvent"); m->set_property ("span-direction", scm_from_int (START)); m->set_spot (@$); - - Music *chord = MY_MAKE_MUSIC ("EventChord"); - chord->set_property ("elements", scm_cons (m->self_scm (), SCM_EOL)); - m->unprotect(); - chord->set_spot (@$); - $$ = chord->unprotect (); + $$ = m->unprotect(); } | E_BRACKET_CLOSE { Music *m = MY_MAKE_MUSIC ("LigatureEvent"); m->set_property ("span-direction", scm_from_int (STOP)); m->set_spot (@$); - - Music *chord = MY_MAKE_MUSIC ("EventChord"); - chord->set_property ("elements", scm_cons (m->self_scm (), SCM_EOL)); - chord->set_spot (@$); - m->unprotect (); - $$ = chord->unprotect (); + $$ = m->unprotect (); } | E_BACKSLASH { - Music *m = MY_MAKE_MUSIC ("VoiceSeparator"); - m->set_spot (@$); - $$ = m->unprotect (); + $$ = MAKE_SYNTAX ("voice-separator", @$, SCM_UNDEFINED); } | '|' { SCM pipe = PARSER->lexer_->lookup_identifier ("pipeSymbol"); Music *m = unsmob_music (pipe); if (m) + { m = m->clone (); + m->set_spot (@$); + $$ = m->unprotect (); + } else - m = MY_MAKE_MUSIC ("BarCheck"); + $$ = MAKE_SYNTAX ("bar-check", @$, SCM_UNDEFINED); - m->set_spot (@$); - $$ = m->unprotect (); } | TRANSPOSITION pitch { Pitch middle_c; Pitch sounds_as_c = pitch_interval (*unsmob_pitch ($2), middle_c); - Music *m = set_property_music (ly_symbol2scm ("instrumentTransposition"), - sounds_as_c.smobbed_copy()); - m->set_spot (@$); - $$ = context_spec_music (ly_symbol2scm ("Staff"), SCM_UNDEFINED, - m->unprotect (), SCM_EOL, false); + $$ = MAKE_SYNTAX ("property-operation", @$, SCM_BOOL_F, ly_symbol2scm ("Staff"), ly_symbol2scm ("PropertySet"), ly_symbol2scm ("instrumentTransposition"), sounds_as_c.smobbed_copy ()); } - | PARTIAL duration_length { + | PARTIAL duration_length { Moment m = - unsmob_duration ($2)->get_length (); - Music *p = set_property_music (ly_symbol2scm ( "measurePosition"),m.smobbed_copy ()); - p->set_spot (@$); - SCM ps = p->unprotect (); - ps = context_spec_music (ly_symbol2scm ("Timing"), SCM_UNDEFINED, - ps, SCM_EOL, false); - $$ = context_spec_music (ly_symbol2scm ("Score"), SCM_UNDEFINED, - ps, SCM_EOL, false); + $$ = MAKE_SYNTAX ("property-operation", @$, SCM_BOOL_F, ly_symbol2scm ("Timing"), ly_symbol2scm ("PropertySet"), ly_symbol2scm ("measurePosition"), m.smobbed_copy ()); + $$ = MAKE_SYNTAX ("context-specification", @$, ly_symbol2scm ("Score"), SCM_BOOL_F, $$, SCM_EOL, SCM_BOOL_F); } | TIME_T fraction { @@ -1640,9 +1536,7 @@ $$ = $1; } | '-' music_function_event { - Music *mus = run_music_function (PARSER, $2); - mus->set_spot (@1); - $$ = mus->unprotect (); + $$ = run_music_function (PARSER, $2); } | HYPHEN { if (!PARSER->lexer_->is_lyric_state ()) @@ -2065,10 +1959,7 @@ figure_spec: FIGURE_OPEN figure_list FIGURE_CLOSE { - Music *m = MY_MAKE_MUSIC ("EventChord"); - $2 = scm_reverse_x ($2, SCM_EOL); - m->set_property ("elements", $2); - $$ = m->self_scm (); + $$ = scm_reverse_x ($2, SCM_EOL); } ; @@ -2103,36 +1994,16 @@ if ($2 % 2 || $3 % 2) n->set_property ("force-accidental", SCM_BOOL_T); - Music *v = MY_MAKE_MUSIC ("EventChord"); - v->set_property ("elements", scm_list_1 (n->self_scm ())); - n->unprotect (); - - v->set_spot (@$); n->set_spot (@$); - $$ = v->unprotect (); + $$ = n->unprotect (); } | DRUM_PITCH optional_notemode_duration { Music *n = MY_MAKE_MUSIC ("NoteEvent"); n->set_property ("duration", $2); n->set_property ("drum-type", $1); - Music *v = MY_MAKE_MUSIC ("EventChord"); - v->set_property ("elements", scm_list_1 (n->self_scm ())); - n->unprotect (); - v->set_spot (@$); - n->set_spot (@$); - $$ = v->unprotect (); - + $$ = n->unprotect (); } - | figure_spec optional_notemode_duration { - Music *m = unsmob_music ($1); - m->set_spot (@$); - for (SCM s = m->get_property ("elements"); scm_is_pair (s); s = scm_cdr (s)) - { - unsmob_music (scm_car (s))->set_property ("duration", $2); - } - $$ = m->unprotect (); - } | RESTNAME optional_notemode_duration { Music *ev = 0; if (ly_scm2string ($1) == "s") { @@ -2145,17 +2016,7 @@ } ev->set_property ("duration", $2); ev->set_spot (@$); - Music *velt = MY_MAKE_MUSIC ("EventChord"); - velt->set_property ("elements", scm_list_1 (ev->self_scm ())); - velt->set_spot (@$); - - ev->unprotect(); - - $$ = velt->unprotect (); - } - | MULTI_MEASURE_REST optional_notemode_duration { - SCM proc = ly_lily_module_constant ("make-multi-measure-rest"); - $$ = scm_call_2 (proc, $2, make_input (@$)); + $$ = ev->unprotect (); } | lyric_element optional_notemode_duration { if (!PARSER->lexer_->is_lyric_state ()) @@ -2165,16 +2026,27 @@ levent->set_property ("text", $1); levent->set_property ("duration",$2); levent->set_spot (@$); - Music *velt = MY_MAKE_MUSIC ("EventChord"); - velt->set_property ("elements", scm_list_1 (levent->self_scm ())); - - $$= velt->unprotect (); + $$= levent->unprotect (); } + ; + +simple_chord_elements: + simple_element { + scm_display ($1, scm_current_output_port ()); + $$ = scm_list_1 ($1); + } | new_chord { if (!PARSER->lexer_->is_chord_state ()) PARSER->parser_error (@1, _ ("have to be in Chord mode for chords")); $$ = $1; } + | figure_spec optional_notemode_duration { + for (SCM s = $1; scm_is_pair (s); s = scm_cdr (s)) + { + unsmob_music (scm_car (s))->set_property ("duration", $2); + } + $$ = $1; + } ; lyric_element: @@ -2188,11 +2060,11 @@ new_chord: steno_tonic_pitch optional_notemode_duration { - $$ = make_chord ($1, $2, SCM_EOL); + $$ = make_chord_elements ($1, $2, SCM_EOL); } | steno_tonic_pitch optional_notemode_duration chord_separator chord_items { SCM its = scm_reverse_x ($4, SCM_EOL); - $$ = make_chord ($1, $2, scm_cons ($3, its)); + $$ = make_chord_elements ($1, $2, scm_cons ($3, its)); } ; @@ -2544,66 +2416,6 @@ return -1; } -Music * -property_op_to_music (SCM op) -{ - Music *m = 0; - SCM tag = scm_car (op); - SCM symbol = scm_cadr (op); - SCM args = scm_cddr (op); - SCM grob_val = SCM_UNDEFINED; - SCM grob_path = SCM_UNDEFINED; - SCM val = SCM_UNDEFINED; - - if (tag == ly_symbol2scm ("assign")) - { - m = MY_MAKE_MUSIC ("PropertySet"); - val = scm_car (args); - } - else if (tag == ly_symbol2scm ("unset")) - m = MY_MAKE_MUSIC ("PropertyUnset"); - else if (tag == ly_symbol2scm ("push")) - { - m = MY_MAKE_MUSIC ("OverrideProperty"); - grob_val = scm_car (args); - grob_path = scm_cdr (args); - m->set_property ("pop-first", SCM_BOOL_T); - } - else if (tag == ly_symbol2scm ("pop")) { - m = MY_MAKE_MUSIC ("RevertProperty"); - grob_path = args; - } - - m->set_property ("symbol", symbol); - - if (val != SCM_UNDEFINED) - m->set_property ("value", val); - if (grob_val != SCM_UNDEFINED) - m->set_property ("grob-value", grob_val); - if (grob_path != SCM_UNDEFINED) - m->set_property ("grob-property-path", grob_path); - - return m; -} - -SCM -context_spec_music (SCM type, SCM id, SCM m, SCM ops, bool create_new) -{ - Music *csm = MY_MAKE_MUSIC ("ContextSpeccedMusic"); - - csm->set_property ("element", m); - - csm->set_property ("context-type", - scm_is_symbol (type) ? type : scm_string_to_symbol (type)); - csm->set_property ("property-operations", ops); - if (create_new) - csm->set_property ("create-new", SCM_BOOL_T); - - if (scm_is_string (id)) - csm->set_property ("context-id", id); - return csm->unprotect (); -} - SCM get_next_unique_context_id () { @@ -2621,7 +2433,7 @@ } -Music * +SCM run_music_function (Lily_parser *parser, SCM expr) { SCM func = scm_car (expr); @@ -2630,34 +2442,15 @@ SCM sig = scm_object_property (func, ly_symbol2scm ("music-function-signature")); SCM type_check_proc = ly_lily_module_constant ("type-check-list"); - bool ok = true; if (!to_boolean (scm_call_3 (type_check_proc, scm_cadr (expr), sig, args))) { parser->error_level_ = 1; - ok = false; + return LOWLEVEL_MAKE_SYNTAX (ly_lily_module_constant ("void-music"), scm_list_2 (parser->self_scm (), make_input (*loc))); } - SCM m = SCM_EOL; - if (ok) - m = scm_apply_0 (func, scm_cons (parser->self_scm(), - scm_cdr (expr))); - - - Music* retval = 0; - if (unsmob_music (m)) - { - retval = unsmob_music (m); - retval->protect (); - } - else - { - if (ok) - loc->error (_ ("music head function must return Music object")); - retval = MY_MAKE_MUSIC ("Music"); - } - retval->set_spot (*loc); - return retval; + SCM syntax_args = scm_list_4 (parser->self_scm (), make_input (*loc), func, args); + return LOWLEVEL_MAKE_SYNTAX (ly_lily_module_constant ("music-function"), syntax_args); } bool @@ -2727,13 +2520,10 @@ SCM -make_chord (SCM pitch, SCM dur, SCM modification_list) +make_chord_elements (SCM pitch, SCM dur, SCM modification_list) { - SCM chord_ctor = ly_lily_module_constant ("construct-chord"); - SCM ch = scm_call_3 (chord_ctor, pitch, dur, modification_list); - - unsmob_music (ch)->protect(); - return ch; + SCM chord_ctor = ly_lily_module_constant ("construct-chord-elements"); + return scm_call_3 (chord_ctor, pitch, dur, modification_list); } @@ -2745,15 +2535,6 @@ || (scm_is_pair (x) && ly_is_procedure (scm_car (x))); } -Music* -set_property_music (SCM sym, SCM value) -{ - Music *p = MY_MAKE_MUSIC ("PropertySet"); - p->set_property ("symbol", sym); - p->set_property ("value", value); - return p; -} - SCM make_music_relative (Pitch start, SCM music) { @@ -2767,16 +2548,6 @@ return relative->unprotect (); } -SCM -make_lyric_combine_music (SCM name, SCM music) -{ - Music *combine = MY_MAKE_MUSIC ("LyricCombineMusic"); - combine->set_property ("element", music); - combine->set_property ("associated-context", name); - return combine->unprotect (); -} - - int yylex (YYSTYPE *s, YYLTYPE *loc, void *v) { Index: scm/chord-entry.scm =================================================================== RCS file: /sources/lilypond/lilypond/scm/chord-entry.scm,v retrieving revision 1.21 diff -u -r1.21 chord-entry.scm --- scm/chord-entry.scm 6 Jan 2006 09:13:23 -0000 1.21 +++ scm/chord-entry.scm 13 Jun 2006 18:01:23 -0000 @@ -4,14 +4,13 @@ ;;;; ;;;; (c) 2004--2006 Han-Wen Nienhuys -(define-public (construct-chord root duration modifications) - " Build a chord on root using modifiers in MODIFICATIONS. NoteEvent -have duration DURATION.. +(define-public (construct-chord-elements root duration modifications) + " Build a chord on root using modifiers in MODIFICATIONS. NoteEvents +have duration DURATION. Notes: natural 11 is left from chord if not explicitly specified. Entry point for the parser. - " (let* ((flat-mods (flatten-list modifications)) (base-chord (stack-thirds (ly:make-pitch 0 4 0) the-canonical-chord)) @@ -155,12 +154,12 @@ (write-me "inversion: " inversion) (write-me "bass: " bass))) (if inversion - (make-chord (cdr complete-chord) bass duration (car complete-chord) + (make-chord-elements (cdr complete-chord) bass duration (car complete-chord) inversion) - (make-chord complete-chord bass duration #f #f)))) + (make-chord-elements complete-chord bass duration #f #f)))) -(define (make-chord pitches bass duration inversion original-inv-pitch) +(define (make-chord-elements pitches bass duration inversion original-inv-pitch) "Make EventChord with notes corresponding to PITCHES, BASS and DURATION, and INVERSION." (define (make-note-ev pitch) @@ -181,7 +180,7 @@ (- (ly:pitch-octave inversion) (ly:pitch-octave original-inv-pitch))) (set! nots (cons inv-note nots)))) - (make-event-chord nots))) + nots)) ;;;;;;;;;;;;;;;; ; chord modifiers change the pitch list. Index: scm/ly-syntax-constructors.scm =================================================================== RCS file: /sources/lilypond/lilypond/scm/ly-syntax-constructors.scm,v retrieving revision 1.1 diff -u -r1.1 ly-syntax-constructors.scm --- scm/ly-syntax-constructors.scm 19 May 2006 11:07:35 -0000 1.1 +++ scm/ly-syntax-constructors.scm 13 Jun 2006 18:01:25 -0000 @@ -4,22 +4,166 @@ ;;;; ;;;; (c) 2006 Erik Sandberg -;; TODO: use separate module for parser. +;; TODO: use separate module for syntax +;; constructors. Also create wrapper around the constructor? (define define-ly-syntax define-public) -;; This shorthand adds a location parameter, and uses it to set the -;; origin. It can be used for most music functions. +;; A ly-syntax constructor takes two extra parameters, parser and +;; location. These are mainly used for reporting errors and +;; warnings. This function is a syntactic sugar which uses the +;; location arg to set the origin of the returned music object; this +;; behaviour is usually desired (defmacro define-ly-syntax-loc (args . body) - (primitive-eval `(define-ly-syntax ,(cons* (car args) 'location (cdr args)) - (let ((m ((lambda ,(cdr args) . ,body) . ,(cdr args)))) + (primitive-eval `(define-ly-syntax ,args + (let ((m ,(cons 'begin body))) + (set! (ly:music-property m 'origin) ,(third args)) + m)))) + +;; Like define-ly-syntax-loc, but adds parser and location +;; parameters. Useful for simple constructors that don't need to +;; report errors. +(defmacro define-ly-syntax-simple (args . body) + (primitive-eval `(define-ly-syntax ,(cons* (car args) + 'parser + 'location + (cdr args)) + (let ((m ,(cons 'begin body))) (set! (ly:music-property m 'origin) location) m)))) -(define-ly-syntax-loc (sequential-music mlist) +;; Music function: Apply function and check return value. +(define-ly-syntax-loc (music-function parser loc fun args) + (let ((m (apply fun (cons* parser loc args)))) + (if (ly:music? m) + m + (begin + (ly:parser-error parser (_ "Music head function must return Music object") loc) + (make-music 'Music))))) + +(define-ly-syntax-simple (void-music) + (make-music 'Music)) + +(define-ly-syntax-simple (sequential-music mlist) (make-sequential-music mlist)) -(define-ly-syntax-loc (simultaneous-music mlist) +(define-ly-syntax-simple (simultaneous-music mlist) (make-simultaneous-music mlist)) -(define-ly-syntax-loc (repeat type num body alts) +(define-ly-syntax-simple (event-chord mlist) + (make-music 'EventChord + 'elements mlist)) + +(define-ly-syntax-simple (unrelativable-music mus) + (make-music 'UnrelativableMusic + 'element mus)) + +(define-ly-syntax-simple (context-change type id) + (make-music 'ContextChange + 'change-to-type type + 'change-to-id id)) + +(define-ly-syntax-simple (voice-separator) + (make-music 'VoiceSeparator)) + +(define-ly-syntax-simple (bar-check) + (make-music 'BarCheck)) + +(define-ly-syntax-simple (time-scaled-music fraction music) + (make-music 'TimeScaledMusic + 'element (ly:compress music (ly:make-moment (car fraction) (cdr fraction))) + 'numerator (car fraction) + 'denominator (cdr fraction))) + +(define-ly-syntax-simple (transposed-music pitch music) + (make-music 'TransposedMusic + 'element (ly:transpose-music music pitch))) + +(define-ly-syntax-simple (skip-music dur) + (make-music 'SkipMusic + 'duration dur)) + +(define-ly-syntax-simple (repeat type num body alts) (make-repeat type num body alts)) + +;; UGH. TODO: represent mm rests in a decent way as music expressions. +;; Also eliminate glue-mm-rests while we are at it. +(define-ly-syntax (multi-measure-rest parser location duration articulations) + (let* ((mus (make-multi-measure-rest duration location)) + (elts (ly:music-property mus 'elements))) + (set! (ly:music-property mus 'elements) + (append elts articulations)) + mus)) + +(define-ly-syntax-simple (context-specification type id mus ops create-new) + (let* ((type-sym (if (symbol? type) type (string->symbol type))) + (csm (context-spec-music mus type-sym id))) + (set! (ly:music-property csm 'property-operations) ops) + (if create-new (set! (ly:music-property csm 'create-new) #t)) + csm)) + +(define-ly-syntax (property-operation parser location once ctx music-type symbol . args) + (let* ((props (case music-type + ((PropertySet) (list 'value (car args))) + ((PropertyUnset) '()) + ((OverrideProperty) (list 'grob-value (car args) + 'grob-property-path (cdr args) + 'pop-first #t)) + ((RevertProperty) (list 'grob-property-path args)) + (else (ly:error (_ "Invalid property operation ~a") music-type)))) + (oprops (if once (cons* 'once once props) props)) + (m (apply make-music music-type + 'symbol symbol + 'origin location + oprops))) + (make-music 'ContextSpeccedMusic + 'element m + 'context-type ctx + 'origin location))) + +;; TODO: It seems that this function rarely returns anything useful. +(define (get-first-context-id type mus) + "Find the name of a ContextSpeccedMusic with given type" + (let ((id (ly:music-property mus 'context-id))) + (if (and (eq? (ly:music-property mus 'type) 'ContextSpeccedMusic) + (eq? (ly:music-property mus 'context-type) type) + (string? id) + (not (string-null? id))) + id + '()))) + +(define unique-counter -1) +(define (get-next-unique-voice-name) + (set! unique-counter (1+ unique-counter)) + (call-with-output-string (lambda (p) (format p "uniqueContext~s" unique-counter)))) + +(define (lyric-combine-music sync music loc) + (make-music 'LyricCombineMusic + 'element music + 'associated-context sync + 'origin loc)) + +(define-ly-syntax (lyric-combine parser location voice music) + (lyric-combine-music voice music location)) + +(define-ly-syntax (add-lyrics parser location music addlyrics-list) + (let* ((existing-voice-name (get-first-context-id 'Voice music)) + (voice-name (if (string? existing-voice-name) + existing-voice-name + (get-next-unique-voice-name))) + (voice (if (string? existing-voice-name) + (music) + (make-music 'ContextSpeccedMusic + 'element music + 'context-type 'Voice + 'context-id voice-name + 'origin (ly:music-property music 'origin)))) + (lyricstos (map (lambda (mus) + (let* ((loc (ly:music-property mus 'origin)) + (lyr (lyric-combine-music voice-name mus loc))) + (make-music 'ContextSpeccedMusic + 'create-new #t + 'context-type 'Lyrics + 'element lyr + 'origin loc))) + addlyrics-list))) + (make-simultaneous-music (cons voice lyricstos)))) Index: scm/music-functions.scm =================================================================== RCS file: /sources/lilypond/lilypond/scm/music-functions.scm,v retrieving revision 1.169 diff -u -r1.169 music-functions.scm --- scm/music-functions.scm 16 May 2006 11:19:50 -0000 1.169 +++ scm/music-functions.scm 13 Jun 2006 18:01:30 -0000 @@ -16,6 +16,9 @@ (make-procedure-with-setter ly:music-property ly:music-set-property!)) +(define-safe-public (music-is-of-type? mus type) + "Does @code{mus} belong to the music class @code{type}?" + (memq type (ly:music-property mus 'types))) ;; TODO move this (define-public ly:grob-property @@ -196,8 +199,6 @@ (set! (ly:music-property music 'duration) nd))) music)) - - (define-public (shift-duration-log music shift dot) (music-map (lambda (x) (shift-one-duration-log x shift dot)) music)) Index: scm/paper.scm =================================================================== RCS file: /sources/lilypond/lilypond/scm/paper.scm,v retrieving revision 1.67 diff -u -r1.67 paper.scm --- scm/paper.scm 14 Mar 2006 11:39:47 -0000 1.67 +++ scm/paper.scm 13 Jun 2006 18:01:30 -0000 @@ -124,7 +124,7 @@ (if landscape? (module-define! module 'landscape #t))) (else - (ly:warning (_ ("Unknown papersize: ~a" name))))))) + (ly:warning (_ "Unknown papersize: ~a" name)))))) (define-safe-public (set-default-paper-size name . rest) (internal-set-paper-size