#include "scalar.hh"
#include "translation-property.hh"
#include "script-def.hh"
-#include "symtable.hh"
#include "lookup.hh"
#include "misc.hh"
#include "my-lily-lexer.hh"
#include "relative-music.hh"
#include "transposed-music.hh"
#include "compressed-music.hh"
+#include "repeated-music.hh"
// mmm
-Mudela_version oldest_version ("1.0.7");
-Mudela_version version ("1.0.8");
+Mudela_version oldest_version ("1.0.14");
+Mudela_version version ("1.0.15");
// needed for bison.simple's malloc() and free()
#include <malloc.h>
-int const GUESS_PLET = 5;
-int guess_plet_a[GUESS_PLET] =
-{
- 1,
- 3,
- 2,
- 3,
- 4
-};
-
struct Assignment {
String *name_p_;
Identifier *id_p_;
%union {
Array<Interval>* intarr;
Array<Musical_pitch> *pitch_arr;
+ Link_array<Request> *reqvec;
Array<String> * strvec;
Array<int> *intvec;
- Box *box;
- Simultaneous_music *chord;
+ Notename_table *chordmodifiertab;
Duration *duration;
+ General_script_def * script;
Identifier *id;
- Translator* trans;
Music *music;
Music_list *music_list;
Score *score;
Paper_def *paper;
Real real;
Request * request;
- General_script_def * script;
Scalar *scalar;
+ Simultaneous_music *chord;
String *string;
- Atom * symbol;
- Symtable * symtable;
- Symtables* symtables;
- Text_def * textdef;
Tempo_req *tempo;
+ Text_def * textdef;
+ Translator* trans;
char c;
const char *consstr;
int i;
- int pair[2];
int ii[10];
}
%{
%token ABSDYNAMIC
%token ACCEPTS
+%token ALTERNATIVE
%token BAR
-%token BEAMPLET
%token CADENZA
+%token CHORDMODIFIERS
+%token CHORDS
%token CLEF
%token CM_T
%token CONSISTS
%token DURATION
-%token END
+%token EXTENDER
%token FONT
%token GROUPING
%token HEADER
%token KEY
%token KEYSIGNATURE
%token LYRICS
-%token MAEBTELP
%token MARK
%token MEASURES
%token MIDI
%token MM_T
-%token MUSIC
%token MUSICAL_PITCH
%token NAME
%token NOTENAMES
%token NOTES
-%token OCTAVE
-%token OUTPUT
%token PAPER
%token PARTIAL
%token PENALTY
-%token PLET
%token PROPERTY
%token PT_T
%token RELATIVE
%token REMOVE
-%token SCHEME /* token vs typedef; can't be named SCM */
+%token REPEAT
+%token SCM_T
+%token SCMFILE
%token SCORE
%token SCRIPT
%token SHAPE
%token SKIP
%token SPANDYNAMIC
-%token SYMBOLTABLES
-%token TABLE
-%token TELP
%token TEMPO
%token TIME_T
%token TIMES
%type <i> dots
%token <i> DIGIT
%token <pitch> NOTENAME_PITCH
+%token <pitch> TONICNAME_PITCH
+%token <pitch> CHORDMODIFIER_PITCH
%token <id> DURATION_IDENTIFIER
%token <id> IDENTIFIER
%token <id> NOTENAME_TABLE_IDENTIFIER
%token <id> SCORE_IDENTIFIER
%token <id> MIDI_IDENTIFIER
%token <id> PAPER_IDENTIFIER
-%token <id> REQUEST_IDENTIFIER
%token <real> REAL
%token <string> DURATION RESTNAME
%token <string> STRING
%type <outputdef> output_def
%type <scope> mudela_header mudela_header_body
-%type <box> box
-%type <i> open_request_parens close_request_parens
-%type <i> open_abbrev_parens
-%type <i> open_plet_parens close_plet_parens
+%type <request> open_request_parens close_request_parens open_request close_request
%type <i> sub_quotes sup_quotes
-%type <music> simple_element request_chord command_element Simple_music Composite_music
+%type <music> simple_element request_chord command_element Simple_music Composite_music
+%type <music> Alternative_music Repeated_music
%type <i> abbrev_type
%type <i> int unsigned
%type <i> script_dir
%type <i> optional_modality
-%type <id> identifier_init simple_identifier_init block_identifier
+%type <id> identifier_init
%type <duration> steno_duration notemode_duration
%type <duration> entered_notemode_duration explicit_duration
-%type <interval> dinterval
%type <intvec> intastint_list int_list
-%type <symtables> symtables symtables_body
+%type <reqvec> pre_requests post_requests
%type <pitch> explicit_musical_pitch steno_musical_pitch musical_pitch absolute_musical_pitch
+%type <pitch> steno_tonic_pitch
%type <notereq> steno_notepitch
%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 <midi> midi_block midi_body
%type <duration> duration_length
%type <music> property_def translator_change
%type <music_list> Music_list
%type <paper> paper_block paper_def_body
-%type <real> real_expression real dimension
+%type <real> real_expression real real_with_dimension
%type <request> abbrev_command_req
%type <request> post_request structured_post_request
-%type <pair> plet_fraction
%type <request> command_req verbose_command_req
-%type <request> script_req dynamic_req
+%type <request> script_req dynamic_req extender_req
%type <string> string
%type <score> score_block score_body
%type <intarr> shape_array
%type <script> script_definition script_body mudela_script gen_script_def
%type <textdef> text_def finger
%type <string> script_abbreviation
-%type <symbol> symboldef
-%type <symtable> symtable symtable_body
-%type <trans> translator_spec translator_spec_body
+%type <trans> translator_spec_block translator_spec_body
%type <tempo> tempo_request
-%type <notenametab> notenames_body notenames_block
-%expect 3
+%type <notenametab> notenames_body notenames_block chordmodifiers_block
+
+%expect 7
%left '-' '+'
notenames_block {
THIS->lexer_p_->set_notename_table ($1);
}
+ | chordmodifiers_block {
+ THIS->lexer_p_->set_chordmodifier_table ($1);
+ }
| mudela_header {
delete header_global_p;
header_global_p = $1;
;
embedded_scm:
- SCHEME STRING ';' {
- #ifdef HAVE_LIBGUILE
+ SCMFILE STRING ';' {
+ read_lily_scm_file (*$2);
+ delete $2;
+ }
+ | SCM_T STRING ';' {
gh_eval_str ($2->ch_l ());
- #endif
delete $2;
};
;
+chordmodifiers_block:
+ CHORDMODIFIERS '{' notenames_body '}' { $$ = $3; }
+ ;
+
+
notenames_block:
NOTENAMES '{' notenames_body '}' { $$ = $3; }
;
;
-simple_identifier_init: identifier_init
- ;
identifier_init:
- block_identifier
- ;
-
-block_identifier:
score_block {
$$ = new Score_identifier ($1, SCORE_IDENTIFIER);
}
+ | chordmodifiers_block {
+ $$ = new Notename_table_identifier ($1, NOTENAME_TABLE_IDENTIFIER);
+ }
| notenames_block {
$$ = new Notename_table_identifier ($1, NOTENAME_TABLE_IDENTIFIER);
}
$$ = new Midi_def_identifier ($1, MIDI_IDENTIFIER);
}
- | symtables {
- $$ = new Symtables_identifier ($1, IDENTIFIER);
- }
- | translator_spec {
+ | translator_spec_block {
$$ = new Translator_identifier ($1, TRANS_IDENTIFIER);
}
| Music {
}
;
-translator_spec:
+translator_spec_block:
TRANSLATOR '{' translator_spec_body '}'
{ $$ = $3; }
;
$$ = t;
delete $2;
}
- | translator_spec_body STRING '=' simple_identifier_init ';' {
+ | translator_spec_body STRING '=' identifier_init ';' {
Identifier* id = $4;
String_identifier *s = dynamic_cast<String_identifier*> (id);
Real_identifier *r= dynamic_cast<Real_identifier*>(id);
THIS->parser_error (_("Wrong type for property value"));
delete $4;
- $$->set_property (*$2, str);
+ /* ugh*/
+ Translator_group * tr = dynamic_cast<Translator_group*>($$);
+ tr->set_property (*$2, str);
}
| translator_spec_body NAME STRING ';' {
$$->type_str_ = *$3;
*/
score_block:
SCORE { THIS->remember_spot ();
- THIS->error_level_i_ =0;
}
/*cont*/ '{' score_body '}' {
$$ = $4;
if (!$$->def_p_arr_.size ())
$$->add_output (THIS->default_paper_p ());
- /* handle error levels. */
- $$->errorlevel_i_ = THIS->error_level_i_;
- THIS->error_level_i_ = 0;
}
;
}
;
-optional_semicolon:
+optional_dot:
/* empty */
- | ';'
+ | '.'
;
paper_def_body:
THIS-> lexer_p_-> scope_l_arr_.push (p->scope_p_);
$$ = p;
}
- | PAPER_IDENTIFIER optional_semicolon {
+ | PAPER_IDENTIFIER {
Paper_def *p = $1->access_content_Paper_def (true);
THIS->lexer_p_->scope_l_arr_.push (p->scope_p_);
$$ = p;
}
- | paper_def_body int '=' symtables { // ugh, what a syntax
- Lookup * l = new Lookup (*$4);
+ | paper_def_body int '=' FONT STRING { // ugh, what a syntax
+ Lookup * l = new Lookup;
+ l->font_name_ = *$5;
+ delete $5;
$$->set_lookup ($2, l);
}
| paper_def_body assignment ';' {
}
- | paper_def_body translator_spec {
+ | paper_def_body translator_spec_block {
$$->assign_translator ($2);
}
| paper_def_body SHAPE '=' shape_array ';' {
;
-dimension:
+real_with_dimension:
REAL CM_T {
$$ = $1 CM;
}
REAL {
$$ = $1;
}
- | dimension
+ | real_with_dimension
| REAL_IDENTIFIER {
$$= *$1->access_content_Real (false);
}
| MIDI_IDENTIFIER {
$$ = $1-> access_content_Midi_def (true);
}
- | midi_body translator_spec {
+ | midi_body translator_spec_block {
$$-> assign_translator ($2);
}
| midi_body tempo_request ';' {
- $$->set_tempo ($2->dur_.length (), $2->metronome_i_);
+ $$->set_tempo ($2->dur_.length_mom (), $2->metronome_i_);
delete $2;
}
| midi_body error {
;
tempo_request:
- TEMPO entered_notemode_duration '=' unsigned {
+ TEMPO steno_duration '=' unsigned {
$$ = new Tempo_req;
$$->dur_ = *$2;
delete $2;
| Composite_music
;
+Alternative_music: {
+ Music_list* m = new Music_list;
+ $$ = new Sequential_music (m);
+ }
+ | ALTERNATIVE Simultaneous_music {
+ $$ = $2;
+ }
+ | ALTERNATIVE Sequential_music {
+ $$ = $2;
+ }
+ ;
+
+Repeated_music: REPEAT unsigned Music Alternative_music {
+ Music_sequence* m = dynamic_cast <Music_sequence*> ($4);
+ assert (m);
+ $$ = new Repeated_music ($3, $2 >? 1, m);
+ }
+ ;
+
Sequential_music: '{' Music_list '}' {
$$ = new Sequential_music ($2);
}
| MUSIC_IDENTIFIER { $$ = $1->access_content_Music (true); }
| property_def
| translator_change
+ | Simple_music '*' unsigned '/' unsigned {
+ /* urg */
+ $$ = new Compressed_music ($3, $5, $1);
+ }
+ | Simple_music '*' unsigned {
+ $$ = new Compressed_music ($3, 1, $1);
+ }
;
delete $2;
delete $4;
}
- | TIMES int '/' int Music {
- $$ = new Compressed_music ($2, $4, $5);
+ | TIMES {
+ THIS->remember_spot ();
+ }
+ /* CONTINUED */
+ unsigned '/' unsigned Music
+ {
+ $$ = new Compressed_music ($3, $5, $6);
+ $$->set_spot (THIS->pop_spot ());
}
+ | Repeated_music { $$ = $1; }
| Simultaneous_music { $$ = $1; }
| Sequential_music { $$ = $1; }
| TRANSPOSE musical_pitch Music {
$$ = new Transposed_music ($3, *$2);
delete $2;
}
+ | TRANSPOSE steno_tonic_pitch Music {
+ $$ = new Transposed_music ($3, *$2);
+ delete $2;
+ }
| NOTES
{ THIS->lexer_p_->push_note_state (); }
Music
{ $$ = $3;
THIS->lexer_p_->pop_state ();
}
-
+ | CHORDS
+ { THIS->lexer_p_->push_chord_state (); }
+ Music
+ {
+ $$ = $3;
+ THIS->lexer_p_->pop_state ();
+ }
| LYRICS
{ THIS->lexer_p_->push_lyric_state (); }
Music
{
$$ = $3;
THIS->lexer_p_->pop_state ();
- }
+ }
| relative_music { $$ = $1; }
;
request_chord:
pre_requests simple_element post_requests {
- THIS->add_requests ((Simultaneous_music*)$2);//ugh
+ Music_sequence *l = dynamic_cast<Music_sequence*>($2);
+ for (int i=0; i < $1->size(); i++)
+ l->add_music ($1->elem(i));
+ for (int i=0; i < $3->size(); i++)
+ l->add_music ($3->elem(i));
$$ = $2;
+
}
| command_element
;
;
abbrev_command_req:
- '|' {
+ extender_req {
+ $$ = $1;
+ }
+ | '|' {
$$ = new Barcheck_req;
}
| COMMAND_IDENTIFIER {
$$ = $1->access_content_Request (true);
}
-/*
+ | '~' {
+ $$ = new Tie_req;
+ }
| '[' {
- $$ = new Beam_req;
- $$->spantype = Span_req::START;
+ Beam_req*b= new Beam_req;
+ b->spantype_ = START;
+ $$ =b;
}
| ']' {
- $$ = new Beam_req;
- $$->spantype = Span_req::STOP;
+ Beam_req*b= new Beam_req;
+ b->spantype_ = STOP;
+ $$ = b;
}
-*/
;
$$ = new Cadenza_req ($2);
}
| PARTIAL duration_length {
- $$ = new Partial_measure_req ($2->length ());
+ $$ = new Partial_measure_req ($2->length_mom ());
delete $2;
}
| CLEF STRING {
delete $2;
}
| GROUPING intastint_list {
- $$ = get_grouping_req (*$2); delete $2;
+ 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:
{
- /* something silly happened. Junk this stuff*/
- if (!THIS->post_reqs.empty ())
- {
- warning ("Junking post-requests");
- THIS->post_reqs.clear ();
- }
+ $$ = new Link_array<Request>;
}
| post_requests structured_post_request {
$2->set_spot (THIS->here_input ());
- THIS->post_reqs.push ($2);
+ $$->push ($2);
}
- | post_requests close_request_parens {
- Array<Request*>& r = *THIS->get_parens_request ($2);
- for (int i = 0; i < r.size (); i++ )
- r[i]->set_spot (THIS->here_input ());
- THIS->post_reqs.concat (r);
- delete &r;
+ | post_requests close_request {
+ $$->push ($2);
}
;
a->type_i_ = $1;
$$ = a;
}
+
;
optional_modality:
$$ ++;
}
;
+
sub_quotes:
',' {
$$ = 1;
}
;
+steno_tonic_pitch:
+ TONICNAME_PITCH {
+ $$ = $1;
+ }
+ | TONICNAME_PITCH sup_quotes {
+ $$ = $1;
+ $$->octave_i_ += $2;
+ }
+ | TONICNAME_PITCH sub_quotes {
+ $$ = $1;
+ $$->octave_i_ += - $2;
+ }
+ ;
+
explicit_musical_pitch:
MUSICAL_PITCH '{' int_list '}' {/* ugh */
Array<int> &a = *$3;
}
;
+extender_req:
+ EXTENDER {
+ if (!THIS->lexer_p_->lyric_state_b ())
+ THIS->parser_error (_ ("have to be in Lyric mode for lyrics"));
+ $$ = new Extender_req;
+ }
+ ;
+
dynamic_req:
- ABSDYNAMIC '{' unsigned '}' {
+ ABSDYNAMIC '{' STRING '}' {
Absolute_dynamic_req *ad_p = new Absolute_dynamic_req;
- ad_p ->loudness_ = (Dynamic_req::Loudness)$3;
+ ad_p ->loudness_str_ = *$3;
+ delete $3;
$$ =ad_p;
}
| SPANDYNAMIC '{' int int '}' {
Span_dynamic_req * sp_p = new Span_dynamic_req;
- sp_p->spantype = (Span_req::Spantype)$4;
- sp_p-> dynamic_dir_ = (Direction)$3;
+ sp_p-> dynamic_dir_ = Direction($3);
+ sp_p->spantype_ = Direction($4);
$$ = sp_p;
}
;
-plet_fraction:
- unsigned '/' unsigned {
- $$[0] = $1;
- $$[1] = $3;
- }
- |
- '/' unsigned {
- int num = $2 >? 1;
- $$[0] = guess_plet_a[(num <? GUESS_PLET) - 1];
- $$[1] = num;
- }
- ;
-close_plet_parens:
- ']' plet_fraction {
- $$ = MAEBTELP;
- THIS->plet_.type_i_ = $2[1];
- THIS->plet_.iso_i_ = $2[0];
- THIS->default_duration_.plet_ = THIS->plet_;
- }
- | TELP {
- $$ = TELP;
- THIS->plet_.type_i_ = 1;
- THIS->plet_.iso_i_ = 1;
- THIS->default_duration_.plet_ = THIS->plet_;
- }
- | TELP plet_fraction {
- $$ = TELP;
- THIS->plet_.type_i_ = $2[1];
- THIS->plet_.iso_i_ = $2[0];
- THIS->default_duration_.plet_ = THIS->plet_;
+close_request:
+ close_request_parens {
+ $$ = $1;
+ dynamic_cast<Span_req*> ($$)->spantype_ = START;
}
- ;
-
+
close_request_parens:
- '~' {
- $$ = '~';
- }
- | '(' {
- $$='(';
- }
- | ']' {
- $$ = ']';
+ '(' {
+ $$= new Slur_req;
}
| E_SMALLER {
- $$ = '<';
+ Span_dynamic_req*s =new Span_dynamic_req;
+ $$ = s;
+ s->dynamic_dir_ = UP;
}
| E_BIGGER {
- $$ = '>';
+ Span_dynamic_req*s =new Span_dynamic_req;
+ $$ = s;
+ s->dynamic_dir_ = DOWN;
}
- | close_plet_parens
;
-open_abbrev_parens:
- '[' ':' 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);
- }
- ;
-open_plet_parens:
- '[' plet_fraction {
- $$ = BEAMPLET;
- THIS->plet_.type_i_ = $2[1];
- THIS->plet_.iso_i_ = $2[0];
- THIS->default_duration_.plet_ = THIS->plet_;
- }
- | PLET plet_fraction {
- $$ = PLET;
- THIS->plet_.type_i_ = $2[1];
- THIS->plet_.iso_i_ = $2[0];
- THIS->default_duration_.plet_ = THIS->plet_;
+open_request:
+ open_request_parens {
+ $$ = $1;
+ dynamic_cast<Span_req*> ($$)->spantype_ = STOP;
}
;
open_request_parens:
E_EXCLAMATION {
- $$ = '!';
+ Span_dynamic_req *s = new Span_dynamic_req;
+ s->dynamic_dir_ = SMALLER;
+ $$ = s;
+
}
| ')' {
- $$=')';
- }
- | '[' {
- $$='[';
+ $$= new Slur_req
}
- | open_abbrev_parens
- | open_plet_parens
;
;
script_abbreviation:
- '^' { $$ = get_scriptdef ('^'); }
- | '+' { $$ = get_scriptdef ('+'); }
- | '-' { $$ = get_scriptdef ('-'); }
- | '|' { $$ = get_scriptdef ('|'); }
- | 'o' { $$ = get_scriptdef ('o'); }
- | '>' { $$ = get_scriptdef ('>'); }
+ '^' {
+ $$ = THIS->lexer_p_
+ ->lookup_identifier ("dash-hat")->access_content_String (true)
+
+ }
+ | '+' {
+ $$ = THIS->lexer_p_
+ ->lookup_identifier ("dash-plus")->access_content_String (true)
+ }
+ | '-' {
+ $$ = THIS->lexer_p_
+ ->lookup_identifier ("dash-dash")->access_content_String (true)
+ }
+ | '|' {
+ $$ = THIS->lexer_p_
+ ->lookup_identifier ("dash-bar")->access_content_String (true)
+ }
+ | '>' {
+ $$ = THIS->lexer_p_
+ ->lookup_identifier ("dash-larger")->access_content_String (true)
+ }
| '.' {
- $$ = get_scriptdef ('.');
+ $$ = THIS->lexer_p_
+ ->lookup_identifier ("dash-dot")->access_content_String (true);
}
;
;
script_dir:
- '_' { $$ = -1; }
- | '^' { $$ = 1; }
- | '-' { $$ = 0; }
+ '_' { $$ = DOWN; }
+ | '^' { $$ = CENTER; }
+ | '-' { $$ = UP; }
;
pre_requests:
{
+ $$ = new Link_array<Request>;
}
- | pre_requests open_request_parens {
- Array<Request*>& r = *THIS->get_parens_request ($2);
- for (int i = 0; i < r.size (); i++ )
- r[i]->set_spot (THIS->here_input ());
- THIS->pre_reqs.concat (r);
- delete &r;
+ | pre_requests open_request {
+ $$->push ($2);
}
;
steno_duration {
$$ = $1;
}
+ | duration_length '*' unsigned {
+ $$->plet_.iso_i_ *= $3;
+ }
+ | duration_length '/' unsigned {
+ $$->plet_.type_i_ *= $3;
+ }
;
dots:
THIS->parser_error (_f ("not a duration: %d", $1));
else {
$$->durlog_i_ = Duration_convert::i2_type ($1);
- $$->set_plet (THIS->plet_.iso_i_, THIS->plet_.type_i_);
}
}
| DURATION_IDENTIFIER {
| steno_duration '.' {
$$->dots_i_ ++;
}
- | steno_duration '*' unsigned {
- $$->plet_.iso_i_ *= $3;
- }
- | steno_duration '/' unsigned {
- $$->plet_.type_i_ *= $3;
- }
;
$$ = 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"));
+ $$ = $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 {
+ $$ = THIS->get_chord (*$1, $3, $4, $5, *$2);
+ };
+
+chord_additions:
+ {
+ $$ = new Array<Musical_pitch>;
+ }
+ | '-' chord_notes {
+ $$ = $2;
+ }
+ ;
+
+chord_notes:
+ {
+ $$ = new Array<Musical_pitch>;
+ }
+ | chord_notes chord_addsub {
+ $$ = $1;
+ $$->push (*$2);
+ }
+ ;
+
+chord_addsub:
+ chord_note optional_dot
+ | CHORDMODIFIER_PITCH optional_dot
+ ;
+
+chord_inversion:
+ {
+ $$ = 0;
+ }
+ | '/' steno_tonic_pitch {
+ $$ = $2
+ }
+ ;
+
+notemode_chord_inversion:
+ {
+ $$ = 0;
+ }
+ | '/' steno_musical_pitch {
+ $$ = $2
+ }
;
+chord_note:
+ unsigned {
+ $$ = new Musical_pitch;
+ $$->notename_i_ = ($1 - 1) % 7;
+ $$->octave_i_ = $1 > 7 ? 1 : 0;
+ $$->accidental_i_ = 0;
+ }
+ | unsigned '+' {
+ $$ = new Musical_pitch;
+ $$->notename_i_ = ($1 - 1) % 7;
+ $$->octave_i_ = $1 > 7 ? 1 : 0;
+ $$->accidental_i_ = 1;
+ }
+ | unsigned '-' {
+ $$ = new Musical_pitch;
+ $$->notename_i_ = ($1 - 1) % 7;
+ $$->octave_i_ = $1 > 7 ? 1 : 0;
+ $$->accidental_i_ = -1;
+ }
+ ;
+
+chord_subtractions:
+ {
+ $$ = new Array<Musical_pitch>;
+ }
+ | '^' chord_notes {
+ $$ = $2;
+ }
+ ;
/*
UTILITIES
-/*
- symbol tables
-*/
-symtables:
- SYMBOLTABLES '{' symtables_body '}' { $$ = $3; }
- ;
-
-symtables_body:
- {
- $$ = new Symtables;
- }
- | IDENTIFIER {
- $$ = $1->access_content_Symtables (true);
- }
- | symtables_body FONT STRING {
- $$->font_ = *$3;
- $$->font_path_ = global_path.find (*$3);
- if (!$$->font_path_.length_i ())
- THIS->here_input ().error (_f("can't open file: `%s'", $3->ch_C()));
-
- delete $3;
- }
- | symtables_body STRING '=' symtable {
- $$->add (*$2, $4);
- delete $2;
- }
- ;
-
-symtable:
- TABLE '{' symtable_body '}' { $$ = $3; }
- ;
-
-symtable_body:
- { $$ = new Symtable; }
- | symtable_body STRING symboldef {
- $$->elem (*$2) = *$3;
- delete $2;
- delete $3;
- }
- ;
-
-symboldef:
- STRING unsigned box {
- // ignore #args
- $$ = new Atom (*$1, *$3);
- delete $1;
- delete $3;
- }
- | STRING unsigned {
- Box b (Interval (0,0), Interval (0,0));
- // ignore #args
- $$ = new Atom (*$1, b);
- delete $1;
- }
- ;
-box:
- dinterval dinterval {
- $$ = new Box (*$1, *$2);
- delete $1;
- delete $2;
- }
- ;
-dinterval: real real {
- $$ = new Interval ($1, $2);
- }
- ;
%%
projects / lilypond.git / blobdiff