X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fparser.yy;h=54f23241c158488f37b723d3876d0b1ab373d155;hb=3f0c0f19dac072ad2ba39b254ef51962fc1c7353;hp=c7a905166c41759b000e5f08f1f3f93844af38d7;hpb=b02bb98ffea2c376ba67eb049b8ba6b04d76e084;p=lilypond.git diff --git a/lily/parser.yy b/lily/parser.yy index c7a905166c..54f23241c1 100644 --- a/lily/parser.yy +++ b/lily/parser.yy @@ -5,68 +5,100 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Han-Wen Nienhuys + (c) 1997--2003 Han-Wen Nienhuys Jan Nieuwenhuizen */ /* Two shift/reduce problems: - - - - + +1. foo = bar. + + "bar" -> String -> Lyric -> Music -> music-assignment + + "bar" -> String -> string-assignment + + +2. \repeat + \repeat .. \alternative + + + \repeat { \repeat .. \alternative } + +or + + \repeat { \repeat } \alternative + +) + +--hwn + */ /* -the rules for who is protecting what are very shady. TODO: uniformise -this. +TODO: + +* The rules for who is protecting what are very shady. Uniformise + this. +* There are too many lexical modes? */ #include -#include +#include + + #include "translator-def.hh" #include "lily-guile.hh" -#include "change-iterator.hh" #include "misc.hh" #include "my-lily-lexer.hh" #include "paper-def.hh" #include "midi-def.hh" #include "main.hh" #include "file-path.hh" -#include "debug.hh" +#include "warn.hh" #include "dimensions.hh" -#include "command-request.hh" -#include "musical-request.hh" #include "my-lily-parser.hh" -#include "context-specced-music.hh" #include "score.hh" -#include "music-list.hh" -#include "output-property-music-iterator.hh" -#include "property-iterator.hh" -#include "file-results.hh" +#include "input-file-results.hh" #include "input.hh" -#include "scope.hh" -#include "relative-music.hh" -#include "lyric-combine-music.hh" -#include "transposed-music.hh" -#include "time-scaled-music.hh" -#include "repeated-music.hh" -#include "untransposable-music.hh" #include "lilypond-input-version.hh" -#include "grace-music.hh" -#include "part-combine-music.hh" #include "scm-hash.hh" #include "auto-change-iterator.hh" -#include "un-relativable-music.hh" -#include "chord.hh" +#include "ly-modules.hh" +#include "music-sequence.hh" +#include "input-smob.hh" +#include "event.hh" +#include "text-item.hh" +#include "music-list.hh" + + +#define MY_MAKE_MUSIC(x) make_music_by_name (ly_symbol2scm (x)) + + + +#define YYERROR_VERBOSE 1 + +My_lily_parser* my_lily_parser; +#define YYPARSE_PARAM my_lily_parser +#define YYLEX_PARAM my_lily_parser +#define THIS\ + ((My_lily_parser *) my_lily_parser) + +#define yyerror THIS->parser_error + + + + bool regular_identifier_b (SCM id) { String str = ly_scm2string (id); - char const *s = str.ch_C() ; + char const *s = str.to_str0 () ; bool v = true; while (*s && v) @@ -77,19 +109,17 @@ regular_identifier_b (SCM id) return v; } - -Music* -set_property_music (SCM sym, SCM value) +SCM +make_simple_markup (SCM a) { - Music * p = new Music (SCM_EOL); - p->set_mus_property ("symbol", sym); - p->set_mus_property ("iterator-ctor", - Property_iterator::constructor_cxx_function); + static SCM simple; + if (!simple) + simple = scm_c_eval_string ("simple-markup"); - p->set_mus_property ("value", value); - return p; + return scm_list_n (simple, a, SCM_UNDEFINED); } + bool is_duration_b (int t) { @@ -105,64 +135,74 @@ set_music_properties (Music *p, SCM a) } } +SCM +make_chord_step (int step, int alter) +{ + if (step == 7) + alter--; + /* ugh: fucks up above 13 */ + Pitch m(step > 7 ? 1 : 0,(step - 1) % 7, alter); + return m.smobbed_copy (); +} +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 ch= scm_call_3 (chord_ctor, pitch, dur, modification_list); + scm_gc_protect_object (ch); + return ch; +} +/* + Todo: actually also use apply iso. call too ... +*/ +bool +ly_input_procedure_p (SCM x) +{ + return gh_procedure_p (x) + || (gh_pair_p (x) && gh_procedure_p (gh_car (x))); +} - -// needed for bison.simple's malloc () and free () -#include - -#ifndef NDEBUG -#define YYDEBUG 1 -#endif - -#define YYERROR_VERBOSE 1 - -#define YYPARSE_PARAM my_lily_parser_l -#define YYLEX_PARAM my_lily_parser_l -#define THIS\ - ((My_lily_parser *) my_lily_parser_l) - -#define yyerror THIS->parser_error -#define ARRAY_SIZE(a,s) if (a.size () != s) THIS->parser_error (_f ("Expecting %d arguments", s)) +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); + return p; +} %} +/* We use SCMs to do strings, because it saves us the trouble of +deleting them. Let's hope that a stack overflow doesnt trigger a move +of the parse stack onto the heap. */ -%union { - - Link_array *reqvec; - String *string; // needed by the lexer as temporary scratch area. +%union { + String * string; Music *music; Score *score; - Scope *scope; - Scheme_hash_table *scmhash; Music_output_def * outputdef; - - Request * request; - - /* We use SCMs to do strings, because it saves us the trouble of -deleting them. Let's hope that a stack overflow doesnt trigger a move -of the parse stack onto the heap. */ - SCM scm; - - Tempo_req *tempo; int i; } %{ int -yylex (YYSTYPE *s, void * v_l) +yylex (YYSTYPE *s, void * v) { - My_lily_parser *pars_l = (My_lily_parser*) v_l; - My_lily_lexer * lex_l = pars_l->lexer_p_; + My_lily_parser *pars = (My_lily_parser*) v; + My_lily_lexer * lex = pars->lexer_; - lex_l->lexval_l = (void*) s; - return lex_l->yylex (); + lex->lexval = (void*) s; + lex->prepare_for_next_token(); + return lex->yylex (); } @@ -173,18 +213,16 @@ yylex (YYSTYPE *s, void * v_l) /* tokens which are not keywords */ %token AUTOCHANGE %token ALIAS +%token APPLYCONTEXT +%token APPLYOUTPUT %token APPLY -%token ARPEGGIO -%token DYNAMICSCRIPT %token ACCEPTS %token ALTERNATIVE %token BAR %token BREATHE -%token CHORDMODIFIERS +%token CHORDMODIFIERS %token CHORDS -%token CHAR_T %token CLEF -%token CM_T %token CONSISTS %token DURATION %token SEQUENTIAL @@ -192,33 +230,29 @@ yylex (YYSTYPE *s, void * v_l) %token SIMULTANEOUS %token CONSISTSEND %token DENIES -%token DURATION +%token DESCRIPTION %token EXTENDER %token FIGURES FIGURE_OPEN FIGURE_CLOSE %token FIGURE_BRACKET_CLOSE FIGURE_BRACKET_OPEN -%token GLISSANDO %token GRACE %token HEADER %token HYPHEN -%token IN_T %token INVALID %token KEY %token LYRICS %token MARK %token MULTI_MEASURE_REST %token MIDI -%token MM_T %token PITCH %token DEFAULT %token NAME %token PITCHNAMES %token NOTES +%token ONCE %token PAPER %token PARTIAL -%token PENALTY %token PROPERTY %token OVERRIDE SET REVERT -%token PT_T %token RELATIVE %token REMOVE %token REPEAT @@ -226,10 +260,8 @@ yylex (YYSTYPE *s, void * v_l) %token PARTCOMBINE %token SCM_T %token SCORE -%token SCRIPT %token SKIP %token SPANREQUEST -%token STYLESHEET %token COMMANDSPANREQUEST %token TEMPO %token OUTPUTPROPERTY @@ -242,16 +274,21 @@ yylex (YYSTYPE *s, void * v_l) %token CONTEXT %token REST +%token CHORD_OPEN +%token CHORD_CLOSE + + /* escaped */ -%token E_CHAR E_EXCLAMATION E_SMALLER E_BIGGER E_OPEN E_CLOSE E_TILDE +%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 +%token E_UNSIGNED +%token CHORD_BASS CHORD_COLON CHORD_MINUS CHORD_CARET CHORD_SLASH %token FIGURE_SPACE - %type exclamations questions dots optional_rest -%type bass_number bass_mod -%type br_bass_figure bass_figure figure_list figure_spec +%type bass_mod +%type bass_number br_bass_figure bass_figure figure_list figure_spec %token DIGIT %token NOTENAME_PITCH %token TONICNAME_PITCH @@ -259,13 +296,14 @@ yylex (YYSTYPE *s, void * v_l) %token DURATION_IDENTIFIER %token FRACTION %token IDENTIFIER +%token CHORDNAMES +%token CHORD_MODIFIER %token SCORE_IDENTIFIER %token MUSIC_OUTPUT_DEF_IDENTIFIER - %token NUMBER_IDENTIFIER -%token REQUEST_IDENTIFIER +%token EVENT_IDENTIFIER %token MUSIC_IDENTIFIER TRANSLATOR_IDENTIFIER %token STRING_IDENTIFIER SCM_IDENTIFIER %token RESTNAME @@ -274,50 +312,65 @@ yylex (YYSTYPE *s, void * v_l) %token UNSIGNED %token REAL +%token MARKUP +%token MARKUP_HEAD_MARKUP0 +%token MARKUP_HEAD_MARKUP0_MARKUP1 +%token MARKUP_HEAD_SCM0 +%token MARKUP_HEAD_SCM0_MARKUP1 +%token MARKUP_HEAD_SCM0_SCM1 +%token MARKUP_HEAD_SCM0_SCM1_SCM2 +%token MARKUP_HEAD_SCM0_SCM1_MARKUP2 + +%token MARKUP_IDENTIFIER MARKUP_HEAD_LIST0 +%type markup markup_line markup_list markup_list_body full_markup + %type output_def -%type lilypond_header lilypond_header_body -%type open_request_parens close_request_parens open_request close_request -%type request_with_dir request_that_take_dir verbose_request +%type lilypond_header lilypond_header_body +%type open_event_parens close_event_parens open_event close_event +%type event_with_dir event_that_take_dir verbose_event %type sub_quotes sup_quotes -%type simple_element request_chord command_element Simple_music Composite_music +%type simple_element event_chord command_element Simple_music Composite_music %type Repeated_music %type Alternative_music %type tremolo_type %type bare_int bare_unsigned %type script_dir - %type identifier_init +%type note_chord_element chord_body chord_body_element +%type chord_body_elements %type steno_duration optional_notemode_duration multiplied_duration %type verbose_duration -%type pre_requests post_requests -%type gen_text_def -%type steno_pitch pitch absolute_pitch +%type post_events +%type gen_text_def +%type steno_pitch pitch absolute_pitch pitch_also_in_chords %type explicit_pitch steno_tonic_pitch -%type chord_additions chord_subtractions chord_notes chord_step -%type chord -%type chord_note chord_inversion chord_bass +/* %type chord_additions chord_subtractions chord_notes chord_step */ +/* %type chord */ +/* %type chord_note chord_inversion chord_bass */ %type duration_length fraction +%type new_chord step_number chord_items chord_item chord_separator step_numbers + %type embedded_scm scalar %type Music Sequential_music Simultaneous_music %type relative_music re_rhythmed_music part_combined_music -%type property_def translator_change +%type property_def translator_change simple_property_def %type Music_list %type music_output_def_body -%type shorthand_command_req -%type post_request +%type shorthand_command_req +%type post_event %type command_req verbose_command_req -%type extender_req -%type hyphen_req +%type extender_req +%type hyphen_req +%type string_event %type string bare_number number_expression number_term number_factor - %type score_block score_body %type translator_spec_block translator_spec_body -%type tempo_request +%type tempo_event %type notenames_body notenames_block chordmodifiers_block %type script_abbreviation @@ -336,37 +389,32 @@ lilypond: /* empty */ | lilypond toplevel_expression {} | lilypond assignment { } | lilypond error { - THIS->error_level_i_ = 1; + THIS->error_level_ = 1; } | lilypond INVALID { - THIS->error_level_i_ = 1; + THIS->error_level_ = 1; } ; toplevel_expression: notenames_block { - THIS->lexer_p_->pitchname_tab_ = $1; + THIS->lexer_->pitchname_tab_ = $1; } | chordmodifiers_block { - THIS->lexer_p_->chordmodifier_tab_ = $1; + THIS->lexer_->chordmodifier_tab_ = $1; } | lilypond_header { - if (global_header_p) - scm_gc_unprotect_object (global_header_p->self_scm ()); - global_header_p = $1; + THIS->input_file_->header_ = $1; } | score_block { - score_global_array.push ($1); + THIS->input_file_->scores_.push ($1); } | output_def { if (dynamic_cast ($1)) - THIS->lexer_p_->set_identifier ("$defaultpaper", $1->self_scm ()); + THIS->lexer_->set_identifier (scm_makfrom0str ("$defaultpaper"), $1->self_scm ()); else if (dynamic_cast ($1)) - THIS->lexer_p_->set_identifier ("$defaultmidi", $1->self_scm ()); + THIS->lexer_->set_identifier (scm_makfrom0str ("$defaultmidi"), $1->self_scm ()); } - | embedded_scm { - // junk value - } ; embedded_scm: @@ -390,32 +438,25 @@ notenames_body: 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); - if (!unsmob_pitch (pt)) - THIS->parser_error ("Need pitch object."); - else - scm_hashq_set_x (tab, ly_caar (s), pt); + scm_hashq_set_x (tab, ly_caar (s), pt); } - $$ = tab; } ; lilypond_header_body: { - $$ = new Scheme_hash_table; - - Scope *sc = new Scope ($$); - THIS->lexer_p_-> scope_l_arr_.push (sc); + $$ = ly_make_anonymous_module (); + THIS->lexer_->add_scope ($$); } | lilypond_header_body assignment { - + } ; lilypond_header: HEADER '{' lilypond_header_body '}' { - $$ = $3; - delete THIS->lexer_p_-> scope_l_arr_.pop (); + $$ = THIS->lexer_-> remove_scope(); } ; @@ -436,10 +477,10 @@ assignment: if (! regular_identifier_b ($1)) { - ip.warning (_ ("Identifier should have alphabetic characters only")); + ip.warning (_ ("Identifier should have alphabetic characters only")); } - THIS->lexer_p_->set_identifier (ly_scm2string ($1), $4); + THIS->lexer_->set_identifier ($1, $4); /* TODO: devise standard for protection in parser. @@ -449,6 +490,7 @@ all objects can be unprotected as soon as they're here. */ } + | embedded_scm { } ; @@ -458,6 +500,9 @@ identifier_init: $$ = $1->self_scm (); scm_gc_unprotect_object ($$); } + | full_markup { + $$ = $1; + } | output_def { $$ = $1->self_scm (); scm_gc_unprotect_object ($$); @@ -469,7 +514,7 @@ identifier_init: $$ = $1->self_scm (); scm_gc_unprotect_object ($$); } - | post_request { + | post_event { $$ = $1->self_scm (); scm_gc_unprotect_object ($$); } @@ -496,7 +541,7 @@ translator_spec_block: translator_spec_body: TRANSLATOR_IDENTIFIER { - $$ = unsmob_translator_def ($1)->clone_scm (); + $$ = $1; unsmob_translator_def ($$)-> set_spot (THIS->here_input ()); } | TYPE STRING { @@ -505,6 +550,9 @@ translator_spec_body: td->translator_group_type_ = $2; td->set_spot (THIS->here_input ()); } + | translator_spec_body DESCRIPTION string { + unsmob_translator_def ($$)->description_ = $3; + } | translator_spec_body STRING '=' embedded_scm { unsmob_translator_def ($$)->add_property_assign ($2, $4); } @@ -512,6 +560,10 @@ translator_spec_body: unsmob_translator_def ($$) ->add_push_property (scm_string_to_symbol ($2), $4, $6); } + | translator_spec_body STRING SET embedded_scm '=' embedded_scm { + unsmob_translator_def ($$) + ->add_push_property (scm_string_to_symbol ($2), $4, $6); + } | translator_spec_body STRING REVERT embedded_scm { unsmob_translator_def ($$)->add_pop_property ( scm_string_to_symbol ($2), $4); @@ -524,7 +576,7 @@ translator_spec_body: } | translator_spec_body ALIAS STRING { Translator_def*td = unsmob_translator_def ($$); - td->type_aliases_ = gh_cons ($3, td->type_aliases_); + td->type_aliases_ = scm_cons ($3, td->type_aliases_); } | translator_spec_body GROBDESCRIPTIONS embedded_scm { Translator_def*td = unsmob_translator_def($$); @@ -556,10 +608,10 @@ score_block: /*cont*/ '{' score_body '}' { THIS->pop_spot (); $$ = $4; - if (!$$->def_p_arr_.size ()) + if (!$$->defs_.size ()) { Music_output_def *id = - unsmob_music_output_def (THIS->lexer_p_->lookup_identifier ("$defaultpaper")); + unsmob_music_output_def (THIS->lexer_->lookup_identifier ("$defaultpaper")); $$->add_output (id ? id->clone () : new Paper_def ); } } @@ -572,15 +624,22 @@ score_body: $$->set_spot (THIS->here_input ()); SCM m = $1->self_scm (); scm_gc_unprotect_object (m); + + /* + guh. + */ + SCM check_funcs = scm_c_eval_string ("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 { - $$ = new Score (*unsmob_score ($1)); + $$ = unsmob_score ($1); $$->set_spot (THIS->here_input ()); } | score_body lilypond_header { - scm_gc_unprotect_object ($2->self_scm ()); - $$->header_p_ = $2; + $$->header_ = $2; } | score_body output_def { $$->add_output ($2); @@ -597,46 +656,46 @@ score_body: output_def: music_output_def_body '}' { $$ = $1; - THIS-> lexer_p_-> scope_l_arr_.pop (); + THIS-> lexer_-> remove_scope (); } ; music_output_def_body: MIDI '{' { - Music_output_def *id = unsmob_music_output_def (THIS->lexer_p_->lookup_identifier ("$defaultmidi")); + Music_output_def *id = unsmob_music_output_def (THIS->lexer_->lookup_identifier ("$defaultmidi")); - - Midi_def* p =0; - if (id) - p = dynamic_cast (id->clone ()); - else - p = new Midi_def; - $$ = p; - THIS->lexer_p_->scope_l_arr_.push (p->scope_p_); + Midi_def* p =0; + if (id) + p = dynamic_cast (id->clone ()); + else + p = new Midi_def; + + $$ = p; + THIS->lexer_->add_scope (p->scope_); } | PAPER '{' { - Music_output_def *id = unsmob_music_output_def (THIS->lexer_p_->lookup_identifier ("$defaultpaper")); + Music_output_def *id = unsmob_music_output_def (THIS->lexer_->lookup_identifier ("$defaultpaper")); Paper_def *p = 0; if (id) p = dynamic_cast (id->clone ()); else p = new Paper_def; - THIS-> lexer_p_-> scope_l_arr_.push (p->scope_p_); + + THIS->lexer_->add_scope (p->scope_); $$ = p; } | PAPER '{' MUSIC_OUTPUT_DEF_IDENTIFIER { - Music_output_def *p = unsmob_music_output_def ($3); - p = p->clone (); - THIS->lexer_p_->scope_l_arr_.push (p->scope_p_); - $$ = p; + Music_output_def * o = unsmob_music_output_def ($3); + $$ =o; + + THIS->lexer_->add_scope (o->scope_); } | MIDI '{' MUSIC_OUTPUT_DEF_IDENTIFIER { - Music_output_def *p = unsmob_music_output_def ($3); - p = p->clone (); + Music_output_def * o = unsmob_music_output_def ($3); + $$ = o; - THIS->lexer_p_->scope_l_arr_.push (p->scope_p_); - $$ = p; + THIS->lexer_->add_scope (o->scope_); } | music_output_def_body assignment { @@ -644,27 +703,26 @@ music_output_def_body: | music_output_def_body translator_spec_block { $$->assign_translator ($2); } - | music_output_def_body STYLESHEET embedded_scm { - dynamic_cast ($$)-> style_sheet_ = $3; - } - | music_output_def_body tempo_request { + | 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 ("duration")); - dynamic_cast ($$)->set_tempo (d->length_mom (), m); + Duration *d = unsmob_duration ($2->get_mus_property ("tempo-unit")); + Midi_def * md = dynamic_cast ($$); + if (md) + md->set_tempo (d->get_length (), m); } | music_output_def_body error { } ; -tempo_request: +tempo_event: TEMPO steno_duration '=' bare_unsigned { - $$ = new Tempo_req; - $$->set_mus_property ("duration", $2); + $$ = MY_MAKE_MUSIC("MetronomeChangeEvent"); + $$->set_mus_property ("tempo-unit", $2); $$->set_mus_property ("metronome-count", gh_int2scm ( $4)); } ; @@ -676,12 +734,13 @@ The representation of a list is the to have efficient append. */ -Music_list: /* empty */ { - $$ = gh_cons (SCM_EOL, SCM_EOL); +Music_list: + /* empty */ { + $$ = scm_cons (SCM_EOL, SCM_EOL); } | Music_list Music { SCM s = $$; - SCM c = gh_cons ($2->self_scm (), SCM_EOL); + SCM c = scm_cons ($2->self_scm (), SCM_EOL); scm_gc_unprotect_object ($2->self_scm ()); /* UGH */ if (gh_pair_p (ly_cdr (s))) gh_set_cdr_x (ly_cdr (s), c); /* append */ @@ -721,7 +780,14 @@ Repeated_music: alts = ly_truncate_list (times, alts); } - Repeated_music * r = new Repeated_music (SCM_EOL); + + static SCM proc; + if (!proc) + proc = scm_c_eval_string ("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 ()); @@ -730,64 +796,101 @@ Repeated_music: r->set_mus_property ("repeat-count", gh_int2scm (times >? 1)); r-> set_mus_property ("elements",alts); - SCM func = scm_primitive_eval (ly_symbol2scm ("repeat-name-to-ctor")); - SCM result = gh_call1 (func, $2); - - set_music_properties (r, result); + if (gh_equal_p ($2, scm_makfrom0str ("tremolo"))) { + /* + we can not get durations and other stuff correct down the line, so we have to + add to the duration log here. + */ + static SCM func; + + if (!func) + func = scm_primitive_eval (ly_symbol2scm ("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 (list_len != 2) + seq->origin ()->warning ("Chord tremolo must have 2 elements."); + shift -= 1; + r->compress (Moment (Rational (1,list_len))); + } + gh_call3 (func, r->self_scm (), gh_int2scm(shift),gh_int2scm(dots)); + } r->set_spot (*$4->origin ()); + $$ = r; } ; Sequential_music: SEQUENTIAL '{' Music_list '}' { - $$ = new Sequential_music (SCM_EOL); + $$ = MY_MAKE_MUSIC("SequentialMusic"); $$->set_mus_property ("elements", ly_car ($3)); + $$->set_spot(THIS->here_input()); } | '{' Music_list '}' { - $$ = new Sequential_music (SCM_EOL); + $$ = MY_MAKE_MUSIC("SequentialMusic"); $$->set_mus_property ("elements", ly_car ($2)); + $$->set_spot(THIS->here_input()); } ; Simultaneous_music: SIMULTANEOUS '{' Music_list '}'{ - $$ = new Simultaneous_music (SCM_EOL); + $$ = MY_MAKE_MUSIC("SimultaneousMusic"); $$->set_mus_property ("elements", ly_car ($3)); + $$->set_spot(THIS->here_input()); } | '<' Music_list '>' { - $$ = new Simultaneous_music (SCM_EOL); + $$ = MY_MAKE_MUSIC("SimultaneousMusic"); $$->set_mus_property ("elements", ly_car ($2)); + $$->set_spot(THIS->here_input()); } ; Simple_music: - request_chord { $$ = $1; } + event_chord { $$ = $1; } + | APPLYOUTPUT embedded_scm { + 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()); + } + | 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()); + } | OUTPUTPROPERTY embedded_scm embedded_scm '=' embedded_scm { SCM pred = $2; if (!gh_symbol_p ($3)) { THIS->parser_error (_ ("Second argument must be a symbol")); } - /*hould check # args */ + /* Should check # args */ if (!gh_procedure_p (pred)) { - THIS->parser_error (_ ("First argument must be a procedure taking 1 argument")); + THIS->parser_error (_ ("First argument must be a procedure taking one argument")); } - Music *m = new Music (SCM_EOL); + Music*m = MY_MAKE_MUSIC("OutputPropertySetMusic"); m->set_mus_property ("predicate", pred); m->set_mus_property ("grob-property", $3); m->set_mus_property ("grob-value", $5); - m->set_mus_property ("iterator-ctor", - Output_property_music_iterator::constructor_cxx_function); $$ = m; } | MUSIC_IDENTIFIER { - $$ = unsmob_music ($1)->clone (); + $$ = unsmob_music ($1); } | property_def | translator_change @@ -796,19 +899,20 @@ Simple_music: Composite_music: CONTEXT STRING Music { - Context_specced_music *csm = new Context_specced_music (SCM_EOL); + Music*csm =MY_MAKE_MUSIC("ContextSpeccedMusic"); + csm->set_mus_property ("element", $3->self_scm ()); scm_gc_unprotect_object ($3->self_scm ()); csm->set_mus_property ("context-type",$2); - csm->set_mus_property ("context-id", ly_str02scm ("")); + csm->set_mus_property ("context-id", scm_makfrom0str ("")); $$ = csm; } | AUTOCHANGE STRING Music { - Music * chm = new Music_wrapper (SCM_EOL); + Music*chm = MY_MAKE_MUSIC("AutoChangeMusic"); chm->set_mus_property ("element", $3->self_scm ()); - chm->set_mus_property ("iterator-ctor", Auto_change_iterator::constructor_cxx_function); + chm->set_mus_property ("iterator-ctor", Auto_change_iterator::constructor_proc); scm_gc_unprotect_object ($3->self_scm ()); chm->set_mus_property ("what", $2); @@ -823,39 +927,42 @@ Composite_music: Sequential_music_iterator in combination with grace notes. */ - SCM start = THIS->lexer_p_->lookup_identifier ("startGraceMusic"); - SCM stop = THIS->lexer_p_->lookup_identifier ("stopGraceMusic"); + SCM start = THIS->lexer_->lookup_identifier ("startGraceMusic"); + SCM stop = THIS->lexer_->lookup_identifier ("stopGraceMusic"); Music *startm = unsmob_music (start); Music *stopm = unsmob_music (stop); SCM ms = SCM_EOL; if (stopm) { stopm = stopm->clone (); - ms = gh_cons (stopm->self_scm (), ms); + ms = scm_cons (stopm->self_scm (), ms); scm_gc_unprotect_object (stopm->self_scm ()); } - ms = gh_cons ($2->self_scm (), ms); + ms = scm_cons ($2->self_scm (), ms); scm_gc_unprotect_object ($2->self_scm()); if (startm) { startm = startm->clone (); - ms = gh_cons (startm->self_scm () , ms); + ms = scm_cons (startm->self_scm () , ms); scm_gc_unprotect_object (startm->self_scm ()); } - Music* seq = new Sequential_music (SCM_EOL); + + Music* seq = MY_MAKE_MUSIC("SequentialMusic"); seq->set_mus_property ("elements", ms); - $$ = new Grace_music (SCM_EOL); + + $$ = MY_MAKE_MUSIC("GraceMusic"); $$->set_mus_property ("element", seq->self_scm ()); scm_gc_unprotect_object (seq->self_scm ()); #else - $$ = new Grace_music (SCM_EOL); + $$ = MY_MAKE_MUSIC("GraceMusic"); $$->set_mus_property ("element", $2->self_scm ()); scm_gc_unprotect_object ($2->self_scm ()); #endif } | CONTEXT string '=' string Music { - Context_specced_music *csm = new Context_specced_music (SCM_EOL); + Music * csm = MY_MAKE_MUSIC("ContextSpeccedMusic"); + csm->set_mus_property ("element", $5->self_scm ()); scm_gc_unprotect_object ($5->self_scm ()); @@ -873,7 +980,7 @@ Composite_music: { int n = gh_scm2int (ly_car ($3)); int d = gh_scm2int (ly_cdr ($3)); Music *mp = $4; - $$ = new Time_scaled_music (SCM_EOL); + $$= MY_MAKE_MUSIC("TimeScaledMusic"); $$->set_spot (THIS->pop_spot ()); @@ -887,66 +994,62 @@ Composite_music: | Repeated_music { $$ = $1; } | Simultaneous_music { $$ = $1; } | Sequential_music { $$ = $1; } - | TRANSPOSE pitch Music { - $$ = new Transposed_music (SCM_EOL); - Music *p = $3; - Pitch pit = *unsmob_pitch ($2); + | TRANSPOSE pitch_also_in_chords pitch_also_in_chords Music { + $$ = MY_MAKE_MUSIC("TransposedMusic"); + Music *p = $4; + Pitch from = *unsmob_pitch ($2); + Pitch to = *unsmob_pitch ($3); - p->transpose (pit); + p->transpose (interval (from, to)); $$->set_mus_property ("element", p->self_scm ()); scm_gc_unprotect_object (p->self_scm ()); } - | TRANSPOSE steno_tonic_pitch Music { - $$ = new Transposed_music (SCM_EOL); - Music *p = $3; - Pitch pit = *unsmob_pitch ($2); - - p->transpose (pit); - $$->set_mus_property ("element", p->self_scm ()); - scm_gc_unprotect_object (p->self_scm ()); - - } | APPLY embedded_scm Music { + if (!ly_input_procedure_p ($2)) + THIS->parser_error (_ ("\\apply takes function argument")); + SCM ret = gh_call1 ($2, $3->self_scm ()); Music *m = unsmob_music (ret); if (!m) { THIS->parser_error ("\\apply must return a Music"); - m = new Music (SCM_EOL); + m = MY_MAKE_MUSIC("Music"); } $$ = m; } | NOTES - { THIS->lexer_p_->push_note_state (); } + { THIS->lexer_->push_note_state (); } Music { $$ = $3; - THIS->lexer_p_->pop_state (); + THIS->lexer_->pop_state (); } | FIGURES - { THIS->lexer_p_->push_figuredbass_state (); } + { THIS->lexer_->push_figuredbass_state (); } Music { - Music * chm = new Untransposable_music () ; + Music * chm = MY_MAKE_MUSIC("UntransposableMusic"); chm->set_mus_property ("element", $3->self_scm ()); $$ = chm; + scm_gc_unprotect_object ($3->self_scm()); - THIS->lexer_p_->pop_state (); + THIS->lexer_->pop_state (); } | CHORDS - { THIS->lexer_p_->push_chord_state (); } + { THIS->lexer_->push_chord_state (); } Music { - Music * chm = new Un_relativable_music ; + Music * chm = MY_MAKE_MUSIC("UnrelativableMusic"); chm->set_mus_property ("element", $3->self_scm ()); + scm_gc_unprotect_object ($3->self_scm()); $$ = chm; - THIS->lexer_p_->pop_state (); + THIS->lexer_->pop_state (); } | LYRICS - { THIS->lexer_p_->push_lyric_state (); } + { THIS->lexer_->push_lyric_state (); } Music { $$ = $3; - THIS->lexer_p_->pop_state (); + THIS->lexer_->pop_state (); } | relative_music { $$ = $1; } | re_rhythmed_music { $$ = $1; } @@ -957,11 +1060,12 @@ relative_music: RELATIVE absolute_pitch Music { Music * p = $3; Pitch pit = *unsmob_pitch ($2); - $$ = new Relative_octave_music (SCM_EOL); + $$ = MY_MAKE_MUSIC("RelativeOctaveMusic"); $$->set_mus_property ("element", p->self_scm ()); scm_gc_unprotect_object (p->self_scm ()); + $$->set_mus_property ("last-pitch", p->to_relative_octave (pit).smobbed_copy ()); } @@ -969,7 +1073,7 @@ relative_music: re_rhythmed_music: ADDLYRICS Music Music { - Lyric_combine_music * l = new Lyric_combine_music (SCM_EOL); + Music*l =MY_MAKE_MUSIC("LyricCombineMusic"); l->set_mus_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 ()); @@ -979,8 +1083,7 @@ re_rhythmed_music: part_combined_music: PARTCOMBINE STRING Music Music { - Part_combine_music * p = new Part_combine_music (SCM_EOL); - + Music * p= MY_MAKE_MUSIC("PartCombineMusic"); p->set_mus_property ("what", $2); p->set_mus_property ("elements", gh_list ($3->self_scm (),$4->self_scm (), SCM_UNDEFINED)); @@ -993,9 +1096,7 @@ part_combined_music: translator_change: TRANSLATOR STRING '=' STRING { - Music * t = new Music (SCM_EOL); - t->set_mus_property ("iterator-ctor", - Change_iterator::constructor_cxx_function); + Music*t= MY_MAKE_MUSIC("TranslatorChange"); t-> set_mus_property ("change-to-type", $2); t-> set_mus_property ("change-to-id", $4); @@ -1005,12 +1106,20 @@ translator_change: ; property_def: + simple_property_def + | ONCE simple_property_def { + $$ = $2; + SCM e = $2->get_mus_property ("element"); + unsmob_music (e)->set_mus_property ("once", SCM_BOOL_T); + } + ; + +simple_property_def: PROPERTY STRING '.' STRING '=' scalar { - Music *t = set_property_music (scm_string_to_symbol ($4), $6); - Context_specced_music *csm = new Context_specced_music (SCM_EOL); + Music *csm = MY_MAKE_MUSIC("ContextSpeccedMusic"); - csm->set_mus_property ("element", t->self_scm ()); + csm->set_mus_property ("element", t->self_scm ()); scm_gc_unprotect_object (t->self_scm ()); $$ = csm; @@ -1019,13 +1128,11 @@ property_def: csm-> set_mus_property ("context-type", $2); } | PROPERTY STRING '.' STRING UNSET { - Music *t = new Music (SCM_EOL); - - t->set_mus_property ("iterator-ctor", - Property_unset_iterator::constructor_cxx_function); + + Music *t = MY_MAKE_MUSIC("PropertyUnset"); t->set_mus_property ("symbol", scm_string_to_symbol ($4)); - Context_specced_music *csm = new Context_specced_music (SCM_EOL); + Music *csm = MY_MAKE_MUSIC("ContextSpeccedMusic"); csm->set_mus_property ("element", t->self_scm ()); scm_gc_unprotect_object (t->self_scm ()); @@ -1035,14 +1142,20 @@ property_def: csm-> set_mus_property ("context-type", $2); } | PROPERTY STRING '.' STRING SET embedded_scm '=' embedded_scm { - Music *t = new Music (SCM_EOL); - t->set_mus_property ("iterator-ctor", - Push_property_iterator::constructor_cxx_function); + bool autobeam + = gh_equal_p ($4, scm_makfrom0str ("autoBeamSettings")); + bool itc = internal_type_checking_global_b; + Music *t = MY_MAKE_MUSIC("OverrideProperty"); t->set_mus_property ("symbol", scm_string_to_symbol ($4)); t->set_mus_property ("pop-first", SCM_BOOL_T); + if (autobeam) + internal_type_checking_global_b = false; t->set_mus_property ("grob-property", $6); + if (autobeam) + internal_type_checking_global_b = itc; t->set_mus_property ("grob-value", $8); - Context_specced_music *csm = new Context_specced_music (SCM_EOL); + + Music *csm = MY_MAKE_MUSIC("ContextSpeccedMusic"); csm->set_mus_property ("element", t->self_scm ()); scm_gc_unprotect_object (t->self_scm ()); $$ = csm; @@ -1050,14 +1163,26 @@ property_def: csm-> set_mus_property ("context-type", $2); } - | PROPERTY STRING '.' STRING OVERRIDE embedded_scm '=' embedded_scm { - Music *t = new Music (SCM_EOL); - t->set_mus_property ("iterator-ctor", - Push_property_iterator::constructor_cxx_function); + | PROPERTY STRING '.' STRING OVERRIDE + embedded_scm '=' embedded_scm + { + /* + UGH UGH UGH UGH. + */ + bool autobeam + = gh_equal_p ($4, scm_makfrom0str ("autoBeamSettings")); + bool itc = internal_type_checking_global_b; + + Music *t = MY_MAKE_MUSIC("OverrideProperty"); t->set_mus_property ("symbol", scm_string_to_symbol ($4)); + if (autobeam) + internal_type_checking_global_b = false; t->set_mus_property ("grob-property", $6); t->set_mus_property ("grob-value", $8); - Context_specced_music *csm = new Context_specced_music (SCM_EOL); + if (autobeam) + internal_type_checking_global_b = itc; + + Music *csm = MY_MAKE_MUSIC("ContextSpeccedMusic"); csm->set_mus_property ("element", t->self_scm ()); scm_gc_unprotect_object (t->self_scm ()); @@ -1065,15 +1190,22 @@ property_def: $$->set_spot (THIS->here_input ()); csm-> set_mus_property ("context-type", $2); + } | PROPERTY STRING '.' STRING REVERT embedded_scm { - Music *t = new Music (SCM_EOL); - t->set_mus_property ("iterator-ctor", - Pop_property_iterator::constructor_cxx_function); + Music *t = MY_MAKE_MUSIC("RevertProperty"); + bool autobeam + = gh_equal_p ($4, scm_makfrom0str ("autoBeamSettings")); + bool itc = internal_type_checking_global_b; + t->set_mus_property ("symbol", scm_string_to_symbol ($4)); + if (autobeam) + internal_type_checking_global_b = false; t->set_mus_property ("grob-property", $6); - - Context_specced_music *csm = new Context_specced_music (SCM_EOL); + if (autobeam) + internal_type_checking_global_b = itc; + + Music *csm = MY_MAKE_MUSIC("ContextSpeccedMusic"); csm->set_mus_property ("element", t->self_scm ()); scm_gc_unprotect_object (t->self_scm ()); @@ -1084,128 +1216,182 @@ property_def: } ; + scalar: - string { $$ = $1; } - | bare_int { $$ = gh_int2scm ($1); } - | embedded_scm { $$ = $1; } - ; + string { $$ = $1; } + | bare_int { $$ = gh_int2scm ($1); } + | embedded_scm { $$ = $1; } + | full_markup { $$ = $1; } + | DIGIT { $$ = gh_int2scm ($1); } + ; + + + +/* +This is a trick: + +Adding pre_events to the simple_element +makes the choice between + + string: STRING + +and + + simple_element: STRING +a single shift/reduction conflict. -request_chord: - pre_requests { +nevertheless, this is not very clean, and we should find a different +solution. + +*/ +pre_events: { THIS->push_spot (); - } /*cont */ simple_element post_requests { - Music_sequence *l = dynamic_cast ($3); - - $1->concat (*$4); - for (int i=0; i < $1->size (); i++) { - Music * m = $1->elem (i); - l->append_music (m); - } - $$ = $3; + } + ; - delete $1; - delete $4; +event_chord: + pre_events simple_element post_events { + SCM elts = $2-> get_mus_property ("elements"); + + elts = gh_append2 (elts, scm_reverse_x ($3, SCM_EOL)); + + $2->set_mus_property ("elements", elts); + $$ = $2; } | command_element + | note_chord_element + ; + + +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 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); + es = gh_append2 (es, postevs); + + $1-> set_mus_property ("elements", es); + $$ = $1; + } + ; + +chord_body: + CHORD_OPEN chord_body_elements CHORD_CLOSE + { + $$ = MY_MAKE_MUSIC("EventChord"); + $$->set_mus_property ("elements", + scm_reverse_x ($2, SCM_EOL)); + } + ; + +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()); + } + ; + +chord_body_element: + pitch exclamations questions post_events + { + Music * n = MY_MAKE_MUSIC("NoteEvent"); + n->set_mus_property ("pitch", $1); + if ($3 % 2) + n->set_mus_property ("cautionary", SCM_BOOL_T); + if ($2 % 2 || $3 % 2) + n->set_mus_property ("force-accidental", SCM_BOOL_T); + + SCM arts = scm_reverse_x ($4, SCM_EOL); + n->set_mus_property ("articulations", arts); + + $$ = n; + } ; command_element: command_req { - $$ = new Request_chord (SCM_EOL); - $$->set_mus_property ("elements", gh_cons ($1->self_scm (), SCM_EOL)); + $$ = MY_MAKE_MUSIC("EventChord"); + $$->set_mus_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 ()); } + | E_LEFTSQUARE { + Music *l = MY_MAKE_MUSIC("LigatureEvent"); + l->set_mus_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()); + $$->set_spot (THIS->here_input ()); + } + | E_RIGHTSQUARE { + Music *l = MY_MAKE_MUSIC("LigatureEvent"); + l->set_mus_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)); + $$->set_spot (THIS->here_input ()); + scm_gc_unprotect_object (l->self_scm()); + } | E_BACKSLASH { - $$ = new Music (gh_list (gh_cons (ly_symbol2scm ("name"), ly_symbol2scm ("separator")), SCM_UNDEFINED)); + $$ = MY_MAKE_MUSIC("VoiceSeparator"); $$->set_spot (THIS->here_input ()); } | '|' { - extern Music * get_barcheck(); - $$ = get_barcheck (); + $$ = MY_MAKE_MUSIC("BarCheck"); $$->set_spot (THIS->here_input ()); } | BAR STRING { Music *t = set_property_music (ly_symbol2scm ("whichBar"), $2); - Context_specced_music *csm = new Context_specced_music (SCM_EOL); + 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 ()); - csm->set_mus_property ("context-type", ly_str02scm ("Score")); + csm->set_mus_property ("context-type", scm_makfrom0str ("Timing")); } | PARTIAL duration_length { - Moment m = - unsmob_duration ($2)->length_mom (); + Moment m = - unsmob_duration ($2)->get_length (); Music * p = set_property_music (ly_symbol2scm ( "measurePosition"),m.smobbed_copy ()); - Context_specced_music * sp = new Context_specced_music (SCM_EOL); + 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_str02scm ( "Score")); + sp-> set_mus_property ("context-type", scm_makfrom0str ("Timing")); } | CLEF STRING { - SCM func = scm_primitive_eval (ly_symbol2scm ("clef-name-to-properties")); - SCM result = gh_call1 (func, $2); - - SCM l = SCM_EOL; - for (SCM s = result ; gh_pair_p (s); s = ly_cdr (s)) { - Music * p = new Music (SCM_EOL); - set_music_properties (p, ly_car (s)); - l = gh_cons (p->self_scm (), l); - scm_gc_unprotect_object (p->self_scm ()); - } - Sequential_music * seq = new Sequential_music (SCM_EOL); - seq->set_mus_property ("elements", l); + static SCM proc ; + if (!proc) + proc = scm_c_eval_string ("make-clef-set"); - Context_specced_music * sp = new Context_specced_music (SCM_EOL); - sp->set_mus_property ("element", seq->self_scm ()); - scm_gc_unprotect_object (seq->self_scm ()); - - $$ =sp ; - sp-> set_mus_property ("context-type", ly_str02scm ("Staff")); + SCM result = scm_call_1 (proc, $2); + scm_gc_protect_object (result); + $$ = unsmob_music (result); } | TIME_T fraction { - Music * p1 = set_property_music (ly_symbol2scm ( "timeSignatureFraction"), $2); - - int l = gh_scm2int (ly_car ($2)); - int o = gh_scm2int (ly_cdr ($2)); - - Moment one_beat = Moment (1)/Moment (o); - Moment len = Moment (l) * one_beat; - - - Music *p2 = set_property_music (ly_symbol2scm ("measureLength"), len.smobbed_copy ()); - Music *p3 = set_property_music (ly_symbol2scm ("beatLength"), one_beat.smobbed_copy ()); + static SCM proc; + if (!proc) + proc = scm_c_eval_string ("make-time-signature-set"); - SCM list = scm_list_n (p1->self_scm (), p2->self_scm (), p3->self_scm(), SCM_UNDEFINED); - Sequential_music *seq = new Sequential_music (SCM_EOL); - seq->set_mus_property ("elements", list); - - - Context_specced_music * sp = new Context_specced_music (SCM_EOL); - sp->set_mus_property ("element", seq->self_scm ()); - - - - scm_gc_unprotect_object (p3->self_scm ()); - scm_gc_unprotect_object (p2->self_scm ()); - scm_gc_unprotect_object (p1->self_scm ()); - scm_gc_unprotect_object (seq->self_scm ()); - - $$ = sp; - -/* - TODO: should make alias TimingContext for Score -*/ - - sp-> set_mus_property ("context-type", ly_str02scm ( "Score")); + SCM result = scm_apply_2 (proc, gh_car ($2), gh_cdr ($2), SCM_EOL); + scm_gc_protect_object (result); + $$ = unsmob_music (result); } ; @@ -1222,104 +1408,131 @@ shorthand_command_req: $$ = $1; } | '~' { - $$ = new Tie_req; + $$ = MY_MAKE_MUSIC("TieEvent"); } | '[' { - Span_req*b= new Span_req; - b->set_span_dir (START); - b->set_mus_property ("span-type", ly_str02scm ("beam")); - $$ =b; - + Music *b= MY_MAKE_MUSIC("BeamEvent"); + b->set_mus_property ("span-direction", gh_int2scm (START)); + $$ = b; THIS->last_beam_start_ = b->self_scm (); } | ']' { - Span_req*b= new Span_req; - b->set_span_dir ( STOP); - b->set_mus_property ("span-type", ly_str02scm ("beam")); + Music *b= MY_MAKE_MUSIC("BeamEvent"); + b->set_mus_property ("span-direction", gh_int2scm (STOP)); $$ = b; } | BREATHE { - $$ = new Breathing_sign_req; + $$ = MY_MAKE_MUSIC("BreathingSignEvent"); } | E_TILDE { - $$ = new Porrectus_req; + $$ = MY_MAKE_MUSIC("PesOrFlexaEvent"); } ; verbose_command_req: - COMMANDSPANREQUEST bare_int STRING { /*TODO: junkme */ - Span_req * sp_p = new Span_req; - sp_p-> set_span_dir ( Direction ($2)); - sp_p->set_mus_property ("span-type",$3); - sp_p->set_spot (THIS->here_input ()); - $$ = sp_p; - } - | MARK DEFAULT { - Mark_req * m = new Mark_req; + MARK DEFAULT { + Music * m = MY_MAKE_MUSIC("MarkEvent"); $$ = m; } | MARK scalar { - Mark_req *m = new Mark_req; + Music *m = MY_MAKE_MUSIC("MarkEvent"); m->set_mus_property ("label", $2); $$ = m; - - } - | PENALTY SCM_T { - Break_req * b = new Break_req; - SCM s = $2; - if (!gh_number_p (s)) - s =gh_int2scm (0); - - b->set_mus_property ("penalty", s); - b->set_spot (THIS->here_input ()); - $$ = b; } | SKIP duration_length { - Skip_req * skip_p = new Skip_req; - skip_p->set_mus_property ("duration", $2); + Music * skip = MY_MAKE_MUSIC("SkipEvent"); + skip->set_mus_property ("duration", $2); - $$ = skip_p; + $$ = skip; } - | tempo_request { + | tempo_event { $$ = $1; } | KEY DEFAULT { - Key_change_req *key_p= new Key_change_req; - $$ = key_p; + Music *key= MY_MAKE_MUSIC("KeyChangeEvent"); + $$ = key; } | KEY NOTENAME_PITCH SCM_IDENTIFIER { - Key_change_req *key_p= new Key_change_req; - - key_p->set_mus_property ("pitch-alist", $3); - ((Music*)key_p)->transpose (* unsmob_pitch ($2)); - $$ = key_p; + + 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()); + ((Music*)key)->transpose (* unsmob_pitch ($2)); + } else { + THIS->parser_error (_("Second argument must be pitch list.")); + } + + $$ = key; } ; -post_requests: - { - $$ = new Link_array; +post_events: + /* empty */ { + $$ = SCM_EOL; } - | post_requests post_request { + | post_events post_event { $2->set_spot (THIS->here_input ()); - $$->push ($2); + $$ = gh_cons ($2->self_scm(), $$); + scm_gc_unprotect_object ($2->self_scm()); } ; -post_request: - verbose_request - | request_with_dir - | close_request +post_event: + verbose_event + | event_with_dir + | close_event + | string_event ; +string_event: + E_UNSIGNED { + Music * s = MY_MAKE_MUSIC("StringNumberEvent"); + s->set_mus_property ("string-number", gh_int2scm($1)); + s->set_spot (THIS->here_input ()); + $$ = s; + } + ; -request_that_take_dir: + +event_that_take_dir: gen_text_def - | verbose_request + | verbose_event + | close_event + | open_event + | '[' { + + +/* + +TODO: should take all these defs out of the parser, adn make use +configurable, i.e. + + +(set-articulation '~ "trill") + +*/ + Music * m = MY_MAKE_MUSIC ("NewBeamEvent"); + m->set_spot (THIS->here_input()); + m->set_mus_property ("span-direction" , gh_int2scm (START)); + $$ = m; + } + | ']' { + Music * m = MY_MAKE_MUSIC ("NewBeamEvent"); + m->set_spot (THIS->here_input()); + m->set_mus_property ("span-direction" , gh_int2scm (STOP)); + $$ = m; + } + | '~' { + Music * m = MY_MAKE_MUSIC ("NewTieEvent"); + m->set_spot (THIS->here_input()); + $$ = m; + } | script_abbreviation { - SCM s = THIS->lexer_p_->lookup_identifier ("dash" + ly_scm2string ($1)); - Articulation_req *a = new Articulation_req; + SCM s = THIS->lexer_->lookup_identifier ("dash" + ly_scm2string ($1)); + Music *a = MY_MAKE_MUSIC("ArticulationEvent"); if (gh_string_p (s)) a->set_mus_property ("articulation-type", s); else THIS->parser_error (_ ("Expecting string as script definition")); @@ -1327,64 +1540,23 @@ request_that_take_dir: } ; -request_with_dir: - script_dir request_that_take_dir { - if (Script_req * gs = dynamic_cast ($2)) - gs->set_direction (Direction ($1)); - else if ($1) - $2->origin ()->warning (_ ("Can't specify direction for this request")); +event_with_dir: + script_dir event_that_take_dir { + $2->set_mus_property ("direction", gh_int2scm ($1)); $$ = $2; } ; -verbose_request: - REQUEST_IDENTIFIER { - $$ = dynamic_cast (unsmob_music ($1)->clone ()); - $$->set_spot (THIS->here_input ()); - } - | DYNAMICSCRIPT embedded_scm { - /* - TODO: junkme, use text-type == dynamic - */ - Text_script_req *d = new Text_script_req; - SCM dyn = ly_symbol2scm ("dynamic"); - d->set_mus_property ("text-type" , dyn); - d->set_mus_property ("text", $2); - d->set_spot (THIS->here_input ()); - $$ = d; - } - | SPANREQUEST bare_int STRING { - Span_req * sp_p = new Span_req; - sp_p->set_span_dir ( Direction ($2)); - sp_p->set_mus_property ("span-type", $3); - sp_p->set_spot (THIS->here_input ()); - $$ = sp_p; +verbose_event: + EVENT_IDENTIFIER { + $$ = unsmob_music ($1); } | tremolo_type { - Tremolo_req* a = new Tremolo_req; + Music * a = MY_MAKE_MUSIC("TremoloEvent"); a->set_spot (THIS->here_input ()); a->set_mus_property ("tremolo-type", gh_int2scm ($1)); $$ = a; } - | SCRIPT STRING { - Articulation_req * a = new Articulation_req; - a->set_mus_property ("articulation-type", $2); - a->set_spot (THIS->here_input ()); - $$ = a; - } - /* -duh, junk this syntax from the parser, if possible. - */ - | ARPEGGIO { - Arpeggio_req *a = new Arpeggio_req; - a->set_spot (THIS->here_input ()); - $$ = a; - } - | GLISSANDO { - Glissando_req *g = new Glissando_req; - g->set_spot /* No pun intended */ (THIS->here_input ()); - $$ = g; - } ; sup_quotes: @@ -1411,15 +1583,13 @@ steno_pitch: } | NOTENAME_PITCH sup_quotes { Pitch p = *unsmob_pitch ($1); - p.octave_i_ += $2; + p = p.transposed (Pitch ($2,0,0)); $$ = p.smobbed_copy (); } | NOTENAME_PITCH sub_quotes { Pitch p =* unsmob_pitch ($1); - - p.octave_i_ += -$2; + p = p.transposed (Pitch (-$2,0,0)); $$ = p.smobbed_copy (); - } ; @@ -1433,15 +1603,14 @@ steno_tonic_pitch: } | TONICNAME_PITCH sup_quotes { Pitch p = *unsmob_pitch ($1); - p.octave_i_ += $2; + p = p.transposed (Pitch ($2,0,0)); $$ = p.smobbed_copy (); } | TONICNAME_PITCH sub_quotes { Pitch p =* unsmob_pitch ($1); - p.octave_i_ += -$2; + p = p.transposed (Pitch (-$2,0,0)); $$ = p.smobbed_copy (); - } ; @@ -1454,6 +1623,11 @@ pitch: } ; +pitch_also_in_chords: + pitch + | steno_tonic_pitch + ; + explicit_pitch: PITCH embedded_scm { $$ = $2; @@ -1477,95 +1651,104 @@ verbose_duration: extender_req: EXTENDER { - if (!THIS->lexer_p_->lyric_state_b ()) + if (!THIS->lexer_->lyric_state_b ()) THIS->parser_error (_ ("Have to be in Lyric mode for lyrics")); - $$ = new Extender_req; + $$ = MY_MAKE_MUSIC("ExtenderEvent"); } ; hyphen_req: HYPHEN { - if (!THIS->lexer_p_->lyric_state_b ()) + if (!THIS->lexer_->lyric_state_b ()) THIS->parser_error (_ ("Have to be in Lyric mode for lyrics")); - $$ = new Hyphen_req; + $$ = MY_MAKE_MUSIC("HyphenEvent"); } ; -close_request: - close_request_parens { +close_event: + close_event_parens { $$ = $1; - dynamic_cast ($$)->set_span_dir ( START); + dynamic_cast ($$)->set_mus_property ("span-direction", gh_int2scm (START)) +; } - -close_request_parens: + ; + +close_event_parens: '(' { - Span_req* s= new Span_req; + Music * s= MY_MAKE_MUSIC("SlurEvent"); $$ = s; - s->set_mus_property ("span-type", ly_str02scm ( "slur")); + s->set_spot (THIS->here_input()); } | E_OPEN { - Span_req* s= new Span_req; + Music * s= MY_MAKE_MUSIC("PhrasingSlurEvent"); $$ = s; - s->set_mus_property ("span-type", ly_str02scm ( "phrasing-slur")); + s->set_spot (THIS->here_input()); } | E_SMALLER { - Span_req*s =new Span_req; + Music *s =MY_MAKE_MUSIC("CrescendoEvent"); $$ = s; - s->set_mus_property ("span-type", ly_str02scm ( "crescendo")); + s->set_spot (THIS->here_input()); } | E_BIGGER { - Span_req*s =new Span_req; + Music *s =MY_MAKE_MUSIC("DecrescendoEvent"); $$ = s; - s->set_mus_property ("span-type", ly_str02scm ("decrescendo")); + s->set_spot (THIS->here_input()); } ; -open_request: - open_request_parens { +open_event: + open_event_parens { $$ = $1; - dynamic_cast ($$)->set_span_dir (STOP); + dynamic_cast ($$)->set_mus_property ("span-direction", gh_int2scm (STOP)) +; } ; -open_request_parens: +open_event_parens: E_EXCLAMATION { - Span_req *s = new Span_req; - s->set_mus_property ("span-type", ly_str02scm ( "crescendo")); + Music *s = MY_MAKE_MUSIC("CrescendoEvent"); + s->set_spot (THIS->here_input()); $$ = s; } | ')' { - Span_req* s= new Span_req; + Music * s= MY_MAKE_MUSIC("SlurEvent"); $$ = s; - s->set_mus_property ("span-type", ly_str02scm ( "slur")); + s->set_spot (THIS->here_input()); + } | E_CLOSE { - Span_req* s= new Span_req; + Music * s= MY_MAKE_MUSIC("PhrasingSlurEvent"); $$ = s; - s->set_mus_property ("span-type", ly_str02scm ( "phrasing-slur")); + s->set_mus_property ("span-type", scm_makfrom0str ( "phrasing-slur")); + s->set_spot (THIS->here_input()); } ; gen_text_def: embedded_scm { - Text_script_req *t = new Text_script_req; + Music *t = MY_MAKE_MUSIC("TextScriptEvent"); t->set_mus_property ("text", $1); t->set_spot (THIS->here_input ()); $$ = t; } - | string { - Text_script_req *t = new Text_script_req; + | full_markup { + Music *t = MY_MAKE_MUSIC("TextScriptEvent"); t->set_mus_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)); + t->set_spot (THIS->here_input ()); $$ = t; + } | DIGIT { - String ds = to_str ($1); - Text_script_req* t = new Text_script_req; - SCM finger = ly_symbol2scm ("finger"); - t->set_mus_property ("text", ly_str02scm (ds.ch_C ())); - t->set_mus_property ("text-type" , finger); + Music * t = MY_MAKE_MUSIC("FingerEvent"); + t->set_mus_property ("digit", gh_int2scm ($1)); t->set_spot (THIS->here_input ()); $$ = t; } @@ -1573,22 +1756,25 @@ gen_text_def: script_abbreviation: '^' { - $$ = gh_str02scm ("Hat"); + $$ = scm_makfrom0str ("Hat"); } | '+' { - $$ = gh_str02scm ("Plus"); + $$ = scm_makfrom0str ("Plus"); } | '-' { - $$ = gh_str02scm ("Dash"); + $$ = scm_makfrom0str ("Dash"); } | '|' { - $$ = gh_str02scm ("Bar"); + $$ = scm_makfrom0str ("Bar"); } | '>' { - $$ = gh_str02scm ("Larger"); + $$ = scm_makfrom0str ("Larger"); } | '.' { - $$ = gh_str02scm ("Dot"); + $$ = scm_makfrom0str ("Dot"); + } + | '_' { + $$ = scm_makfrom0str ("Underscore"); } ; @@ -1598,14 +1784,6 @@ script_dir: | '-' { $$ = CENTER; } ; -pre_requests: - { - $$ = new Link_array; - } - | pre_requests open_request { - $$->push ($2); - } - ; absolute_pitch: steno_pitch { @@ -1654,7 +1832,9 @@ steno_duration: | DURATION_IDENTIFIER dots { Duration *d =unsmob_duration ($1); Duration k (d->duration_log (),d->dot_count () + $2); - $$ = k.smobbed_copy (); + + *d = k; + $$ = $1; } ; @@ -1678,7 +1858,7 @@ multiplied_duration: fraction: FRACTION { $$ = $1; } | UNSIGNED '/' UNSIGNED { - $$ = gh_cons (gh_int2scm ($1), gh_int2scm ($3)); + $$ = scm_cons (gh_int2scm ($1), gh_int2scm ($3)); } ; @@ -1704,9 +1884,18 @@ tremolo_type: ; + +/***************************************************************** + BASS FIGURES +*****************************************************************/ bass_number: - DIGIT - | UNSIGNED + DIGIT { + $$ = scm_number_to_string (gh_int2scm ($1), gh_int2scm (10)); + } + | UNSIGNED { + $$ = scm_number_to_string (gh_int2scm ($1), gh_int2scm (10)); + } + | STRING { $$ = $1 } ; bass_mod: @@ -1717,15 +1906,15 @@ bass_mod: bass_figure: FIGURE_SPACE { - Bass_figure_req *bfr = new Bass_figure_req; + Music *bfr = MY_MAKE_MUSIC("BassFigureEvent"); $$ = bfr->self_scm(); scm_gc_unprotect_object ($$); } | bass_number { - Bass_figure_req *bfr = new Bass_figure_req; + Music *bfr = MY_MAKE_MUSIC("BassFigureEvent"); $$ = bfr->self_scm(); - bfr->set_mus_property ("figure", gh_int2scm ($1)); + bfr->set_mus_property ("figure", $1); scm_gc_unprotect_object ($$); } @@ -1733,7 +1922,7 @@ bass_figure: Music *m = unsmob_music ($1); if ($2) { SCM salter =m->get_mus_property ("alteration"); - int alter = gh_number_p( salter) ? gh_scm2int (salter) : 0; + int alter = gh_number_p ( salter) ? gh_scm2int (salter) : 0; m->set_mus_property ("alteration", gh_int2scm (alter + $2)); } else { @@ -1744,12 +1933,14 @@ bass_figure: br_bass_figure: '[' bass_figure { - unsmob_music ($2)->set_mus_property ("bracket-start", SCM_BOOL_T); + $$ = $2; + unsmob_music ($$)->set_mus_property ("bracket-start", SCM_BOOL_T); } | bass_figure { - + $$ = $1; } | br_bass_figure ']' { + $$ = $1; unsmob_music ($1)->set_mus_property ("bracket-stop", SCM_BOOL_T); } ; @@ -1759,13 +1950,13 @@ figure_list: $$ = SCM_EOL; } | figure_list br_bass_figure { - $$ = gh_cons ($2, $1); + $$ = scm_cons ($2, $1); } ; figure_spec: FIGURE_OPEN figure_list FIGURE_CLOSE { - Music * m = new Request_chord (SCM_EOL); + Music * m = MY_MAKE_MUSIC("EventChord"); $2 = scm_reverse_x ($2, SCM_EOL); m->set_mus_property ("elements", $2); $$ = m->self_scm (); @@ -1782,14 +1973,14 @@ simple_element: pitch exclamations questions optional_notemode_duration optional_rest { Input i = THIS->pop_spot (); - if (!THIS->lexer_p_->note_state_b ()) + if (!THIS->lexer_->note_state_b ()) THIS->parser_error (_ ("Have to be in Note mode for notes")); Music *n = 0; if ($5) - n = new Rest_req ; + n = MY_MAKE_MUSIC("RestEvent"); else - n = new Note_req; + n = MY_MAKE_MUSIC("NoteEvent"); n->set_mus_property ("pitch", $1); n->set_mus_property ("duration", $4); @@ -1800,8 +1991,9 @@ simple_element: if ($2 % 2 || $3 % 2) n->set_mus_property ("force-accidental", SCM_BOOL_T); - Simultaneous_music*v = new Request_chord (SCM_EOL); + 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()); v->set_spot (i); n->set_spot (i); @@ -1812,176 +2004,134 @@ simple_element: 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)) - { - unsmob_music (ly_car (s))->set_mus_property ("duration", $2); - } + { + unsmob_music (ly_car (s))->set_mus_property ("duration", $2); + } $$ = m; } | RESTNAME optional_notemode_duration { Input i = THIS->pop_spot (); - SCM e = SCM_UNDEFINED; + Music * ev = 0; if (ly_scm2string ($1) =="s") { /* Space */ - Skip_req * skip_p = new Skip_req; - skip_p->set_mus_property ("duration" ,$2); - skip_p->set_spot (i); - e = skip_p->self_scm (); + ev = MY_MAKE_MUSIC("SkipEvent"); } - else { - Rest_req * rest_req_p = new Rest_req; - rest_req_p->set_mus_property ("duration", $2); - rest_req_p->set_spot (i); - e = rest_req_p->self_scm (); + else { + ev = MY_MAKE_MUSIC("RestEvent"); + } - Simultaneous_music* velt_p = new Request_chord (SCM_EOL); - velt_p-> set_mus_property ("elements", scm_list_n (e,SCM_UNDEFINED)); - velt_p->set_spot (i); + ev->set_mus_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)); + velt->set_spot (i); - $$ = velt_p; + $$ = velt; } | MULTI_MEASURE_REST optional_notemode_duration { - Input i = THIS->pop_spot (); - - Skip_req * sk = new Skip_req; - sk->set_mus_property ("duration", $2); - Span_req *sp1 = new Span_req; - Span_req *sp2 = new Span_req; - sp1-> set_span_dir ( START); - sp2-> set_span_dir ( STOP); - SCM r = ly_str02scm ("rest"); - sp1->set_mus_property ("span-type", r); - sp2->set_mus_property ("span-type", r); - - Request_chord * rqc1 = new Request_chord (SCM_EOL); - rqc1->set_mus_property ("elements", scm_list_n (sp1->self_scm (), SCM_UNDEFINED)); - Request_chord * rqc2 = new Request_chord (SCM_EOL); - rqc2->set_mus_property ("elements", scm_list_n (sk->self_scm (), SCM_UNDEFINED));; - Request_chord * rqc3 = new Request_chord (SCM_EOL); - rqc3->set_mus_property ("elements", scm_list_n (sp2->self_scm (), SCM_UNDEFINED));; + THIS->pop_spot (); - SCM ms = scm_list_n (rqc1->self_scm (), rqc2->self_scm (), rqc3->self_scm (), SCM_UNDEFINED); + static SCM proc ; + if (!proc) + proc = scm_c_eval_string ("make-multi-measure-rest"); - $$ = new Sequential_music (SCM_EOL); - $$->set_mus_property ("elements", ms); + SCM mus = scm_call_2 (proc, $2, + make_input (THIS->here_input())); + scm_gc_protect_object (mus); + $$ = unsmob_music (mus); } | STRING optional_notemode_duration { Input i = THIS->pop_spot (); - Lyric_req* lreq_p = new Lyric_req; - lreq_p->set_mus_property ("text", $1); - lreq_p->set_mus_property ("duration",$2); - lreq_p->set_spot (i); - Simultaneous_music* velt_p = new Request_chord (SCM_EOL); - velt_p->set_mus_property ("elements", scm_list_n (lreq_p->self_scm (), SCM_UNDEFINED)); + Music * lreq = MY_MAKE_MUSIC("LyricEvent"); + lreq->set_mus_property ("text", $1); + lreq->set_mus_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)); - $$= velt_p; + $$= velt; } - | chord { - Input i = THIS->pop_spot (); + | new_chord { + THIS->pop_spot (); - if (!THIS->lexer_p_->chord_state_b ()) - THIS->parser_error (_ ("Have to be in Chord mode for chords")); - $$ = $1; + if (!THIS->lexer_->chord_state_b ()) + THIS->parser_error (_ ("Have to be in Chord mode for chords")); + $$ = unsmob_music ($1); } ; - -chord: - steno_tonic_pitch optional_notemode_duration chord_additions chord_subtractions chord_inversion chord_bass { - $$ = Chord::get_chord ($1, $3, $4, $5, $6, $2); - $$->set_spot (THIS->here_input ()); - }; - -chord_additions: - { - $$ = SCM_EOL; - } - | CHORD_COLON chord_notes { - $$ = $2; +new_chord: + steno_tonic_pitch optional_notemode_duration { + $$ = make_chord ($1, $2, SCM_EOL); } - ; - -chord_notes: - chord_step { - $$ = $1 - } - | chord_notes '.' chord_step { - $$ = gh_append2 ($$, $3); + | steno_tonic_pitch optional_notemode_duration chord_separator chord_items { + SCM its = scm_reverse_x ($4, SCM_EOL); + $$ = make_chord ($1, $2, gh_cons ($3, its)); } ; -chord_subtractions: - { - $$ = SCM_EOL; - } - | CHORD_CARET chord_notes { - $$ = $2; +chord_items: + /**/ { + $$ = SCM_EOL; + } + | chord_items chord_item { + $$ = gh_cons ($2, $$); } ; - -chord_inversion: - { - $$ = SCM_EOL; +chord_separator: + CHORD_COLON { + $$ = ly_symbol2scm ("chord-colon"); } - | '/' steno_tonic_pitch { - $$ = $2; + | CHORD_CARET { + $$ = ly_symbol2scm ("chord-caret"); } - ; - -chord_bass: - { - $$ = SCM_EOL; + | CHORD_SLASH steno_tonic_pitch { + $$ = scm_list_n (ly_symbol2scm ("chord-slash"), $2, SCM_UNDEFINED); } | CHORD_BASS steno_tonic_pitch { - $$ = $2; + $$ = scm_list_n (ly_symbol2scm ("chord-bass"), $2, SCM_UNDEFINED); } ; -chord_step: - chord_note { - $$ = gh_cons ($1, SCM_EOL); +chord_item: + chord_separator { + $$ = $1; } - | CHORDMODIFIER_PITCH { - $$ = gh_cons (unsmob_pitch ($1)->smobbed_copy (), SCM_EOL); + | step_numbers { + $$ = scm_reverse_x ($1, SCM_EOL); } - | CHORDMODIFIER_PITCH chord_note { /* Ugh. */ - $$ = scm_list_n (unsmob_pitch ($1)->smobbed_copy (), - $2, SCM_UNDEFINED); + | CHORD_MODIFIER { + $$ = $1; } ; -chord_note: - bare_unsigned { - Pitch m; - m.notename_i_ = ($1 - 1) % 7; - m.octave_i_ = $1 > 7 ? 1 : 0; - m.alteration_i_ = 0; +step_numbers: + step_number { $$ = gh_cons ($1, SCM_EOL); } + | step_numbers '.' step_number { + $$ = gh_cons ($3, $$); + } + ; - $$ = m.smobbed_copy (); +step_number: + bare_unsigned { + $$ = make_chord_step ($1, 0); } | bare_unsigned '+' { - Pitch m; - m.notename_i_ = ($1 - 1) % 7; - m.octave_i_ = $1 > 7 ? 1 : 0; - m.alteration_i_ = 1; - - - $$ = m.smobbed_copy (); + $$ = make_chord_step ($1, 1); } | bare_unsigned CHORD_MINUS { - Pitch m; - m.notename_i_ = ($1 - 1) % 7; - m.octave_i_ = $1 > 7 ? 1 : 0; - m.alteration_i_ = -1; - - $$ = m.smobbed_copy (); + $$ = make_chord_step ($1,-1); } - ; + ; /* UTILITIES + +TODO: should deprecate in favor of Scheme? + */ number_expression: number_expression '+' number_term { @@ -2006,10 +2156,7 @@ number_term: ; number_factor: - '(' number_expression ')' { - $$ = $2; - } - | '-' number_factor { /* %prec UNARY_MINUS */ + '-' number_factor { /* %prec UNARY_MINUS */ $$ = scm_difference ($2, SCM_UNDEFINED); } | bare_number @@ -2026,20 +2173,11 @@ bare_number: | NUMBER_IDENTIFIER { $$ = $1; } - | REAL CM_T { - $$ = gh_double2scm (gh_scm2double ($1) CM ); - } - | REAL PT_T { - $$ = gh_double2scm (gh_scm2double ($1) PT); - } - | REAL IN_T { - $$ = gh_double2scm (gh_scm2double ($1) INCH); + | REAL NUMBER_IDENTIFIER { + $$ = gh_double2scm (gh_scm2double ($1) * gh_scm2double ($2)); } - | REAL MM_T { - $$ = gh_double2scm (gh_scm2double ($1) MM); - } - | REAL CHAR_T { - $$ = gh_double2scm (gh_scm2double ($1) CHAR); + | UNSIGNED NUMBER_IDENTIFIER { + $$ = gh_double2scm ($1 * gh_scm2double ($2)); } ; @@ -2095,13 +2233,86 @@ questions: ; + +full_markup: + MARKUP_IDENTIFIER { + $$ = $1; + } + | MARKUP + { THIS->lexer_->push_markup_state (); } + markup + { $$ = $3; + THIS->lexer_->pop_state (); + } + ; + + +/* +This should be done more dynamically if possible. +*/ +markup: + STRING { + $$ = make_simple_markup ($1); + } + | MARKUP_HEAD_MARKUP0 markup { + $$ = scm_list_n ($1, $2, SCM_UNDEFINED); + } + | MARKUP_HEAD_MARKUP0_MARKUP1 markup markup { + $$ = scm_list_n ($1, $2, $3, SCM_UNDEFINED); + } + | MARKUP_HEAD_SCM0_MARKUP1 SCM_T markup { + $$ = scm_list_n ($1, $2, $3, SCM_UNDEFINED); + } + | markup_line { + $$ = $1; + } + | MARKUP_HEAD_LIST0 markup_list { + $$ = scm_list_n ($1,$2, SCM_UNDEFINED); + } + | MARKUP_HEAD_SCM0 embedded_scm { + $$ = scm_list_n ($1, $2, SCM_UNDEFINED); + } + | MARKUP_HEAD_SCM0_SCM1_MARKUP2 embedded_scm embedded_scm markup { + $$ = scm_list_n ($1, $2, $3, $4, SCM_UNDEFINED); + } + | MARKUP_HEAD_SCM0_SCM1_SCM2 embedded_scm embedded_scm embedded_scm { + $$ = scm_list_n ($1, $2, $3, $4, SCM_UNDEFINED); + } + | MARKUP_IDENTIFIER { + $$ = $1; + } + + ; + +markup_list: + CHORD_OPEN markup_list_body CHORD_CLOSE { $$ = scm_reverse_x ($2, SCM_EOL); } + ; + +markup_line: + '{' markup_list_body '}' { + static SCM line ; + if (!line) + line = scm_c_eval_string ("line-markup"); + + $$ = scm_list_n (line, scm_reverse_x ($2, SCM_EOL), SCM_UNDEFINED); + } + ; + +markup_list_body: + /**/ { $$ = SCM_EOL; } + | markup_list_body markup { + $$ = gh_cons ($2, $1) ; + } + ; + + %% void -My_lily_parser::set_yydebug (bool b) +My_lily_parser::set_yydebug (bool ) { -#ifdef YYDEBUG - yydebug = b; +#if 0 + yydebug = 1; #endif } @@ -2110,7 +2321,6 @@ extern My_lily_parser * current_parser; void My_lily_parser::do_yyparse () { - current_parser = this;; yyparse ((void*)this); } @@ -2126,6 +2336,7 @@ which is entirely legitimate. Or we can scrap it. Barchecks should detect wrong durations, and skipTypesetting speeds it up a lot. */ + void My_lily_parser::beam_check (SCM dur) { @@ -2137,3 +2348,58 @@ My_lily_parser::beam_check (SCM dur) } last_beam_start_ = SCM_EOL; } + + + +bool +markup_p (SCM x) +{ + return gh_pair_p (x) + && SCM_BOOL_F != scm_object_property (gh_car (x), ly_symbol2scm ("markup-signature")); +} + + +/* + +It is a little strange to have this function in this file, but +otherwise, we have to import music classes into the lexer. + +*/ +int +My_lily_lexer::try_special_identifiers (SCM * destination, SCM sid) +{ + if (gh_string_p (sid)) { + *destination = sid; + return STRING_IDENTIFIER; + } 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_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(); + unsmob_music (*destination)-> + set_mus_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(); + 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(); + return MUSIC_OUTPUT_DEF_IDENTIFIER; + } else if (new_markup_p (sid)) { + *destination = sid; + return MARKUP_IDENTIFIER; + } + + return -1; +}