#include "file-path.hh"
#include "keyword.hh"
#include "debug.hh"
-#include "parseconstruct.hh"
#include "dimensions.hh"
#include "identifier.hh"
#include "command-request.hh"
#include "musical-request.hh"
#include "my-lily-parser.hh"
-
+#include "context-specced-music.hh"
#include "translator-group.hh"
#include "score.hh"
#include "music-list.hh"
#include "duration-convert.hh"
#include "change-translator.hh"
#include "file-results.hh"
-#include "mudela-version.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 "mudela-version.hh"
+#include "grace-music.hh"
+#include "auto-change-music.hh"
// mmm
-Mudela_version oldest_version ("1.0.14");
-Mudela_version version ("1.0.15");
+Mudela_version oldest_version ("1.1.52");
+
+void
+print_mudela_versions (ostream &os)
+{
+ os << _f ("Oldest supported input version: %s", oldest_version.str ())
+ << endl;
+}
// needed for bison.simple's malloc() and free()
#include <malloc.h>
-struct Assignment {
- String *name_p_;
- Identifier *id_p_;
- ~Assignment () {
- delete name_p_;
- delete id_p_;
- }
- Assignment () {
- name_p_ = 0;
- id_p_ =0;
- }
- Assignment (Assignment const&s)
- {
- name_p_ = new String (*s.name_p_);
- id_p_ = s.id_p_->clone ();
- }
-};
-
-Paper_def* current_paper = 0;
-
#ifndef NDEBUG
#define YYDEBUG 1
#endif
#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))
+#define ARRAY_SIZE(a,s) if (a.size () != s) THIS->parser_error (_f ("Expecting %d arguments", s))
%}
%union {
- Array<Interval>* intarr;
+ Array<Real>* realarr;
Array<Musical_pitch> *pitch_arr;
Link_array<Request> *reqvec;
Array<String> * strvec;
%pure_parser
/* tokens which are not keywords */
-
-%token ABSDYNAMIC
+%token AUTOCHANGE
+%token TEXTSCRIPT
%token ACCEPTS
%token ALTERNATIVE
%token BAR
+%token BREATHE
%token CADENZA
%token CHORDMODIFIERS
%token CHORDS
+%token HYPHEN
%token CLEF
%token CM_T
%token CONSISTS
+%token SEQUENTIAL
+%token SIMULTANEOUS
+%token CONSISTSEND
%token DURATION
%token EXTENDER
%token FONT
-%token GROUPING
+%token GRACE
%token HEADER
%token IN_T
+%token INVALID
%token KEY
%token KEYSIGNATURE
%token LYRICS
%token RELATIVE
%token REMOVE
%token REPEAT
+%token REPETITIONS
+%token ADDLYRICS
%token SCM_T
%token SCMFILE
%token SCORE
%token SCRIPT
%token SHAPE
%token SKIP
-%token SPANDYNAMIC
+%token SPANREQUEST
%token TEMPO
%token TIME_T
%token TIMES
%token TRANSLATOR
%token TRANSPOSE
%token TYPE
+%token CONTEXT
%token VERSION
/* escaped */
-%token E_EXCLAMATION E_SMALLER E_BIGGER E_CHAR
+%token E_EXCLAMATION E_SMALLER E_BIGGER E_CHAR CHORD_MINUS CHORD_CARET
-%type <i> dots exclamations questions
+%type <i> exclamations questions
%token <i> DIGIT
%token <pitch> NOTENAME_PITCH
%token <pitch> TONICNAME_PITCH
%type <i> script_dir
%type <i> optional_modality
%type <id> identifier_init
-%type <duration> steno_duration notemode_duration
+%type <duration> steno_duration optional_notemode_duration
%type <duration> entered_notemode_duration explicit_duration
-%type <intvec> intastint_list int_list
+%type <intvec> int_list
%type <reqvec> pre_requests post_requests
%type <request> gen_text_def
%type <pitch> explicit_musical_pitch steno_musical_pitch musical_pitch absolute_musical_pitch
%type <pitch> steno_tonic_pitch
%type <pitch_arr> pitch_list
-%type <music> chord notemode_chord
-%type <pitch_arr> chord_additions chord_subtractions chord_notes
-%type <pitch> chord_addsub chord_note chord_inversion notemode_chord_inversion
+%type <music> chord
+%type <pitch_arr> chord_additions chord_subtractions chord_notes chord_step
+%type <pitch> chord_note chord_inversion
%type <midi> midi_block midi_body
%type <duration> duration_length
%type <scalar> scalar
-%type <music> Music relative_music Sequential_music Simultaneous_music
+%type <music> Music Sequential_music Simultaneous_music Music_sequence
+%type <music> relative_music re_rhythmed_music
%type <music> property_def translator_change
%type <music_list> Music_list
%type <paper> paper_block paper_def_body
-%type <real> real_expression real real_with_dimension
+%type <real> real real_with_dimension
%type <request> abbrev_command_req
%type <request> post_request
%type <request> command_req verbose_command_req
%type <request> extender_req
+%type <request> hyphen_req
%type <string> string
%type <score> score_block score_body
-%type <intarr> shape_array
+%type <realarr> real_array
%type <string> script_abbreviation
%type <trans> translator_spec_block translator_spec_body
%type <tempo> tempo_request
%type <notenametab> notenames_body notenames_block chordmodifiers_block
-%expect 8
+
%left '-' '+'
%left '*' '/'
mudela: /* empty */
| mudela toplevel_expression {}
- | mudela assignment { }
+ | mudela assignment { }
| mudela error
- | mudela check_version { }
+ | mudela INVALID {
+ THIS->error_level_i_ =1;
+ }
;
toplevel_expression:
delete $2;
}
| SCM_T STRING semicolon {
+ if (THIS->lexer_p_->main_input_b_ && safe_global_b)
+ error (_("Can't evaluate Scheme in safe mode"));
gh_eval_str ($2->ch_l ());
delete $2;
};
-check_version:
- VERSION STRING semicolon {
- Mudela_version ver (*$2);
- if (!((ver >= oldest_version) && (ver <= version))) {
- if (THIS->ignore_version_b_) {
- THIS->here_input ().error (_f ("incorrect mudela version: %s (%s, %s)", ver.str (), oldest_version.str (), version.str ()));
- } else {
- THIS->fatal_error_i_ = 1;
- THIS->parser_error (_f ("incorrect mudela version: %s (%s, %s)", ver.str (), oldest_version.str (), version.str ()));
- }
- }
- }
- ;
-
chordmodifiers_block:
CHORDMODIFIERS '{' notenames_body '}' { $$ = $3; }
}
| notenames_body STRING '=' explicit_musical_pitch {
(*$$)[*$2] = *$4;
- int n = ($4->notename_i_ + 10 * 7) % 7;
- int a = $4->accidental_i_ + 2;
- Musical_pitch::name_str_arr_arr_[n][a] = *$2;
+
delete $4;
delete $2;
}
translator_spec_body:
TRANS_IDENTIFIER {
$$ = $1->access_content_Translator (true);
+ Translator_group * tg = dynamic_cast<Translator_group*> ($$);
+ if (!tg)
+ THIS->parser_error (_("Need a translator group for a context"));
$$-> set_spot (THIS->here_input ());
}
| TYPE STRING semicolon {
delete $4;
/* ugh*/
- Translator_group * tr = dynamic_cast<Translator_group*>($$);
- tr->set_property (*$2, str);
+ Translator_group* tg = dynamic_cast<Translator_group*> ($$);
+ if (!tg)
+ THIS->parser_error (_("Need a translator group for a context"));
+ tg->set_property (*$2, str);
}
| translator_spec_body NAME STRING semicolon {
$$->type_str_ = *$3;
dynamic_cast<Translator_group*> ($$)-> set_element (*$3, true);
delete $3;
}
+ | translator_spec_body CONSISTSEND STRING semicolon {
+ dynamic_cast<Translator_group*> ($$)-> set_element (*$3, true);
+ delete $3;
+ }
| translator_spec_body ACCEPTS STRING semicolon {
dynamic_cast<Translator_group*> ($$)-> set_acceptor (*$3, true);
delete $3;
SCORE
*/
score_block:
- SCORE { THIS->remember_spot ();
+ SCORE {
}
/*cont*/ '{' score_body '}' {
$$ = $4;
- $$->set_spot (THIS->pop_spot ());
if (!$$->def_p_arr_.size ())
$$->add_output (THIS->default_paper_p ());
-
}
;
score_body: {
$$ = new Score;
+ $$->set_spot (THIS->here_input ());
}
| SCORE_IDENTIFIER {
$$ = $1->access_content_Score (true);
}
;
-intastint_list:
- /* */ { $$ =new Array<int>; }
- | intastint_list int '*' int {
- $$->push ($2); $$->push ($4);
- }
- | intastint_list int {
- $$->push ($2); $$->push (1);
- }
- ;
-
/*
PAPER
;
-optional_dot:
- /* empty */
- | '.'
- ;
-
paper_def_body:
/* empty */ {
Paper_def *p = THIS->default_paper_p ();
| paper_def_body translator_spec_block {
$$->assign_translator ($2);
}
- | paper_def_body SHAPE '=' shape_array semicolon {
- $$->shape_int_a_ = *$4;
- delete $4;
+ | paper_def_body SHAPE real_array semicolon {
+ /*
+ URG URG.
+ */
+ if ($3->size () % 2)
+ warning (_ ("Need even number of args for shape array"));
+
+ for (int i=0; i < $3->size (); i+=2)
+ {
+ Real l = $3->elem (i);
+ $$->shape_int_a_.push (Interval (l,
+ l + $3->elem (i+1)));
+ }
+ delete $3;
}
| paper_def_body error {
;
-real:
- real_expression { $$ = $1; }
- ;
-
real_with_dimension:
REAL CM_T {
}
;
-real_expression:
+real:
REAL {
$$ = $1;
}
| REAL_IDENTIFIER {
$$= *$1->access_content_Real (false);
}
- | '-' real_expression %prec UNARY_MINUS {
+ | '-' real %prec UNARY_MINUS {
$$ = -$2;
}
- | real_expression '*' real_expression {
+ | real '*' real {
$$ = $1 * $3;
}
- | real_expression '/' real_expression {
+ | real '/' real {
$$ = $1 / $3;
}
- | real_expression '+' real_expression {
+ | real '+' real {
$$ = $1 + $3;
}
- | real_expression '-' real_expression {
+ | real '-' real {
$$ = $1 - $3;
}
- | '(' real_expression ')' {
+ | '(' real ')' {
$$ = $2;
}
;
-shape_array:
- /* empty */ {
- $$ = new Array<Interval>;
+real_array:
+ real {
+ $$ = new Array<Real>;
+ $$->push ($1);
}
- | shape_array real real {
- $$->push(Interval($2, $2 + $3));
- };
+ | /* empty */ {
+ $$ = new Array<Real>;
+ }
+ | real_array ',' real {
+ $$->push($3);
+ }
+ ;
/*
MIDI
*/
midi_block:
MIDI
-
- '{' midi_body '}' { $$ = $3; }
+ '{' midi_body '}' {
+ $$ = $3;
+ THIS-> lexer_p_-> scope_l_arr_.pop();
+ }
;
midi_body: /* empty */ {
- $$ = THIS->default_midi_p ();
+ Midi_def * p =THIS->default_midi_p ();
+ $$ = p;
+ THIS->lexer_p_->scope_l_arr_.push (p->scope_p_);
}
| MIDI_IDENTIFIER {
- $$ = $1-> access_content_Midi_def (true);
+ Midi_def * p =$1-> access_content_Midi_def (true);
+ $$ = p;
+ THIS->lexer_p_->scope_l_arr_.push (p->scope_p_);
+ }
+ | midi_body assignment semicolon {
+
}
| midi_body translator_spec_block {
$$-> assign_translator ($2);
Music_list: /* empty */ {
$$ = new Music_list;
+ $$->set_spot (THIS->here_input ());
}
| Music_list Music {
$$->add_music ($2);
Alternative_music:
/* empty */ {
-
- /* UGH*/
- Music_list* m = new Music_list;
- $$ = new Sequential_music (m);
+ $$ = 0;
}
- | ALTERNATIVE Simultaneous_music {
+ | ALTERNATIVE Music_sequence {
$$ = $2;
+ $2->set_spot (THIS->here_input ());
}
- | ALTERNATIVE Sequential_music {
- $$ = $2;
+ ;
+
+
+
+
+Repeated_music:
+ REPEAT STRING unsigned Music Alternative_music
+ {
+ Music_sequence* m = dynamic_cast <Music_sequence*> ($5);
+ if (m && $3 < m->length_i ())
+ $5->warning (_ ("More alternatives than repeats. Junking excess alternatives."));
+
+ Repeated_music * r = new Repeated_music ($4, $3 >? 1, m);
+ $$ = r;
+ r->fold_b_ = (*$2 == "fold");
+ r->volta_fold_b_ = (*$2 == "volta");
+ delete $2;
+ r->set_spot ($4->spot ());
}
;
-Repeated_music: REPEAT unsigned Music Alternative_music {
- Music_sequence* m = dynamic_cast <Music_sequence*> ($4);
- assert (m);
- $$ = new Repeated_music ($3, $2 >? 1, m);
+Music_sequence: '{' Music_list '}' {
+ $$ = new Music_sequence ($2);
+ $$->set_spot ($2->spot ());
}
;
-Sequential_music: '{' Music_list '}' {
+Sequential_music:
+ SEQUENTIAL '{' Music_list '}' {
+ $$ = new Sequential_music ($3);
+ $$->set_spot ($3->spot ());
+ }
+ | '{' Music_list '}' {
$$ = new Sequential_music ($2);
+ $$->set_spot ($2->spot ());
}
;
-Simultaneous_music: '<' Music_list '>' {
+Simultaneous_music:
+ SIMULTANEOUS '{' Music_list '}'{
+ $$ = new Simultaneous_music ($3);
+ $$->set_spot ($3->spot ());
+ }
+ | '<' Music_list '>' {
$$ = new Simultaneous_music ($2);
+ $$->set_spot ($2->spot ());
}
;
| property_def
| translator_change
| Simple_music '*' unsigned '/' unsigned {
- /* urg */
- $$ = new Time_scaled_music ($3, $5, $1);
+ $$ = $1;
+ $$->compress (Moment($3, $5 ));
}
| Simple_music '*' unsigned {
- $$ = new Time_scaled_music ($3, 1, $1);
+ $$ = $1;
+ $$->compress (Moment ($3, 1));
}
;
Composite_music:
- TYPE STRING Music {
- $$ = $3;
- $$->translator_type_str_ = *$2;
+ CONTEXT STRING Music {
+ Context_specced_music *csm = new Context_specced_music ($3);
+
+ csm->translator_type_str_ = *$2;
+ csm->translator_id_str_ = "";
delete $2;
+
+ $$ = csm;
}
- | TYPE STRING '=' STRING Music {
- $$ = $5;
- $$->translator_type_str_ = *$2;
- $$->translator_id_str_ = *$4;
+ | AUTOCHANGE STRING Music {
+ Auto_change_music * chm = new Auto_change_music (*$2, $3);
+ delete $2;
+ $$ = chm;
+ chm->set_spot ($3->spot ());
+ }
+ | GRACE Music {
+ $$ = new Grace_music ($2);
+ }
+ | CONTEXT STRING '=' STRING Music {
+ Context_specced_music *csm = new Context_specced_music ($5);
+
+ csm->translator_type_str_ = *$2;
+ csm->translator_id_str_ = *$4;
delete $2;
delete $4;
+
+ $$ = csm;
}
| TIMES {
THIS->remember_spot ();
THIS->lexer_p_->pop_state ();
}
| relative_music { $$ = $1; }
+ | re_rhythmed_music { $$ = $1; }
;
relative_music:
}
;
+re_rhythmed_music:
+ ADDLYRICS Music Music {
+ Lyric_combine_music * l = new Lyric_combine_music ($2, $3);
+ $$ = l;
+ }
+ ;
+
translator_change:
TRANSLATOR STRING '=' STRING {
Change_translator * t = new Change_translator;
;
property_def:
- PROPERTY STRING '.' STRING '=' scalar {
+ PROPERTY STRING '.' STRING '=' scalar {
Translation_property *t = new Translation_property;
- t-> translator_type_str_ = *$2;
+
t-> var_str_ = *$4;
t-> value_ = *$6;
- $$ = t;
+
+ Context_specced_music *csm = new Context_specced_music (t);
+ $$ = csm;
$$->set_spot (THIS->here_input ());
+
+ csm-> translator_type_str_ = *$2;
+
delete $2;
delete $4;
delete $6;
;
scalar:
- STRING { $$ = new Scalar (*$1); delete $1; }
+ string { $$ = new Scalar (*$1); delete $1; }
| int { $$ = new Scalar ($1); }
;
extender_req {
$$ = $1;
}
+ | hyphen_req {
+ $$ = $1;
+ }
| '|' {
$$ = new Barcheck_req;
}
$$ = new Tie_req;
}
| '[' {
- Beam_req*b= new Beam_req;
- b->spantype_ = START;
+ Span_req*b= new Span_req;
+ b->span_dir_ = START;
+ b->span_type_str_ = "beam";
$$ =b;
}
+ | '[' ':' unsigned {
+ if (!Duration::duration_type_b ($3))
+ THIS->parser_error (_f ("not a duration: %d", $3));
+ else if ($3 < 8)
+ THIS->parser_error (_ ("Can't abbreviate"));
+ else
+ THIS->set_abbrev_beam ($3);
+
+ Chord_tremolo_req* a = new Chord_tremolo_req;
+ a->span_dir_ = START;
+ a->type_i_ = THIS->abbrev_beam_type_i_;
+ $$=a;
+ }
| ']' {
- Beam_req*b= new Beam_req;
- b->spantype_ = STOP;
- $$ = b;
+ if (!THIS->abbrev_beam_type_i_)
+ {
+ Span_req*b= new Span_req;
+ b->span_dir_ = STOP;
+ b->span_type_str_ = "beam";
+ $$ = b;
+ }
+ else
+ {
+ Chord_tremolo_req* a = new Chord_tremolo_req;
+ a->span_dir_ = STOP;
+ a->type_i_ = THIS->abbrev_beam_type_i_;
+ THIS->set_abbrev_beam (0);
+ $$ = a;
+ }
+ }
+ | BREATHE {
+ $$ = new Breathing_sign_req;
}
;
m->one_beat_i_=$4;
$$ = m;
}
- | PENALTY int {
+ | PENALTY int {
Break_req * b = new Break_req;
- b->penalty_i_ = $2;
- b-> set_spot (THIS->here_input ());
+ b->penalty_f_ = $2 / 100.0;
+ b->set_spot (THIS->here_input ());
$$ = b;
}
| SKIP duration_length {
}
| KEY NOTENAME_PITCH optional_modality {
Key_change_req *key_p= new Key_change_req;
- key_p->pitch_arr_.push(*$2);
- key_p->ordinary_key_b_ = true;
- key_p->modality_i_ = $3;
+ key_p->key_.pitch_arr_.push (*$2);
+ key_p->key_.ordinary_key_b_ = true;
+ key_p->key_.modality_i_ = $3;
$$ = key_p;
delete $2;
}
| KEYSIGNATURE pitch_list {
Key_change_req *key_p= new Key_change_req;
- key_p->pitch_arr_ = *$2;
- key_p->ordinary_key_b_ = false;
+ key_p->key_.pitch_arr_ = *$2;
+ key_p->key_.ordinary_key_b_ = false;
$$ = key_p;
delete $2;
}
- | GROUPING intastint_list {
- Measure_grouping_req * mr_p = new Measure_grouping_req;
- for (int i=0; i < $2->size();)
- {
- mr_p->elt_length_arr_.push (Moment (1, $2->elem(i++)));
- mr_p->beat_i_arr_.push ($2->elem(i++));
- }
-
- $$ = mr_p;
- delete $2;
- }
;
post_requests:
request_with_dir:
script_dir request_that_take_dir {
- if (G_script_req * gs = dynamic_cast<G_script_req*> ($2))
- gs->dir_ = $1;
+ if (Script_req * gs = dynamic_cast<Script_req*> ($2))
+ gs->dir_ = Direction ($1);
else if ($1)
- $2->warning ("Can't specify direction for this request");
+ $2->warning (_ ("Can't specify direction for this request"));
$$ = $2;
}
;
$$ = (Request*)$1->access_content_Request (true);
$$->set_spot (THIS->here_input ());
}
- | ABSDYNAMIC '{' STRING '}' {
- Absolute_dynamic_req *ad_p = new Absolute_dynamic_req;
- ad_p ->loudness_str_ = *$3;
- ad_p->set_spot (THIS->here_input ());
+ | TEXTSCRIPT STRING STRING {
+ Text_script_req *ts_p = new Text_script_req;
+ ts_p-> text_str_ = *$2;
+ ts_p-> style_str_ = *$3;
+ ts_p->set_spot (THIS->here_input ());
delete $3;
- $$ =ad_p;
+ delete $2;
+ $$ = ts_p;
}
- | SPANDYNAMIC '{' int int '}' {
- Span_dynamic_req * sp_p = new Span_dynamic_req;
- sp_p-> dynamic_dir_ = Direction($3);
- sp_p->spantype_ = Direction($4);
+ | SPANREQUEST int STRING {
+ Span_req * sp_p = new Span_req;
+ sp_p-> span_dir_ = Direction($2);
+ sp_p->span_type_str_ = *$3;
sp_p->set_spot (THIS->here_input ());
$$ = sp_p;
}
| abbrev_type {
- Abbreviation_req* a = new Abbreviation_req;
+ Tremolo_req* a = new Tremolo_req;
a->set_spot (THIS->here_input ());
a->type_i_ = $1;
$$ = a;
;
musical_pitch:
- steno_musical_pitch
- | explicit_musical_pitch
+ steno_musical_pitch {
+ $$ = $1;
+ THIS->set_last_pitch ($1);
+ }
+ | explicit_musical_pitch {
+ $$ = $1;
+ THIS->set_last_pitch ($1);
+ }
;
explicit_duration:
extender_req:
EXTENDER {
if (!THIS->lexer_p_->lyric_state_b ())
- THIS->parser_error (_ ("have to be in Lyric mode for lyrics"));
+ THIS->parser_error (_ ("Have to be in Lyric mode for lyrics"));
$$ = new Extender_req;
}
;
+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<Span_req*> ($$)->spantype_ = START;
+ dynamic_cast<Span_req*> ($$)->span_dir_ = START;
}
close_request_parens:
'(' {
- $$= new Slur_req;
+ Span_req* s= new Span_req;
+ $$ = s;
+ s->span_type_str_ = "slur";
}
| E_SMALLER {
- Span_dynamic_req*s =new Span_dynamic_req;
+ Span_req*s =new Span_req;
$$ = s;
- s->dynamic_dir_ = UP;
+ s->span_type_str_ = "crescendo";
}
| E_BIGGER {
- Span_dynamic_req*s =new Span_dynamic_req;
+ Span_req*s =new Span_req;
$$ = s;
- s->dynamic_dir_ = DOWN;
+ s->span_type_str_ = "decrescendo";
}
;
open_request:
open_request_parens {
$$ = $1;
- dynamic_cast<Span_req*> ($$)->spantype_ = STOP;
+ dynamic_cast<Span_req*> ($$)->span_dir_ = STOP;
}
;
open_request_parens:
E_EXCLAMATION {
- Span_dynamic_req *s = new Span_dynamic_req;
- s->dynamic_dir_ = SMALLER;
+ Span_req *s = new Span_req;
+ s->span_type_str_ = "crescendo";
$$ = s;
-
}
| ')' {
- $$= new Slur_req
+ Span_req* s= new Span_req;
+ $$ = s;
+ s->span_type_str_ = "slur";
}
;
;
entered_notemode_duration:
- dots {
- $$ = new Duration (THIS->default_duration_);
- if ($1)
- $$->dots_i_ = $1;
- }
- | steno_duration {
+ steno_duration {
THIS->set_last_duration ($1);
}
;
-notemode_duration:
- entered_notemode_duration {
+optional_notemode_duration:
+ {
+ $$ = new Duration (THIS->default_duration_);
+ }
+ | entered_notemode_duration {
$$ = $1;
}
;
if (!Duration::duration_type_b ($2))
THIS->parser_error (_f ("not a duration: %d", $2));
else if ($2 < 8)
- THIS->parser_error (_ ("can't abbreviate"));
+ THIS->parser_error (_ ("Can't abbreviate"));
$$ = $2;
}
;
simple_element:
- musical_pitch exclamations questions notemode_duration {
+ musical_pitch exclamations questions optional_notemode_duration {
if (!THIS->lexer_p_->note_state_b ())
- THIS->parser_error (_ ("have to be in Note mode for notes"));
+ THIS->parser_error (_ ("Have to be in Note mode for notes"));
Note_req *n = new Note_req;
delete $1;
n->duration_ = *$4;
delete $4;
+ if (THIS->abbrev_beam_type_i_)
+ {
+ if (n->duration_.plet_b ())
+ THIS->parser_error (_ ("Can't abbreviate tuplet"));
+ else
+ n->duration_.set_plet (1, 2);
+ }
n->cautionary_b_ = $3 % 2;
n->forceacc_b_ = $2 % 2 || n->cautionary_b_;
$$ = v;
}
- | RESTNAME notemode_duration {
+ | RESTNAME optional_notemode_duration {
$$ = THIS->get_rest_element (*$1, $2);
delete $1; // delete notename
}
- | MEASURES notemode_duration {
+ | MEASURES optional_notemode_duration {
Multi_measure_rest_req* m = new Multi_measure_rest_req;
m->duration_ = *$2;
delete $2;
velt_p->add_music (m);
$$ = velt_p;
}
- | STRING notemode_duration {
+ | REPETITIONS optional_notemode_duration {
+ Repetitions_req* r = new Repetitions_req;
+ r->duration_ = *$2;
+ delete $2;
+
+ Simultaneous_music*velt_p = new Request_chord;
+ velt_p->set_spot (THIS->here_input ());
+ velt_p->add_music (r);
+ $$ = velt_p;
+ }
+ | STRING optional_notemode_duration {
if (!THIS->lexer_p_->lyric_state_b ())
- THIS->parser_error (_ ("have to be in Lyric mode for lyrics"));
+ THIS->parser_error (_ ("Have to be in Lyric mode for lyrics"));
$$ = THIS->get_word_element (*$1, $2);
delete $1;
}
| chord {
if (!THIS->lexer_p_->chord_state_b ())
- THIS->parser_error (_ ("have to be in Chord mode for chords"));
+ THIS->parser_error (_ ("Have to be in Chord mode for chords"));
$$ = $1;
}
- | '@' notemode_chord '@' {
- if (!THIS->lexer_p_->note_state_b ())
- THIS->parser_error (_ ("have to be in Note mode for @chords"));
- $$ = $2;
- }
;
chord:
- steno_tonic_pitch notemode_duration chord_additions chord_subtractions chord_inversion {
- $$ = THIS->get_chord (*$1, $3, $4, $5, *$2);
- };
-
-notemode_chord:
- steno_musical_pitch notemode_duration chord_additions chord_subtractions notemode_chord_inversion {
+ steno_tonic_pitch optional_notemode_duration chord_additions chord_subtractions chord_inversion {
$$ = THIS->get_chord (*$1, $3, $4, $5, *$2);
};
-
chord_additions:
{
$$ = new Array<Musical_pitch>;
}
- | '-' chord_notes {
+ | CHORD_MINUS chord_notes {
$$ = $2;
}
;
chord_notes:
- {
- $$ = new Array<Musical_pitch>;
+ chord_step {
+ $$ = $1
}
- | chord_notes chord_addsub {
+ | chord_notes '.' chord_step {
$$ = $1;
- $$->push (*$2);
+ $$->concat (*$3);
}
;
{
$$ = new Array<Musical_pitch>;
}
- | '^' chord_notes {
+ | CHORD_CARET chord_notes {
$$ = $2;
}
;
-/*
- forevery : X : optional_X sucks. Devise a solution.
-*/
-
-
-chord_addsub:
- chord_note optional_dot
- | CHORDMODIFIER_PITCH optional_dot
- ;
-
chord_inversion:
{
$$ = 0;
}
;
-notemode_chord_inversion:
- {
- $$ = 0;
+chord_step:
+ chord_note {
+ $$ = new Array<Musical_pitch>;
+ $$->push (*$1);
}
- | '/' steno_musical_pitch {
- $$ = $2
+ | CHORDMODIFIER_PITCH {
+ $$ = new Array<Musical_pitch>;
+ $$->push (*$1);
+ }
+ | CHORDMODIFIER_PITCH chord_note { /* Ugh. */
+ $$ = new Array<Musical_pitch>;
+ $$->push (*$1);
+ $$->push (*$2);
}
;
$$->octave_i_ = $1 > 7 ? 1 : 0;
$$->accidental_i_ = 1;
}
- | unsigned '-' {
+ | unsigned CHORD_MINUS {
$$ = new Musical_pitch;
$$->notename_i_ = ($1 - 1) % 7;
$$->octave_i_ = $1 > 7 ? 1 : 0;
UNSIGNED {
$$ = $1;
}
- | DIGIT {
+ | DIGIT {
$$ = $1;
- };
+ }
+ ;
int:
unsigned {
;
-
-
-dots:
- { $$ = 0; }
- | dots '.' { $$ ++; }
- ;
-
-
-
exclamations:
{ $$ = 0; }
| exclamations '!' { $$ ++; }