X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fparser.yy;h=9afd1e5be4f0cc2b8332fec6998bf84db1359e2c;hb=26380ed75fbd7b32781715c043dfa5dd96dfbe4a;hp=6d8d755366ae37cd7805ec5d8df29a7fa44e827f;hpb=0886f6a00f3bfba9f42106119662d77e600e5c1b;p=lilypond.git diff --git a/lily/parser.yy b/lily/parser.yy index 6d8d755366..9afd1e5be4 100644 --- a/lily/parser.yy +++ b/lily/parser.yy @@ -5,28 +5,27 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2004 Han-Wen Nienhuys + (c) 1997--2005 Han-Wen Nienhuys Jan Nieuwenhuizen */ /* +FIXME: -TODO: - -* The rules for who is protecting what are very shady. Uniformise - this. - -* There are too many lexical modes? + * The rules for who is protecting what are very shady. Uniformise + this. + * There are too many lexical modes? */ +#include "config.hh" + #include #include #include #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" @@ -47,14 +43,23 @@ TODO: #include "scm-hash.hh" #include "scm-option.hh" #include "score.hh" -#include "text-item.hh" +#include "text-interface.hh" #include "warn.hh" #define MY_MAKE_MUSIC(x) make_music_by_name (ly_symbol2scm (x)) 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 (); + +#undef _ +#if !HAVE_GETTEXT +#define _(x) x +#else +#include +#define _(x) gettext (x) +#endif #define YYERROR_VERBOSE 1 @@ -65,6 +70,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 @@ -76,7 +87,7 @@ tag_music (Music *m, SCM tag, Input ip) else if (ly_c_list_p (tag)) tags = ly_append2 (tag, tags); else - ip.warning (_ ("Tag must be symbol or list of symbols.")); + ip.warning (_ ("tag must be symbol or list of symbols")); m->set_property ("tags", tags); } @@ -100,13 +111,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); } @@ -119,8 +141,8 @@ is_duration (int t) void set_music_properties (Music *p, SCM a) { - for (SCM k = a; scm_is_pair (k); k = ly_cdr (k)) - p->internal_set_property (ly_caar (k), ly_cdar (k)); + for (SCM k = a; scm_is_pair (k); k = scm_cdr (k)) + p->internal_set_property (scm_caar (k), scm_cdar (k)); } SCM @@ -139,7 +161,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; @@ -150,7 +172,7 @@ bool ly_input_procedure_p (SCM x) { return ly_c_procedure_p (x) - || (scm_is_pair (x) && ly_c_procedure_p (ly_car (x))); + || (scm_is_pair (x) && ly_c_procedure_p (scm_car (x))); } Music* @@ -177,7 +199,7 @@ make_music_relative (Pitch start, Music *music) Music* make_lyric_combine_music (SCM name, Music *music) { - Music *combine = MY_MAKE_MUSIC ("NewLyricCombineMusic"); + Music *combine = MY_MAKE_MUSIC ("LyricCombineMusic"); combine->set_property ("element", music->self_scm ()); combine->set_property ("associated-context", name); return combine; @@ -203,12 +225,13 @@ of the parse stack onto the heap. */ %{ int -yylex (YYSTYPE *s, void *v) +yylex (YYSTYPE *s, YYLTYPE *loc, void *v) { Lily_parser *pars = (Lily_parser*) v; Lily_lexer *lex = pars->lexer_; lex->lexval = (void*) s; + lex->lexloc = loc; lex->prepare_for_next_token (); return lex->yylex (); } @@ -216,139 +239,153 @@ yylex (YYSTYPE *s, void *v) %} -%expect 3 +%expect 1 -/* - Three shift/reduce problems: - -2. \markup identifier. - - (what? --hwn) - -3. \markup { } +/* One shift/reduce problem - (what? --hwn) - - -4. \repeat +1. \repeat \repeat .. \alternative - \repeat { \repeat .. \alternative } or \repeat { \repeat } \alternative - -) - */ +*/ %pure_parser +%locations + +/* The third option is an alias that will be used to display the + syntax error. Bison CVS now correctly handles backslash escapes. + + FIXME: Bison needs to translate some of these, eg, STRING. + +*/ + +/* Keyword tokens with plain escaped name. */ +%token ACCEPTS "\\accepts" +%token ADDLYRICS "\\addlyrics" +%token ADDQUOTE "\\addquote" +%token ALIAS "\\alias" +%token ALTERNATIVE "\\alternative" +%token BAR "\\bar" +%token BOOK "\book" +%token CHANGE "\\change" +%token CHORDMODE "\\chordmode" +%token CHORDS "\\chords" +%token CLEF "\\clef" +%token CONSISTS "\\consists" +%token CONTEXT "\\context" +%token DEFAULT "\\default" +%token DEFAULTCHILD "\\defaultchild" +%token DENIES "\\denies" +%token DESCRIPTION "\\description" +%token DRUMMODE "\\drummode" +%token DRUMS "\\drums" +%token FIGUREMODE "\\figuremode" +%token FIGURES "\\figures" +%token GROBDESCRIPTIONS "\\grobdescriptions" +%token HEADER "\\header" +%token INVALID "\\invalid" +%token KEY "\\key" +%token LAYOUT "\\layout" +%token LYRICMODE "\\lyricmode" +%token LYRICS "\\lyrics" +%token LYRICSTO "\\lyricsto" +%token MARK "\\mark" +%token MARKUP "\\markup" +%token MIDI "\\midi" +%token NAME "\\name" +%token NOTEMODE "\\notemode" +%token OBJECTID "\\objectid" +%token OCTAVE "\\octave" +%token ONCE "\\once" +%token OVERRIDE "\\override" +%token PAPER "\\paper" +%token PARTIAL "\\partial" +%token RELATIVE "\\relative" +%token REMOVE "\\remove" +%token REPEAT "\\repeat" +%token REST "\\rest" +%token REVERT "\\revert" +%token SCORE "\\score" +%token SEQUENTIAL "\\sequential" +%token SET "\\set" +%token SIMULTANEOUS "\\simultaneous" +%token SKIP "\\skip" +%token TAG "\\tag" +%token TEMPO "\\tempo" +%token TIMES "\\times" +%token TRANSPOSE "\\transpose" +%token TRANSPOSITION "\\transposition" +%token TYPE "\\type" +%token UNSET "\\unset" +%token WITH "\\with" + +/* Keyword token exceptions. */ +%token TIME_T "\\time" +%token NEWCONTEXT "\\new" + + +/* Other string tokens. */ + +%token CHORD_BASS "/+" +%token CHORD_CARET "^" +%token CHORD_COLON ":" +%token CHORD_MINUS "-" +%token CHORD_SLASH "/" +%token DOUBLE_ANGLE_CLOSE ">>" +%token DOUBLE_ANGLE_OPEN "<<" +%token E_BACKSLASH "\\" +%token E_ANGLE_CLOSE "\\>" +%token E_CHAR "\\C[haracter]" +%token E_CLOSE "\\)" +%token E_EXCLAMATION "\\!" +%token E_BRACKET_OPEN "\\[" +%token E_OPEN "\\(" +%token E_BRACKET_CLOSE "\\]" +%token E_ANGLE_OPEN "\\<" +%token E_TILDE "\\~" +%token EXTENDER "__" +/* These used at all? + %token FIGURE_BRACKET_CLOSE + %token FIGURE_BRACKET_OPEN + +parser.yy:348.8-25: warning: symbol `"\\>"' used more than once as a literal string +parser.yy:352.8-24: warning: symbol `"\\<"' used more than once as a literal string + +*/ +%token FIGURE_CLOSE /* "\\>" */ +%token FIGURE_OPEN /* "\\<" */ +%token FIGURE_SPACE "_" +%token HYPHEN "--" -%token ACCEPTS -%token ADDQUOTE -%token LYRICSTO -%token ALIAS -%token ALTERNATIVE -%token BAR -%token BOOK -%token BOOKPAPER -%token CHANGE %token CHORDMODIFIERS -%token CHORDS -%token CHORDMODE -%token DOUBLE_ANGLE_OPEN -%token DOUBLE_ANGLE_CLOSE -%token CLEF %token COMMANDSPANREQUEST -%token CONSISTS -%token CONTEXT -%token DEFAULT -%token DENIES -%token DESCRIPTION -%token EXTENDER -%token FIGURES -%token FIGUREMODE -%token FIGURE_OPEN FIGURE_CLOSE -%token FIGURE_BRACKET_CLOSE FIGURE_BRACKET_OPEN -%token GROBDESCRIPTIONS -%token HEADER -%token HYPHEN -%token INVALID -%token KEY -%token LYRICS -%token LYRICMODE -%token MARK -%token MIDI +%token LYRIC_MARKUP %token MULTI_MEASURE_REST -%token NAME -%token NEWCONTEXT -%token NOTEMODE -%token OCTAVE -%token ONCE -%token OVERRIDE SET REVERT -%token PAPER -%token PARTIAL -%token QUOTE -%token RELATIVE -%token REMOVE -%token REPEAT -%token REST %token SCM_T -%token SCORE -%token SEQUENTIAL -%token ADDLYRICS -%token SIMULTANEOUS -%token SKIP -%token SPANREQUEST -%token TAG -%token TEMPO -%token TIMES -%token TIME_T -%token TRANSPOSE -%token TRANSPOSITION -%token TYPE -%token UNSET -%token WITH -%token MARKUP - -/* escaped */ -/* FIXME: this sucks. The user will get to see these names: - syntax error, unexpected E_CHAR: - \ - %% - */ - -%token E_CHAR E_EXCLAMATION E_SMALLER E_BIGGER E_OPEN E_CLOSE -%token E_LEFTSQUARE E_RIGHTSQUARE E_TILDE -%token E_BACKSLASH -%token CHORD_BASS CHORD_COLON CHORD_MINUS CHORD_CARET CHORD_SLASH -%token FIGURE_SPACE - -%token DIGIT -%token UNSIGNED + + +%token DIGIT %token E_UNSIGNED -%token IDENTIFIER -%token CHORDMODIFIER_PITCH -%token DRUM_PITCH -%token DURATION_IDENTIFIER -%token EVENT_IDENTIFIER -%token MUSIC_IDENTIFIER CONTEXT_DEF_IDENTIFIER -%token NOTENAME_PITCH -%token NUMBER_IDENTIFIER -%token OUTPUT_DEF_IDENTIFIER -%token RESTNAME +%token UNSIGNED + +%token IDENTIFIER + +%token CHORDMODIFIER_PITCH +%token CHORD_MODIFIER +%token CONTEXT_DEF_IDENTIFIER +%token DRUM_PITCH +%token DURATION_IDENTIFIER +%token EVENT_IDENTIFIER +%token FRACTION %token LYRICS_STRING -%token SCM_T -%token SCORE_IDENTIFIER -%token STRING -%token STRING_IDENTIFIER SCM_IDENTIFIER -%token TONICNAME_PITCH -%token CHORD_MODIFIER -%token FRACTION -%token REAL +%token LYRIC_MARKUP_IDENTIFIER %token MARKUP_HEAD_EMPTY +%token MARKUP_HEAD_LIST0 %token MARKUP_HEAD_MARKUP0 %token MARKUP_HEAD_MARKUP0_MARKUP1 %token MARKUP_HEAD_SCM0 @@ -356,78 +393,150 @@ 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 MARKUP_IDENTIFIER %token MUSIC_FUNCTION +%token MUSIC_FUNCTION_MARKUP +%token MUSIC_FUNCTION_MARKUP_MARKUP +%token MUSIC_FUNCTION_MARKUP_MARKUP_MUSIC +%token MUSIC_FUNCTION_MARKUP_MUSIC +%token MUSIC_FUNCTION_MARKUP_MUSIC_MUSIC %token MUSIC_FUNCTION_MUSIC %token MUSIC_FUNCTION_MUSIC_MUSIC %token MUSIC_FUNCTION_SCM -%token MUSIC_FUNCTION_SCM_SCM %token MUSIC_FUNCTION_SCM_MUSIC %token MUSIC_FUNCTION_SCM_MUSIC_MUSIC +%token MUSIC_FUNCTION_SCM_SCM %token MUSIC_FUNCTION_SCM_SCM_MUSIC - -%token DRUMS -%token DRUMMODE - - -%type book_block book_body -%type bare_int bare_unsigned -%type exclamations questions dots optional_rest -%type script_dir -%type sub_quotes sup_quotes -%type tremolo_type -%type bass_mod - -%type Composite_music Simple_music Prefix_composite_music Generic_prefix_music -%type Grouped_music_list -%type Music Sequential_music Simultaneous_music -%type Repeated_music -%type command_req -%type gen_text_def direction_less_event direction_reqd_event -%type music_property_def context_change -%type note_chord_element chord_body chord_body_element -%type post_event tagged_post_event -%type relative_music re_rhythmed_music -%type simple_element event_chord command_element -%type string_number_event -%type toplevel_music -%type tempo_event - -%type output_def_body output_def_head -%type output_def book_paper_block - -%type Music_list -%type chord_body_elements -%type chord_item chord_items chord_separator new_chord -%type context_def_spec_block context_def_spec_body -%type context_mod context_def_mod optional_context_mod -%type context_prop_spec -%type direction_less_char -%type duration_length fraction -%type embedded_scm scalar -%type identifier_init -%type lilypond_header lilypond_header_body -%type new_lyrics -%type post_events -%type property_operation -%type script_abbreviation -%type simple_string -%type steno_pitch pitch absolute_pitch pitch_also_in_chords -%type steno_tonic_pitch -%type step_number step_numbers -%type string bare_number number_expression number_term number_factor -%type bass_number br_bass_figure bass_figure figure_list figure_spec -%type context_mod_list -%type octave_check -%type steno_duration optional_notemode_duration multiplied_duration -%type Generic_prefix_music_scm -%type lyric_element -%type Alternative_music -%type markup markup_line markup_list markup_list_body full_markup -%type mode_changing_head -%type mode_changing_head_with_context - -%type score_block score_body +%token MUSIC_IDENTIFIER +%token NOTENAME_PITCH +%token NUMBER_IDENTIFIER +%token OUTPUT_DEF_IDENTIFIER +%token REAL +%token RESTNAME +%token SCM_IDENTIFIER +%token SCM_T +%token SCORE_IDENTIFIER +%token STRING +%token STRING_IDENTIFIER +%token TONICNAME_PITCH + + +%type book_block +%type book_body + +%type bare_unsigned +%type bass_mod +%type dots +%type exclamations +%type optional_rest +%type questions +%type script_dir +%type sub_quotes +%type sup_quotes +%type tremolo_type + +%type Composite_music +%type Generic_prefix_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 +%type command_req +%type context_change +%type direction_less_event +%type direction_reqd_event +%type event_chord +%type gen_text_def +%type music_property_def +%type note_chord_element +%type post_event +%type re_rhythmed_music +%type relative_music +%type simple_element +%type string_number_event +%type tagged_post_event +%type tempo_event +%type toplevel_music + +%type output_def_body +%type output_def_head +%type output_def +%type paper_block + +%type Alternative_music +%type Generic_prefix_music_scm +%type Music_list +%type absolute_pitch +%type assignment_id +%type bare_number +%type bass_figure +%type bass_number +%type br_bass_figure +%type chord_body_elements +%type chord_item +%type chord_items +%type chord_separator +%type context_def_mod +%type context_def_spec_block +%type context_def_spec_body +%type context_mod +%type context_mod_list +%type context_prop_spec +%type direction_less_char +%type duration_length +%type embedded_scm +%type figure_list +%type figure_spec +%type fraction +%type full_markup +%type identifier_init +%type lilypond_header +%type lilypond_header_body +%type lyric_element +%type lyric_markup +%type markup +%type markup_braced_list +%type markup_braced_list_body +%type markup_composed_list +%type markup_head_1_item +%type markup_head_1_list +%type markup_list +%type markup_top +%type mode_changing_head +%type mode_changing_head_with_context +%type multiplied_duration +%type new_chord +%type new_lyrics +%type number_expression +%type number_factor +%type number_term +%type object_id_setting +%type octave_check +%type optional_context_mod +%type optional_notemode_duration +%type pitch +%type pitch_also_in_chords +%type post_events +%type property_operation +%type scalar +%type script_abbreviation +%type simple_markup +%type simple_string +%type steno_duration +%type steno_pitch +%type steno_tonic_pitch +%type step_number +%type step_numbers +%type string + +%type score_block +%type score_body %left '-' '+' @@ -452,6 +561,11 @@ lilypond: /* empty */ } ; + +object_id_setting: + OBJECTID STRING { $$ = $2; } + ; + toplevel_expression: lilypond_header { THIS->lexer_->set_identifier (ly_symbol2scm ("$globalheader"), $1); @@ -478,6 +592,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; @@ -486,8 +604,8 @@ toplevel_expression: id = ly_symbol2scm ("$defaultpaper"); else if ($1->c_variable ("is-midi") == SCM_BOOL_T) id = ly_symbol2scm ("$defaultmidi"); - else if ($1->c_variable ("is-bookpaper") == SCM_BOOL_T) - id = ly_symbol2scm ("$defaultbookpaper"); + else if ($1->c_variable ("is-layout") == SCM_BOOL_T) + id = ly_symbol2scm ("$defaultlayout"); THIS->lexer_->set_identifier (id, od->self_scm ()); scm_gc_unprotect_object (od->self_scm ()); @@ -507,7 +625,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 +639,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,21 +715,21 @@ 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 ($$); - for (SCM p = $3; scm_is_pair (p); p = ly_cdr (p)) { - SCM tag = ly_caar (p); + for (SCM p = $3; scm_is_pair (p); p = scm_cdr (p)) { + SCM tag = scm_caar (p); /* TODO: should make new tag "grob-definition" ? */ td->add_context_mod (scm_list_3 (ly_symbol2scm ("assign"), - tag, scm_cons (ly_cdar (p), SCM_EOL))); + tag, scm_cons (scm_cdar (p), SCM_EOL))); } } | context_def_spec_body context_mod { @@ -627,63 +740,63 @@ context_def_spec_body: book_block: - BOOK { - THIS->push_spot (); - } - /*cont*/ '{' book_body '}' { - THIS->pop_spot (); - $$ = $4; + BOOK '{' book_body '}' { + $$ = $3; } ; /* FIXME: * Use 'handlers' like for toplevel-* stuff? - * grok \paper and \midi? */ + * grok \layout and \midi? */ book_body: { $$ = new Book; - $$->set_spot (THIS->here_input ()); - $$->bookpaper_ = dynamic_cast (unsmob_output_def (THIS->lexer_->lookup_identifier ("$defaultbookpaper"))->clone ()); - scm_gc_unprotect_object ($$->bookpaper_->self_scm ()); + $$->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"); } - | book_body book_paper_block { - $$->bookpaper_ = $2; + | book_body paper_block { + $$->paper_ = $2; 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 { - $$->bookpaper_ = 0; - $$->scores_.clear(); + $$->paper_ = 0; + $$->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 ()); + $$ = unsmob_score ($1); + $$->set_spot (@$); + } + | score_body object_id_setting { + $$->user_key_ = ly_scm2string ($2); } | score_body Music { SCM m = $2->self_scm (); @@ -694,9 +807,9 @@ score_body: $$->header_ = $2; } | score_body output_def { - if ($2->lookup_variable (ly_symbol2scm ("is-bookpaper")) == SCM_BOOL_T) + if ($2->lookup_variable (ly_symbol2scm ("is-paper")) == SCM_BOOL_T) { - THIS->parser_error (_("\\bookpaper cannot be in \\score. Use \\paper instead")); + THIS->parser_error (@2, _("\\paper cannot be used in \\score, use \\layout instead")); } else @@ -715,13 +828,13 @@ score_body: OUTPUT DEF */ -book_paper_block: +paper_block: output_def { $$ = $1; - if ($$->lookup_variable (ly_symbol2scm ("is-bookpaper")) != SCM_BOOL_T) + if ($$->lookup_variable (ly_symbol2scm ("is-paper")) != SCM_BOOL_T) { - THIS->parser_error (_("Need \\bookpaper for bookpaper block.")); - $$ = get_bookpaper (THIS); + THIS->parser_error (@1, _ ("need \\paper for paper block")); + $$ = get_paper (THIS); } } ; @@ -737,9 +850,9 @@ output_def: ; output_def_head: - BOOKPAPER { - $$ = get_bookpaper (THIS); - $$->input_origin_ = THIS->here_input (); + PAPER { + $$ = get_paper (THIS); + $$->input_origin_ = @$; THIS->lexer_->add_scope ($$->scope_); } | MIDI { @@ -747,8 +860,8 @@ output_def_head: $$ = p; THIS->lexer_->add_scope (p->scope_); } - | PAPER { - Output_def *p = get_paper (THIS); + | LAYOUT { + Output_def *p = get_layout (THIS); THIS->lexer_->add_scope (p->scope_); $$ = p; @@ -759,13 +872,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_); @@ -816,8 +929,8 @@ Music_list: SCM c = scm_cons ($2->self_scm (), SCM_EOL); scm_gc_unprotect_object ($2->self_scm ()); /* UGH */ - if (scm_is_pair (ly_cdr (s))) - scm_set_cdr_x (ly_cdr (s), c); /* append */ + if (scm_is_pair (scm_cdr (s))) + scm_set_cdr_x (scm_cdr (s), c); /* append */ else scm_set_car_x (s, c); /* set first cons */ scm_set_cdr_x (s, c); /* remember last cell */ @@ -833,8 +946,8 @@ Music_list: SCM c = scm_cons (m->self_scm (), SCM_EOL); scm_gc_unprotect_object (m->self_scm ()); /* UGH */ - if (scm_is_pair (ly_cdr (s))) - scm_set_cdr_x (ly_cdr (s), c); /* append */ + if (scm_is_pair (scm_cdr (s))) + scm_set_cdr_x (scm_cdr (s), c); /* append */ else scm_set_car_x (s, c); /* set first cons */ scm_set_cdr_x (s, c); /* remember last cell */ @@ -861,16 +974,17 @@ Repeated_music: { Music *beg = $4; int times = $3; - SCM alts = scm_is_pair ($5) ? ly_car ($5) : SCM_EOL; + SCM alts = scm_is_pair ($5) ? scm_car ($5) : SCM_EOL; if (times < scm_ilength (alts)) { - unsmob_music (ly_car (alts)) + unsmob_music (scm_car (alts)) ->origin ()->warning ( - _ ("More alternatives than repeats. Junking excess alternatives.")); + _ ("more alternatives than repeats")); + warning ("junking excess alternatives"); alts = ly_truncate_list (times, alts); } - 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. @@ -888,25 +1002,24 @@ Repeated_music: TODO: move this code to Scheme. */ - /* - 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"); + /* we cannot get durations and other stuff + correct down the line, + so we have to add to the duration log here. */ + 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 (_f ("expect 2 elements for Chord tremolo, found %d", list_len)); 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 ()); @@ -918,27 +1031,27 @@ Repeated_music: Sequential_music: SEQUENTIAL '{' Music_list '}' { $$ = MY_MAKE_MUSIC ("SequentialMusic"); - $$->set_property ("elements", ly_car ($3)); - $$->set_spot (THIS->here_input ()); + $$->set_property ("elements", scm_car ($3)); + $$->set_spot (@$); } | '{' Music_list '}' { $$ = MY_MAKE_MUSIC ("SequentialMusic"); - $$->set_property ("elements", ly_car ($2)); - $$->set_spot (THIS->here_input ()); + $$->set_property ("elements", scm_car ($2)); + $$->set_spot (@$); } ; Simultaneous_music: SIMULTANEOUS '{' Music_list '}'{ $$ = MY_MAKE_MUSIC ("SimultaneousMusic"); - $$->set_property ("elements", ly_car ($3)); - $$->set_spot (THIS->here_input ()); + $$->set_property ("elements", scm_car ($3)); + $$->set_spot (@$); } | simul_open Music_list simul_close { $$ = MY_MAKE_MUSIC ("SimultaneousMusic"); - $$->set_property ("elements", ly_car ($2)); - $$->set_spot (THIS->here_input ()); + $$->set_property ("elements", scm_car ($2)); + $$->set_spot (@$); } ; @@ -982,78 +1095,82 @@ 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 { - THIS->push_spot (); - } embedded_scm embedded_scm { - $$ = scm_list_4 ($1, make_input (THIS->pop_spot ()), $3, $4); + | MUSIC_FUNCTION_SCM_SCM_MUSIC embedded_scm embedded_scm Music { + $$ = scm_list_5 ($1, make_input (@$), $2, $3, $4->self_scm ()); } - | 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_MARKUP_MUSIC full_markup Music { + $$ = scm_list_4 ($1, make_input (@$), $2, $3->self_scm ()); scm_gc_unprotect_object ($3->self_scm ()); + } + | MUSIC_FUNCTION_MARKUP_MARKUP full_markup full_markup { + $$ = scm_list_4 ($1, make_input (@$), $2, $3); + } + | 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 ()); } ; Generic_prefix_music: Generic_prefix_music_scm { - SCM func = ly_car ($1); - Input *loc = unsmob_input (ly_cadr ($1)); - SCM args = ly_cddr ($1); + SCM func = scm_car ($1); + 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 = ly_cdr (s), t = ly_cdr (t)) { - k++; - if (scm_call_1 (ly_car (s), ly_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, ly_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.")); + loc->error (_ ("music head function must return Music object")); $$ = MY_MAKE_MUSIC ("Music"); } $$->set_spot (*loc); @@ -1073,22 +1190,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 (ly_car ($3)); int d = scm_to_int (ly_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 +1224,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 +1236,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 ("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 +1250,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,37 +1350,39 @@ 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"); SCM lst = SCM_EOL; - for (SCM s = $2; scm_is_pair (s); s = ly_cdr (s)) + for (SCM s = $2; scm_is_pair (s); s = scm_cdr (s)) { - Music *music = unsmob_music (ly_car (s)); + 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 +1390,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 (@$); } ; @@ -1308,6 +1423,7 @@ context_def_mod: | REMOVE { $$ = ly_symbol2scm ("remove"); } | ACCEPTS { $$ = ly_symbol2scm ("accepts"); } + | DEFAULTCHILD { $$ = ly_symbol2scm ("default-child"); } | DENIES { $$ = ly_symbol2scm ("denies"); } | ALIAS { $$ = ly_symbol2scm ("alias"); } @@ -1327,7 +1443,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"), @@ -1343,30 +1459,30 @@ music_property_def: OVERRIDE context_prop_spec embedded_scm '=' scalar { $$ = property_op_to_music (scm_list_4 ( ly_symbol2scm ("poppush"), - ly_cadr ($2), + scm_cadr ($2), $3, $5)); - $$= context_spec_music (ly_car ($2), SCM_UNDEFINED, $$, SCM_EOL); + $$= context_spec_music (scm_car ($2), SCM_UNDEFINED, $$, SCM_EOL); } | REVERT context_prop_spec embedded_scm { $$ = property_op_to_music (scm_list_3 ( ly_symbol2scm ("pop"), - ly_cadr ($2), + scm_cadr ($2), $3)); - $$= context_spec_music (ly_car ($2), SCM_UNDEFINED, $$, SCM_EOL); + $$= context_spec_music (scm_car ($2), SCM_UNDEFINED, $$, SCM_EOL); } | SET context_prop_spec '=' scalar { $$ = property_op_to_music (scm_list_3 ( ly_symbol2scm ("assign"), - ly_cadr ($2), + scm_cadr ($2), $4)); - $$= context_spec_music (ly_car ($2), SCM_UNDEFINED, $$, SCM_EOL); + $$= context_spec_music (scm_car ($2), SCM_UNDEFINED, $$, SCM_EOL); } | UNSET context_prop_spec { $$ = property_op_to_music (scm_list_2 ( ly_symbol2scm ("unset"), - ly_cadr ($2))); - $$= context_spec_music (ly_car ($2), SCM_UNDEFINED, $$, SCM_EOL); + scm_cadr ($2))); + $$= context_spec_music (scm_car ($2), SCM_UNDEFINED, $$, SCM_EOL); } | ONCE music_property_def { SCM e = $2->get_property ("element"); @@ -1403,8 +1519,17 @@ scalar: string { | LYRICS_STRING { $$ = $1; } - | bare_int { - $$ = scm_int2num ($1); + | bare_number { + $$ = $1; +/* if (scm_integer_p ($1) == SCM_BOOL_T) + { + int k = scm_to_int (scm_inexact_to_exact ($1)); + $$ = k; + } else + { + THIS->parser_error (@1, _ ("need integer number arg")); + $$ = 0; + }*/ } | embedded_scm { $$ = $1; @@ -1436,9 +1561,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 +1571,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 @@ -1462,11 +1590,12 @@ note_chord_element: SCM es = $1->get_property ("elements"); SCM postevs = scm_reverse_x ($3, SCM_EOL); - for (SCM s = es; scm_is_pair (s); s = ly_cdr (s)) - unsmob_music (ly_car (s))->set_property ("duration", dur); + for (SCM s = es; scm_is_pair (s); s = scm_cdr (s)) + unsmob_music (scm_car (s))->set_property ("duration", dur); es = ly_append2 (es, postevs); $1-> set_property ("elements", es); + $1->set_spot (@$); $$ = $1; } ; @@ -1487,6 +1616,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 +1631,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 +1640,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 +1663,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 +1675,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 +1688,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 { + | E_BRACKET_OPEN { 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 { + | E_BRACKET_CLOSE { 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 +1752,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 +1766,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, ly_car ($2), ly_cdr ($2), SCM_EOL); + 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 +1800,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->set_property ("tonic", Pitch (0, 0, 0).smobbed_copy ()); + 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 +1839,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 +1876,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; } ; @@ -1782,10 +1906,10 @@ direction_less_char: | E_CLOSE { $$ = ly_symbol2scm ("escapedParenthesisCloseSymbol"); } - | E_BIGGER { + | E_ANGLE_CLOSE { $$ = ly_symbol2scm ("escapedBiggerSymbol"); } - | E_SMALLER { + | E_ANGLE_OPEN { $$ = ly_symbol2scm ("escapedSmallerSymbol"); } ; @@ -1802,7 +1926,7 @@ direction_less_event: { m = MY_MAKE_MUSIC ("Music"); } - m->set_spot (THIS->here_input ()); + m->set_spot (@$); $$ = m; } | EVENT_IDENTIFIER { @@ -1810,7 +1934,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 +1949,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 +2031,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 +2112,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); @@ -2010,7 +2134,7 @@ multiplied_duration: $$ = unsmob_duration ($$)->compressed ( $3) .smobbed_copy (); } | multiplied_duration '*' FRACTION { - Rational m (scm_to_int (ly_car ($3)), scm_to_int (ly_cdr ($3))); + Rational m (scm_to_int (scm_car ($3)), scm_to_int (scm_cdr ($3))); $$ = unsmob_duration ($$)->compressed (m).smobbed_copy (); } @@ -2038,7 +2162,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 +2170,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 +2255,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 +2282,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,24 +2294,21 @@ 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); - for (SCM s = m->get_property ("elements"); scm_is_pair (s); s = ly_cdr (s)) + m->set_spot (@$); + for (SCM s = m->get_property ("elements"); scm_is_pair (s); s = scm_cdr (s)) { - unsmob_music (ly_car (s))->set_property ("duration", $2); + unsmob_music (scm_car (s))->set_property ("duration", $2); } $$ = m; } | RESTNAME optional_notemode_duration { - - Input i = THIS->pop_spot (); Music *ev = 0; if (ly_scm2string ($1) == "s") { /* Space */ @@ -2201,55 +2319,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); } ; @@ -2382,23 +2493,6 @@ bare_unsigned: } ; -bare_int: - bare_number { - if (scm_integer_p ($1) == SCM_BOOL_T) - { - int k = scm_to_int ($1); - $$ = k; - } else - { - THIS->parser_error (_ ("need integer number arg")); - $$ = 0; - } - } - | '-' bare_int { - $$ = -$2; - } - ; - exclamations: { $$ = 0; } | exclamations '!' { $$ ++; } @@ -2409,61 +2503,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_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 +2614,40 @@ 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 mapper = ly_lily_module_constant ("map-markup-command-list"); + $$ = scm_car (scm_call_2 (mapper, $1, scm_list_1 ($2))); } - ; - -markup_list_body: - /**/ { $$ = SCM_EOL; } - | markup_list_body markup { - $$ = scm_cons ($2, $1); + | simple_markup { + $$ = $1; } ; - %% void @@ -2515,16 +2665,14 @@ Lily_parser::do_yyparse () } -/* -Should make this optional? It will also complain when you do +/* FIXME: Should make this optional? It will also complain at [s4] which is entirely legitimate. -Or we can scrap it. Barchecks should detect wrong durations, and -skipTypesetting speeds it up a lot. -*/ +Or we can scrap it. Barchecks should detect wrong durations, and +skipTypesetting speeds it up a lot. */ void Lily_parser::beam_check (SCM dur) @@ -2533,7 +2681,8 @@ Lily_parser::beam_check (SCM dur) if (unsmob_music (last_beam_start_) && d->duration_log () <= 2) { Music *m = unsmob_music (last_beam_start_); - m->origin ()->warning (_ ("Suspect duration found following this beam")); + m->origin ()->warning (_f ("suspect duration in beam: %s", + d->to_string ())); } last_beam_start_ = SCM_EOL; } @@ -2581,6 +2730,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; } @@ -2591,9 +2742,9 @@ Music * property_op_to_music (SCM op) { Music *m = 0; - SCM tag = ly_car (op); - SCM symbol = ly_cadr (op); - SCM args = ly_cddr (op); + SCM tag = scm_car (op); + SCM symbol = scm_cadr (op); + SCM args = scm_cddr (op); SCM grob_val = SCM_UNDEFINED; SCM grob_sym = SCM_UNDEFINED; SCM val = SCM_UNDEFINED; @@ -2601,7 +2752,7 @@ property_op_to_music (SCM op) if (tag == ly_symbol2scm ("assign")) { m = MY_MAKE_MUSIC ("PropertySet"); - val = ly_car (args); + val = scm_car (args); } else if (tag == ly_symbol2scm ("unset")) m = MY_MAKE_MUSIC ("PropertyUnset"); @@ -2609,12 +2760,12 @@ property_op_to_music (SCM op) || tag == ly_symbol2scm ("push")) { m = MY_MAKE_MUSIC ("OverrideProperty"); - grob_sym = ly_car (args); - grob_val = ly_cadr (args); + grob_sym = scm_car (args); + grob_val = scm_cadr (args); } else if (tag == ly_symbol2scm ("pop")) { m = MY_MAKE_MUSIC ("RevertProperty"); - grob_sym = ly_car (args); + grob_sym = scm_car (args); } m->set_property ("symbol", symbol); @@ -2626,15 +2777,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 +2812,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); } -