X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Fparser.yy;h=f5eed1ba3b688e33257667b7343d480baa1ad3d5;hb=04ae3a59a98ccdfa95db5664c88223a5805dc3db;hp=e9b33a4e0e942ae5ac4ab9bbb6678f6b0842ea3d;hpb=f0da063c7a52889d36d0ee293b76c390096b0a1f;p=lilypond.git diff --git a/lily/parser.yy b/lily/parser.yy index e9b33a4e0e..f5eed1ba3b 100644 --- a/lily/parser.yy +++ b/lily/parser.yy @@ -5,7 +5,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2003 Han-Wen Nienhuys + (c) 1997--2004 Han-Wen Nienhuys Jan Nieuwenhuizen */ @@ -58,7 +58,7 @@ TODO: #include "scm-option.hh" -#include "translator-def.hh" +#include "context-def.hh" #include "lily-guile.hh" #include "misc.hh" #include "my-lily-lexer.hh" @@ -74,13 +74,13 @@ TODO: #include "input.hh" #include "lilypond-input-version.hh" #include "scm-hash.hh" -#include "auto-change-iterator.hh" -#include "ly-modules.hh" +#include "ly-module.hh" #include "music-sequence.hh" #include "input-smob.hh" #include "event.hh" #include "text-item.hh" #include "music-list.hh" +#include "paper-book.hh" #define MY_MAKE_MUSIC(x) make_music_by_name (ly_symbol2scm (x)) @@ -105,7 +105,7 @@ My_lily_parser* my_lily_parser; void tag_music (Music*m, SCM tag, Input ip) { - SCM tags = m->get_mus_property ("tags"); + SCM tags = m->get_property ("tags"); if (gh_symbol_p (tag)) tags = scm_cons (tag, tags); else if (gh_list_p (tag)) @@ -113,21 +113,25 @@ tag_music (Music*m, SCM tag, Input ip) else ip.warning (_("Tag must be symbol or list of symbols.")); - m->set_mus_property ("tags", tags); + m->set_property ("tags", tags); } bool -regular_identifier_b (SCM id) +is_regular_identifier (SCM id) { String str = ly_scm2string (id); char const *s = str.to_str0 () ; bool v = true; +/* + isalpha (*s); + s++; +*/ while (*s && v) { - v = v && isalpha (*s); + v = v && isalnum (*s); s++; } return v; @@ -136,16 +140,14 @@ regular_identifier_b (SCM id) SCM make_simple_markup (SCM a) { - static SCM simple; - if (!simple) - simple = scm_c_eval_string ("simple-markup"); + SCM simple = scm_c_eval_string ("simple-markup"); - return scm_list_n (simple, a, SCM_UNDEFINED); + return scm_list_2 (simple, a); } bool -is_duration_b (int t) +is_is_duration (int t) { return t && t == 1 << intlog2 (t); } @@ -155,7 +157,7 @@ set_music_properties (Music *p, SCM a) { for (SCM k = a; gh_pair_p (k); k = ly_cdr (k)) { - p->internal_set_mus_property (ly_caar (k), ly_cdar (k)); + p->internal_set_property (ly_caar (k), ly_cdar (k)); } } @@ -175,9 +177,7 @@ make_chord_step (int step, int alter) SCM make_chord (SCM pitch, SCM dur, SCM modification_list) { - static SCM chord_ctor; - if (!chord_ctor) - chord_ctor= scm_c_eval_string ("construct-chord"); + SCM chord_ctor = ly_scheme_function ("construct-chord"); SCM ch= scm_call_3 (chord_ctor, pitch, dur, modification_list); scm_gc_protect_object (ch); return ch; @@ -196,9 +196,9 @@ ly_input_procedure_p (SCM x) Music* set_property_music (SCM sym, SCM value) { - Music * p = MY_MAKE_MUSIC("PropertySet"); - p->set_mus_property ("symbol", sym); - p->set_mus_property ("value", value); + Music * p = MY_MAKE_MUSIC ("PropertySet"); + p->set_property ("symbol", sym); + p->set_property ("value", value); return p; } @@ -226,7 +226,7 @@ yylex (YYSTYPE *s, void * v) My_lily_lexer * lex = pars->lexer_; lex->lexval = (void*) s; - lex->prepare_for_next_token(); + lex->prepare_for_next_token (); return lex->yylex (); } @@ -238,6 +238,8 @@ yylex (YYSTYPE *s, void * v) %token ACCEPTS %token ADDLYRICS +%token ADDQUOTE +%token NEWADDLYRICS %token ALIAS %token ALTERNATIVE %token APPLY @@ -283,8 +285,7 @@ yylex (YYSTYPE *s, void * v) %token PAPER %token PARTCOMBINE %token PARTIAL -%token PITCHNAMES -%token PROPERTY +%token QUOTE %token RELATIVE %token REMOVE %token REPEAT @@ -299,8 +300,8 @@ yylex (YYSTYPE *s, void * v) %token TEMPO %token TIMES %token TIME_T -%token TRANSLATOR %token TRANSPOSE +%token TRANSPOSITION %token TYPE %token UNSET %token WITH @@ -316,6 +317,7 @@ yylex (YYSTYPE *s, void * v) %type exclamations questions dots optional_rest %type bass_mod %type grace_head +%type oct_check %type context_mod_list %type lyric_element %type bass_number br_bass_figure bass_figure figure_list figure_spec @@ -326,13 +328,14 @@ yylex (YYSTYPE *s, void * v) %token DURATION_IDENTIFIER %token FRACTION %token IDENTIFIER -%token CHORDNAMES +%token DRUMS +%token DRUM_PITCH %token CHORD_MODIFIER %token SCORE_IDENTIFIER %token MUSIC_OUTPUT_DEF_IDENTIFIER %token NUMBER_IDENTIFIER %token EVENT_IDENTIFIER -%token MUSIC_IDENTIFIER TRANSLATOR_IDENTIFIER +%token MUSIC_IDENTIFIER CONTEXT_DEF_IDENTIFIER %token STRING_IDENTIFIER SCM_IDENTIFIER %token RESTNAME %token STRING @@ -342,6 +345,7 @@ yylex (YYSTYPE *s, void * v) %token MARKUP %token MARKUP_HEAD_MARKUP0 +%token MARKUP_HEAD_EMPTY %token MARKUP_HEAD_MARKUP0_MARKUP1 %token MARKUP_HEAD_SCM0 %token MARKUP_HEAD_SCM0_MARKUP1 @@ -378,22 +382,20 @@ yylex (YYSTYPE *s, void * v) %type embedded_scm scalar %type Music Sequential_music Simultaneous_music -%type relative_music re_rhythmed_music part_combined_music -%type music_property_def context_change -%type Music_list -%type property_operation context_mod translator_mod optional_context_mod -%type music_output_def_body -%type shorthand_command_req +%type relative_music re_rhythmed_music +%type music_property_def context_change +%type context_prop_spec +%type Music_list +%type property_operation context_mod context_def_mod optional_context_mod +%type music_output_def_body music_output_def_head %type post_event tagged_post_event -%type command_req verbose_command_req -%type hyphen_req +%type command_req %type string_number_event %type string bare_number number_expression number_term number_factor %type score_block score_body -%type translator_spec_block translator_spec_body +%type context_def_spec_block context_def_spec_body %type tempo_event -%type notenames_body notenames_block chordmodifiers_block %type script_abbreviation @@ -419,15 +421,11 @@ lilypond: /* empty */ ; toplevel_expression: - notenames_block { - THIS->lexer_->pitchname_tab_ = $1; - } - | chordmodifiers_block { - THIS->lexer_->chordmodifier_tab_ = $1; - } - | lilypond_header { + lilypond_header { THIS->input_file_->header_ = $1; } + | add_quote { + } | score_block { Score * sc = $1; @@ -444,9 +442,9 @@ toplevel_expression: SCM outname = scm_makfrom0str (p.to_string ().to_str0()); for (int i=0; i < sc->defs_.size (); i++) - default_rendering (sc->music_, sc->defs_[i]->self_scm(),head, outname); + default_rendering (sc->music_, sc->defs_[i]->self_scm (), head, outname); - if (sc->defs_.empty ()) + if (sc->defs_.is_empty ()) { Music_output_def *id = unsmob_music_output_def (THIS->lexer_->lookup_identifier @@ -454,46 +452,30 @@ toplevel_expression: id = id ? id->clone () : new Paper_def; - default_rendering (sc->music_, id->self_scm(), head, outname); - - scm_gc_unprotect_object (id->self_scm ()); + default_rendering (sc->music_, id->self_scm (), head, outname); + scm_gc_unprotect_object (id->self_scm ()); } - scm_gc_unprotect_object (sc->self_scm()); + scm_gc_unprotect_object (sc->self_scm ()); } | output_def { + SCM id = SCM_EOL; if (dynamic_cast ($1)) - THIS->lexer_->set_identifier (scm_makfrom0str ("$defaultpaper"), $1->self_scm ()); + id = scm_makfrom0str ("$defaultpaper"); else if (dynamic_cast ($1)) - THIS->lexer_->set_identifier (scm_makfrom0str ("$defaultmidi"), $1->self_scm ()); + id = scm_makfrom0str ("$defaultmidi"); + THIS->lexer_->set_identifier (id, $1->self_scm ()); + scm_gc_unprotect_object ($1->self_scm ()); } ; + embedded_scm: SCM_T | SCM_IDENTIFIER ; -chordmodifiers_block: - CHORDMODIFIERS notenames_body { $$ = $2; } - ; - -notenames_block: - PITCHNAMES notenames_body { $$ = $2; } - ; - -notenames_body: - embedded_scm { - int i = scm_ilength ($1); - SCM tab = scm_make_vector (gh_int2scm (i), SCM_EOL); - for (SCM s = $1; gh_pair_p (s); s = ly_cdr (s)) { - SCM pt = ly_cdar (s); - scm_hashq_set_x (tab, ly_caar (s), pt); - } - $$ = tab; - } - ; lilypond_header_body: { @@ -507,7 +489,7 @@ lilypond_header_body: lilypond_header: HEADER '{' lilypond_header_body '}' { - $$ = THIS->lexer_-> remove_scope(); + $$ = THIS->lexer_->remove_scope (); } ; @@ -526,7 +508,7 @@ assignment: */ Input ip = THIS->pop_spot (); - if (! regular_identifier_b ($1)) + if (! is_regular_identifier ($1)) { ip.warning (_ ("Identifier should have alphabetic characters only")); } @@ -545,7 +527,6 @@ all objects can be unprotected as soon as they're here. ; - identifier_init: score_block { $$ = $1->self_scm (); @@ -558,7 +539,7 @@ identifier_init: $$ = $1->self_scm (); scm_gc_unprotect_object ($$); } - | translator_spec_block { + | context_def_spec_block { $$ = $1; } | Music { @@ -580,33 +561,35 @@ identifier_init: } ; -translator_spec_block: - TRANSLATOR '{' translator_spec_body '}' +context_def_spec_block: + CONTEXT '{' context_def_spec_body '}' { $$ = $3; } ; -translator_spec_body: +context_def_spec_body: /**/ { - $$ = Translator_def::make_scm (); - unsmob_translator_def ($$)->set_spot (THIS->here_input ()); + $$ = Context_def::make_scm (); + unsmob_context_def ($$)->set_spot (THIS->here_input ()); } - | TRANSLATOR_IDENTIFIER { + | CONTEXT_DEF_IDENTIFIER { $$ = $1; - unsmob_translator_def ($$)->set_spot (THIS->here_input ()); + unsmob_context_def ($$)->set_spot (THIS->here_input ()); } - | translator_spec_body GROBDESCRIPTIONS embedded_scm { - Translator_def*td = unsmob_translator_def($$); + | context_def_spec_body GROBDESCRIPTIONS embedded_scm { + Context_def*td = unsmob_context_def ($$); for (SCM p = $3; gh_pair_p (p); p = ly_cdr (p)) { SCM tag = gh_caar (p); - td->add_context_mod (scm_list_n (ly_symbol2scm ("assign"), - tag, ly_cdar (p), SCM_UNDEFINED)); + + /* TODO: should make new tag "grob-definition" ? */ + td->add_context_mod (scm_list_3 (ly_symbol2scm ("assign"), + tag, gh_cons (ly_cdar (p), SCM_EOL))); } } - | translator_spec_body context_mod { - unsmob_translator_def ($$)->add_context_mod ($2); + | context_def_spec_body context_mod { + unsmob_context_def ($$)->add_context_mod ($2); } ; @@ -635,14 +618,14 @@ score_body: /* guh. */ - SCM check_funcs = scm_c_eval_string ("toplevel-music-functions"); + SCM check_funcs = ly_scheme_function ("toplevel-music-functions"); for (; gh_pair_p (check_funcs); check_funcs = gh_cdr (check_funcs)) m = gh_call1 (gh_car (check_funcs), m); $$->music_ = m; } | SCORE_IDENTIFIER { - $$ = unsmob_score ($1); + $$ = new Score ( *unsmob_score ($1)); $$->set_spot (THIS->here_input ()); } | score_body lilypond_header { @@ -650,6 +633,7 @@ score_body: } | score_body output_def { $$->defs_.push ($2); + scm_gc_unprotect_object ($2->self_scm ()); } | score_body error { @@ -667,8 +651,8 @@ output_def: } ; -music_output_def_body: - MIDI '{' { +music_output_def_head: + MIDI { Music_output_def *id = unsmob_music_output_def (THIS->lexer_->lookup_identifier ("$defaultmidi")); @@ -681,7 +665,7 @@ music_output_def_body: $$ = p; THIS->lexer_->add_scope (p->scope_); } - | PAPER '{' { + | PAPER { Music_output_def *id = unsmob_music_output_def (THIS->lexer_->lookup_identifier ("$defaultpaper")); Paper_def *p = 0; if (id) @@ -692,35 +676,40 @@ music_output_def_body: THIS->lexer_->add_scope (p->scope_); $$ = p; } - | PAPER '{' MUSIC_OUTPUT_DEF_IDENTIFIER { - Music_output_def * o = unsmob_music_output_def ($3); - $$ =o; + ; - THIS->lexer_->add_scope (o->scope_); + +music_output_def_body: + music_output_def_head '{' { + $$ = $1; + $$->input_origin_. set_spot (THIS->here_input ()); + } - | MIDI '{' MUSIC_OUTPUT_DEF_IDENTIFIER { + | music_output_def_head '{' MUSIC_OUTPUT_DEF_IDENTIFIER { + scm_gc_unprotect_object ($1->self_scm ()); Music_output_def * o = unsmob_music_output_def ($3); + o->input_origin_.set_spot (THIS->here_input ()); $$ = o; - + THIS->lexer_->remove_scope (); THIS->lexer_->add_scope (o->scope_); } | music_output_def_body assignment { } - | music_output_def_body translator_spec_block { - $$->assign_translator ($2); - + | music_output_def_body context_def_spec_block { + $$->assign_context_def ($2); } | music_output_def_body tempo_event { /* junk this ? there already is tempo stuff in music. */ - int m = gh_scm2int ( $2->get_mus_property ("metronome-count")); - Duration *d = unsmob_duration ($2->get_mus_property ("tempo-unit")); + int m = gh_scm2int ( $2->get_property ("metronome-count")); + Duration *d = unsmob_duration ($2->get_property ("tempo-unit")); Midi_def * md = dynamic_cast ($$); if (md) md->set_tempo (d->get_length (), m); + scm_gc_unprotect_object ($2->self_scm ()); } | music_output_def_body error { @@ -729,9 +718,9 @@ music_output_def_body: tempo_event: TEMPO steno_duration '=' bare_unsigned { - $$ = MY_MAKE_MUSIC("MetronomeChangeEvent"); - $$->set_mus_property ("tempo-unit", $2); - $$->set_mus_property ("metronome-count", gh_int2scm ( $4)); + $$ = MY_MAKE_MUSIC ("MetronomeChangeEvent"); + $$->set_property ("tempo-unit", $2); + $$->set_property ("metronome-count", gh_int2scm ( $4)); } ; @@ -789,21 +778,19 @@ Repeated_music: } - static SCM proc; - if (!proc) - proc = scm_c_eval_string ("make-repeated-music"); + SCM proc = ly_scheme_function ("make-repeated-music"); SCM mus = scm_call_1 (proc, $2); scm_gc_protect_object (mus); // UGH. Music *r =unsmob_music (mus); if (beg) { - r-> set_mus_property ("element", beg->self_scm ()); + r-> set_property ("element", beg->self_scm ()); scm_gc_unprotect_object (beg->self_scm ()); } - r->set_mus_property ("repeat-count", gh_int2scm (times >? 1)); + r->set_property ("repeat-count", gh_int2scm (times >? 1)); - r-> set_mus_property ("elements",alts); + r-> set_property ("elements",alts); if (gh_equal_p ($2, scm_makfrom0str ("tremolo"))) { /* we can not get durations and other stuff correct down the line, so we have to @@ -826,7 +813,7 @@ Repeated_music: shift -= 1; r->compress (Moment (Rational (1,list_len))); } - gh_call3 (func, r->self_scm (), gh_int2scm(shift),gh_int2scm(dots)); + gh_call3 (func, r->self_scm (), gh_int2scm (shift),gh_int2scm (dots)); } r->set_spot (*$4->origin ()); @@ -837,28 +824,28 @@ Repeated_music: Sequential_music: SEQUENTIAL '{' Music_list '}' { - $$ = MY_MAKE_MUSIC("SequentialMusic"); - $$->set_mus_property ("elements", ly_car ($3)); - $$->set_spot(THIS->here_input()); + $$ = MY_MAKE_MUSIC ("SequentialMusic"); + $$->set_property ("elements", ly_car ($3)); + $$->set_spot (THIS->here_input ()); } | '{' Music_list '}' { - $$ = MY_MAKE_MUSIC("SequentialMusic"); - $$->set_mus_property ("elements", ly_car ($2)); - $$->set_spot(THIS->here_input()); + $$ = MY_MAKE_MUSIC ("SequentialMusic"); + $$->set_property ("elements", ly_car ($2)); + $$->set_spot (THIS->here_input ()); } ; Simultaneous_music: SIMULTANEOUS '{' Music_list '}'{ - $$ = MY_MAKE_MUSIC("SimultaneousMusic"); - $$->set_mus_property ("elements", ly_car ($3)); - $$->set_spot(THIS->here_input()); + $$ = MY_MAKE_MUSIC ("SimultaneousMusic"); + $$->set_property ("elements", ly_car ($3)); + $$->set_spot (THIS->here_input ()); } | simul_open Music_list simul_close { - $$ = MY_MAKE_MUSIC("SimultaneousMusic"); - $$->set_mus_property ("elements", ly_car ($2)); - $$->set_spot(THIS->here_input()); + $$ = MY_MAKE_MUSIC ("SimultaneousMusic"); + $$->set_property ("elements", ly_car ($2)); + $$->set_spot (THIS->here_input ()); } ; @@ -868,15 +855,15 @@ Simple_music: if (!ly_input_procedure_p ($2)) THIS->parser_error (_ ("\\applycontext takes function argument")); $$ = MY_MAKE_MUSIC ("ApplyOutputEvent"); - $$->set_mus_property ("procedure", $2); - $$->set_spot (THIS->here_input()); + $$->set_property ("procedure", $2); + $$->set_spot (THIS->here_input ()); } | APPLYCONTEXT embedded_scm { if (!ly_input_procedure_p ($2)) THIS->parser_error (_ ("\\applycontext takes function argument")); $$ = MY_MAKE_MUSIC ("ApplyContext"); - $$->set_mus_property ("procedure", $2); - $$->set_spot (THIS->here_input()); + $$->set_property ("procedure", $2); + $$->set_spot (THIS->here_input ()); } | MUSIC_IDENTIFIER { $$ = unsmob_music ($1); @@ -905,16 +892,25 @@ context_mod_list: ; Composite_music: - AUTOCHANGE STRING Music { - Music*chm = MY_MAKE_MUSIC("AutoChangeMusic"); - chm->set_mus_property ("element", $3->self_scm ()); - chm->set_mus_property ("iterator-ctor", Auto_change_iterator::constructor_proc); + AUTOCHANGE Music { + SCM proc = ly_scheme_function ("make-autochange-music"); + + SCM res = scm_call_1 (proc, $2->self_scm ()); + scm_gc_unprotect_object ($2->self_scm ()); + $$ = unsmob_music (res); + scm_gc_protect_object (res); + $$->set_spot (THIS->here_input ()); + } + | PARTCOMBINE Music Music { + SCM proc = ly_scheme_function ("make-part-combine-music"); + SCM res = scm_call_1 (proc, gh_list ($2->self_scm (), + $3->self_scm (), SCM_UNDEFINED)); scm_gc_unprotect_object ($3->self_scm ()); - chm->set_mus_property ("what", scm_string_to_symbol ($2)); - - $$ = chm; - chm->set_spot (*$3->origin ()); + scm_gc_unprotect_object ($2->self_scm ()); + $$ = unsmob_music (res); + scm_gc_protect_object (res); + $$->set_spot (THIS->here_input ()); } | grace_head Music { #if 1 @@ -946,24 +942,23 @@ basic music objects too, since the meaning is different. scm_gc_unprotect_object (stopm->self_scm ()); } ms = scm_cons ($2->self_scm (), ms); - scm_gc_unprotect_object ($2->self_scm()); + scm_gc_unprotect_object ($2->self_scm ()); if (startm) { startm = startm->clone (); ms = scm_cons (startm->self_scm () , ms); scm_gc_unprotect_object (startm->self_scm ()); } - - Music* seq = MY_MAKE_MUSIC("SequentialMusic"); - seq->set_mus_property ("elements", ms); + Music* seq = MY_MAKE_MUSIC ("SequentialMusic"); + seq->set_property ("elements", ms); - $$ = MY_MAKE_MUSIC("GraceMusic"); - $$->set_mus_property ("element", seq->self_scm ()); + $$ = MY_MAKE_MUSIC ("GraceMusic"); + $$->set_property ("element", seq->self_scm ()); scm_gc_unprotect_object (seq->self_scm ()); #else - $$ = MY_MAKE_MUSIC("GraceMusic"); - $$->set_mus_property ("element", $2->self_scm ()); + $$ = MY_MAKE_MUSIC ("GraceMusic"); + $$->set_property ("element", $2->self_scm ()); scm_gc_unprotect_object ($2->self_scm ()); #endif } @@ -989,13 +984,13 @@ basic music objects too, since the meaning is different. int n = gh_scm2int (ly_car ($3)); int d = gh_scm2int (ly_cdr ($3)); Music *mp = $4; - $$= MY_MAKE_MUSIC("TimeScaledMusic"); + $$= MY_MAKE_MUSIC ("TimeScaledMusic"); $$->set_spot (THIS->pop_spot ()); - $$->set_mus_property ("element", mp->self_scm ()); + $$->set_property ("element", mp->self_scm ()); scm_gc_unprotect_object (mp->self_scm ()); - $$->set_mus_property ("numerator", gh_int2scm (n)); - $$->set_mus_property ("denominator", gh_int2scm (d)); + $$->set_property ("numerator", gh_int2scm (n)); + $$->set_property ("denominator", gh_int2scm (d)); $$->compress (Moment (Rational (n,d))); } @@ -1003,13 +998,13 @@ basic music objects too, since the meaning is different. | Simultaneous_music { $$ = $1; } | Sequential_music { $$ = $1; } | TRANSPOSE pitch_also_in_chords pitch_also_in_chords Music { - $$ = MY_MAKE_MUSIC("TransposedMusic"); + $$ = MY_MAKE_MUSIC ("TransposedMusic"); Music *p = $4; Pitch from = *unsmob_pitch ($2); Pitch to = *unsmob_pitch ($3); p->transpose (interval (from, to)); - $$->set_mus_property ("element", p->self_scm ()); + $$->set_property ("element", p->self_scm ()); scm_gc_unprotect_object (p->self_scm ()); } | APPLY embedded_scm Music { @@ -1024,13 +1019,25 @@ basic music objects too, since the meaning is different. Music *m = unsmob_music (ret); if (!m) { THIS->parser_error ("\\apply must return a Music"); - m = MY_MAKE_MUSIC("Music"); + m = MY_MAKE_MUSIC ("Music"); } $$ = m; } } | NOTES - { THIS->lexer_->push_note_state (); } + { + SCM nn = THIS->lexer_->lookup_identifier ("pitchnames"); + THIS->lexer_->push_note_state (alist_to_hashq (nn)); + } + Music + { $$ = $3; + THIS->lexer_->pop_state (); + } + | DRUMS + { + SCM nn = THIS->lexer_->lookup_identifier ("drumPitchNames"); + THIS->lexer_->push_note_state (alist_to_hashq (nn)); + } Music { $$ = $3; THIS->lexer_->pop_state (); @@ -1039,20 +1046,23 @@ basic music objects too, since the meaning is different. { THIS->lexer_->push_figuredbass_state (); } Music { - Music * chm = MY_MAKE_MUSIC("UntransposableMusic"); - chm->set_mus_property ("element", $3->self_scm ()); + Music * chm = MY_MAKE_MUSIC ("UntransposableMusic"); + chm->set_property ("element", $3->self_scm ()); $$ = chm; - scm_gc_unprotect_object ($3->self_scm()); + scm_gc_unprotect_object ($3->self_scm ()); THIS->lexer_->pop_state (); } - | CHORDS - { THIS->lexer_->push_chord_state (); } - Music - { - Music * chm = MY_MAKE_MUSIC("UnrelativableMusic"); - chm->set_mus_property ("element", $3->self_scm ()); - scm_gc_unprotect_object ($3->self_scm()); + | CHORDS { + SCM nn = THIS->lexer_->lookup_identifier ("chordmodifiers"); + THIS->lexer_->chordmodifier_tab_ = alist_to_hashq (nn); + nn = THIS->lexer_->lookup_identifier ("pitchnames"); + THIS->lexer_->push_chord_state (alist_to_hashq (nn)); + + } Music { + Music * chm = MY_MAKE_MUSIC ("UnrelativableMusic"); + chm->set_property ("element", $3->self_scm ()); + scm_gc_unprotect_object ($3->self_scm ()); $$ = chm; THIS->lexer_->pop_state (); @@ -1066,7 +1076,6 @@ basic music objects too, since the meaning is different. } | relative_music { $$ = $1; } | re_rhythmed_music { $$ = $1; } - | part_combined_music { $$ = $1; } | TAG embedded_scm Music { tag_music ($3, $2, THIS->here_input ()); $$ = $3; @@ -1077,46 +1086,40 @@ relative_music: RELATIVE absolute_pitch Music { Music * p = $3; Pitch pit = *unsmob_pitch ($2); - $$ = MY_MAKE_MUSIC("RelativeOctaveMusic"); + $$ = MY_MAKE_MUSIC ("RelativeOctaveMusic"); - $$->set_mus_property ("element", p->self_scm ()); + $$->set_property ("element", p->self_scm ()); scm_gc_unprotect_object (p->self_scm ()); Pitch retpitch = p->to_relative_octave (pit); if (lily_1_8_relative) - $$->set_mus_property ("last-pitch", retpitch.smobbed_copy ()); + $$->set_property ("last-pitch", retpitch.smobbed_copy ()); } ; re_rhythmed_music: ADDLYRICS Music Music { - Music*l =MY_MAKE_MUSIC("LyricCombineMusic"); - l->set_mus_property ("elements", gh_list ($2->self_scm (), $3->self_scm (), SCM_UNDEFINED)); + Music*l =MY_MAKE_MUSIC ("LyricCombineMusic"); + l->set_property ("elements", gh_list ($2->self_scm (), $3->self_scm (), SCM_UNDEFINED)); scm_gc_unprotect_object ($3->self_scm ()); scm_gc_unprotect_object ($2->self_scm ()); $$ = l; } - ; - -part_combined_music: - PARTCOMBINE STRING Music Music { - Music * p= MY_MAKE_MUSIC("PartCombineMusic"); - p->set_mus_property ("what", scm_string_to_symbol ($2)); - p->set_mus_property ("elements", gh_list ($3->self_scm (),$4->self_scm (), SCM_UNDEFINED)); - - scm_gc_unprotect_object ($3->self_scm ()); - scm_gc_unprotect_object ($4->self_scm ()); - - $$ = p; + | NEWADDLYRICS string Music { + Music*l =MY_MAKE_MUSIC ("NewLyricCombineMusic"); + l->set_property ("element", $3->self_scm ()); + scm_gc_unprotect_object ($3->self_scm ()); + $$ = l; + l->set_property ("associated-context", $2); } ; context_change: CHANGE STRING '=' STRING { - Music*t= MY_MAKE_MUSIC("TranslatorChange"); - t-> set_mus_property ("change-to-type", scm_string_to_symbol ($2)); - t-> set_mus_property ("change-to-id", $4); + 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 ()); @@ -1125,28 +1128,24 @@ context_change: property_operation: STRING '=' scalar { - $$ = scm_list_n (ly_symbol2scm ("assign"), - scm_string_to_symbol ($1), $3, SCM_UNDEFINED); - } - | STRING UNSET { - $$ = scm_list_n (ly_symbol2scm ("unset"), - scm_string_to_symbol ($1), SCM_UNDEFINED); + $$ = scm_list_3 (ly_symbol2scm ("assign"), + scm_string_to_symbol ($1), $3); } - | STRING SET embedded_scm '=' embedded_scm { - $$ = scm_list_n (ly_symbol2scm ("poppush"), - scm_string_to_symbol ($1), $3, $5, SCM_UNDEFINED); + | UNSET STRING { + $$ = scm_list_2 (ly_symbol2scm ("unset"), + scm_string_to_symbol ($2)); } - | STRING OVERRIDE embedded_scm '=' embedded_scm { - $$ = scm_list_n (ly_symbol2scm ("push"), - scm_string_to_symbol ($1), $3, $5, SCM_UNDEFINED); + | OVERRIDE STRING embedded_scm '=' embedded_scm { + $$ = scm_list_4 (ly_symbol2scm ("push"), + scm_string_to_symbol ($2), $3, $5); } - | STRING REVERT embedded_scm { - $$ = scm_list_n (ly_symbol2scm ("pop"), - scm_string_to_symbol ($1), $3, SCM_UNDEFINED); + | REVERT STRING embedded_scm { + $$ = scm_list_3 (ly_symbol2scm ("pop"), + scm_string_to_symbol ($2), $3); } ; -translator_mod: +context_def_mod: CONSISTSEND { $$ = ly_symbol2scm ("consists-end"); } | CONSISTS { $$ = ly_symbol2scm ("consists"); } | REMOVE { $$ = ly_symbol2scm ("remove"); } @@ -1162,32 +1161,59 @@ translator_mod: context_mod: property_operation { $$ = $1; } - | translator_mod STRING { - $$ = scm_list_n ($1, $2, SCM_UNDEFINED); + | context_def_mod STRING { + $$ = scm_list_2 ($1, $2); } ; -music_property_def: - PROPERTY STRING '.' property_operation { - Music * t = property_op_to_music ($4); - Music *csm = MY_MAKE_MUSIC("ContextSpeccedMusic"); - - csm->set_mus_property ("element", t->self_scm ()); - scm_gc_unprotect_object (t->self_scm ()); - - $$ = csm; - $$->set_spot (THIS->here_input ()); +context_prop_spec: + STRING { + $$ = scm_list_2 (ly_symbol2scm ("Bottom"), scm_string_to_symbol ($1)); + } + | STRING '.' STRING { + $$ = scm_list_2 (scm_string_to_symbol ($1), scm_string_to_symbol ($3)); + } + ; - csm-> set_mus_property ("context-type", scm_string_to_symbol ($2)); +music_property_def: + OVERRIDE context_prop_spec embedded_scm '=' scalar { + $$ = property_op_to_music (scm_list_4 ( + ly_symbol2scm ("poppush"), + gh_cadr ($2), + $3, $5)); + $$= context_spec_music (gh_car ($2), SCM_UNDEFINED, $$, SCM_EOL); + } + | REVERT context_prop_spec embedded_scm { + $$ = property_op_to_music (scm_list_3 ( + ly_symbol2scm ("pop"), + gh_cadr ($2), + $3)); + + $$= context_spec_music (gh_car ($2), SCM_UNDEFINED, $$, SCM_EOL); + } + | SET context_prop_spec '=' scalar { + $$ = property_op_to_music (scm_list_3 ( + ly_symbol2scm ("assign"), + gh_cadr ($2), + $4)); + $$= context_spec_music (gh_car ($2), SCM_UNDEFINED, $$, SCM_EOL); + } + | UNSET context_prop_spec { + $$ = property_op_to_music (scm_list_2 ( + ly_symbol2scm ("unset"), + gh_cadr ($2))); + $$= context_spec_music (gh_car ($2), SCM_UNDEFINED, $$, SCM_EOL); } | ONCE music_property_def { + SCM e = $2->get_property ("element"); + unsmob_music (e)->set_property ("once", SCM_BOOL_T); $$ = $2; - SCM e = $2->get_mus_property ("element"); - unsmob_music (e)->set_mus_property ("once", SCM_BOOL_T); + } ; + scalar: string { $$ = $1; } | bare_int { $$ = gh_int2scm ($1); } @@ -1221,11 +1247,11 @@ pre_events: { event_chord: pre_events simple_element post_events { - SCM elts = $2-> get_mus_property ("elements"); + SCM elts = $2-> get_property ("elements"); elts = gh_append2 (elts, scm_reverse_x ($3, SCM_EOL)); - $2->set_mus_property ("elements", elts); + $2->set_property ("elements", elts); $$ = $2; } | command_element @@ -1236,15 +1262,15 @@ event_chord: note_chord_element: chord_body optional_notemode_duration post_events { - SCM dur = unsmob_duration ($2)->smobbed_copy(); - SCM es = $1->get_mus_property ("elements"); + SCM dur = unsmob_duration ($2)->smobbed_copy (); + SCM es = $1->get_property ("elements"); SCM postevs = scm_reverse_x ($3, SCM_EOL); for (SCM s = es; gh_pair_p (s); s = gh_cdr (s)) - unsmob_music (gh_car(s))->set_mus_property ("duration", dur); + unsmob_music (gh_car (s))->set_property ("duration", dur); es = gh_append2 (es, postevs); - $1-> set_mus_property ("elements", es); + $1-> set_property ("elements", es); $$ = $1; } ; @@ -1264,8 +1290,8 @@ simul_close: MOREMORE chord_body: chord_open chord_body_elements chord_close { - $$ = MY_MAKE_MUSIC("EventChord"); - $$->set_mus_property ("elements", + $$ = MY_MAKE_MUSIC ("EventChord"); + $$->set_property ("elements", scm_reverse_x ($2, SCM_EOL)); } ; @@ -1273,163 +1299,196 @@ chord_body: chord_body_elements: /* empty */ { $$ = SCM_EOL; } | chord_body_elements chord_body_element { - $$ = gh_cons ($2->self_scm(), $1); - scm_gc_unprotect_object ($2->self_scm()); + $$ = gh_cons ($2->self_scm (), $1); + scm_gc_unprotect_object ($2->self_scm ()); } ; chord_body_element: pitch exclamations questions post_events { - Music * n = MY_MAKE_MUSIC("NoteEvent"); - n->set_mus_property ("pitch", $1); + Music * n = MY_MAKE_MUSIC ("NoteEvent"); + n->set_property ("pitch", $1); if ($3 % 2) - n->set_mus_property ("cautionary", SCM_BOOL_T); + n->set_property ("cautionary", SCM_BOOL_T); if ($2 % 2 || $3 % 2) - n->set_mus_property ("force-accidental", SCM_BOOL_T); + n->set_property ("force-accidental", SCM_BOOL_T); - SCM arts = scm_reverse_x ($4, SCM_EOL); - n->set_mus_property ("articulations", arts); + if (gh_pair_p ($4)) { + SCM arts = scm_reverse_x ($4, SCM_EOL); + n->set_property ("articulations", arts); + } + $$ = n; + } + | DRUM_PITCH post_events { + Music *n = MY_MAKE_MUSIC ("NoteEvent"); + n->set_property ("duration" ,$2); + n->set_property ("drum-type" , $1); + n->set_spot (THIS->here_input ()); + if (gh_pair_p ($2)) { + SCM arts = scm_reverse_x ($2, SCM_EOL); + n->set_property ("articulations", arts); + } $$ = n; } ; +add_quote: + ADDQUOTE string Music { + SCM adder = ly_scheme_function ("add-quotable"); + + scm_call_2 (adder, $2, $3->self_scm ()); + scm_gc_unprotect_object ($3->self_scm ()); + } + ; + command_element: command_req { - $$ = MY_MAKE_MUSIC("EventChord"); - $$->set_mus_property ("elements", scm_cons ($1->self_scm (), SCM_EOL)); - scm_gc_unprotect_object ($1->self_scm()); + $$ = MY_MAKE_MUSIC ("EventChord"); + $$->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 ()); } + | SKIP duration_length { + Music * skip = MY_MAKE_MUSIC ("SkipMusic"); + skip->set_property ("duration", $2); + + $$ = skip; + } + | QUOTE STRING duration_length { + SCM tab = THIS->lexer_->lookup_identifier ("musicQuotes"); + SCM evs = SCM_EOL; + if (scm_hash_table_p (tab) == SCM_BOOL_T) + { + SCM key = $2; // use symbol? + evs = scm_hash_ref (tab, key, SCM_BOOL_F); + } + Music * quote = 0; + if (gh_vector_p (evs)) + { + quote = MY_MAKE_MUSIC ("QuoteMusic"); + quote->set_property ("duration", $3); + quote->set_property ("quoted-events", evs); + } else { + THIS->here_input ().warning (_f ("Can\'t find music")); + quote = MY_MAKE_MUSIC ("Event"); + } + quote->set_spot (THIS->here_input ()); + $$ = quote; + } | OCTAVE { THIS->push_spot (); } pitch { - Music *l = MY_MAKE_MUSIC("RelativeOctaveCheck"); + Music *l = MY_MAKE_MUSIC ("RelativeOctaveCheck"); $$ = l; $$->set_spot (THIS->pop_spot ()); - $$->set_mus_property ("pitch", $3); + $$->set_property ("pitch", $3); } | E_LEFTSQUARE { - Music *l = MY_MAKE_MUSIC("LigatureEvent"); - l->set_mus_property ("span-direction", gh_int2scm (START)); + Music *l = MY_MAKE_MUSIC ("LigatureEvent"); + l->set_property ("span-direction", gh_int2scm (START)); l->set_spot (THIS->here_input ()); - $$ = MY_MAKE_MUSIC("EventChord"); - $$->set_mus_property ("elements", scm_cons (l->self_scm (), SCM_EOL)); - scm_gc_unprotect_object (l->self_scm()); + $$ = MY_MAKE_MUSIC ("EventChord"); + $$->set_property ("elements", scm_cons (l->self_scm (), SCM_EOL)); + scm_gc_unprotect_object (l->self_scm ()); $$->set_spot (THIS->here_input ()); } | E_RIGHTSQUARE { - Music *l = MY_MAKE_MUSIC("LigatureEvent"); - l->set_mus_property ("span-direction", gh_int2scm (STOP)); + Music *l = MY_MAKE_MUSIC ("LigatureEvent"); + l->set_property ("span-direction", gh_int2scm (STOP)); l->set_spot (THIS->here_input ()); - $$ = MY_MAKE_MUSIC("EventChord"); - $$->set_mus_property ("elements", scm_cons (l->self_scm (), SCM_EOL)); + $$ = MY_MAKE_MUSIC ("EventChord"); + $$->set_property ("elements", scm_cons (l->self_scm (), SCM_EOL)); $$->set_spot (THIS->here_input ()); - scm_gc_unprotect_object (l->self_scm()); + scm_gc_unprotect_object (l->self_scm ()); } | E_BACKSLASH { - $$ = MY_MAKE_MUSIC("VoiceSeparator"); + $$ = MY_MAKE_MUSIC ("VoiceSeparator"); $$->set_spot (THIS->here_input ()); } | '|' { - $$ = MY_MAKE_MUSIC("BarCheck"); + $$ = MY_MAKE_MUSIC ("BarCheck"); $$->set_spot (THIS->here_input ()); } + | TRANSPOSITION pitch { + $$ = set_property_music (ly_symbol2scm ("instrumentTransposition"), + $2); + $$->set_spot (THIS-> here_input ()); + $$ = context_spec_music (ly_symbol2scm ("Staff"), SCM_UNDEFINED, + $$ , SCM_EOL); + } | BAR STRING { Music *t = set_property_music (ly_symbol2scm ("whichBar"), $2); - Music *csm = MY_MAKE_MUSIC("ContextSpeccedMusic"); - csm->set_mus_property ("element", t->self_scm ()); - scm_gc_unprotect_object (t->self_scm ()); - - $$ = csm; + 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 ()); - - csm->set_mus_property ("context-type", ly_symbol2scm ("Timing")); + t->set_spot (THIS->here_input ()); } | PARTIAL duration_length { Moment m = - unsmob_duration ($2)->get_length (); Music * p = set_property_music (ly_symbol2scm ( "measurePosition"),m.smobbed_copy ()); - - Music * sp = MY_MAKE_MUSIC("ContextSpeccedMusic"); - sp->set_mus_property ("element", p->self_scm ()); - scm_gc_unprotect_object (p->self_scm ()); - - $$ =sp ; - sp-> set_mus_property ("context-type", ly_symbol2scm ("Timing")); + p->set_spot (THIS->here_input ()); + p = context_spec_music (ly_symbol2scm ("Timing"), SCM_UNDEFINED, + p, SCM_EOL); + p = context_spec_music (ly_symbol2scm ("Score"), SCM_UNDEFINED, + p, SCM_EOL); + $$ =p ; } | CLEF STRING { - static SCM proc ; - if (!proc) - proc = scm_c_eval_string ("make-clef-set"); + SCM proc = ly_scheme_function ("make-clef-set"); SCM result = scm_call_1 (proc, $2); scm_gc_protect_object (result); $$ = unsmob_music (result); } | TIME_T fraction { - static SCM proc; - if (!proc) - proc = scm_c_eval_string ("make-time-signature-set"); + SCM proc= ly_scheme_function ("make-time-signature-set"); SCM result = scm_apply_2 (proc, gh_car ($2), gh_cdr ($2), SCM_EOL); scm_gc_protect_object (result); $$ = unsmob_music (result); } - ; + | MARK scalar { + SCM proc = ly_scheme_function ("make-mark-set"); -command_req: - shorthand_command_req { $$ = $1; } - | verbose_command_req { $$ = $1; } + SCM result = scm_call_1 (proc, $2); + scm_gc_protect_object (result); + $$ = unsmob_music (result); + } ; -shorthand_command_req: - hyphen_req { - $$ = $1; - } - | BREATHE { - $$ = MY_MAKE_MUSIC("BreathingSignEvent"); +command_req: + BREATHE { + $$ = MY_MAKE_MUSIC ("BreathingSignEvent"); } | E_TILDE { - $$ = MY_MAKE_MUSIC("PesOrFlexaEvent"); + $$ = MY_MAKE_MUSIC ("PesOrFlexaEvent"); } - ; - -verbose_command_req: - MARK DEFAULT { - Music * m = MY_MAKE_MUSIC("MarkEvent"); - $$ = m; - } - | MARK scalar { - Music *m = MY_MAKE_MUSIC("MarkEvent"); - m->set_mus_property ("label", $2); + | MARK DEFAULT { + Music * m = MY_MAKE_MUSIC ("MarkEvent"); $$ = m; } - | SKIP duration_length { - Music * skip = MY_MAKE_MUSIC("SkipEvent"); - skip->set_mus_property ("duration", $2); - - $$ = skip; - } | tempo_event { $$ = $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_mus_property ("pitch-alist", $3); - key->set_mus_property ("tonic", Pitch (0,0,0).smobbed_copy()); + key->set_property ("pitch-alist", $3); + key->set_property ("tonic", Pitch (0,0,0).smobbed_copy ()); ((Music*)key)->transpose (* unsmob_pitch ($2)); } else { THIS->parser_error (_("Second argument must be pitch list.")); @@ -1445,13 +1504,13 @@ post_events: } | post_events post_event { $2->set_spot (THIS->here_input ()); - $$ = gh_cons ($2->self_scm(), $$); - scm_gc_unprotect_object ($2->self_scm()); + $$ = gh_cons ($2->self_scm (), $$); + scm_gc_unprotect_object ($2->self_scm ()); } | post_events tagged_post_event { $2 -> set_spot (THIS->here_input ()); - $$ = scm_cons ($2->self_scm(), $$); - scm_gc_unprotect_object ($2->self_scm()); + $$ = scm_cons ($2->self_scm (), $$); + scm_gc_unprotect_object ($2->self_scm ()); } ; @@ -1467,19 +1526,24 @@ post_event: direction_less_event { $$ = $1; } + | HYPHEN { + if (!THIS->lexer_->is_lyric_state ()) + THIS->parser_error (_ ("Have to be in Lyric mode for lyrics")); + $$ = MY_MAKE_MUSIC ("HyphenEvent"); + } | EXTENDER { - if (!THIS->lexer_->lyric_state_b ()) + if (!THIS->lexer_->is_lyric_state ()) THIS->parser_error (_ ("Have to be in Lyric mode for lyrics")); - $$ = MY_MAKE_MUSIC("ExtenderEvent"); + $$ = MY_MAKE_MUSIC ("ExtenderEvent"); } | script_dir direction_reqd_event { if ($1) - $2->set_mus_property ("direction", gh_int2scm ($1)); + $2->set_property ("direction", gh_int2scm ($1)); $$ = $2; } | script_dir direction_less_event { if ($1) - $2->set_mus_property ("direction", gh_int2scm ($1)); + $2->set_property ("direction", gh_int2scm ($1)); $$ = $2; } | string_number_event @@ -1487,8 +1551,8 @@ post_event: string_number_event: E_UNSIGNED { - Music * s = MY_MAKE_MUSIC("StringNumberEvent"); - s->set_mus_property ("string-number", gh_int2scm($1)); + Music * s = MY_MAKE_MUSIC ("StringNumberEvent"); + s->set_property ("string-number", gh_int2scm ($1)); s->set_spot (THIS->here_input ()); $$ = s; } @@ -1509,38 +1573,38 @@ configurable, i.e. */ Music * m = MY_MAKE_MUSIC ("BeamEvent"); - m->set_spot (THIS->here_input()); - m->set_mus_property ("span-direction" , gh_int2scm (START)); + m->set_spot (THIS->here_input ()); + m->set_property ("span-direction" , gh_int2scm (START)); $$ = m; } | ']' { Music * m = MY_MAKE_MUSIC ("BeamEvent"); - m->set_spot (THIS->here_input()); - m->set_mus_property ("span-direction" , gh_int2scm (STOP)); + m->set_spot (THIS->here_input ()); + m->set_property ("span-direction" , gh_int2scm (STOP)); $$ = m; } | '~' { Music * m = MY_MAKE_MUSIC ("TieEvent"); - m->set_spot (THIS->here_input()); + m->set_spot (THIS->here_input ()); $$ = m; } | close_event { $$ = $1; - dynamic_cast ($$)->set_mus_property ("span-direction", + dynamic_cast ($$)->set_property ("span-direction", gh_int2scm (START)); } | open_event { $$ = $1; - dynamic_cast ($$)->set_mus_property ("span-direction", + dynamic_cast ($$)->set_property ("span-direction", gh_int2scm (STOP)); } | EVENT_IDENTIFIER { $$ = unsmob_music ($1); } | tremolo_type { - Music * a = MY_MAKE_MUSIC("TremoloEvent"); + Music * a = MY_MAKE_MUSIC ("TremoloEvent"); a->set_spot (THIS->here_input ()); - a->set_mus_property ("tremolo-type", gh_int2scm ($1)); + a->set_property ("tremolo-type", gh_int2scm ($1)); $$ = a; } ; @@ -1551,14 +1615,21 @@ direction_reqd_event: } | script_abbreviation { SCM s = THIS->lexer_->lookup_identifier ("dash" + ly_scm2string ($1)); - Music *a = MY_MAKE_MUSIC("ArticulationEvent"); + Music *a = MY_MAKE_MUSIC ("ArticulationEvent"); if (gh_string_p (s)) - a->set_mus_property ("articulation-type", s); + a->set_property ("articulation-type", s); else THIS->parser_error (_ ("Expecting string as script definition")); $$ = a; } ; - + +oct_check: + /**/ { $$ = SCM_EOL; } + | '=' { $$ = gh_int2scm (0); } + | '=' sub_quotes { $$ = gh_int2scm ($2); } + | '=' sup_quotes { $$ = gh_int2scm ($2); } + ; + sup_quotes: '\'' { $$ = 1; @@ -1625,76 +1696,68 @@ pitch_also_in_chords: | steno_tonic_pitch ; -hyphen_req: - HYPHEN { - if (!THIS->lexer_->lyric_state_b ()) - THIS->parser_error (_ ("Have to be in Lyric mode for lyrics")); - $$ = MY_MAKE_MUSIC("HyphenEvent"); - } - ; - close_event: '(' { - Music * s= MY_MAKE_MUSIC("SlurEvent"); + Music * s= MY_MAKE_MUSIC ("SlurEvent"); $$ = s; - s->set_spot (THIS->here_input()); + s->set_spot (THIS->here_input ()); } | E_OPEN { - Music * s= MY_MAKE_MUSIC("PhrasingSlurEvent"); + Music * s= MY_MAKE_MUSIC ("PhrasingSlurEvent"); $$ = s; - s->set_spot (THIS->here_input()); + s->set_spot (THIS->here_input ()); } | E_SMALLER { - Music *s =MY_MAKE_MUSIC("CrescendoEvent"); + Music *s =MY_MAKE_MUSIC ("CrescendoEvent"); $$ = s; - s->set_spot (THIS->here_input()); + s->set_spot (THIS->here_input ()); } | E_BIGGER { - Music *s =MY_MAKE_MUSIC("DecrescendoEvent"); + Music *s =MY_MAKE_MUSIC ("DecrescendoEvent"); $$ = s; - s->set_spot (THIS->here_input()); + s->set_spot (THIS->here_input ()); } ; open_event: E_EXCLAMATION { - Music *s = MY_MAKE_MUSIC("CrescendoEvent"); - s->set_spot (THIS->here_input()); + Music *s = MY_MAKE_MUSIC ("CrescendoEvent"); + s->set_spot (THIS->here_input ()); $$ = s; } | ')' { - Music * s= MY_MAKE_MUSIC("SlurEvent"); + Music * s= MY_MAKE_MUSIC ("SlurEvent"); $$ = s; - s->set_spot (THIS->here_input()); + s->set_spot (THIS->here_input ()); } | E_CLOSE { - Music * s= MY_MAKE_MUSIC("PhrasingSlurEvent"); + Music * s= MY_MAKE_MUSIC ("PhrasingSlurEvent"); $$ = s; - s->set_mus_property ("span-type", scm_makfrom0str ( "phrasing-slur")); - s->set_spot (THIS->here_input()); + s->set_property ("span-type", scm_makfrom0str ( "phrasing-slur")); + s->set_spot (THIS->here_input ()); } ; gen_text_def: full_markup { - Music *t = MY_MAKE_MUSIC("TextScriptEvent"); - t->set_mus_property ("text", $1); + Music *t = MY_MAKE_MUSIC ("TextScriptEvent"); + t->set_property ("text", $1); t->set_spot (THIS->here_input ()); $$ = t; } | string { - Music *t = MY_MAKE_MUSIC("TextScriptEvent"); - t->set_mus_property ("text", make_simple_markup ($1)); + Music *t = MY_MAKE_MUSIC ("TextScriptEvent"); + t->set_property ("text", make_simple_markup ($1)); t->set_spot (THIS->here_input ()); $$ = t; } | DIGIT { - Music * t = MY_MAKE_MUSIC("FingerEvent"); - t->set_mus_property ("digit", gh_int2scm ($1)); + Music * t = MY_MAKE_MUSIC ("FingerEvent"); + t->set_property ("digit", gh_int2scm ($1)); t->set_spot (THIS->here_input ()); $$ = t; } @@ -1761,7 +1824,7 @@ optional_notemode_duration: steno_duration: bare_unsigned dots { int l = 0; - if (!is_duration_b ($1)) + if (!is_is_duration ($1)) THIS->parser_error (_f ("not a duration: %d", $1)); else l = intlog2 ($1); @@ -1816,7 +1879,7 @@ tremolo_type: $$ =0; } | ':' bare_unsigned { - if (!is_duration_b ($2)) + if (!is_is_duration ($2)) THIS->parser_error (_f ("not a duration: %d", $2)); $$ = $2; } @@ -1845,27 +1908,27 @@ bass_mod: bass_figure: FIGURE_SPACE { - Music *bfr = MY_MAKE_MUSIC("BassFigureEvent"); - $$ = bfr->self_scm(); + Music *bfr = MY_MAKE_MUSIC ("BassFigureEvent"); + $$ = bfr->self_scm (); scm_gc_unprotect_object ($$); } | bass_number { - Music *bfr = MY_MAKE_MUSIC("BassFigureEvent"); - $$ = bfr->self_scm(); + Music *bfr = MY_MAKE_MUSIC ("BassFigureEvent"); + $$ = bfr->self_scm (); - bfr->set_mus_property ("figure", $1); + bfr->set_property ("figure", $1); scm_gc_unprotect_object ($$); } | bass_figure bass_mod { Music *m = unsmob_music ($1); if ($2) { - SCM salter =m->get_mus_property ("alteration"); - int alter = gh_number_p ( salter) ? gh_scm2int (salter) : 0; - m->set_mus_property ("alteration", + SCM salter =m->get_property ("alteration"); + int alter = gh_number_p (salter) ? gh_scm2int (salter) : 0; + m->set_property ("alteration", gh_int2scm (alter + $2)); } else { - m->set_mus_property ("alteration", gh_int2scm (0)); + m->set_property ("alteration", gh_int2scm (0)); } } ; @@ -1873,14 +1936,14 @@ bass_figure: br_bass_figure: '[' bass_figure { $$ = $2; - unsmob_music ($$)->set_mus_property ("bracket-start", SCM_BOOL_T); + unsmob_music ($$)->set_property ("bracket-start", SCM_BOOL_T); } | bass_figure { $$ = $1; } | br_bass_figure ']' { $$ = $1; - unsmob_music ($1)->set_mus_property ("bracket-stop", SCM_BOOL_T); + unsmob_music ($1)->set_property ("bracket-stop", SCM_BOOL_T); } ; @@ -1895,9 +1958,9 @@ figure_list: figure_spec: FIGURE_OPEN figure_list FIGURE_CLOSE { - Music * m = MY_MAKE_MUSIC("EventChord"); + Music * m = MY_MAKE_MUSIC ("EventChord"); $2 = scm_reverse_x ($2, SCM_EOL); - m->set_mus_property ("elements", $2); + m->set_property ("elements", $2); $$ = m->self_scm (); } ; @@ -1909,42 +1972,62 @@ optional_rest: ; simple_element: - pitch exclamations questions optional_notemode_duration optional_rest { + pitch exclamations questions oct_check optional_notemode_duration optional_rest { Input i = THIS->pop_spot (); - if (!THIS->lexer_->note_state_b ()) + if (!THIS->lexer_->is_note_state ()) THIS->parser_error (_ ("Have to be in Note mode for notes")); Music *n = 0; - if ($5) - n = MY_MAKE_MUSIC("RestEvent"); + if ($6) + n = MY_MAKE_MUSIC ("RestEvent"); else - n = MY_MAKE_MUSIC("NoteEvent"); + n = MY_MAKE_MUSIC ("NoteEvent"); - n->set_mus_property ("pitch", $1); - n->set_mus_property ("duration", $4); + n->set_property ("pitch", $1); + n->set_property ("duration", $5); + if (gh_number_p ($4)) + { + int q = gh_scm2int ($4); + n->set_property ("absolute-octave", gh_int2scm (q-1)); + } if ($3 % 2) - n->set_mus_property ("cautionary", SCM_BOOL_T); + n->set_property ("cautionary", SCM_BOOL_T); if ($2 % 2 || $3 % 2) - n->set_mus_property ("force-accidental", SCM_BOOL_T); + n->set_property ("force-accidental", SCM_BOOL_T); - Music *v = MY_MAKE_MUSIC("EventChord"); - v->set_mus_property ("elements", scm_list_n (n->self_scm (), SCM_UNDEFINED)); - scm_gc_unprotect_object (n->self_scm()); + 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; } + | 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); + + 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; + + } | figure_spec optional_notemode_duration { Music * m = unsmob_music ($1); Input i = THIS->pop_spot (); m->set_spot (i); - for (SCM s = m->get_mus_property ("elements"); gh_pair_p (s); s = ly_cdr (s)) + for (SCM s = m->get_property ("elements"); gh_pair_p (s); s = ly_cdr (s)) { - unsmob_music (ly_car (s))->set_mus_property ("duration", $2); + unsmob_music (ly_car (s))->set_property ("duration", $2); } $$ = m; } @@ -1954,51 +2037,50 @@ simple_element: Music * ev = 0; if (ly_scm2string ($1) =="s") { /* Space */ - ev = MY_MAKE_MUSIC("SkipEvent"); + ev = MY_MAKE_MUSIC ("SkipEvent"); } else { - ev = MY_MAKE_MUSIC("RestEvent"); + ev = MY_MAKE_MUSIC ("RestEvent"); } - ev->set_mus_property ("duration" ,$2); + ev->set_property ("duration" ,$2); ev->set_spot (i); - Music * velt = MY_MAKE_MUSIC("EventChord"); - velt->set_mus_property ("elements", scm_list_n (ev->self_scm (),SCM_UNDEFINED)); + Music * velt = MY_MAKE_MUSIC ("EventChord"); + velt->set_property ("elements", scm_list_1 (ev->self_scm ())); velt->set_spot (i); + scm_gc_unprotect_object (ev->self_scm ()); + $$ = velt; } | MULTI_MEASURE_REST optional_notemode_duration { THIS->pop_spot (); - static SCM proc ; - if (!proc) - proc = scm_c_eval_string ("make-multi-measure-rest"); - + SCM proc = ly_scheme_function ("make-multi-measure-rest"); SCM mus = scm_call_2 (proc, $2, - make_input (THIS->here_input())); + make_input (THIS->here_input ())); scm_gc_protect_object (mus); $$ = unsmob_music (mus); } | lyric_element optional_notemode_duration { Input i = THIS->pop_spot (); - if (!THIS->lexer_->lyric_state_b ()) + if (!THIS->lexer_->is_lyric_state ()) THIS->parser_error (_ ("Have to be in Lyric mode for lyrics")); - Music * lreq = MY_MAKE_MUSIC("LyricEvent"); - lreq->set_mus_property ("text", $1); - lreq->set_mus_property ("duration",$2); + Music * lreq = MY_MAKE_MUSIC ("LyricEvent"); + lreq->set_property ("text", $1); + lreq->set_property ("duration",$2); lreq->set_spot (i); - Music * velt = MY_MAKE_MUSIC("EventChord"); - velt->set_mus_property ("elements", scm_list_n (lreq->self_scm (), SCM_UNDEFINED)); + 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_->chord_state_b ()) + if (!THIS->lexer_->is_chord_state ()) THIS->parser_error (_ ("Have to be in Chord mode for chords")); $$ = unsmob_music ($1); } @@ -2036,10 +2118,10 @@ chord_separator: $$ = ly_symbol2scm ("chord-caret"); } | CHORD_SLASH steno_tonic_pitch { - $$ = scm_list_n (ly_symbol2scm ("chord-slash"), $2, SCM_UNDEFINED); + $$ = scm_list_2 (ly_symbol2scm ("chord-slash"), $2); } | CHORD_BASS steno_tonic_pitch { - $$ = scm_list_n (ly_symbol2scm ("chord-bass"), $2, SCM_UNDEFINED); + $$ = scm_list_2 (ly_symbol2scm ("chord-bass"), $2); } ; @@ -2164,7 +2246,7 @@ string: $$ = $1; } | string '+' string { - $$ = scm_string_append (scm_list_n ($1, $3, SCM_UNDEFINED)); + $$ = scm_string_append (scm_list_2 ($1, $3)); } ; @@ -2201,34 +2283,42 @@ markup: STRING { $$ = make_simple_markup ($1); } + | MARKUP_HEAD_EMPTY { + $$ = scm_list_1 ($1); + } | MARKUP_HEAD_MARKUP0 markup { - $$ = scm_list_n ($1, $2, SCM_UNDEFINED); + $$ = scm_list_2 ($1, $2); } | MARKUP_HEAD_MARKUP0_MARKUP1 markup markup { - $$ = scm_list_n ($1, $2, $3, SCM_UNDEFINED); + $$ = scm_list_3 ($1, $2, $3); } | MARKUP_HEAD_SCM0_MARKUP1 SCM_T markup { - $$ = scm_list_n ($1, $2, $3, SCM_UNDEFINED); + $$ = scm_list_3 ($1, $2, $3); } | markup_line { $$ = $1; } | MARKUP_HEAD_LIST0 markup_list { - $$ = scm_list_n ($1,$2, SCM_UNDEFINED); + $$ = scm_list_2 ($1,$2); } | MARKUP_HEAD_SCM0 embedded_scm { - $$ = scm_list_n ($1, $2, SCM_UNDEFINED); + $$ = scm_list_2 ($1, $2); } | MARKUP_HEAD_SCM0_SCM1_MARKUP2 embedded_scm embedded_scm markup { - $$ = scm_list_n ($1, $2, $3, $4, SCM_UNDEFINED); + $$ = scm_list_4 ($1, $2, $3, $4); } | MARKUP_HEAD_SCM0_SCM1_SCM2 embedded_scm embedded_scm embedded_scm { - $$ = scm_list_n ($1, $2, $3, $4, SCM_UNDEFINED); + $$ = scm_list_4 ($1, $2, $3, $4); + } + | MARKUP_HEAD_SCM0_SCM1 embedded_scm embedded_scm { + $$ = scm_list_3 ($1, $2, $3); } | MARKUP_IDENTIFIER { $$ = $1; } - + | STRING_IDENTIFIER { + $$ = $1; + } ; markup_list: @@ -2237,11 +2327,9 @@ markup_list: markup_line: '{' markup_list_body '}' { - static SCM line ; - if (!line) - line = scm_c_eval_string ("line-markup"); + SCM line = ly_scheme_function ("line-markup"); - $$ = scm_list_n (line, scm_reverse_x ($2, SCM_EOL), SCM_UNDEFINED); + $$ = scm_list_2 (line, scm_reverse_x ($2, SCM_EOL)); } ; @@ -2314,27 +2402,28 @@ My_lily_lexer::try_special_identifiers (SCM * destination, SCM sid) } else if (gh_number_p (sid)) { *destination = sid; return NUMBER_IDENTIFIER; - } else if (unsmob_translator_def (sid)) { - *destination = unsmob_translator_def (sid)->clone_scm(); - return TRANSLATOR_IDENTIFIER; + } else if (unsmob_context_def (sid)) { + *destination = unsmob_context_def (sid)->clone_scm (); + return CONTEXT_DEF_IDENTIFIER; } else if (unsmob_score (sid)) { Score *sc = new Score (*unsmob_score (sid)); *destination =sc->self_scm (); return SCORE_IDENTIFIER; } else if (Music * mus =unsmob_music (sid)) { - *destination = unsmob_music (sid)->clone ()->self_scm(); + mus = mus->clone (); + *destination = mus->self_scm (); unsmob_music (*destination)-> - set_mus_property ("origin", make_input (last_input_)); + set_property ("origin", make_input (last_input_)); return dynamic_cast (mus) ? EVENT_IDENTIFIER : MUSIC_IDENTIFIER; } else if (unsmob_duration (sid)) { - *destination = unsmob_duration (sid)->smobbed_copy(); + *destination = unsmob_duration (sid)->smobbed_copy (); return DURATION_IDENTIFIER; } else if (unsmob_music_output_def (sid)) { Music_output_def *p = unsmob_music_output_def (sid); p = p->clone (); - *destination = p->self_scm(); + *destination = p->self_scm (); return MUSIC_OUTPUT_DEF_IDENTIFIER; } else if (Text_item::markup_p (sid)) { *destination = sid; @@ -2357,29 +2446,29 @@ property_op_to_music (SCM op) if (tag == ly_symbol2scm ("assign")) { - m = MY_MAKE_MUSIC("PropertySet"); + m = MY_MAKE_MUSIC ("PropertySet"); val = gh_car (args); } else if (tag == ly_symbol2scm ("unset")) - m = MY_MAKE_MUSIC("PropertyUnset"); + m = MY_MAKE_MUSIC ("PropertyUnset"); else if (tag == ly_symbol2scm ("poppush") || tag == ly_symbol2scm ("push")) { - m = MY_MAKE_MUSIC("OverrideProperty"); + m = MY_MAKE_MUSIC ("OverrideProperty"); grob_sym = gh_car (args); grob_val = gh_cadr (args); } else if (tag == ly_symbol2scm ("pop")) { - m = MY_MAKE_MUSIC("RevertProperty"); + m = MY_MAKE_MUSIC ("RevertProperty"); grob_sym = gh_car (args); } - m->set_mus_property ("symbol", symbol); + m->set_property ("symbol", symbol); if (val != SCM_UNDEFINED) - m->set_mus_property ("value", val); + m->set_property ("value", val); if (grob_val != SCM_UNDEFINED) - m->set_mus_property ("grob-value", grob_val); + m->set_property ("grob-value", grob_val); if (grob_sym != SCM_UNDEFINED) { @@ -2389,13 +2478,13 @@ property_op_to_music (SCM op) bool autobeam = gh_equal_p (symbol, ly_symbol2scm ("autoBeamSettings")); if (autobeam) internal_type_checking_global_b = false; - m->set_mus_property ("grob-property", grob_sym); + m->set_property ("grob-property", grob_sym); if (autobeam) internal_type_checking_global_b = itc; } if (op == ly_symbol2scm ("poppush")) - m->set_mus_property ("pop-first", SCM_BOOL_T); + m->set_property ("pop-first", SCM_BOOL_T); return m; @@ -2404,16 +2493,17 @@ property_op_to_music (SCM op) Music* context_spec_music (SCM type, SCM id, Music * m, SCM ops) { - Music * csm = MY_MAKE_MUSIC("ContextSpeccedMusic"); + Music * csm = MY_MAKE_MUSIC ("ContextSpeccedMusic"); - csm->set_mus_property ("element", m->self_scm ()); + csm->set_property ("element", m->self_scm ()); scm_gc_unprotect_object (m->self_scm ()); - csm->set_mus_property ("context-type", scm_string_to_symbol (type)); - csm->set_mus_property ("property-operations", ops); + csm->set_property ("context-type", + gh_symbol_p (type) ? type : scm_string_to_symbol (type)); + csm->set_property ("property-operations", ops); if (gh_string_p (id)) - csm->set_mus_property ("context-id", id); + csm->set_property ("context-id", id); return csm; } @@ -2428,3 +2518,4 @@ get_next_unique_context () return scm_makfrom0str (s); } +