X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fparser.yy;h=f901a6de0e67cdc6bc54ea00e4ca4bfc08d811ec;hb=f39a05d9ff96aae5412b9d5cf5c47e10ccce5a75;hp=06c38c4e0ca9808b1cc9933c1bed028d93be9b63;hpb=3465d3e1c1d2b87f7a1adc5c7c1dfe868c754e57;p=lilypond.git diff --git a/lily/parser.yy b/lily/parser.yy index 06c38c4e0c..f901a6de0e 100644 --- a/lily/parser.yy +++ b/lily/parser.yy @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2006 Han-Wen Nienhuys + (c) 1997--2007 Han-Wen Nienhuys Jan Nieuwenhuizen */ @@ -80,7 +80,6 @@ using namespace std; #include "lily-guile.hh" #include "lily-lexer.hh" #include "lily-parser.hh" -#include "lilypond-input-version.hh" #include "main.hh" #include "misc.hh" #include "music.hh" @@ -137,7 +136,7 @@ SCM make_music_relative (Pitch start, SCM music, Input loc); SCM run_music_function (Lily_parser *, SCM expr); SCM get_first_context_id (SCM type, Music *m); SCM make_chord_elements (SCM pitch, SCM dur, SCM modification_list); -SCM make_chord_step (int step, int alter); +SCM make_chord_step (int step, Rational alter); SCM make_simple_markup (SCM a); bool is_duration (int t); bool is_regular_identifier (SCM id); @@ -157,7 +156,6 @@ void set_music_properties (Music *p, SCM a); /* Keyword tokens with plain escaped name. */ %token ACCEPTS "\\accepts" %token ADDLYRICS "\\addlyrics" -%token ADDQUOTE "\\addquote" %token ALIAS "\\alias" %token ALTERNATIVE "\\alternative" %token BOOK "\\book" @@ -302,7 +300,7 @@ If we give names, Bison complains. %type book_body %type bare_unsigned -%type figured_bass_alteration +%type figured_bass_alteration %type dots %type exclamations %type optional_rest @@ -352,6 +350,7 @@ If we give names, Bison complains. %type absolute_pitch %type assignment_id %type bare_number +%type unsigned_number %type bass_figure %type figured_bass_modification %type br_bass_figure @@ -411,6 +410,7 @@ If we give names, Bison complains. %type pitch_also_in_chords %type post_events %type property_operation +%type property_path property_path_revved %type scalar %type script_abbreviation %type simple_chord_elements @@ -504,7 +504,7 @@ embedded_scm: lilypond_header_body: { - $$ = get_header(PARSER); + $$ = get_header (PARSER); PARSER->lexer_->add_scope ($$); } | lilypond_header_body assignment { @@ -651,12 +651,19 @@ book_body: $2->unprotect (); } | book_body score_block { - SCM s = $2->self_scm (); - $$->add_score (s); - $2->unprotect(); + Score *score = $2; + SCM proc = PARSER->lexer_->lookup_identifier ("book-score-handler"); + scm_call_2 (proc, $$->self_scm (), score->self_scm ()); + score->unprotect (); + } + | book_body composite_music { + Music *music = unsmob_music ($2); + SCM proc = PARSER->lexer_->lookup_identifier ("book-music-handler"); + scm_call_3 (proc, PARSER->self_scm (), $$->self_scm (), music->self_scm ()); } | book_body full_markup { - $$->add_score ($2); + SCM proc = PARSER->lexer_->lookup_identifier ("book-text-handler"); + scm_call_2 (proc, $$->self_scm (), $2); } | book_body lilypond_header { $$->header_ = $2; @@ -856,9 +863,9 @@ alternative_music: repeated_music: - REPEAT simple_string bare_unsigned music alternative_music + REPEAT simple_string unsigned_number music alternative_music { - $$ = MAKE_SYNTAX ("repeat", @$, $2, scm_int2num ($3), $4, $5); + $$ = MAKE_SYNTAX ("repeat", @$, $2, $3, $4, $5); } ; @@ -977,7 +984,7 @@ prefix_composite_music: generic_prefix_music_scm { $$ = run_music_function (PARSER, $1); } - | CONTEXT simple_string optional_id optional_context_mod music { + | CONTEXT simple_string optional_id optional_context_mod music { $$ = MAKE_SYNTAX ("context-specification", @$, $2, $3, $5, $4, SCM_BOOL_F); } | NEWCONTEXT simple_string optional_id optional_context_mod music { @@ -1123,6 +1130,22 @@ context_change: } ; + +property_path_revved: + embedded_scm { + $$ = scm_cons ($1, SCM_EOL); + } + | property_path_revved embedded_scm { + $$ = scm_cons ($2, $1); + } + ; + +property_path: + property_path_revved { + $$ = scm_reverse_x ($1, SCM_EOL); + } + ; + property_operation: STRING '=' scalar { $$ = scm_list_3 (ly_symbol2scm ("assign"), @@ -1132,13 +1155,10 @@ property_operation: $$ = scm_list_2 (ly_symbol2scm ("unset"), scm_string_to_symbol ($2)); } - | OVERRIDE simple_string embedded_scm '=' embedded_scm { - $$ = scm_list_4 (ly_symbol2scm ("push"), - scm_string_to_symbol ($2), $5, $3); - } - | OVERRIDE simple_string embedded_scm embedded_scm '=' embedded_scm { - $$ = scm_list_5 (ly_symbol2scm ("push"), - scm_string_to_symbol ($2), $6, $4, $3); + | OVERRIDE simple_string property_path '=' embedded_scm { + $$ = scm_append (scm_list_2 (scm_list_3 (ly_symbol2scm ("push"), + scm_string_to_symbol ($2), $5), + $3)); } | REVERT simple_string embedded_scm { $$ = scm_list_3 (ly_symbol2scm ("pop"), @@ -1184,17 +1204,12 @@ context_prop_spec: ; simple_music_property_def: - OVERRIDE context_prop_spec embedded_scm '=' scalar { - $$ = scm_list_5 (scm_car ($2), - ly_symbol2scm ("OverrideProperty"), - scm_cadr ($2), - $5, $3); - } - | OVERRIDE context_prop_spec embedded_scm embedded_scm '=' scalar { - $$ = scm_list_n (scm_car ($2), - ly_symbol2scm ("OverrideProperty"), - scm_cadr ($2), - $6, $4, $3, SCM_UNDEFINED); + OVERRIDE context_prop_spec property_path '=' scalar { + $$ = scm_append (scm_list_2 (scm_list_n (scm_car ($2), + ly_symbol2scm ("OverrideProperty"), + scm_cadr ($2), + $5, SCM_UNDEFINED), + $3)); } | REVERT context_prop_spec embedded_scm { $$ = scm_list_4 (scm_car ($2), @@ -1457,7 +1472,6 @@ command_event: | MARK DEFAULT { Music *m = MY_MAKE_MUSIC ("MarkEvent", @$); $$ = m->unprotect (); - scm_display($$, SCM_UNDEFINED); } | tempo_event { $$ = $1; @@ -1612,7 +1626,7 @@ direction_reqd_event: octave_check: /**/ { $$ = SCM_EOL; } | '=' { $$ = scm_from_int (0); } - | '=' sub_quotes { $$ = scm_from_int ($2); } + | '=' sub_quotes { $$ = scm_from_int (-$2); } | '=' sup_quotes { $$ = scm_from_int ($2); } ; @@ -1664,7 +1678,7 @@ steno_tonic_pitch: $$ = p.smobbed_copy (); } | TONICNAME_PITCH sub_quotes { - Pitch p =* unsmob_pitch ($1); + Pitch p = *unsmob_pitch ($1); p = p.transposed (Pitch (-$2,0,0)); $$ = p.smobbed_copy (); @@ -1703,25 +1717,25 @@ gen_text_def: script_abbreviation: '^' { - $$ = scm_makfrom0str ("Hat"); + $$ = scm_from_locale_string ("Hat"); } | '+' { - $$ = scm_makfrom0str ("Plus"); + $$ = scm_from_locale_string ("Plus"); } | '-' { - $$ = scm_makfrom0str ("Dash"); + $$ = scm_from_locale_string ("Dash"); } | '|' { - $$ = scm_makfrom0str ("Bar"); + $$ = scm_from_locale_string ("Bar"); } | ANGLE_CLOSE { - $$ = scm_makfrom0str ("Larger"); + $$ = scm_from_locale_string ("Larger"); } | '.' { - $$ = scm_makfrom0str ("Dot"); + $$ = scm_from_locale_string ("Dot"); } | '_' { - $$ = scm_makfrom0str ("Underscore"); + $$ = scm_from_locale_string ("Underscore"); } ; @@ -1826,9 +1840,9 @@ bass_number: ; figured_bass_alteration: - '-' { $$ = -2; } - | '+' { $$ = 2; } - | '!' { $$ = 0; } + '-' { $$ = ly_rational2scm (FLAT_ALTERATION); } + | '+' { $$ = ly_rational2scm (SHARP_ALTERATION); } + | '!' { $$ = scm_from_int (0); } ; bass_figure: @@ -1853,11 +1867,11 @@ bass_figure: } | bass_figure figured_bass_alteration { Music *m = unsmob_music ($1); - if ($2) { + if (scm_to_double ($2)) { SCM salter = m->get_property ("alteration"); - int alter = scm_is_number (salter) ? scm_to_int (salter) : 0; + SCM alter = scm_is_number (salter) ? salter : scm_from_int (0); m->set_property ("alteration", - scm_from_int (alter + $2)); + scm_sum (alter, $2)); } else { m->set_property ("alteration", scm_from_int (0)); } @@ -2066,10 +2080,10 @@ step_number: $$ = make_chord_step ($1, 0); } | bare_unsigned '+' { - $$ = make_chord_step ($1, SHARP); + $$ = make_chord_step ($1, SHARP_ALTERATION); } | bare_unsigned CHORD_MINUS { - $$ = make_chord_step ($1, FLAT); + $$ = make_chord_step ($1, FLAT_ALTERATION); } ; @@ -2137,6 +2151,14 @@ bare_unsigned: } ; +unsigned_number: + bare_unsigned { $$ = scm_from_int ($1); } + | NUMBER_IDENTIFIER { + $$ = $1; + } + ; + + exclamations: { $$ = 0; } | exclamations '!' { $$ ++; } @@ -2378,7 +2400,7 @@ Lily_lexer::try_special_identifiers (SCM *destination, SCM sid) SCM get_next_unique_context_id () { - return scm_makfrom0str ("$uniqueContextId"); + return scm_from_locale_string ("$uniqueContextId"); } @@ -2388,7 +2410,7 @@ get_next_unique_lyrics_context_id () static int new_context_count; char s[128]; snprintf (s, sizeof (s)-1, "uniqueContext%d", new_context_count++); - return scm_makfrom0str (s); + return scm_from_locale_string (s); } @@ -2473,10 +2495,10 @@ set_music_properties (Music *p, SCM a) SCM -make_chord_step (int step, int alter) +make_chord_step (int step, Rational alter) { if (step == 7) - alter += FLAT; + alter += FLAT_ALTERATION; while (step < 0) step += 7;