X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fparser.yy;h=c2e714d3e6890b388c3cce8b31162467ff47205f;hb=9602a6de93da3d612b7833fdd56168c3c8d19df1;hp=1603b234ceb1ebd71e43ab5fdb4cd21da15faabc;hpb=83edaa0b35f49b81b2e7e1e9411ea3020372099f;p=lilypond.git diff --git a/lily/parser.yy b/lily/parser.yy index 1603b234ce..c2e714d3e6 100644 --- a/lily/parser.yy +++ b/lily/parser.yy @@ -5,7 +5,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2004 Han-Wen Nienhuys + (c) 1997--2005 Han-Wen Nienhuys Jan Nieuwenhuizen */ @@ -26,7 +26,6 @@ TODO: #include "book.hh" - #include "context-def.hh" #include "dimensions.hh" #include "event.hh" @@ -35,11 +34,8 @@ TODO: #include "input.hh" #include "lily-guile.hh" #include "lilypond-input-version.hh" -#include "ly-module.hh" #include "main.hh" #include "misc.hh" -#include "music-list.hh" -#include "music-sequence.hh" #include "lily-lexer.hh" #include "lily-parser.hh" #include "paper-book.hh" @@ -54,7 +50,8 @@ TODO: Music *property_op_to_music (SCM op); Music *context_spec_music (SCM type, SCM id, Music *m, SCM ops); -SCM get_next_unique_context (); +SCM get_next_unique_context_id (); +SCM get_next_unique_lyrics_context_id (); #define YYERROR_VERBOSE 1 @@ -65,6 +62,12 @@ SCM get_next_unique_context (); #define yyerror THIS->parser_error +/* We use custom location type: Input objects */ +#define YYLTYPE Input +#define YYLLOC_DEFAULT(Current,Rhs,N) \ + ((Current).set_location ((Rhs)[1], (Rhs)[N])) + + /* Add symbols to the TAGS field of a music object. */ void @@ -100,13 +103,24 @@ is_regular_identifier (SCM id) return v; } + +SCM +get_first_context_id (SCM type, Music *m) +{ + SCM id = m->get_property ("context-id"); + if (SCM_BOOL_T == scm_equal_p (m->get_property ("context-type"), type) + && scm_is_string (m->get_property ("context-id")) + && scm_c_string_length (id) > 0) + { + return id; + } + return SCM_EOL; +} + SCM -make_simple_markup (SCM encoding, SCM a) +make_simple_markup (SCM a) { - SCM simple = ly_scheme_function ("simple-markup"); - if (scm_is_symbol (encoding)) - return scm_list_3 (ly_scheme_function ("encoded-simple-markup"), - encoding, a); + SCM simple = ly_lily_module_constant ("simple-markup"); return scm_list_2 (simple, a); } @@ -139,7 +153,7 @@ make_chord_step (int step, int alter) SCM make_chord (SCM pitch, SCM dur, SCM modification_list) { - SCM chord_ctor = ly_scheme_function ("construct-chord"); + SCM chord_ctor = ly_lily_module_constant ("construct-chord"); SCM ch = scm_call_3 (chord_ctor, pitch, dur, modification_list); scm_gc_protect_object (ch); return ch; @@ -203,12 +217,13 @@ of the parse stack onto the heap. */ %{ int -yylex (YYSTYPE *s, void *v) +yylex (YYSTYPE *s, YYLTYPE *l, void *v) { Lily_parser *pars = (Lily_parser*) v; Lily_lexer *lex = pars->lexer_; lex->lexval = (void*) s; + lex->lexloc = l; lex->prepare_for_next_token (); return lex->yylex (); } @@ -216,35 +231,23 @@ yylex (YYSTYPE *s, void *v) %} -%expect 3 - -/* - Three shift/reduce problems: +%expect 1 -2. \markup identifier. +/* One shift/reduce problem - (what? --hwn) - -3. \markup { } - - (what? --hwn) - - -4. \repeat +1. \repeat \repeat .. \alternative - \repeat { \repeat .. \alternative } or \repeat { \repeat } \alternative - -) - */ +*/ %pure_parser +%locations %token ACCEPTS %token ADDQUOTE @@ -278,6 +281,7 @@ or %token KEY %token LAYOUT %token LYRICS +%token LYRIC_MARKUP %token LYRICMODE %token MARK %token MIDI @@ -285,6 +289,7 @@ or %token NAME %token NEWCONTEXT %token NOTEMODE +%token OBJECTID %token OCTAVE %token ONCE %token OVERRIDE SET REVERT @@ -356,7 +361,7 @@ or %token MARKUP_HEAD_SCM0_SCM1 %token MARKUP_HEAD_SCM0_SCM1_MARKUP2 %token MARKUP_HEAD_SCM0_SCM1_SCM2 -%token MARKUP_IDENTIFIER MARKUP_HEAD_LIST0 +%token LYRIC_MARKUP_IDENTIFIER MARKUP_IDENTIFIER MARKUP_HEAD_LIST0 %token MUSIC_FUNCTION %token MUSIC_FUNCTION_MUSIC %token MUSIC_FUNCTION_MUSIC_MUSIC @@ -365,6 +370,11 @@ or %token MUSIC_FUNCTION_SCM_MUSIC %token MUSIC_FUNCTION_SCM_MUSIC_MUSIC %token MUSIC_FUNCTION_SCM_SCM_MUSIC +%token MUSIC_FUNCTION_MARKUP +%token MUSIC_FUNCTION_MARKUP_MARKUP +%token MUSIC_FUNCTION_MARKUP_MUSIC +%token MUSIC_FUNCTION_MARKUP_MUSIC_MUSIC +%token MUSIC_FUNCTION_MARKUP_MARKUP_MUSIC %token DRUMS %token DRUMMODE @@ -396,6 +406,7 @@ or %type output_def_body output_def_head %type output_def paper_block +%type assignment_id %type Music_list %type chord_body_elements %type chord_item chord_items chord_separator new_chord @@ -423,9 +434,12 @@ or %type Generic_prefix_music_scm %type lyric_element %type Alternative_music -%type markup markup_line markup_list markup_list_body full_markup +%type full_markup lyric_markup +%type markup_list markup_composed_list markup_braced_list markup_braced_list_body +%type markup_head_1_item markup_head_1_list markup simple_markup markup_top %type mode_changing_head %type mode_changing_head_with_context +%type object_id_setting %type score_block score_body @@ -452,6 +466,11 @@ lilypond: /* empty */ } ; + +object_id_setting: + OBJECTID STRING { $$ = $2; } + ; + toplevel_expression: lilypond_header { THIS->lexer_->set_identifier (ly_symbol2scm ("$globalheader"), $1); @@ -478,6 +497,10 @@ toplevel_expression: scm_call_2 (proc, THIS->self_scm (), music->self_scm ()); scm_gc_unprotect_object (music->self_scm ()); } + | full_markup { + SCM proc = THIS->lexer_->lookup_identifier ("toplevel-text-handler"); + scm_call_2 (proc, THIS->self_scm (), $1); + } | output_def { SCM id = SCM_EOL; Output_def * od = $1; @@ -507,7 +530,7 @@ embedded_scm: lilypond_header_body: { - $$ = ly_make_anonymous_module (safe_global_b); + $$ = ly_make_anonymous_module (be_safe_global); THIS->lexer_->add_scope ($$); } | lilypond_header_body assignment { @@ -521,27 +544,22 @@ lilypond_header: } ; - /* DECLARATIONS */ -assignment: - STRING { - THIS->push_spot (); - } - /* cont */ '=' identifier_init { - - /* - Should find generic way of associating input with objects. - */ - Input ip = THIS->pop_spot (); +assignment_id: + STRING { $$ = $1; } + | LYRICS_STRING { $$ = $1; } + ; +assignment: + assignment_id '=' identifier_init { if (! is_regular_identifier ($1)) { - ip.warning (_ ("Identifier should have alphabetic characters only")); + @1.warning (_ ("Identifier should have alphabetic characters only")); } - THIS->lexer_->set_identifier ($1, $4); + THIS->lexer_->set_identifier ($1, $3); /* TODO: devise standard for protection in parser. @@ -602,11 +620,11 @@ context_def_spec_block: context_def_spec_body: /**/ { $$ = Context_def::make_scm (); - unsmob_context_def ($$)->set_spot (THIS->here_input ()); + unsmob_context_def ($$)->set_spot (@$); } | CONTEXT_DEF_IDENTIFIER { $$ = $1; - unsmob_context_def ($$)->set_spot (THIS->here_input ()); + unsmob_context_def ($$)->set_spot (@$); } | context_def_spec_body GROBDESCRIPTIONS embedded_scm { Context_def*td = unsmob_context_def ($$); @@ -627,12 +645,8 @@ context_def_spec_body: book_block: - BOOK { - THIS->push_spot (); - } - /*cont*/ '{' book_body '}' { - THIS->pop_spot (); - $$ = $4; + BOOK '{' book_body '}' { + $$ = $3; } ; @@ -642,7 +656,7 @@ book_block: book_body: { $$ = new Book; - $$->set_spot (THIS->here_input ()); + $$->set_spot (@$); $$->paper_ = dynamic_cast (unsmob_output_def (THIS->lexer_->lookup_identifier ("$defaultpaper"))->clone ()); scm_gc_unprotect_object ($$->paper_->self_scm ()); $$->header_ = THIS->lexer_->lookup_identifier ("$globalheader"); @@ -652,38 +666,42 @@ book_body: scm_gc_unprotect_object ($2->self_scm ()); } | book_body score_block { - Score *score = $2; - $$->scores_.push (score); - scm_gc_unprotect_object (score->self_scm ()); + SCM s = $2->self_scm (); + $$->add_score (s); + scm_gc_unprotect_object (s); + } + | book_body full_markup { + $$->add_score ($2); } | book_body lilypond_header { $$->header_ = $2; } | book_body error { $$->paper_ = 0; - $$->scores_.clear(); + $$->scores_ = SCM_EOL; + } + | book_body object_id_setting { + $$->user_key_ = ly_scm2string ($2); } ; score_block: - SCORE { - THIS->push_spot (); - } - /*cont*/ '{' score_body '}' { - THIS->pop_spot (); - $$ = $4; + SCORE '{' score_body '}' { + $$ = $3; } ; score_body: /**/ { $$ = new Score; - - $$->set_spot (THIS->here_input ()); + $$->set_spot (@$); } | SCORE_IDENTIFIER { $$ = new Score ( *unsmob_score ($1)); - $$->set_spot (THIS->here_input ()); + $$->set_spot (@$); + } + | score_body object_id_setting { + $$->user_key_ = ly_scm2string ($2); } | score_body Music { SCM m = $2->self_scm (); @@ -696,7 +714,7 @@ score_body: | score_body output_def { if ($2->lookup_variable (ly_symbol2scm ("is-paper")) == SCM_BOOL_T) { - THIS->parser_error (_("\\paper cannot be in \\score. Use \\layout instead")); + THIS->parser_error (@2, _("\\paper cannot be in \\score. Use \\layout instead")); } else @@ -720,7 +738,7 @@ paper_block: $$ = $1; if ($$->lookup_variable (ly_symbol2scm ("is-paper")) != SCM_BOOL_T) { - THIS->parser_error (_("Need \\paper for paper block.")); + THIS->parser_error (@1, _("Need \\paper for paper block.")); $$ = get_paper (THIS); } } @@ -739,7 +757,7 @@ output_def: output_def_head: PAPER { $$ = get_paper (THIS); - $$->input_origin_ = THIS->here_input (); + $$->input_origin_ = @$; THIS->lexer_->add_scope ($$->scope_); } | MIDI { @@ -759,13 +777,13 @@ output_def_head: output_def_body: output_def_head '{' { $$ = $1; - $$->input_origin_.set_spot (THIS->here_input ()); + $$->input_origin_.set_spot (@$); THIS->lexer_->push_initial_state (); } | output_def_head '{' OUTPUT_DEF_IDENTIFIER { scm_gc_unprotect_object ($1->self_scm ()); Output_def *o = unsmob_output_def ($3); - o->input_origin_.set_spot (THIS->here_input ()); + o->input_origin_.set_spot (@$); $$ = o; THIS->lexer_->remove_scope (); THIS->lexer_->add_scope (o->scope_); @@ -870,7 +888,7 @@ Repeated_music: } - SCM proc = ly_scheme_function ("make-repeated-music"); + SCM proc = ly_lily_module_constant ("make-repeated-music"); SCM mus = scm_call_1 (proc, $2); scm_gc_protect_object (mus); // UGH. @@ -892,21 +910,21 @@ Repeated_music: we can not get durations and other stuff correct down the line, so we have to add to the duration log here. */ - SCM func = ly_scheme_function ("shift-duration-log"); + SCM func = ly_lily_module_constant ("shift-duration-log"); int dots = ($3 % 3) ? 0 : 1; int shift = -intlog2 ((dots) ? ($3*2/3) : $3); - Sequential_music *seq = dynamic_cast ($4); - if (seq) { - int list_len = scm_ilength (seq->music_list ()); + if ($4->is_mus_type ("sequential-music")) + { + int list_len = scm_ilength ($4->get_property ("elements")); if (list_len != 2) - seq->origin ()->warning ("Chord tremolo must have 2 elements."); + $4->origin ()->warning ("Chord tremolo must have 2 elements."); shift -= 1; r->compress (Moment (Rational (1, list_len))); - } - scm_call_3 (func, r->self_scm (), scm_int2num (shift),scm_int2num (dots)); + } + scm_call_3 (func, r->self_scm (), scm_int2num (shift), scm_int2num (dots)); } r->set_spot (*$4->origin ()); @@ -919,12 +937,12 @@ Sequential_music: SEQUENTIAL '{' Music_list '}' { $$ = MY_MAKE_MUSIC ("SequentialMusic"); $$->set_property ("elements", scm_car ($3)); - $$->set_spot (THIS->here_input ()); + $$->set_spot (@$); } | '{' Music_list '}' { $$ = MY_MAKE_MUSIC ("SequentialMusic"); $$->set_property ("elements", scm_car ($2)); - $$->set_spot (THIS->here_input ()); + $$->set_spot (@$); } ; @@ -932,13 +950,13 @@ Simultaneous_music: SIMULTANEOUS '{' Music_list '}'{ $$ = MY_MAKE_MUSIC ("SimultaneousMusic"); $$->set_property ("elements", scm_car ($3)); - $$->set_spot (THIS->here_input ()); + $$->set_spot (@$); } | simul_open Music_list simul_close { $$ = MY_MAKE_MUSIC ("SimultaneousMusic"); $$->set_property ("elements", scm_car ($2)); - $$->set_spot (THIS->here_input ()); + $$->set_spot (@$); } ; @@ -982,43 +1000,48 @@ Grouped_music_list: Generic_prefix_music_scm: MUSIC_FUNCTION { - $$ = scm_list_2 ($1, make_input (THIS->here_input ())); + $$ = scm_list_2 ($1, make_input (@$)); } - | MUSIC_FUNCTION_SCM { - THIS->push_spot (); - } embedded_scm { - $$ = scm_list_3 ($1, make_input (THIS->pop_spot ()), $3); + | MUSIC_FUNCTION_SCM embedded_scm { + $$ = scm_list_3 ($1, make_input (@$), $2); } - | MUSIC_FUNCTION_MUSIC { - THIS->push_spot (); - } Music { - $$ = scm_list_3 ($1, make_input (THIS->pop_spot ()), $3->self_scm ()); + | MUSIC_FUNCTION_MARKUP full_markup { + $$ = scm_list_3 ($1, make_input (@$), $2); + } + | MUSIC_FUNCTION_MUSIC Music { + $$ = scm_list_3 ($1, make_input (@$), $2->self_scm ()); + scm_gc_unprotect_object ($2->self_scm ()); + } + | MUSIC_FUNCTION_SCM_MUSIC embedded_scm Music { + $$ = scm_list_4 ($1, make_input (@$), $2, $3->self_scm ()); scm_gc_unprotect_object ($3->self_scm ()); } - | MUSIC_FUNCTION_SCM_MUSIC { - THIS->push_spot (); - } embedded_scm Music { - $$ = scm_list_4 ($1, make_input (THIS->pop_spot ()), $3, $4->self_scm ()); - scm_gc_unprotect_object ($4->self_scm ()); + | MUSIC_FUNCTION_SCM_SCM embedded_scm embedded_scm { + $$ = scm_list_4 ($1, make_input (@$), $2, $3); + } + | MUSIC_FUNCTION_SCM_SCM_MUSIC embedded_scm embedded_scm Music { + $$ = scm_list_5 ($1, make_input (@$), $2, $3, $4->self_scm ()); + } + | MUSIC_FUNCTION_MARKUP_MUSIC full_markup Music { + $$ = scm_list_4 ($1, make_input (@$), $2, $3->self_scm ()); + scm_gc_unprotect_object ($3->self_scm ()); } - | MUSIC_FUNCTION_SCM_SCM { - THIS->push_spot (); - } embedded_scm embedded_scm { - $$ = scm_list_4 ($1, make_input (THIS->pop_spot ()), $3, $4); + | MUSIC_FUNCTION_MARKUP_MARKUP full_markup full_markup { + $$ = scm_list_4 ($1, make_input (@$), $2, $3); } - | MUSIC_FUNCTION_MUSIC_MUSIC { - THIS->push_spot (); - } Music Music { - $$ = scm_list_4 ($1, make_input (THIS->pop_spot ()), $3->self_scm (), $4->self_scm ()); + | MUSIC_FUNCTION_MUSIC_MUSIC Music Music { + $$ = scm_list_4 ($1, make_input (@$), $2->self_scm (), $3->self_scm ()); + scm_gc_unprotect_object ($2->self_scm ()); scm_gc_unprotect_object ($3->self_scm ()); + } + | MUSIC_FUNCTION_SCM_MUSIC_MUSIC embedded_scm Music Music { + $$ = scm_list_5 ($1, make_input (@$), $2, $3->self_scm (), $4->self_scm ()); scm_gc_unprotect_object ($4->self_scm ()); + scm_gc_unprotect_object ($3->self_scm ()); } - | MUSIC_FUNCTION_SCM_MUSIC_MUSIC { - THIS->push_spot (); - } embedded_scm Music Music { - $$ = scm_list_5 ($1, make_input (THIS->pop_spot ()), - $3, $4->self_scm (), $5->self_scm ()); - scm_gc_unprotect_object ($5->self_scm ()); + | MUSIC_FUNCTION_MARKUP_MUSIC_MUSIC full_markup Music Music { + $$ = scm_list_5 ($1, make_input (@$), $2, $3->self_scm (), $4->self_scm ()); + scm_gc_unprotect_object ($3->self_scm ()); scm_gc_unprotect_object ($4->self_scm ()); } ; @@ -1029,28 +1052,27 @@ Generic_prefix_music: Input *loc = unsmob_input (scm_cadr ($1)); SCM args = scm_cddr ($1); SCM sig = scm_object_property (func, ly_symbol2scm ("music-function-signature")); - int k = 0; - bool ok = true; - for (SCM s = sig, t = args; - ok && scm_is_pair (s) && scm_is_pair (t); - s = scm_cdr (s), t = scm_cdr (t)) { - k++; - if (scm_call_1 (scm_car (s), scm_car (t)) != SCM_BOOL_T) - { - loc->error (_f ("Argument %d failed typecheck", k)); - THIS->error_level_ = 1; - ok = false; - } + + 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 ($1), sig, args))) + { + THIS->error_level_ = 1; + ok = false; } + SCM m = SCM_EOL; - if (ok) - m = scm_apply_0 (func, scm_cdr ($1)); + if (ok) + m = scm_apply_0 (func, scm_cons (THIS->self_scm(), + scm_cdr ($1))); + if (unsmob_music (m)) { $$ = unsmob_music (m); scm_gc_protect_object (m); } - else + else { if (ok) loc->error (_ ("Music head function should return Music object.")); @@ -1073,22 +1095,18 @@ Prefix_composite_music: $$ = context_spec_music ($2, SCM_UNDEFINED, $4, $3); } | NEWCONTEXT simple_string optional_context_mod Music { - $$ = context_spec_music ($2, get_next_unique_context (), $4, + $$ = context_spec_music ($2, get_next_unique_context_id (), $4, $3); } - | TIMES { - THIS->push_spot (); - } - /* CONTINUED */ - fraction Music + | TIMES fraction Music { - int n = scm_to_int (scm_car ($3)); int d = scm_to_int (scm_cdr ($3)); - Music *mp = $4; + int n = scm_to_int (scm_car ($2)); int d = scm_to_int (scm_cdr ($2)); + Music *mp = $3; $$= MY_MAKE_MUSIC ("TimeScaledMusic"); - $$->set_spot (THIS->pop_spot ()); + $$->set_spot (@$); $$->set_property ("element", mp->self_scm ()); scm_gc_unprotect_object (mp->self_scm ()); @@ -1111,7 +1129,7 @@ Prefix_composite_music: | mode_changing_head Grouped_music_list { if ($1 == ly_symbol2scm ("chords")) { - Music *chm = MY_MAKE_MUSIC ("UntransposableMusic"); + Music *chm = MY_MAKE_MUSIC ("UnrelativableMusic"); chm->set_property ("element", $2->self_scm ()); $$ = chm; scm_gc_unprotect_object ($2->self_scm ()); @@ -1123,11 +1141,11 @@ Prefix_composite_music: THIS->lexer_->pop_state (); } | mode_changing_head_with_context optional_context_mod Grouped_music_list { - $$ = context_spec_music ($1, get_next_unique_context (), + $$ = context_spec_music ($1, get_next_unique_context_id (), $3, $2); - if ($1 == ly_symbol2scm ("FiguredBass")) + if ($1 == ly_symbol2scm ("ChordNames")) { - Music *chm = MY_MAKE_MUSIC ("UntransposableMusic"); + Music *chm = MY_MAKE_MUSIC ("UnrelativableMusic"); chm->set_property ("element", $$->self_scm ()); scm_gc_unprotect_object ($$->self_scm ()); $$ = chm; @@ -1137,7 +1155,7 @@ Prefix_composite_music: | relative_music { $$ = $1; } | re_rhythmed_music { $$ = $1; } | TAG embedded_scm Music { - tag_music ($3, $2, THIS->here_input ()); + tag_music ($3, $2, @$); $$ = $3; } ; @@ -1237,11 +1255,15 @@ new_lyrics: re_rhythmed_music: Grouped_music_list new_lyrics { - - SCM name = $1->get_property ("context-id"); - //if (name == SCM_EOL) + Music * voice = $1; + SCM name = get_first_context_id (scm_makfrom0str ("Voice"), voice); if (!scm_is_string (name)) - name = scm_makfrom0str (""); + { + name = get_next_unique_lyrics_context_id (); + voice = context_spec_music (scm_makfrom0str ("Voice"), + name, + voice, SCM_EOL); + } SCM context = scm_makfrom0str ("Lyrics"); Music *all = MY_MAKE_MUSIC ("SimultaneousMusic"); @@ -1252,22 +1274,20 @@ re_rhythmed_music: Music *music = unsmob_music (scm_car (s)); Music *com = make_lyric_combine_music (name, music); Music *csm = context_spec_music (context, - get_next_unique_context (), com, SCM_EOL); + get_next_unique_context_id (), com, SCM_EOL); lst = scm_cons (csm->self_scm (), lst); } - /* FIXME: only first lyric music is accepted, - the rest is junked */ - all->set_property ("elements", scm_cons ($1->self_scm (), + all->set_property ("elements", scm_cons (voice->self_scm (), lst)); $$ = all; - scm_gc_unprotect_object ($1->self_scm ()); + scm_gc_unprotect_object (voice->self_scm ()); } - | LYRICSTO { + | LYRICSTO simple_string { THIS->lexer_->push_lyric_state (); - } simple_string Music { + } Music { THIS->lexer_->pop_state (); Music *music = $4; - SCM name = $3; + SCM name = $2; $$ = make_lyric_combine_music (name, music); scm_gc_unprotect_object (music->self_scm ()); } @@ -1275,12 +1295,12 @@ re_rhythmed_music: context_change: CHANGE STRING '=' STRING { - Music*t= MY_MAKE_MUSIC ("ContextChange"); + 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 (THIS->here_input ()); + $$->set_spot (@$); } ; @@ -1327,7 +1347,7 @@ context_prop_spec: simple_string { if (!is_regular_identifier ($1)) { - THIS->here_input ().error (_("Grob name should be alphanumeric")); + @$.error (_("Grob name should be alphanumeric")); } $$ = scm_list_2 (ly_symbol2scm ("Bottom"), @@ -1436,9 +1456,7 @@ nevertheless, this is not very clean, and we should find a different solution. */ -pre_events: { - THIS->push_spot (); - } +pre_events: /* empty */ ; event_chord: @@ -1448,6 +1466,11 @@ event_chord: elts = ly_append2 (elts, scm_reverse_x ($3, SCM_EOL)); $2->set_property ("elements", elts); + /* why is this giving wrong start location? -ns + * $2->set_spot (@$); */ + Input i; + i.set_location (@2, @3); + $2->set_spot (i); $$ = $2; } | command_element @@ -1467,6 +1490,7 @@ note_chord_element: es = ly_append2 (es, postevs); $1-> set_property ("elements", es); + $1->set_spot (@$); $$ = $1; } ; @@ -1487,6 +1511,7 @@ chord_body: chord_open chord_body_elements chord_close { $$ = MY_MAKE_MUSIC ("EventChord"); + $$->set_spot (@$); $$->set_property ("elements", scm_reverse_x ($2, SCM_EOL)); } @@ -1501,7 +1526,7 @@ chord_body_elements: ; chord_body_element: - pitch exclamations questions octave_check post_events + pitch exclamations questions octave_check post_events { int q = $3; int ex = $2; @@ -1510,6 +1535,7 @@ chord_body_element: Music *n = MY_MAKE_MUSIC ("NoteEvent"); n->set_property ("pitch", $1); + n->set_spot (@$); if (q % 2) n->set_property ("cautionary", SCM_BOOL_T); if (ex % 2 || q % 2) @@ -1532,7 +1558,7 @@ chord_body_element: Music *n = MY_MAKE_MUSIC ("NoteEvent"); n->set_property ("duration", $2); n->set_property ("drum-type", $1); - n->set_spot (THIS->here_input ()); + n->set_spot (@$); if (scm_is_pair ($2)) { SCM arts = scm_reverse_x ($2, SCM_EOL); @@ -1544,7 +1570,7 @@ chord_body_element: add_quote: ADDQUOTE string Music { - SCM adder = ly_scheme_function ("add-quotable"); + SCM adder = ly_lily_module_constant ("add-quotable"); scm_call_2 (adder, $2, $3->self_scm ()); scm_gc_unprotect_object ($3->self_scm ()); @@ -1557,70 +1583,61 @@ command_element: $$->set_property ("elements", scm_cons ($1->self_scm (), SCM_EOL)); scm_gc_unprotect_object ($1->self_scm ()); - $$-> set_spot (THIS->here_input ()); - $1-> set_spot (THIS->here_input ()); + $$-> set_spot (@$); + $1-> set_spot (@$); } | SKIP duration_length { Music *skip = MY_MAKE_MUSIC ("SkipMusic"); skip->set_property ("duration", $2); - + skip->set_spot (@$); $$ = skip; } - | QUOTE STRING duration_length { - Music *quote = MY_MAKE_MUSIC ("QuoteMusic"); - quote->set_property ("duration", $3); - quote->set_property ("quoted-music-name", $2); - quote->set_spot (THIS->here_input ()); - - $$ = quote; - } - | OCTAVE { THIS->push_spot (); } - pitch { + | OCTAVE pitch { Music *m = MY_MAKE_MUSIC ("RelativeOctaveCheck"); $$ = m; - $$->set_spot (THIS->pop_spot ()); - $$->set_property ("pitch", $3); + $$->set_spot (@$); + $$->set_property ("pitch", $2); } | E_LEFTSQUARE { Music *m = MY_MAKE_MUSIC ("LigatureEvent"); m->set_property ("span-direction", scm_int2num (START)); - m->set_spot (THIS->here_input ()); + m->set_spot (@$); $$ = MY_MAKE_MUSIC ("EventChord"); $$->set_property ("elements", scm_cons (m->self_scm (), SCM_EOL)); scm_gc_unprotect_object (m->self_scm ()); - $$->set_spot (THIS->here_input ()); + $$->set_spot (@$); } | E_RIGHTSQUARE { Music *m = MY_MAKE_MUSIC ("LigatureEvent"); m->set_property ("span-direction", scm_int2num (STOP)); - m->set_spot (THIS->here_input ()); + m->set_spot (@$); $$ = MY_MAKE_MUSIC ("EventChord"); $$->set_property ("elements", scm_cons (m->self_scm (), SCM_EOL)); - $$->set_spot (THIS->here_input ()); + $$->set_spot (@$); scm_gc_unprotect_object (m->self_scm ()); } | E_BACKSLASH { $$ = MY_MAKE_MUSIC ("VoiceSeparator"); - $$->set_spot (THIS->here_input ()); + $$->set_spot (@$); } | '|' { - SCM pipe =THIS->lexer_->lookup_identifier ("pipeSymbol"); + SCM pipe = THIS->lexer_->lookup_identifier ("pipeSymbol"); if (Music * m = unsmob_music (pipe)) $$ = m->clone (); else $$ = MY_MAKE_MUSIC ("BarCheck"); - $$->set_spot (THIS->here_input ()); + $$->set_spot (@$); } | TRANSPOSITION pitch { Pitch middle_c; Pitch sounds_as_c = pitch_interval (*unsmob_pitch ($2), middle_c); $$ = set_property_music (ly_symbol2scm ("instrumentTransposition"), sounds_as_c.smobbed_copy()); - $$->set_spot (THIS-> here_input ()); + $$->set_spot (@$); $$ = context_spec_music (ly_symbol2scm ("Staff"), SCM_UNDEFINED, $$, SCM_EOL); } @@ -1630,13 +1647,13 @@ command_element: Music *csm = context_spec_music (ly_symbol2scm ("Timing"), SCM_UNDEFINED, t, SCM_EOL); $$ = context_spec_music (ly_symbol2scm ("Score"), SCM_UNDEFINED, csm, SCM_EOL); - $$->set_spot (THIS->here_input ()); - t->set_spot (THIS->here_input ()); + $$->set_spot (@$); + t->set_spot (@$); } | PARTIAL duration_length { Moment m = - unsmob_duration ($2)->get_length (); Music *p = set_property_music (ly_symbol2scm ( "measurePosition"),m.smobbed_copy ()); - p->set_spot (THIS->here_input ()); + p->set_spot (@$); p = context_spec_music (ly_symbol2scm ("Timing"), SCM_UNDEFINED, p, SCM_EOL); p = context_spec_music (ly_symbol2scm ("Score"), SCM_UNDEFINED, @@ -1644,21 +1661,21 @@ command_element: $$ = p; } | CLEF STRING { - SCM proc = ly_scheme_function ("make-clef-set"); + SCM proc = ly_lily_module_constant ("make-clef-set"); SCM result = scm_call_1 (proc, $2); scm_gc_protect_object (result); $$ = unsmob_music (result); } | TIME_T fraction { - SCM proc= ly_scheme_function ("make-time-signature-set"); + SCM proc = ly_lily_module_constant ("make-time-signature-set"); SCM result = scm_apply_2 (proc, scm_car ($2), scm_cdr ($2), SCM_EOL); scm_gc_protect_object (result); $$ = unsmob_music (result); } | MARK scalar { - SCM proc = ly_scheme_function ("make-mark-set"); + SCM proc = ly_lily_module_constant ("make-mark-set"); SCM result = scm_call_1 (proc, $2); scm_gc_protect_object (result); @@ -1678,36 +1695,37 @@ command_req: $$ = $1; } | KEY DEFAULT { - Music *key= MY_MAKE_MUSIC ("KeyChangeEvent"); + Music *key = MY_MAKE_MUSIC ("KeyChangeEvent"); $$ = key; } | KEY NOTENAME_PITCH SCM_IDENTIFIER { - Music *key= MY_MAKE_MUSIC ("KeyChangeEvent"); + Music *key = MY_MAKE_MUSIC ("KeyChangeEvent"); if (scm_ilength ($3) > 0) { key->set_property ("pitch-alist", $3); key->set_property ("tonic", Pitch (0,0,0).smobbed_copy ()); - ((Music*)key)->transpose (* unsmob_pitch ($2)); + key->transpose (* unsmob_pitch ($2)); } else { - THIS->parser_error (_ ("Second argument must be pitch list.")); + THIS->parser_error (@3, _ ("Second argument must be pitch list.")); } $$ = key; } ; + post_events: /* empty */ { $$ = SCM_EOL; } | post_events post_event { - $2->set_spot (THIS->here_input ()); + $2->set_spot (@2); $$ = scm_cons ($2->self_scm (), $$); scm_gc_unprotect_object ($2->self_scm ()); } | post_events tagged_post_event { - $2 -> set_spot (THIS->here_input ()); + $2 -> set_spot (@2); $$ = scm_cons ($2->self_scm (), $$); scm_gc_unprotect_object ($2->self_scm ()); } @@ -1716,23 +1734,24 @@ post_events: tagged_post_event: '-' TAG embedded_scm post_event { - tag_music ($4, $3, THIS->here_input ()); + tag_music ($4, $3, @$); $$ = $4; } ; + post_event: direction_less_event { $$ = $1; } | HYPHEN { if (!THIS->lexer_->is_lyric_state ()) - THIS->parser_error (_ ("Have to be in Lyric mode for lyrics")); + THIS->parser_error (@1, _ ("Have to be in Lyric mode for lyrics")); $$ = MY_MAKE_MUSIC ("HyphenEvent"); } | EXTENDER { if (!THIS->lexer_->is_lyric_state ()) - THIS->parser_error (_ ("Have to be in Lyric mode for lyrics")); + THIS->parser_error (@1, _ ("Have to be in Lyric mode for lyrics")); $$ = MY_MAKE_MUSIC ("ExtenderEvent"); } | script_dir direction_reqd_event { @@ -1752,7 +1771,7 @@ string_number_event: E_UNSIGNED { Music *s = MY_MAKE_MUSIC ("StringNumberEvent"); s->set_property ("string-number", scm_int2num ($1)); - s->set_spot (THIS->here_input ()); + s->set_spot (@$); $$ = s; } ; @@ -1802,7 +1821,7 @@ direction_less_event: { m = MY_MAKE_MUSIC ("Music"); } - m->set_spot (THIS->here_input ()); + m->set_spot (@$); $$ = m; } | EVENT_IDENTIFIER { @@ -1810,7 +1829,7 @@ direction_less_event: } | tremolo_type { Music *a = MY_MAKE_MUSIC ("TremoloEvent"); - a->set_spot (THIS->here_input ()); + a->set_spot (@$); a->set_property ("tremolo-type", scm_int2num ($1)); $$ = a; } @@ -1825,7 +1844,7 @@ direction_reqd_event: Music *a = MY_MAKE_MUSIC ("ArticulationEvent"); if (scm_is_string (s)) a->set_property ("articulation-type", s); - else THIS->parser_error (_ ("Expecting string as script definition")); + else THIS->parser_error (@1, _ ("Expecting string as script definition")); $$ = a; } ; @@ -1907,21 +1926,21 @@ gen_text_def: full_markup { Music *t = MY_MAKE_MUSIC ("TextScriptEvent"); t->set_property ("text", $1); - t->set_spot (THIS->here_input ()); + t->set_spot (@$); $$ = t; } | string { Music *t = MY_MAKE_MUSIC ("TextScriptEvent"); t->set_property ("text", - make_simple_markup (THIS->lexer_->encoding (), $1)); - t->set_spot (THIS->here_input ()); + make_simple_markup ($1)); + t->set_spot (@$); $$ = t; } | DIGIT { Music *t = MY_MAKE_MUSIC ("FingerEvent"); t->set_property ("digit", scm_int2num ($1)); - t->set_spot (THIS->here_input ()); + t->set_spot (@$); $$ = t; } ; @@ -1988,7 +2007,7 @@ steno_duration: bare_unsigned dots { int len = 0; if (!is_duration ($1)) - THIS->parser_error (_f ("not a duration: %d", $1)); + THIS->parser_error (@1, _f ("not a duration: %d", $1)); else len = intlog2 ($1); @@ -2038,7 +2057,7 @@ tremolo_type: } | ':' bare_unsigned { if (!is_duration ($2)) - THIS->parser_error (_f ("not a duration: %d", $2)); + THIS->parser_error (@2, _f ("not a duration: %d", $2)); $$ = $2; } ; @@ -2046,15 +2065,16 @@ tremolo_type: bass_number: DIGIT { $$ = scm_number_to_string (scm_int2num ($1), scm_int2num (10)); - $$ = scm_list_2 (ly_scheme_function ("number-markup"), + $$ = scm_list_2 (ly_lily_module_constant ("number-markup"), $$); } | UNSIGNED { $$ = scm_number_to_string (scm_int2num ($1), scm_int2num (10)); - $$ = scm_list_2 (ly_scheme_function ("number-markup"), + $$ = scm_list_2 (ly_lily_module_constant ("number-markup"), $$); } | STRING { $$ = $1; } + | full_markup { $$ = $1; } ; bass_mod: @@ -2130,10 +2150,8 @@ optional_rest: simple_element: pitch exclamations questions octave_check optional_notemode_duration optional_rest { - - Input i = THIS->pop_spot (); if (!THIS->lexer_->is_note_state ()) - THIS->parser_error (_ ("Have to be in Note mode for notes")); + THIS->parser_error (@1, _ ("Have to be in Note mode for notes")); Music *n = 0; if ($6) @@ -2159,13 +2177,11 @@ simple_element: v->set_property ("elements", scm_list_1 (n->self_scm ())); scm_gc_unprotect_object (n->self_scm ()); - v->set_spot (i); - n->set_spot (i); + v->set_spot (@$); + n->set_spot (@$); $$ = v; } | DRUM_PITCH optional_notemode_duration { - Input i = THIS->pop_spot (); - Music *n = MY_MAKE_MUSIC ("NoteEvent"); n->set_property ("duration", $2); n->set_property ("drum-type", $1); @@ -2173,15 +2189,14 @@ simple_element: Music *v = MY_MAKE_MUSIC ("EventChord"); v->set_property ("elements", scm_list_1 (n->self_scm ())); scm_gc_unprotect_object (n->self_scm ()); - v->set_spot (i); - n->set_spot (i); + v->set_spot (@$); + n->set_spot (@$); $$ = v; } | figure_spec optional_notemode_duration { Music *m = unsmob_music ($1); - Input i = THIS->pop_spot (); - m->set_spot (i); + 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); @@ -2189,8 +2204,6 @@ simple_element: $$ = m; } | RESTNAME optional_notemode_duration { - - Input i = THIS->pop_spot (); Music *ev = 0; if (ly_scm2string ($1) == "s") { /* Space */ @@ -2201,55 +2214,48 @@ simple_element: } ev->set_property ("duration", $2); - ev->set_spot (i); + ev->set_spot (@$); Music *velt = MY_MAKE_MUSIC ("EventChord"); velt->set_property ("elements", scm_list_1 (ev->self_scm ())); - velt->set_spot (i); + velt->set_spot (@$); scm_gc_unprotect_object (ev->self_scm ()); $$ = velt; } | MULTI_MEASURE_REST optional_notemode_duration { - THIS->pop_spot (); - - SCM proc = ly_scheme_function ("make-multi-measure-rest"); - SCM mus = scm_call_2 (proc, $2, - make_input (THIS->here_input ())); + SCM proc = ly_lily_module_constant ("make-multi-measure-rest"); + SCM mus = scm_call_2 (proc, $2, make_input (@$)); scm_gc_protect_object (mus); $$ = unsmob_music (mus); } | lyric_element optional_notemode_duration { - Input i = THIS->pop_spot (); if (!THIS->lexer_->is_lyric_state ()) - THIS->parser_error (_ ("Have to be in Lyric mode for lyrics")); + THIS->parser_error (@1, _ ("Have to be in Lyric mode for lyrics")); Music *lreq = MY_MAKE_MUSIC ("LyricEvent"); - lreq->set_property ("text", $1); + lreq->set_property ("text", $1); lreq->set_property ("duration",$2); - lreq->set_spot (i); + lreq->set_spot (@$); Music *velt = MY_MAKE_MUSIC ("EventChord"); velt->set_property ("elements", scm_list_1 (lreq->self_scm ())); $$= velt; } | new_chord { - THIS->pop_spot (); - if (!THIS->lexer_->is_chord_state ()) - THIS->parser_error (_ ("Have to be in Chord mode for chords")); + THIS->parser_error (@1, _ ("Have to be in Chord mode for chords")); $$ = unsmob_music ($1); } ; lyric_element: - /* FIXME: lyric flavoured markup would be better */ - full_markup { + lyric_markup { $$ = $1; } | LYRICS_STRING { - $$ = make_simple_markup (THIS->lexer_->encoding (), $1); + $$ = make_simple_markup ($1); } ; @@ -2390,7 +2396,7 @@ bare_int: $$ = k; } else { - THIS->parser_error (_ ("need integer number arg")); + THIS->parser_error (@1, _ ("need integer number arg")); $$ = 0; } } @@ -2409,61 +2415,109 @@ questions: | questions '?' { $$ ++; } ; +/* +This should be done more dynamically if possible. +*/ +lyric_markup: + LYRIC_MARKUP_IDENTIFIER { + $$ = $1; + } + | LYRIC_MARKUP + { THIS->lexer_->push_markup_state (); } + markup_top { + $$ = $3; + THIS->lexer_->pop_state (); + } + ; full_markup: MARKUP_IDENTIFIER { $$ = $1; - } + } | MARKUP { THIS->lexer_->push_markup_state (); } - markup - { $$ = $3; - THIS->lexer_->pop_state (); - } + markup_top { + $$ = $3; + THIS->lexer_->pop_state (); + } ; +markup_top: + markup_list { + $$ = scm_list_2 (ly_lily_module_constant ("line-markup"), $1); + } + | markup_head_1_list simple_markup { + $$ = scm_car (scm_call_2 (ly_lily_module_constant ("map-markup-command-list"), $1, scm_list_1 ($2))); + } + | simple_markup { + $$ = $1; + } + ; -/* -This should be done more dynamically if possible. -*/ -markup: - STRING { - $$ = make_simple_markup (THIS->lexer_->encoding (), $1); +markup_list: + markup_composed_list { + $$ = $1; } - | MARKUP_HEAD_EMPTY { - $$ = scm_list_1 ($1); + | markup_braced_list { + $$ = $1; } - | MARKUP_HEAD_MARKUP0 markup { - $$ = scm_list_2 ($1, $2); + ; + +markup_composed_list: + markup_head_1_list markup_braced_list { + $$ = scm_call_2 (ly_lily_module_constant ("map-markup-command-list"), $1, $2); + } - | MARKUP_HEAD_MARKUP0_MARKUP1 markup markup { - $$ = scm_list_3 ($1, $2, $3); + ; + +markup_braced_list: + '{' markup_braced_list_body '}' { + $$ = scm_reverse_x ($2, SCM_EOL); } - | MARKUP_HEAD_SCM0_MARKUP1 SCM_T markup { - $$ = scm_list_3 ($1, $2, $3); + ; + +markup_braced_list_body: + /* empty */ { $$ = scm_list (SCM_EOL); } + | markup_braced_list_body markup { + $$ = scm_cons ($2, $1); } - | markup_line { - $$ = $1; + | markup_braced_list_body markup_list { + $$ = scm_append_x (scm_list_2 (scm_reverse_x ($2, SCM_EOL), $1)); } - | MARKUP_HEAD_LIST0 markup_list { - $$ = scm_list_2 ($1,$2); + ; + +markup_head_1_item: + MARKUP_HEAD_MARKUP0 { + $$ = scm_list_1 ($1); } - | MARKUP_HEAD_SCM0 embedded_scm { + | MARKUP_HEAD_SCM0_MARKUP1 embedded_scm { $$ = scm_list_2 ($1, $2); } - | MARKUP_HEAD_SCM0_SCM1_MARKUP2 embedded_scm embedded_scm markup { - $$ = scm_list_4 ($1, $2, $3, $4); + | MARKUP_HEAD_SCM0_SCM1_MARKUP2 embedded_scm embedded_scm { + $$ = scm_list_3 ($1, $2, $3); } - | MARKUP_HEAD_SCM0_SCM1_SCM2 embedded_scm embedded_scm embedded_scm { - $$ = scm_list_4 ($1, $2, $3, $4); + ; + +markup_head_1_list: + markup_head_1_item { + $$ = scm_list_1 ($1); } - | MARKUP_HEAD_SCM0_SCM1 embedded_scm embedded_scm { - $$ = scm_list_3 ($1, $2, $3); + | markup_head_1_list markup_head_1_item { + $$ = scm_cons ($2, $1); + } + ; + +simple_markup: + STRING { + $$ = make_simple_markup ($1); } | MARKUP_IDENTIFIER { $$ = $1; } + | LYRIC_MARKUP_IDENTIFIER { + $$ = $1; + } | STRING_IDENTIFIER { $$ = $1; } @@ -2472,32 +2526,39 @@ markup: THIS->lexer_->push_note_state (alist_to_hashq (nn)); } '{' score_body '}' { Score * sc = $4; - $$ = scm_list_2 (ly_scheme_function ("score-markup"), sc->self_scm ()); + $$ = scm_list_2 (ly_lily_module_constant ("score-markup"), sc->self_scm ()); scm_gc_unprotect_object (sc->self_scm ()); THIS->lexer_->pop_state (); } + | MARKUP_HEAD_SCM0 embedded_scm { + $$ = scm_list_2 ($1, $2); + } + | MARKUP_HEAD_SCM0_SCM1_SCM2 embedded_scm embedded_scm embedded_scm { + $$ = scm_list_4 ($1, $2, $3, $4); + } + | MARKUP_HEAD_SCM0_SCM1 embedded_scm embedded_scm { + $$ = scm_list_3 ($1, $2, $3); + } + | MARKUP_HEAD_EMPTY { + $$ = scm_list_1 ($1); + } + | MARKUP_HEAD_LIST0 markup_list { + $$ = scm_list_2 ($1,$2); + } + | MARKUP_HEAD_MARKUP0_MARKUP1 markup markup { + $$ = scm_list_3 ($1, $2, $3); + } ; - -markup_list: - chord_open markup_list_body chord_close { $$ = scm_reverse_x ($2, SCM_EOL); } - ; - -markup_line: - '{' markup_list_body '}' { - SCM line = ly_scheme_function ("line-markup"); - $$ = scm_list_2 (line, scm_reverse_x ($2, SCM_EOL)); +markup: + markup_head_1_list simple_markup { + $$ = scm_car (scm_call_2 (ly_lily_module_constant ("map-markup-command-list"), $1, scm_list_1 ($2))); } - ; - -markup_list_body: - /**/ { $$ = SCM_EOL; } - | markup_list_body markup { - $$ = scm_cons ($2, $1); + | simple_markup { + $$ = $1; } ; - %% void @@ -2581,6 +2642,8 @@ Lily_lexer::try_special_identifiers (SCM *destination, SCM sid) return OUTPUT_DEF_IDENTIFIER; } else if (Text_interface::markup_p (sid)) { *destination = sid; + if (is_lyric_state ()) + return LYRIC_MARKUP_IDENTIFIER; return MARKUP_IDENTIFIER; } @@ -2626,15 +2689,15 @@ property_op_to_music (SCM op) if (grob_sym != SCM_UNDEFINED) { - bool itc = internal_type_checking_global_b; + bool itc = do_internal_type_checking_global; /* UGH. */ bool autobeam = ly_c_equal_p (symbol, ly_symbol2scm ("autoBeamSettings")); if (autobeam) - internal_type_checking_global_b = false; + do_internal_type_checking_global = false; m->set_property ("grob-property", grob_sym); if (autobeam) - internal_type_checking_global_b = itc; + do_internal_type_checking_global = itc; } if (tag == ly_symbol2scm ("poppush")) @@ -2661,15 +2724,18 @@ context_spec_music (SCM type, SCM id, Music *m, SCM ops) return csm; } -/* -FIXME: this should be postponed until the music hits \Score -*/ SCM -get_next_unique_context () +get_next_unique_context_id () +{ + return scm_makfrom0str ("$uniqueContextId"); +} + + +SCM +get_next_unique_lyrics_context_id () { static int new_context_count; - char s[1024]; + char s[128]; snprintf (s, 1024, "uniqueContext%d", new_context_count++); return scm_makfrom0str (s); } -