X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fparser.yy;h=1f2c0d863a1a0609041f280cf555eb209679e2d2;hb=1402d6d957bee7d47e0bddf4c57dd89912182b26;hp=58cafdf098511f59fe01802158cfe86cd2533b72;hpb=0dab7ed0e6343d34eeda8bdd3f7085f663840874;p=lilypond.git diff --git a/lily/parser.yy b/lily/parser.yy index 58cafdf098..1f2c0d863a 100644 --- a/lily/parser.yy +++ b/lily/parser.yy @@ -5,21 +5,21 @@ 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 @@ -28,7 +28,7 @@ TODO: #include "book.hh" #include "context-def.hh" #include "dimensions.hh" -#include "event.hh" +#include "music.hh" #include "file-path.hh" #include "input-smob.hh" #include "input.hh" @@ -36,17 +36,16 @@ TODO: #include "lilypond-input-version.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" #include "output-def.hh" #include "scm-hash.hh" -#include "scm-option.hh" +#include "program-option.hh" #include "score.hh" -#include "text-item.hh" +#include "text-interface.hh" #include "warn.hh" +#include "music.hh" #define MY_MAKE_MUSIC(x) make_music_by_name (ly_symbol2scm (x)) @@ -55,6 +54,14 @@ Music *context_spec_music (SCM type, SCM id, Music *m, SCM ops); 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 #define YYPARSE_PARAM my_lily_parser @@ -78,10 +85,10 @@ tag_music (Music *m, SCM tag, Input ip) SCM tags = m->get_property ("tags"); if (scm_is_symbol (tag)) tags = scm_cons (tag, tags); - else if (ly_c_list_p (tag)) + else if (ly_is_list (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); } @@ -165,8 +172,8 @@ make_chord (SCM pitch, SCM dur, SCM modification_list) bool ly_input_procedure_p (SCM x) { - return ly_c_procedure_p (x) - || (scm_is_pair (x) && ly_c_procedure_p (scm_car (x))); + return ly_is_procedure (x) + || (scm_is_pair (x) && ly_is_procedure (scm_car (x))); } Music* @@ -193,7 +200,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; @@ -219,13 +226,13 @@ of the parse stack onto the heap. */ %{ int -yylex (YYSTYPE *s, YYLTYPE *l, 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 = l; + lex->lexloc = loc; lex->prepare_for_next_token (); return lex->yylex (); } @@ -233,141 +240,153 @@ yylex (YYSTYPE *s, YYLTYPE *l, void *v) %} -%expect 3 - -/* - Three shift/reduce problems: - -2. \markup identifier. - - (what? --hwn) - -3. \markup { } - - (what? --hwn) +%expect 1 +/* One shift/reduce problem -4. \repeat +1. \repeat \repeat .. \alternative - \repeat { \repeat .. \alternative } or \repeat { \repeat } \alternative - -) - */ +*/ %pure_parser %locations -%token ACCEPTS -%token ADDQUOTE -%token LYRICSTO -%token ALIAS -%token ALTERNATIVE -%token BAR -%token BOOK -%token CHANGE +/* 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 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 LAYOUT -%token LYRICS -%token LYRICMODE -%token MARK -%token MIDI +%token LYRIC_MARKUP %token MULTI_MEASURE_REST -%token NAME -%token NEWCONTEXT -%token NOTEMODE -%token OBJECTID -%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 @@ -375,85 +394,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 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 - - -%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 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 full_markup 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 +%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 '-' '+' @@ -509,6 +593,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; @@ -552,15 +640,19 @@ lilypond_header: } ; - /* DECLARATIONS */ +assignment_id: + STRING { $$ = $1; } + | LYRICS_STRING { $$ = $1; } + ; + assignment: - STRING '=' identifier_init { + assignment_id '=' identifier_init { if (! is_regular_identifier ($1)) { - @1.warning (_ ("Identifier should have alphabetic characters only")); + @1.warning (_ ("identifier should have alphabetic characters only")); } THIS->lexer_->set_identifier ($1, $3); @@ -670,15 +762,19 @@ book_body: scm_gc_unprotect_object ($2->self_scm ()); } | book_body score_block { - Score *score = $2; - $$->add_score (score); + 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); @@ -692,29 +788,31 @@ score_block: ; score_body: - /**/ { - $$ = new Score; + Music { + SCM m = $1->self_scm (); + scm_gc_unprotect_object (m); + SCM scorify = ly_lily_module_constant ("scorify-music"); + SCM score = scm_call_2 (scorify, m, THIS->self_scm ()); + + // pass ownernship to C++ again. + scm_gc_protect_object (score); + $$ = unsmob_score (score); $$->set_spot (@$); } | SCORE_IDENTIFIER { - $$ = new Score ( *unsmob_score ($1)); + $$ = unsmob_score ($1); $$->set_spot (@$); } | score_body object_id_setting { $$->user_key_ = ly_scm2string ($2); } - | score_body Music { - SCM m = $2->self_scm (); - scm_gc_unprotect_object (m); - $$->set_music (m, THIS->self_scm ()); - } | score_body lilypond_header { $$->header_ = $2; } | score_body output_def { if ($2->lookup_variable (ly_symbol2scm ("is-paper")) == SCM_BOOL_T) { - THIS->parser_error (@2, _("\\paper cannot be in \\score. Use \\layout instead")); + THIS->parser_error (@2, _("\\paper cannot be used in \\score, use \\layout instead")); } else @@ -738,7 +836,7 @@ paper_block: $$ = $1; if ($$->lookup_variable (ly_symbol2scm ("is-paper")) != SCM_BOOL_T) { - THIS->parser_error (@1, _("Need \\paper for paper block.")); + THIS->parser_error (@1, _ ("need \\paper for paper block")); $$ = get_paper (THIS); } } @@ -883,7 +981,8 @@ Repeated_music: if (times < scm_ilength (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); } @@ -898,18 +997,17 @@ Repeated_music: r-> set_property ("element", beg->self_scm ()); scm_gc_unprotect_object (beg->self_scm ()); } - r->set_property ("repeat-count", scm_int2num (times >? 1)); + r->set_property ("repeat-count", scm_int2num (max (times, 1))); r-> set_property ("elements",alts); - if (ly_c_equal_p ($2, scm_makfrom0str ("tremolo"))) { + if (ly_is_equal ($2, scm_makfrom0str ("tremolo"))) { /* 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. - */ + /* 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; @@ -920,7 +1018,7 @@ Repeated_music: { int list_len = scm_ilength ($4->get_property ("elements")); if (list_len != 2) - $4->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))); } @@ -1075,7 +1173,7 @@ Generic_prefix_music: 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); @@ -1282,12 +1380,12 @@ re_rhythmed_music: $$ = all; 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 ()); } @@ -1328,6 +1426,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"); } @@ -1423,8 +1522,8 @@ scalar: string { | LYRICS_STRING { $$ = $1; } - | bare_int { - $$ = scm_int2num ($1); + | bare_number { + $$ = $1; } | embedded_scm { $$ = $1; @@ -1598,7 +1697,7 @@ command_element: $$->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 (@$); @@ -1608,7 +1707,7 @@ command_element: scm_gc_unprotect_object (m->self_scm ()); $$->set_spot (@$); } - | E_RIGHTSQUARE { + | E_BRACKET_CLOSE { Music *m = MY_MAKE_MUSIC ("LigatureEvent"); m->set_property ("span-direction", scm_int2num (STOP)); m->set_spot (@$); @@ -1704,10 +1803,10 @@ command_req: if (scm_ilength ($3) > 0) { key->set_property ("pitch-alist", $3); - key->set_property ("tonic", Pitch (0,0,0).smobbed_copy ()); + key->set_property ("tonic", Pitch (0, 0, 0).smobbed_copy ()); key->transpose (* unsmob_pitch ($2)); } else { - THIS->parser_error (@3, _ ("Second argument must be pitch list.")); + THIS->parser_error (@3, _ ("second argument must be pitch list")); } $$ = key; @@ -1746,12 +1845,12 @@ post_event: } | HYPHEN { if (!THIS->lexer_->is_lyric_state ()) - THIS->parser_error (@1, _ ("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 (@1, _ ("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 { @@ -1801,10 +1900,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"); } ; @@ -1844,7 +1943,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 (@1, _ ("Expecting string as script definition")); + else THIS->parser_error (@1, _ ("expecting string as script definition")); $$ = a; } ; @@ -1992,14 +2091,10 @@ optional_notemode_duration: { Duration dd = THIS->default_duration_; $$ = dd.smobbed_copy (); - - THIS->beam_check ($$); } | multiplied_duration { $$ = $1; THIS->default_duration_ = *unsmob_duration ($$); - - THIS->beam_check ($$); } ; @@ -2074,6 +2169,7 @@ bass_number: $$); } | STRING { $$ = $1; } + | full_markup { $$ = $1; } ; bass_mod: @@ -2150,7 +2246,7 @@ optional_rest: simple_element: pitch exclamations questions octave_check optional_notemode_duration optional_rest { if (!THIS->lexer_->is_note_state ()) - THIS->parser_error (@1, _ ("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) @@ -2231,7 +2327,7 @@ simple_element: | lyric_element optional_notemode_duration { if (!THIS->lexer_->is_lyric_state ()) - THIS->parser_error (@1, _ ("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); @@ -2244,14 +2340,13 @@ simple_element: } | new_chord { if (!THIS->lexer_->is_chord_state ()) - THIS->parser_error (@1, _ ("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 { @@ -2388,23 +2483,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 (@1, _ ("need integer number arg")); - $$ = 0; - } - } - | '-' bare_int { - $$ = -$2; - } - ; - exclamations: { $$ = 0; } | exclamations '!' { $$ ++; } @@ -2419,6 +2497,18 @@ 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; @@ -2466,7 +2556,7 @@ markup_braced_list: ; markup_braced_list_body: - /* empty */ { $$ = scm_list (SCM_EOL); } + /* empty */ { $$ = SCM_EOL; } | markup_braced_list_body markup { $$ = scm_cons ($2, $1); } @@ -2503,6 +2593,9 @@ simple_markup: | MARKUP_IDENTIFIER { $$ = $1; } + | LYRIC_MARKUP_IDENTIFIER { + $$ = $1; + } | STRING_IDENTIFIER { $$ = $1; } @@ -2537,7 +2630,8 @@ simple_markup: 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))); + SCM mapper = ly_lily_module_constant ("map-markup-command-list"); + $$ = scm_car (scm_call_2 (mapper, $1, scm_list_1 ($2))); } | simple_markup { $$ = $1; @@ -2561,29 +2655,6 @@ Lily_parser::do_yyparse () } -/* -Should make this optional? It will also complain when you do - - [s4] - -which is entirely legitimate. - -Or we can scrap it. Barchecks should detect wrong durations, and -skipTypesetting speeds it up a lot. -*/ - -void -Lily_parser::beam_check (SCM dur) -{ - Duration *d = unsmob_duration (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")); - } - last_beam_start_ = SCM_EOL; -} - @@ -2614,8 +2685,11 @@ Lily_lexer::try_special_identifiers (SCM *destination, SCM sid) *destination = mus->self_scm (); unsmob_music (*destination)-> set_property ("origin", make_input (last_input_)); - return dynamic_cast (mus) - ? EVENT_IDENTIFIER : MUSIC_IDENTIFIER; + + bool is_event = scm_memq (ly_symbol2scm ("event"), mus->get_property ("types")) + != SCM_BOOL_F; + + return is_event ? EVENT_IDENTIFIER : MUSIC_IDENTIFIER; } else if (unsmob_duration (sid)) { *destination = unsmob_duration (sid)->smobbed_copy (); return DURATION_IDENTIFIER; @@ -2627,6 +2701,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; } @@ -2675,7 +2751,7 @@ property_op_to_music (SCM op) bool itc = do_internal_type_checking_global; /* UGH. */ - bool autobeam = ly_c_equal_p (symbol, ly_symbol2scm ("autoBeamSettings")); + bool autobeam = ly_is_equal (symbol, ly_symbol2scm ("autoBeamSettings")); if (autobeam) do_internal_type_checking_global = false; m->set_property ("grob-property", grob_sym);