X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=inline;f=lily%2Fparser.yy;h=9feecf0fae17f4c050ba7633a4f6d397da72d942;hb=59566db06793e38a8805f75d2ee80970ff2cad0f;hp=720732e88c5b0d4411e0a7c808f549e30a797964;hpb=b705c9024035a17664071ceea3c44beb53d56be3;p=lilypond.git diff --git a/lily/parser.yy b/lily/parser.yy index 720732e88c..06aa057bf8 100644 --- a/lily/parser.yy +++ b/lily/parser.yy @@ -5,60 +5,123 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Han-Wen Nienhuys + (c) 1997--2004 Han-Wen Nienhuys Jan Nieuwenhuizen */ /* - Two shift/reduce problems: - - - - + Four shift/reduce problems: + +1. foo = bar. + + "bar" -> String -> Lyric -> Music -> music-assignment + + "bar" -> String -> string-assignment + + +Similar problem for + + * \markup identifier. + * \markup { } + + +2. \repeat + \repeat .. \alternative + + + \repeat { \repeat .. \alternative } + +or + + \repeat { \repeat } \alternative + +) + +--hwn + */ +/* + +TODO: + +* The rules for who is protecting what are very shady. Uniformise + this. + +* There are too many lexical modes? + +*/ + #include -#include +#include +#include -#include "translator-def.hh" + +#include "scm-option.hh" +#include "context-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 "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)) + +Music *property_op_to_music (SCM op); +Music *context_spec_music (SCM type, SCM id, Music * m, SCM ops_); +SCM get_next_unique_context (); + +#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 + +/* + Add symbols to the TAGS field of a music object. +*/ + +void +tag_music (Music*m, SCM tag, Input ip) +{ + SCM tags = m->get_mus_property ("tags"); + if (gh_symbol_p (tag)) + tags = scm_cons (tag, tags); + else if (gh_list_p (tag)) + tags = gh_append2 (tag, tags); + else + ip.warning (_("Tag must be symbol or list of symbols.")); + + m->set_mus_property ("tags", tags); +} + + 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) @@ -69,19 +132,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) { @@ -91,70 +152,81 @@ is_duration_b (int t) void set_music_properties (Music *p, SCM a) { - for (SCM k = a; gh_pair_p (k); k = gh_cdr (k)) + for (SCM k = a; gh_pair_p (k); k = ly_cdr (k)) { - p->set_mus_property (gh_caar (k), gh_cdar (k)); + p->internal_set_mus_property (ly_caar (k), ly_cdar (k)); } } +SCM +make_chord_step (int step, int alter) +{ + if (step == 7) + alter += FLAT; + while(step < 0) + step += 7; + Pitch m((step -1) / 7 , (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 (); } @@ -162,81 +234,90 @@ yylex (YYSTYPE *s, void * v_l) %pure_parser -/* tokens which are not keywords */ -%token AUTOCHANGE -%token ALIAS -%token APPLY -%token ARPEGGIO -%token DYNAMICSCRIPT + %token ACCEPTS +%token ADDLYRICS +%token NEWADDLYRICS +%token ALIAS %token ALTERNATIVE +%token APPLY +%token APPLYCONTEXT +%token APPLYOUTPUT +%token AUTOCHANGE %token BAR %token BREATHE -%token CHORDMODIFIERS +%token CHANGE +%token CHORDMODIFIERS %token CHORDS -%token CHAR_T +%token LESSLESS +%token MOREMORE %token CLEF -%token CM_T +%token COMMANDSPANREQUEST %token CONSISTS -%token DURATION -%token SEQUENTIAL -%token ELEMENTDESCRIPTIONS -%token SIMULTANEOUS %token CONSISTSEND +%token CONTEXT +%token DEFAULT %token DENIES -%token DURATION +%token DESCRIPTION %token EXTENDER -%token FONT -%token GLISSANDO -%token GRACE NGRACE +%token FIGURES FIGURE_OPEN FIGURE_CLOSE +%token FIGURE_BRACKET_CLOSE FIGURE_BRACKET_OPEN +%token GRACE +%token ACCIACCATURA +%token APPOGGIATURA +%token GROBDESCRIPTIONS %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 MULTI_MEASURE_REST %token NAME -%token PITCHNAMES +%token NEWCONTEXT %token NOTES +%token OCTAVE +%token ONCE +%token OVERRIDE SET REVERT %token PAPER +%token PARTCOMBINE %token PARTIAL -%token PENALTY -%token PROPERTY -%token OVERRIDE SET REVERT -%token PT_T %token RELATIVE %token REMOVE %token REPEAT -%token ADDLYRICS -%token PARTCOMBINE +%token REST %token SCM_T %token SCORE -%token SCRIPT +%token SEQUENTIAL +%token SIMULTANEOUS %token SKIP %token SPANREQUEST -%token STYLESHEET -%token COMMANDSPANREQUEST +%token TAG %token TEMPO -%token OUTPUTPROPERTY -%token TIME_T %token TIMES +%token TIME_T %token TRANSLATOR %token TRANSPOSE %token TYPE %token UNSET -%token CONTEXT +%token WITH /* escaped */ %token E_CHAR E_EXCLAMATION E_SMALLER E_BIGGER E_OPEN E_CLOSE -%token CHORD_BASS CHORD_COLON CHORD_MINUS CHORD_CARET - -%type exclamations questions dots +%token E_LEFTSQUARE E_RIGHTSQUARE E_TILDE +%token E_BACKSLASH +%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_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 %token DIGIT %token NOTENAME_PITCH %token TONICNAME_PITCH @@ -244,13 +325,13 @@ yylex (YYSTYPE *s, void * v_l) %token DURATION_IDENTIFIER %token FRACTION %token IDENTIFIER - - +%token DRUMS +%token DRUM_PITCH +%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 @@ -259,50 +340,59 @@ yylex (YYSTYPE *s, void * v_l) %token UNSIGNED %token REAL +%token MARKUP +%token MARKUP_HEAD_MARKUP0 +%token MARKUP_HEAD_EMPTY +%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 close_event %type sub_quotes sup_quotes -%type simple_element request_chord command_element Simple_music Composite_music -%type Alternative_music Repeated_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 explicit_duration -%type pre_requests post_requests -%type gen_text_def -%type steno_pitch pitch absolute_pitch -%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 post_events +%type gen_text_def direction_less_event direction_reqd_event +%type steno_pitch pitch absolute_pitch pitch_also_in_chords +%type steno_tonic_pitch %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 Music_sequence -%type relative_music re_rhythmed_music part_combined_music -%type property_def translator_change -%type Music_list -%type music_output_def_body -%type shorthand_command_req -%type post_request -%type command_req verbose_command_req -%type extender_req -%type hyphen_req +%type Music Sequential_music Simultaneous_music +%type relative_music re_rhythmed_music +%type music_property_def context_change +%type context_prop_spec +%type Music_list +%type property_operation context_mod translator_mod optional_context_mod +%type music_output_def_body music_output_def_head +%type post_event tagged_post_event +%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 tempo_request -%type notenames_body notenames_block chordmodifiers_block +%type tempo_event %type script_abbreviation @@ -320,37 +410,58 @@ 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; - } - | chordmodifiers_block { - THIS->lexer_p_->chordmodifier_tab_ = $1; - } - | lilypond_header { - if (global_header_p) - scm_gc_unprotect_object (global_header_p->self_scm ()); - global_header_p = $1; + lilypond_header { + THIS->input_file_->header_ = $1; } | score_block { - score_global_array.push ($1); + Score * sc = $1; + + SCM head = ly_module_p (sc->header_) ? sc->header_ : THIS->input_file_->header_.to_SCM (); + + Path p = split_path (THIS->output_basename_); + int *c = &THIS->input_file_->score_count_; + if (*c) + { + p.base += "-" + to_string (*c); + } + + (*c)++; + 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); + + if (sc->defs_.is_empty ()) + { + Music_output_def *id = + unsmob_music_output_def (THIS->lexer_->lookup_identifier + ("$defaultpaper")); + + id = id ? id->clone () : new Paper_def; + + default_rendering (sc->music_, id->self_scm(), head, outname); + + scm_gc_unprotect_object (id->self_scm ()); + } + scm_gc_unprotect_object (sc->self_scm()); } | output_def { + SCM id = SCM_EOL; if (dynamic_cast ($1)) - THIS->lexer_p_->set_identifier ("$defaultpaper", $1->self_scm ()); + id = scm_makfrom0str ("$defaultpaper"); else if (dynamic_cast ($1)) - THIS->lexer_p_->set_identifier ("$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 { - // junk value - } ; embedded_scm: @@ -359,47 +470,21 @@ embedded_scm: ; -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 = gh_cdr (s)) { - SCM pt = gh_cdar (s); - if (!unsmob_pitch (pt)) - THIS->parser_error ("Need pitch object."); - else - scm_hashq_set_x (tab, gh_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(); } ; @@ -420,10 +505,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. @@ -433,15 +518,18 @@ all objects can be unprotected as soon as they're here. */ } + | embedded_scm { } ; - identifier_init: score_block { $$ = $1->self_scm (); scm_gc_unprotect_object ($$); } + | full_markup { + $$ = $1; + } | output_def { $$ = $1->self_scm (); scm_gc_unprotect_object ($$); @@ -453,13 +541,10 @@ identifier_init: $$ = $1->self_scm (); scm_gc_unprotect_object ($$); } - | post_request { + | post_event { $$ = $1->self_scm (); scm_gc_unprotect_object ($$); } - | explicit_duration { - $$ = $1; - } | number_expression { $$ = $1; } @@ -479,54 +564,27 @@ translator_spec_block: ; translator_spec_body: - TRANSLATOR_IDENTIFIER { - $$ = unsmob_translator_def ($1)->clone_scm (); - unsmob_translator_def ($$)-> set_spot (THIS->here_input ()); - } - | TYPE STRING { - $$ = Translator_def::make_scm (); - Translator_def*td = unsmob_translator_def ($$); - td->translator_group_type_ = $2; - td->set_spot (THIS->here_input ()); - } - | translator_spec_body STRING '=' embedded_scm { - unsmob_translator_def ($$)->add_property_assign ($2, $4); - } - | translator_spec_body STRING OVERRIDE 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); - } - | translator_spec_body NAME STRING { - unsmob_translator_def ($$)->type_name_ = $3; + /**/ { + $$ = Context_def::make_scm (); + unsmob_context_def ($$)->set_spot (THIS->here_input ()); } - | translator_spec_body CONSISTS STRING { - unsmob_translator_def ($$)->add_element ($3); - } - | translator_spec_body ALIAS STRING { - Translator_def*td = unsmob_translator_def ($$); - td->type_aliases_ = gh_cons ($3, td->type_aliases_); + | TRANSLATOR_IDENTIFIER { + $$ = $1; + unsmob_context_def ($$)->set_spot (THIS->here_input ()); } - | translator_spec_body ELEMENTDESCRIPTIONS embedded_scm { - for (SCM p = $3; gh_pair_p (p); p = gh_cdr (p)) - unsmob_translator_def ($$) - ->add_property_assign (scm_symbol_to_string (gh_caar (p)), gh_cdar (p)); + | translator_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); + + /* TODO: should make new tag "grob-definition" ? */ + td->add_context_mod (scm_list_n (ly_symbol2scm ("assign"), + tag, gh_cons (ly_cdar (p), SCM_EOL), SCM_UNDEFINED)); + } } - | translator_spec_body CONSISTSEND STRING { - unsmob_translator_def ($$)->add_last_element ( $3); - } - | translator_spec_body ACCEPTS STRING { - unsmob_translator_def ($$)->set_acceptor ($3,true); - } - | translator_spec_body DENIES STRING { - unsmob_translator_def ($$)->set_acceptor ($3,false); - } - | translator_spec_body REMOVE STRING { - unsmob_translator_def ($$)->remove_element ($3); + | translator_spec_body context_mod { + unsmob_context_def ($$)->add_context_mod ($2); } ; @@ -540,12 +598,7 @@ score_block: /*cont*/ '{' score_body '}' { THIS->pop_spot (); $$ = $4; - if (!$$->def_p_arr_.size ()) - { - Music_output_def *id = - unsmob_music_output_def (THIS->lexer_p_->lookup_identifier ("$defaultpaper")); - $$->add_output (id ? id->clone () : new Paper_def ); - } + } ; @@ -556,18 +609,26 @@ 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)); + $$ = new Score ( *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); + $$->defs_.push ($2); + scm_gc_unprotect_object ($2->self_scm ()); } | score_body error { @@ -581,46 +642,48 @@ 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_head: + MIDI { + 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")); + | PAPER { + 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_); - $$ = 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_); + + THIS->lexer_->add_scope (p->scope_); $$ = p; } - | MIDI '{' 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_body: + music_output_def_head '{' { + + } + | 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; + THIS->lexer_->remove_scope (); + THIS->lexer_->add_scope (o->scope_); } | music_output_def_body assignment { @@ -628,40 +691,48 @@ 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); + scm_gc_unprotect_object ($2->self_scm ()); } | 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)); } ; -Music_list: /* empty */ { - $$ = gh_cons (SCM_EOL, SCM_EOL); +/* +The representation of a list is the + + (LIST . LAST-CONS) + + to have efficient append. +*/ +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 (gh_cdr (s))) - gh_set_cdr_x (gh_cdr (s), c); /* append */ + if (gh_pair_p (ly_cdr (s))) + gh_set_cdr_x (ly_cdr (s), c); /* append */ else gh_set_car_x (s, c); /* set first cons */ gh_set_cdr_x (s, c) ; /* remember last cell */ @@ -678,183 +749,229 @@ Music: Alternative_music: /* empty */ { - $$ = 0; + $$ = SCM_EOL; } - | ALTERNATIVE Music_sequence { - $$ = $2; - $2->set_spot (THIS->here_input ()); + | ALTERNATIVE '{' Music_list '}' { + $$ = $3; } ; - - - Repeated_music: REPEAT string bare_unsigned Music Alternative_music { - Music_sequence* alts = dynamic_cast ($5); - if (alts && $3 < alts->length_i ()) - $5->origin ()->warning (_ ("More alternatives than repeats. Junking excess alternatives.")); Music *beg = $4; int times = $3; + SCM alts = gh_pair_p ($5) ? gh_car ($5) : SCM_EOL; + if (times < scm_ilength (alts)) { + unsmob_music (gh_car (alts)) + ->origin ()->warning ( + _("More alternatives than repeats. Junking excess alternatives.")); + 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 ("body", beg->self_scm ()); + r-> set_mus_property ("element", beg->self_scm ()); scm_gc_unprotect_object (beg->self_scm ()); } r->set_mus_property ("repeat-count", gh_int2scm (times >? 1)); - if (alts) - { - alts->truncate (times); - r-> set_mus_property ("alternatives", alts->self_scm ()); - scm_gc_unprotect_object (alts->self_scm ()); - } - SCM func = scm_primitive_eval (ly_symbol2scm ("repeat-name-to-ctor")); - SCM result = gh_call1 (func, $2); - - set_music_properties (r, result); + r-> set_mus_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 + 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; - } - ; -Music_sequence: '{' Music_list '}' { - $$ = new Music_sequence (SCM_EOL); - $$->set_mus_property ("elements", gh_car ($2)); + $$ = r; } ; Sequential_music: SEQUENTIAL '{' Music_list '}' { - $$ = new Sequential_music (SCM_EOL); - $$->set_mus_property ("elements", gh_car ($3)); + $$ = MY_MAKE_MUSIC("SequentialMusic"); + $$->set_mus_property ("elements", ly_car ($3)); + $$->set_spot(THIS->here_input()); } | '{' Music_list '}' { - $$ = new Sequential_music (SCM_EOL); - $$->set_mus_property ("elements", gh_car ($2)); + $$ = 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); - $$->set_mus_property ("elements", gh_car ($3)); + $$ = MY_MAKE_MUSIC("SimultaneousMusic"); + $$->set_mus_property ("elements", ly_car ($3)); + $$->set_spot(THIS->here_input()); } - | '<' Music_list '>' { - $$ = new Simultaneous_music (SCM_EOL); - $$->set_mus_property ("elements", gh_car ($2)); + | simul_open Music_list simul_close { + $$ = MY_MAKE_MUSIC("SimultaneousMusic"); + $$->set_mus_property ("elements", ly_car ($2)); + $$->set_spot(THIS->here_input()); } ; Simple_music: - request_chord { $$ = $1; } - | 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 */ - if (!gh_procedure_p (pred)) - { - THIS->parser_error (_ ("First argument must be a procedure taking 1 argument")); - } - - Music *m = new Music (SCM_EOL); - 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; + 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()); } | MUSIC_IDENTIFIER { - $$ = unsmob_music ($1)->clone (); + $$ = unsmob_music ($1); } - | property_def - | translator_change + | music_property_def + | context_change ; -Composite_music: - CONTEXT STRING Music { - Context_specced_music *csm = new Context_specced_music (SCM_EOL); - csm->set_mus_property ("element", $3->self_scm ()); - scm_gc_unprotect_object ($3->self_scm ()); +optional_context_mod: + /**/ { $$ = SCM_EOL; } + | WITH '{' context_mod_list '}' { $$ = $3; } + ; - csm->set_mus_property ("context-type",$2); - csm->set_mus_property ("context-id", ly_str02scm ("")); +grace_head: + GRACE { $$ = scm_makfrom0str ("Grace"); } + | ACCIACCATURA { $$ = scm_makfrom0str ("Acciaccatura"); } + | APPOGGIATURA { $$ = scm_makfrom0str ("Appoggiatura"); } + ; - $$ = csm; +context_mod_list: + /* */ { $$ = SCM_EOL; } + | context_mod_list context_mod { + $$ = gh_cons ($2, $1); } - | AUTOCHANGE STRING Music { - Music * chm = new Music_wrapper (SCM_EOL); - chm->set_mus_property ("element", $3->self_scm ()); - chm->set_mus_property ("iterator-ctor", Auto_change_iterator::constructor_cxx_function); + ; - scm_gc_unprotect_object ($3->self_scm ()); - chm->set_mus_property ("what", $2); +Composite_music: + AUTOCHANGE Music { + static SCM proc ; + if (!proc) + proc = scm_c_eval_string ("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 { + static SCM proc; + if (!proc) + proc = scm_c_eval_string ("make-part-combine-music"); - $$ = chm; - chm->set_spot (*$3->origin ()); + SCM res = scm_call_1 (proc, gh_list ($2->self_scm (), + $3->self_scm (), SCM_UNDEFINED)); + scm_gc_unprotect_object ($3->self_scm ()); + scm_gc_unprotect_object ($2->self_scm ()); + $$ = unsmob_music (res); + scm_gc_protect_object (res); + $$->set_spot (THIS->here_input()); } - | GRACE Music { -#if 0 + | grace_head Music { +#if 1 /* The other version is for easier debugging of Sequential_music_iterator in combination with grace notes. */ - SCM start = THIS->lexer_p_->lookup_identifier ("startGraceMusic"); - SCM stop = THIS->lexer_p_->lookup_identifier ("stopGraceMusic"); +/* + +TODO: should distinguish between both grace types in the +basic music objects too, since the meaning is different. + +*/ + + String start_str = "start" + ly_scm2string ($1) + "Music"; + String stop_str = "stop" + ly_scm2string ($1) + "Music"; + + SCM start = THIS->lexer_->lookup_identifier (start_str); + SCM stop = THIS->lexer_->lookup_identifier (stop_str); + 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); - csm->set_mus_property ("element", $5->self_scm ()); - scm_gc_unprotect_object ($5->self_scm ()); - - csm->set_mus_property ("context-type", $2); - csm->set_mus_property ("context-id", $4); + | CONTEXT string '=' string optional_context_mod Music { + $$ = context_spec_music ($2, $4, $6, $5); - $$ = csm; } + | CONTEXT STRING optional_context_mod Music { + $$ = context_spec_music ($2, SCM_UNDEFINED, $4, $3); + } + | NEWCONTEXT string optional_context_mod Music { + $$ = context_spec_music ($2, get_next_unique_context (), + $4, $3); + } + | TIMES { THIS->push_spot (); } @@ -862,501 +979,626 @@ Composite_music: fraction Music { - int n = gh_scm2int (gh_car ($3)); int d = gh_scm2int (gh_cdr ($3)); + int n = gh_scm2int (ly_car ($3)); int d = gh_scm2int (ly_cdr ($3)); Music *mp = $4; - $$ = new Time_scaled_music (SCM_EOL); - $$->set_spot (THIS->pop_spot ()); + $$= MY_MAKE_MUSIC("TimeScaledMusic"); + $$->set_spot (THIS->pop_spot ()); $$->set_mus_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)); - $$->compress (Moment (n,d)); + $$->compress (Moment (Rational (n,d))); } | 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); - - p->transpose (pit); - $$->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); + | 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 ()); - } | APPLY embedded_scm Music { - 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); + if (!ly_input_procedure_p ($2)) + { + THIS->parser_error (_ ("\\apply takes function argument")); + $$ = $3; + } + else + { + SCM ret = gh_call1 ($2, $3->self_scm ()); + Music *m = unsmob_music (ret); + if (!m) { + THIS->parser_error ("\\apply must return a Music"); + m = MY_MAKE_MUSIC("Music"); + } + $$ = m; } - $$ = m; } | NOTES - { THIS->lexer_p_->push_note_state (); } + { + SCM nn = THIS->lexer_->lookup_identifier ("pitchnames"); + THIS->lexer_->push_note_state (alist_to_hashq (nn)); + } Music { $$ = $3; - THIS->lexer_p_->pop_state (); + THIS->lexer_->pop_state (); } - | CHORDS - { THIS->lexer_p_->push_chord_state (); } + | DRUMS + { + SCM nn = THIS->lexer_->lookup_identifier ("drumPitchNames"); + THIS->lexer_->push_note_state (alist_to_hashq (nn)); + } + Music + { $$ = $3; + THIS->lexer_->pop_state (); + } + | FIGURES + { THIS->lexer_->push_figuredbass_state (); } Music { - Music * chm = new Un_relativable_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_->pop_state (); + } + | 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_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; } - | part_combined_music { $$ = $1; } + | TAG embedded_scm Music { + tag_music ($3, $2, THIS->here_input ()); + $$ = $3; + } ; 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 ()); + Pitch retpitch = p->to_relative_octave (pit); + if (lily_1_8_relative) + $$->set_mus_property ("last-pitch", retpitch.smobbed_copy ()); } ; re_rhythmed_music: ADDLYRICS Music Music { - Lyric_combine_music * l = new Lyric_combine_music (SCM_EOL); - l->set_mus_property ("music", $2->self_scm ()); - l->set_mus_property ("lyrics", $3->self_scm ()); + 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 ()); $$ = l; } + | NEWADDLYRICS string Music { + Music*l =MY_MAKE_MUSIC("NewLyricCombineMusic"); + l->set_mus_property ("element", $3->self_scm ()); + scm_gc_unprotect_object ($3->self_scm ()); + $$ = l; + l->set_mus_property ("associated-context", $2); + } ; -part_combined_music: - PARTCOMBINE STRING Music Music { - Part_combine_music * p = new Part_combine_music (SCM_EOL); +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); - p->set_mus_property ("what", $2); - p->set_mus_property ("one", $3->self_scm ()); - p->set_mus_property ("two", $4->self_scm ()); + $$ = t; + $$->set_spot (THIS->here_input ()); + } + ; - scm_gc_unprotect_object ($3->self_scm ()); - scm_gc_unprotect_object ($4->self_scm ()); +property_operation: + STRING '=' scalar { + $$ = scm_list_n (ly_symbol2scm ("assign"), + scm_string_to_symbol ($1), $3, SCM_UNDEFINED); + } + | UNSET STRING { + $$ = scm_list_n (ly_symbol2scm ("unset"), + scm_string_to_symbol ($2), SCM_UNDEFINED); + } + | OVERRIDE STRING embedded_scm '=' embedded_scm { + $$ = scm_list_n (ly_symbol2scm ("push"), + scm_string_to_symbol ($2), $3, $5, SCM_UNDEFINED); + } + | REVERT STRING embedded_scm { + $$ = scm_list_n (ly_symbol2scm ("pop"), + scm_string_to_symbol ($2), $3, SCM_UNDEFINED); + } + ; +translator_mod: + CONSISTSEND { $$ = ly_symbol2scm ("consists-end"); } + | CONSISTS { $$ = ly_symbol2scm ("consists"); } + | REMOVE { $$ = ly_symbol2scm ("remove"); } - $$ = p; + | ACCEPTS { $$ = ly_symbol2scm ("accepts"); } + | DENIES { $$ = ly_symbol2scm ("denies"); } + + | ALIAS { $$ = ly_symbol2scm ("alias"); } + | TYPE { $$ = ly_symbol2scm ("translator-type"); } + | DESCRIPTION { $$ = ly_symbol2scm ("description"); } + | NAME { $$ = ly_symbol2scm ("context-name"); } + ; + +context_mod: + property_operation { $$ = $1; } + | translator_mod STRING { + $$ = scm_list_n ($1, $2, SCM_UNDEFINED); } ; -translator_change: - TRANSLATOR STRING '=' STRING { - Music * t = new Music (SCM_EOL); - t->set_mus_property ("iterator-ctor", - Change_iterator::constructor_cxx_function); - t-> set_mus_property ("change-to-type", $2); - t-> set_mus_property ("change-to-id", $4); +context_prop_spec: + STRING { + $$ = scm_list_n (ly_symbol2scm ("Bottom"), scm_string_to_symbol ($1), SCM_UNDEFINED); + } + | STRING '.' STRING { + $$ = scm_list_n (scm_string_to_symbol ($1), scm_string_to_symbol ($3), SCM_UNDEFINED); + } + ; - $$ = t; - $$->set_spot (THIS->here_input ()); +music_property_def: + OVERRIDE context_prop_spec embedded_scm '=' scalar { + $$ = property_op_to_music (scm_list_n ( + ly_symbol2scm ("poppush"), + gh_cadr ($2), + $3, $5, SCM_UNDEFINED)); + $$= context_spec_music (gh_car ($2), SCM_UNDEFINED, $$, SCM_EOL); + } + | SET context_prop_spec '=' scalar { + $$ = property_op_to_music (scm_list_n ( + ly_symbol2scm ("assign"), + gh_cadr ($2), + $4, SCM_UNDEFINED)); + $$= context_spec_music (gh_car ($2), SCM_UNDEFINED, $$, SCM_EOL); + } + | REVERT context_prop_spec embedded_scm { + $$ = property_op_to_music (scm_list_n ( + ly_symbol2scm ("pop"), + gh_cadr ($2), + $3, SCM_UNDEFINED)); + + $$= context_spec_music (gh_car ($2), SCM_UNDEFINED, $$, SCM_EOL); + } + | UNSET context_prop_spec { + $$ = property_op_to_music (scm_list_n ( + ly_symbol2scm ("unset"), + gh_cadr ($2))); + $$= context_spec_music (gh_car ($2), SCM_UNDEFINED, $$, SCM_EOL); + } + | ONCE music_property_def { + SCM e = $2->get_mus_property ("element"); + unsmob_music (e)->set_mus_property ("once", SCM_BOOL_T); + $$ = $2; + } ; -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); - csm->set_mus_property ("element", t->self_scm ()); - scm_gc_unprotect_object (t->self_scm ()); - $$ = csm; - $$->set_spot (THIS->here_input ()); +scalar: + string { $$ = $1; } + | bare_int { $$ = gh_int2scm ($1); } + | embedded_scm { $$ = $1; } + | full_markup { $$ = $1; } + | DIGIT { $$ = gh_int2scm ($1); } + ; - csm-> set_mus_property ("context-type", $2); - } - | PROPERTY STRING '.' STRING UNSET { - Music *t = new Music (SCM_EOL); +/* +This is a trick: - t->set_mus_property ("iterator-ctor", - Property_unset_iterator::constructor_cxx_function); - t->set_mus_property ("symbol", scm_string_to_symbol ($4)); +Adding pre_events to the simple_element +makes the choice between - Context_specced_music *csm = new Context_specced_music (SCM_EOL); - csm->set_mus_property ("element", t->self_scm ()); - scm_gc_unprotect_object (t->self_scm ()); + string: STRING - $$ = csm; - $$->set_spot (THIS->here_input ()); +and - 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); - t->set_mus_property ("symbols", scm_string_to_symbol ($4)); - t->set_mus_property ("pop-first", SCM_BOOL_T); - t->set_mus_property ("grob-property", $6); - t->set_mus_property ("grob-value", $8); - Context_specced_music *csm = new Context_specced_music (SCM_EOL); - csm->set_mus_property ("element", t->self_scm ()); - scm_gc_unprotect_object (t->self_scm ()); - $$ = csm; - $$->set_spot (THIS->here_input ()); + simple_element: STRING - csm-> set_mus_property ("context-type", $2); +a single shift/reduction conflict. + +nevertheless, this is not very clean, and we should find a different +solution. + +*/ +pre_events: { + THIS->push_spot (); } - | 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); - t->set_mus_property ("symbols", scm_string_to_symbol ($4)); - t->set_mus_property ("grob-property", $6); - t->set_mus_property ("grob-value", $8); - Context_specced_music *csm = new Context_specced_music (SCM_EOL); - csm->set_mus_property ("element", t->self_scm ()); - scm_gc_unprotect_object (t->self_scm ()); + ; - $$ = csm; - $$->set_spot (THIS->here_input ()); +event_chord: + pre_events simple_element post_events { + SCM elts = $2-> get_mus_property ("elements"); - csm-> set_mus_property ("context-type", $2); + elts = gh_append2 (elts, scm_reverse_x ($3, SCM_EOL)); + + $2->set_mus_property ("elements", elts); + $$ = $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); - t->set_mus_property ("symbols", scm_string_to_symbol ($4)); - t->set_mus_property ("grob-property", $6); + | command_element + | note_chord_element + ; - Context_specced_music *csm = new Context_specced_music (SCM_EOL); - csm->set_mus_property ("element", t->self_scm ()); - scm_gc_unprotect_object (t->self_scm ()); - $$ = csm; - $$->set_spot (THIS->here_input ()); +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); - csm-> set_mus_property ("context-type", $2); + 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; } ; -scalar: - string { $$ = $1; } - | bare_int { $$ = gh_int2scm ($1); } - | embedded_scm { $$ = $1; } +chord_open: '<' ; +chord_close: '>' + ; -request_chord: - pre_requests { - THIS->push_spot (); - } /*cont */ simple_element post_requests { - Music_sequence *l = dynamic_cast ($3); - if (l) { - for (int i=0; i < $1->size (); i++) - l->append_music ($1->elem (i)); - for (int i=0; i < $4->size (); i++) - l->append_music ($4->elem (i)); - } - else - programming_error ("Need Sequence to add music to"); - $$ = $3; +simul_open: LESSLESS + ; + +simul_close: MOREMORE + ; + +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); + + if (gh_pair_p ($4)) { + SCM arts = scm_reverse_x ($4, SCM_EOL); + n->set_mus_property ("articulations", arts); + } + $$ = n; + } + | DRUM_PITCH post_events { + Music *n = MY_MAKE_MUSIC("NoteEvent"); + n->set_mus_property ("duration" ,$2); + n->set_mus_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_mus_property ("articulations", arts); + } + $$ = n; } - | command_element ; 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 ()); } + | SKIP duration_length { + Music * skip = MY_MAKE_MUSIC("SkipMusic"); + skip->set_mus_property ("duration", $2); + + $$ = skip; + } + | OCTAVE { THIS->push_spot (); } + pitch { + Music *l = MY_MAKE_MUSIC("RelativeOctaveCheck"); + $$ = l; + $$->set_spot (THIS->pop_spot ()); + $$->set_mus_property ("pitch", $3); + } + | 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 { + $$ = MY_MAKE_MUSIC("VoiceSeparator"); + $$->set_spot (THIS->here_input ()); + } + | '|' { + + $$ = 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", ly_symbol2scm ("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", ly_symbol2scm ("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 = gh_cdr (s)) { - Music * p = new Music (SCM_EOL); - set_music_properties (p, gh_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); - - 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 ()); + static SCM proc ; + if (!proc) + proc = scm_c_eval_string ("make-clef-set"); - $$ =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 (gh_car ($2)); - int o = gh_scm2int (gh_cdr ($2)); - - Moment one_beat = Moment (1)/Moment (o); - Moment len = Moment (l) * one_beat; - + static SCM proc; + if (!proc) + proc = scm_c_eval_string ("make-time-signature-set"); - Music *p2 = set_property_music (ly_symbol2scm ("measureLength"), len.smobbed_copy ()); - Music *p3 = set_property_music (ly_symbol2scm ("beatLength"), one_beat.smobbed_copy ()); - - SCM list = gh_list (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 -*/ + SCM result = scm_apply_2 (proc, gh_car ($2), gh_cdr ($2), SCM_EOL); + scm_gc_protect_object (result); + $$ = unsmob_music (result); + } + | MARK scalar { + static SCM proc; + if (!proc) + proc = scm_c_eval_string ("make-mark-set"); - sp-> set_mus_property ("context-type", ly_str02scm ( "Score")); + SCM result = scm_call_1 (proc, $2); + scm_gc_protect_object (result); + $$ = unsmob_music (result); } ; command_req: - shorthand_command_req { $$ = $1; } - | verbose_command_req { $$ = $1; } - ; - -shorthand_command_req: - extender_req { - $$ = $1; - } - | hyphen_req { - $$ = $1; + BREATHE { + $$ = MY_MAKE_MUSIC("BreathingSignEvent"); } - | '|' { - $$ = new Barcheck_req; + | E_TILDE { + $$ = MY_MAKE_MUSIC("PesOrFlexaEvent"); } - | '~' { - $$ = new Tie_req; + | MARK DEFAULT { + Music * m = MY_MAKE_MUSIC("MarkEvent"); + $$ = m; } - | '[' { - Span_req*b= new Span_req; - b->set_span_dir (START); - b->set_mus_property ("span-type", ly_str02scm ("beam")); - $$ =b; + | tempo_event { + $$ = $1; } - | ']' { - Span_req*b= new Span_req; - b->set_span_dir ( STOP); - b->set_mus_property ("span-type", ly_str02scm ("beam")); - $$ = b; + | KEY DEFAULT { + Music *key= MY_MAKE_MUSIC("KeyChangeEvent"); + $$ = key; } - | BREATHE { - $$ = new Breathing_sign_req; + | KEY NOTENAME_PITCH SCM_IDENTIFIER { + + 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; } ; - -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; +post_events: + /* empty */ { + $$ = SCM_EOL; } - | MARK DEFAULT { - Mark_req * m = new Mark_req; - $$ = m; + | post_events post_event { + $2->set_spot (THIS->here_input ()); + $$ = gh_cons ($2->self_scm(), $$); + scm_gc_unprotect_object ($2->self_scm()); } - | MARK scalar { - Mark_req *m = new Mark_req; - m->set_mus_property ("label", $2); - $$ = m; - + | post_events tagged_post_event { + $2 -> set_spot (THIS->here_input ()); + $$ = scm_cons ($2->self_scm(), $$); + scm_gc_unprotect_object ($2->self_scm()); } - | 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; +tagged_post_event: + '-' TAG embedded_scm post_event { + tag_music ($4, $3, THIS->here_input ()); + $$ = $4; } - | SKIP duration_length { - Skip_req * skip_p = new Skip_req; - skip_p->set_mus_property ("duration", $2); + ; - $$ = skip_p; - } - | tempo_request { +post_event: + direction_less_event { $$ = $1; } - | KEY DEFAULT { - Key_change_req *key_p= new Key_change_req; - $$ = key_p; + | HYPHEN { + if (!THIS->lexer_->lyric_state_b ()) + THIS->parser_error (_ ("Have to be in Lyric mode for lyrics")); + $$ = MY_MAKE_MUSIC("HyphenEvent"); } - | 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; + | EXTENDER { + if (!THIS->lexer_->lyric_state_b ()) + THIS->parser_error (_ ("Have to be in Lyric mode for lyrics")); + $$ = MY_MAKE_MUSIC("ExtenderEvent"); } - ; - -post_requests: - { - $$ = new Link_array; + | script_dir direction_reqd_event { + if ($1) + $2->set_mus_property ("direction", gh_int2scm ($1)); + $$ = $2; } - | post_requests post_request { - $2->set_spot (THIS->here_input ()); - $$->push ($2); + | script_dir direction_less_event { + if ($1) + $2->set_mus_property ("direction", gh_int2scm ($1)); + $$ = $2; } + | string_number_event ; -post_request: - verbose_request - | request_with_dir - | close_request +string_number_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: - gen_text_def - | verbose_request - | script_abbreviation { - SCM s = THIS->lexer_p_->lookup_identifier ("dash" + ly_scm2string ($1)); - Articulation_req *a = new Articulation_req; - if (gh_string_p (s)) - a->set_mus_property ("articulation-type", s); - else THIS->parser_error (_ ("Expecting string as script definition")); - $$ = a; - } - ; +direction_less_event: + '[' { -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")); - $$ = $2; + +/* + +TODO: should take all these defs out of the parser, adn make use +configurable, i.e. + + +(set-articulation '~ "trill") + +*/ + Music * m = MY_MAKE_MUSIC ("BeamEvent"); + m->set_spot (THIS->here_input()); + m->set_mus_property ("span-direction" , gh_int2scm (START)); + $$ = m; } - ; - -verbose_request: - REQUEST_IDENTIFIER { - $$ = dynamic_cast (unsmob_music ($1)->clone ()); - $$->set_spot (THIS->here_input ()); + | ']' { + Music * m = MY_MAKE_MUSIC ("BeamEvent"); + m->set_spot (THIS->here_input()); + m->set_mus_property ("span-direction" , gh_int2scm (STOP)); + $$ = m; } - | DYNAMICSCRIPT embedded_scm { - /* - TODO: junkme, use text-type == dynamic - */ - Text_script_req *d = new Text_script_req; - d->set_mus_property ("text-type" , ly_symbol2scm ("dynamic")); - 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; + | '~' { + Music * m = MY_MAKE_MUSIC ("TieEvent"); + m->set_spot (THIS->here_input()); + $$ = m; + } + | close_event { + $$ = $1; + dynamic_cast ($$)->set_mus_property ("span-direction", + gh_int2scm (START)); + } + | open_event { + $$ = $1; + dynamic_cast ($$)->set_mus_property ("span-direction", + gh_int2scm (STOP)); + } + | 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; + ; + +direction_reqd_event: + gen_text_def { + $$ = $1; } - /* -duh, junk this syntax from the parser, if possible. - */ - | ARPEGGIO { - Arpeggio_req *a = new Arpeggio_req; - a->set_spot (THIS->here_input ()); + | script_abbreviation { + 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")); $$ = a; } - | GLISSANDO { - Glissando_req *g = new Glissando_req; - g->set_spot /* No pun intended */ (THIS->here_input ()); - $$ = g; - } + ; + +oct_check: + /**/ { $$ = SCM_EOL; } + | '=' { $$ = gh_int2scm (0); } + | '=' sub_quotes { $$ = gh_int2scm ($2); } + | '=' sup_quotes { $$ = gh_int2scm ($2); } ; sup_quotes: @@ -1383,15 +1625,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 (); - } ; @@ -1405,15 +1645,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 (); - } ; @@ -1421,123 +1660,75 @@ pitch: steno_pitch { $$ = $1; } - | explicit_pitch { - $$ = $1; - } - ; - -explicit_pitch: - PITCH embedded_scm { - $$ = $2; - if (!unsmob_pitch ($2)) { - THIS->parser_error (_f ("Expecting musical-pitch value", 3)); - $$ = Pitch ().smobbed_copy (); - } - } ; -explicit_duration: - DURATION embedded_scm { - $$ = $2; - if (!unsmob_duration ($2)) - { - THIS->parser_error (_ ("Must have duration object")); - $$ = Duration ().smobbed_copy (); - } - } - ; - -extender_req: - EXTENDER { - if (!THIS->lexer_p_->lyric_state_b ()) - THIS->parser_error (_ ("Have to be in Lyric mode for lyrics")); - $$ = new Extender_req; - } +pitch_also_in_chords: + pitch + | steno_tonic_pitch ; -hyphen_req: - HYPHEN { - if (!THIS->lexer_p_->lyric_state_b ()) - THIS->parser_error (_ ("Have to be in Lyric mode for lyrics")); - $$ = new Hyphen_req; - } - ; - -close_request: - close_request_parens { - $$ = $1; - dynamic_cast ($$)->set_span_dir ( START); - } - -close_request_parens: +close_event: '(' { - 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 { - $$ = $1; - dynamic_cast ($$)->set_span_dir (STOP); - } - ; - -open_request_parens: +open_event: 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; + full_markup { + Music *t = MY_MAKE_MUSIC("TextScriptEvent"); t->set_mus_property ("text", $1); t->set_spot (THIS->here_input ()); - $$ = t; + $$ = t; } | string { - Text_script_req *t = new Text_script_req; - t->set_mus_property ("text", $1); + 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; - - t->set_mus_property ("text", ly_str02scm (ds.ch_C ())); - t->set_mus_property ("text-type" , ly_symbol2scm ("finger")); + Music * t = MY_MAKE_MUSIC("FingerEvent"); + t->set_mus_property ("digit", gh_int2scm ($1)); t->set_spot (THIS->here_input ()); $$ = t; } @@ -1545,40 +1736,34 @@ 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"); } ; - script_dir: '_' { $$ = DOWN; } | '^' { $$ = UP; } | '-' { $$ = CENTER; } ; -pre_requests: - { - $$ = new Link_array; - } - | pre_requests open_request { - $$->push ($2); - } - ; absolute_pitch: steno_pitch { @@ -1590,21 +1775,21 @@ duration_length: multiplied_duration { $$ = $1; } - | explicit_duration { - $$ = $1; - } ; optional_notemode_duration: { - $$ = THIS->default_duration_.smobbed_copy (); + Duration dd = THIS->default_duration_; + $$ = dd.smobbed_copy (); + + THIS->beam_check ($$); } | multiplied_duration { $$ = $1; + THIS->default_duration_ = *unsmob_duration ($$); + + THIS->beam_check ($$); } - | explicit_duration { - $$ = $1; - } ; steno_duration: @@ -1616,15 +1801,13 @@ steno_duration: l = intlog2 ($1); $$ = Duration (l, $2).smobbed_copy (); - - THIS->set_last_duration (unsmob_duration ($$)); } | DURATION_IDENTIFIER dots { Duration *d =unsmob_duration ($1); Duration k (d->duration_log (),d->dot_count () + $2); - $$ = k.smobbed_copy (); - THIS->set_last_duration (unsmob_duration ($$)); + *d = k; + $$ = $1; } ; @@ -1639,7 +1822,7 @@ multiplied_duration: $$ = unsmob_duration ($$)->compressed ( $3) .smobbed_copy (); } | multiplied_duration '*' FRACTION { - Rational m (gh_scm2int (gh_car ($3)), gh_scm2int (gh_cdr ($3))); + Rational m (gh_scm2int (ly_car ($3)), gh_scm2int (ly_cdr ($3))); $$ = unsmob_duration ($$)->compressed (m).smobbed_copy (); } @@ -1648,7 +1831,7 @@ multiplied_duration: fraction: FRACTION { $$ = $1; } | UNSIGNED '/' UNSIGNED { - $$ = gh_cons (gh_int2scm ($1), gh_int2scm ($3)); + $$ = scm_cons (gh_int2scm ($1), gh_int2scm ($3)); } ; @@ -1674,195 +1857,284 @@ tremolo_type: ; + +/***************************************************************** + BASS FIGURES +*****************************************************************/ +bass_number: + 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: + '-' { $$ = -2; } + | '+' { $$ = 2; } + | '!' { $$ = 0; } + ; + +bass_figure: + FIGURE_SPACE { + Music *bfr = MY_MAKE_MUSIC("BassFigureEvent"); + $$ = bfr->self_scm(); + scm_gc_unprotect_object ($$); + } + | bass_number { + Music *bfr = MY_MAKE_MUSIC("BassFigureEvent"); + $$ = bfr->self_scm(); + + bfr->set_mus_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", + gh_int2scm (alter + $2)); + } else { + m->set_mus_property ("alteration", gh_int2scm (0)); + } + } + ; + +br_bass_figure: + '[' bass_figure { + $$ = $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); + } + ; + +figure_list: + /**/ { + $$ = SCM_EOL; + } + | figure_list br_bass_figure { + $$ = scm_cons ($2, $1); + } + ; + +figure_spec: + FIGURE_OPEN figure_list FIGURE_CLOSE { + Music * m = MY_MAKE_MUSIC("EventChord"); + $2 = scm_reverse_x ($2, SCM_EOL); + m->set_mus_property ("elements", $2); + $$ = m->self_scm (); + } + ; + + +optional_rest: + /**/ { $$ = 0; } + | REST { $$ = 1; } + ; + simple_element: - pitch exclamations questions optional_notemode_duration { + pitch exclamations questions oct_check 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")); - Note_req *n = new Note_req; + Music *n = 0; + if ($6) + n = MY_MAKE_MUSIC("RestEvent"); + else + n = MY_MAKE_MUSIC("NoteEvent"); n->set_mus_property ("pitch", $1); - n->set_mus_property ("duration", $4); + n->set_mus_property ("duration", $5); + + if (gh_number_p ($4)) + { + int q = gh_scm2int ($4); + n->set_mus_property ("absolute-octave", gh_int2scm (q-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); - Simultaneous_music*v = new Request_chord (SCM_EOL); - v->set_mus_property ("elements", gh_list (n->self_scm (), SCM_UNDEFINED)); - + 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); + $$ = v; + } + | DRUM_PITCH optional_notemode_duration { + Input i = THIS->pop_spot (); + + Music *n = MY_MAKE_MUSIC("NoteEvent"); + n->set_mus_property ("duration" ,$2); + n->set_mus_property ("drum-type" , $1); + + 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); $$ = v; + } - | RESTNAME optional_notemode_duration { + | 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)) + { + 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", gh_list (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; + scm_gc_unprotect_object (ev->self_scm()); + + $$ = velt; } | MULTI_MEASURE_REST optional_notemode_duration { - Input = 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", gh_list (sp1->self_scm (), SCM_UNDEFINED)); - Request_chord * rqc2 = new Request_chord (SCM_EOL); - rqc2->set_mus_property ("elements", gh_list (sk->self_scm (), SCM_UNDEFINED));; - Request_chord * rqc3 = new Request_chord (SCM_EOL); - rqc3->set_mus_property ("elements", gh_list (sp2->self_scm (), SCM_UNDEFINED));; - - SCM ms = gh_list (rqc1->self_scm (), rqc2->self_scm (), rqc3->self_scm (), SCM_UNDEFINED); - - $$ = new Sequential_music (SCM_EOL); - $$->set_mus_property ("elements", ms); - } - | STRING optional_notemode_duration { - Input = 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", gh_list (lreq_p->self_scm (), SCM_UNDEFINED)); - - $$= velt_p; - } - | chord { - Input = THIS->pop_spot (); - - if (!THIS->lexer_p_->chord_state_b ()) - THIS->parser_error (_ ("Have to be in Chord mode for chords")); - $$ = $1; + THIS->pop_spot (); + + static SCM proc ; + if (!proc) + proc = scm_c_eval_string ("make-multi-measure-rest"); + + SCM mus = scm_call_2 (proc, $2, + 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 ()) + 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); + lreq->set_spot (i); + Music * velt = MY_MAKE_MUSIC("EventChord"); + velt->set_mus_property ("elements", scm_list_n (lreq->self_scm (), SCM_UNDEFINED)); -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 ()); - }; + $$= velt; + } + | new_chord { + THIS->pop_spot (); -chord_additions: - { - $$ = SCM_EOL; - } - | CHORD_COLON chord_notes { - $$ = $2; + if (!THIS->lexer_->chord_state_b ()) + THIS->parser_error (_ ("Have to be in Chord mode for chords")); + $$ = unsmob_music ($1); } ; -chord_notes: - chord_step { - $$ = $1 - } - | chord_notes '.' chord_step { - $$ = gh_append2 ($$, $3); - } +lyric_element: + full_markup { $$ = $1; } + | STRING { $$ = $1 ; } ; -chord_subtractions: - { - $$ = SCM_EOL; - } - | CHORD_CARET chord_notes { - $$ = $2; +new_chord: + steno_tonic_pitch optional_notemode_duration { + $$ = make_chord ($1, $2, SCM_EOL); + } + | 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_inversion: - { - $$ = SCM_EOL; +chord_items: + /**/ { + $$ = SCM_EOL; } - | '/' steno_tonic_pitch { - $$ = $2; + | chord_items chord_item { + $$ = gh_cons ($2, $$); } ; -chord_bass: - { - $$ = SCM_EOL; +chord_separator: + CHORD_COLON { + $$ = ly_symbol2scm ("chord-colon"); + } + | CHORD_CARET { + $$ = ly_symbol2scm ("chord-caret"); + } + | 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. */ - $$ = gh_list (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, SHARP); } | 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, FLAT); } - ; + ; /* UTILITIES + +TODO: should deprecate in favor of Scheme? + */ number_expression: number_expression '+' number_term { @@ -1887,10 +2159,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 @@ -1907,20 +2176,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 MM_T { - $$ = gh_double2scm (gh_scm2double ($1) MM); + | REAL NUMBER_IDENTIFIER { + $$ = gh_double2scm (gh_scm2double ($1) * gh_scm2double ($2)); } - | REAL CHAR_T { - $$ = gh_double2scm (gh_scm2double ($1) CHAR); + | UNSIGNED NUMBER_IDENTIFIER { + $$ = gh_double2scm ($1 * gh_scm2double ($2)); } ; @@ -1976,13 +2236,92 @@ 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_EMPTY { + $$ = scm_list_n ($1, SCM_UNDEFINED); + } + | 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_HEAD_SCM0_SCM1 embedded_scm embedded_scm { + $$ = scm_list_n ($1, $2, $3, 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 } @@ -1991,9 +2330,165 @@ extern My_lily_parser * current_parser; void My_lily_parser::do_yyparse () { - current_parser = this;; yyparse ((void*)this); } +/* +Should make this optional? It will also complain when you do + + [s4] + +which is entirely legitimate. + +Or we can scrap it. Barchecks should detect wrong durations, and +skipTypesetting speeds it up a lot. +*/ + +void +My_lily_parser::beam_check (SCM dur) +{ + Duration *d = unsmob_duration (dur); + if (unsmob_music (last_beam_start_) && d->duration_log () <= 2) + { + Music * m = unsmob_music (last_beam_start_); + m->origin ()->warning (_("Suspect duration found following this beam")); + } + last_beam_start_ = SCM_EOL; +} + + + + +/* + +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_context_def (sid)) { + *destination = unsmob_context_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 (Text_item::markup_p (sid)) { + *destination = sid; + return MARKUP_IDENTIFIER; + } + + return -1; +} + +Music * +property_op_to_music (SCM op) +{ + Music * m = 0; + SCM tag = gh_car (op); + SCM symbol = gh_cadr (op); + SCM args = gh_cddr (op); + SCM grob_val = SCM_UNDEFINED; + SCM grob_sym = SCM_UNDEFINED; + SCM val = SCM_UNDEFINED; + + if (tag == ly_symbol2scm ("assign")) + { + m = MY_MAKE_MUSIC("PropertySet"); + val = gh_car (args); + } + else if (tag == ly_symbol2scm ("unset")) + m = MY_MAKE_MUSIC("PropertyUnset"); + else if (tag == ly_symbol2scm ("poppush") + || tag == ly_symbol2scm ("push")) + { + 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"); + grob_sym = gh_car (args); + } + + m->set_mus_property ("symbol", symbol); + + if (val != SCM_UNDEFINED) + m->set_mus_property ("value", val); + if (grob_val != SCM_UNDEFINED) + m->set_mus_property ("grob-value", grob_val); + + if (grob_sym != SCM_UNDEFINED) + { + bool itc = internal_type_checking_global_b; + /* UGH. + */ + 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); + if (autobeam) + internal_type_checking_global_b = itc; + } + + if (op == ly_symbol2scm ("poppush")) + m->set_mus_property ("pop-first", SCM_BOOL_T); + + + return m; +} + +Music* +context_spec_music (SCM type, SCM id, Music * m, SCM ops) +{ + Music * csm = MY_MAKE_MUSIC("ContextSpeccedMusic"); + + csm->set_mus_property ("element", m->self_scm ()); + scm_gc_unprotect_object (m->self_scm ()); + + csm->set_mus_property ("context-type", + gh_symbol_p (type) ? type : scm_string_to_symbol (type)); + csm->set_mus_property ("property-operations", ops); + + if (gh_string_p (id)) + csm->set_mus_property ("context-id", id); + return csm; +} + + +SCM +get_next_unique_context () +{ + static int new_context_count; + + char s[1024]; + snprintf (s, 1024, "uniqueContext%d", new_context_count ++); + + return scm_makfrom0str (s); +} +