source file of the GNU LilyPond music typesetter
- (c) 1997 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
Jan Nieuwenhuizen <janneke@gnu.org>
*/
#include <iostream.h>
-#include "notename-table.hh"
-#include "scalar.hh"
+#include "lily-guile.hh"
#include "translation-property.hh"
-#include "script-def.hh"
-#include "symtable.hh"
#include "lookup.hh"
#include "misc.hh"
#include "my-lily-lexer.hh"
#include "midi-def.hh"
#include "main.hh"
#include "file-path.hh"
-#include "keyword.hh"
#include "debug.hh"
-#include "parseconstruct.hh"
-#include "dimension.hh"
+#include "dimensions.hh"
#include "identifier.hh"
#include "command-request.hh"
#include "musical-request.hh"
#include "my-lily-parser.hh"
-#include "text-def.hh"
+#include "context-specced-music.hh"
#include "translator-group.hh"
#include "score.hh"
#include "music-list.hh"
-#include "header.hh"
-#include "duration-convert.hh"
#include "change-translator.hh"
#include "file-results.hh"
-#include "mudela-version.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 "mudela-version.hh"
+#include "grace-music.hh"
+#include "auto-change-music.hh"
+#include "output-property.hh"
-// mmm
-Mudela_version oldest_version ("1.0.6");
-Mudela_version version ("1.0.6");
+bool
+is_duration_b (int t)
+{
+ return t && t == 1 << intlog2(t);
+}
-// needed for bison.simple's malloc() and free()
-#include <malloc.h>
+// mmm JUNKME ?
+Mudela_version oldest_version ("1.3.59");
+
+void
+print_mudela_versions (ostream &os)
+{
+ os << _f ("Oldest supported input version: %s", oldest_version.str ())
+ << endl;
+}
-int const GUESS_PLET = 5;
-int guess_plet_a[GUESS_PLET] =
-{
- 1,
- 3,
- 2,
- 3,
- 4
-};
-Paper_def* current_paper = 0;
+// needed for bison.simple's malloc() and free()
+#include <malloc.h>
#ifndef NDEBUG
#define YYDEBUG 1
#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<Musical_pitch> *pitch_arr;
- Array<String> * strvec;
- Array<int> *intvec;
- Box *box;
- Simultaneous_music *chord;
+ Link_array<Request> *reqvec;
Duration *duration;
Identifier *id;
- Translator* trans;
+ String * string;
Music *music;
- Music_list *music_list;
Score *score;
- Header *header;
+ Scope *scope;
Interval *interval;
- Lookup*lookup;
-
Musical_req* musreq;
Music_output_def * outputdef;
Musical_pitch * pitch;
Midi_def* midi;
Moment *moment;
- Note_req *notereq;
- Notename_table *notenametab;
- Paper_def *paper;
Real real;
Request * request;
- General_script_def * script;
- Scalar *scalar;
- String *string;
- Atom * symbol;
- Symtable * symtable;
- Symtables * symtables;
- Text_def * textdef;
+
+ /* 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;
- char c;
- const char *consstr;
+ Translator_group* trans;
int i;
- int pair[2];
- int ii[10];
}
%{
%pure_parser
/* tokens which are not keywords */
-
-%token ABSDYNAMIC
+%token AUTOCHANGE
+%token TEXTSCRIPT
%token ACCEPTS
+%token ALTERNATIVE
%token BAR
-%token BEAMPLET
-%token CADENZA
+%token BREATHE
+%token CHORDMODIFIERS
+%token CHORDS
+%token CHAR_T
%token CLEF
%token CM_T
%token CONSISTS
+%token SEQUENTIAL
+%token SIMULTANEOUS
+%token CONSISTSEND
%token DURATION
-%token END
+%token EXTENDER
%token FONT
-%token GROUPING
+%token GRACE
%token HEADER
+%token HYPHEN
%token IN_T
+%token INVALID
%token KEY
-%token KEYSIGNATURE
-%token LYRIC
-%token MAEBTELP
+%token LYRICS
%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 REPEAT
+%token ADDLYRICS
+%token SCM_T
%token SCORE
%token SCRIPT
-%token SHAPE
%token SKIP
-%token SPANDYNAMIC
-%token SYMBOLTABLES
-%token TABLE
-%token TELP
+%token SPANREQUEST
+%token COMMANDSPANREQUEST
%token TEMPO
+%token OUTPUTPROPERTY
%token TIME_T
+%token TIMES
%token TRANSLATOR
%token TRANSPOSE
%token TYPE
-%token VERSION
+%token CONTEXT
/* escaped */
-%token E_EXCLAMATION E_SMALLER E_BIGGER E_CHAR
+%token E_CHAR E_EXCLAMATION E_SMALLER E_BIGGER
+%token CHORD_BASS CHORD_COLON CHORD_MINUS CHORD_CARET
-%type <i> dots
+%type <i> exclamations questions
%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> MUSIC_IDENTIFIER
-%token <id> POST_REQUEST_IDENTIFIER
-%token <id> SCRIPT_IDENTIFIER
-%token <id> COMMAND_IDENTIFIER
-%token <id> REAL_IDENTIFIER
-%token <id> STRING_IDENTIFIER
%token <id> TRANS_IDENTIFIER
-%token <id> INT_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
+%token <id> MUSIC_OUTPUT_DEF_IDENTIFIER
+
+%token <scm> NUMBER_IDENTIFIER
+%token <scm> REQUEST_IDENTIFIER
+%token <scm> MUSIC_IDENTIFIER
+%token <scm> STRING_IDENTIFIER SCM_IDENTIFIER
+%token <scm> DURATION RESTNAME
+%token <scm> STRING
+%token <scm> SCM_T
%token <i> UNSIGNED
-
+%token <real> REAL
%type <outputdef> output_def
-%type <header> 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 <scope> mudela_header mudela_header_body
+%type <request> open_request_parens close_request_parens open_request close_request
+%type <request> request_with_dir request_that_take_dir verbose_request
%type <i> sub_quotes sup_quotes
-%type <music> simple_element request_chord command_element
-%type <i> abbrev_type
-%type <i> int unsigned
+%type <music> simple_element request_chord command_element Simple_music Composite_music
+%type <music> Alternative_music Repeated_music
+%type <i> tremolo_type
+%type <i> bare_int bare_unsigned
%type <i> script_dir
-%type <id> identifier_init simple_identifier_init
-%type <duration> steno_duration notemode_duration
+
+%type <scm> identifier_init
+
+%type <duration> steno_duration optional_notemode_duration
%type <duration> entered_notemode_duration explicit_duration
-%type <interval> dinterval
-%type <intvec> intastint_list int_list
-%type <lookup> symtables symtables_body
-
-%type <pitch> explicit_musical_pitch steno_musical_pitch musical_pitch absolute_musical_pitch
-%type <notereq> steno_notepitch
-%type <pitch_arr> pitch_list
-%type <midi> midi_block midi_body
+
+%type <reqvec> pre_requests post_requests
+%type <request> gen_text_def
+%type <pitch> steno_musical_pitch musical_pitch absolute_musical_pitch
+%type <pitch> steno_tonic_pitch
+
+%type <pitch_arr> chord_additions chord_subtractions chord_notes chord_step
+%type <music> chord
+%type <pitch> chord_note chord_inversion chord_bass
%type <duration> duration_length
-%type <scalar> scalar
-%type <music> Music relative_music Sequential_music Simultaneous_music
+%type <scm> embedded_scm scalar
+%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> dim real
-%type <real> real_mult_expression real_primary
-%type <real> unit
-%type <request> abbrev_command_req
-%type <request> post_request structured_post_request
-%type <pair> plet_fraction
+%type <scm> Music_list
+%type <outputdef> music_output_def_body
+%type <request> shorthand_command_req
+%type <request> post_request
%type <request> command_req verbose_command_req
-%type <request> script_req dynamic_req
-%type <string> string
-%type <string> string_primary
+%type <request> extender_req
+%type <request> hyphen_req
+%type <scm> string bare_number number_expression
%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 1
+%type <scm> notenames_body notenames_block chordmodifiers_block
+%type <scm> script_abbreviation
+
+%left '-' '+'
+%left '*' '/'
+%left UNARY_MINUS
+
%%
mudela: /* empty */
| mudela toplevel_expression {}
- | mudela add_declaration { }
+ | mudela assignment { }
| mudela error
- | mudela check_version { }
+ | mudela INVALID {
+ THIS->error_level_i_ =1;
+ }
;
toplevel_expression:
notenames_block {
- THIS->lexer_p_->set_notename_table ($1);
+ THIS->lexer_p_->pitchname_tab_ = $1;
+ }
+ | chordmodifiers_block {
+ THIS->lexer_p_->chordmodifier_tab_ = $1;
}
| mudela_header {
delete header_global_p;
| score_block {
score_global_array.push ($1);
}
- | paper_block {
- Identifier * id = new
- Paper_def_identifier ($1, PAPER_IDENTIFIER);
- THIS->lexer_p_->set_identifier ("$defaultpaper", id)
- }
- | midi_block {
+ | output_def {
Identifier * id = new
- Midi_def_identifier ($1, MIDI_IDENTIFIER);
- THIS->lexer_p_->set_identifier ("$defaultmidi", id)
+ Music_output_def_identifier ($1, MUSIC_OUTPUT_DEF_IDENTIFIER);
+ if (dynamic_cast<Paper_def*> ($1))
+ THIS->lexer_p_->set_identifier ("$defaultpaper", id->self_scm ());
+ else if (dynamic_cast<Midi_def*> ($1))
+ THIS->lexer_p_->set_identifier ("$defaultmidi", id->self_scm ());
}
+ | embedded_scm {
+ // junk value
+ }
;
-check_version:
- VERSION STRING ';' {
- 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 ()));
- }
- }
- }
+embedded_scm:
+ SCM_T
+ | SCM_IDENTIFIER
+ ;
+
+
+chordmodifiers_block:
+ CHORDMODIFIERS notenames_body { $$ = $2; }
;
notenames_block:
- NOTENAMES '{' notenames_body '}' { $$ = $3; }
+ NOTENAMES notenames_body { $$ = $2; }
;
notenames_body:
- /**/ {
- $$ = new Notename_table;
- }
- | NOTENAME_TABLE_IDENTIFIER {
- $$ = $1-> access_Notename_table(true);
- }
- | notenames_body STRING '=' explicit_musical_pitch {
- (*$$)[*$2] = *$4;
+ embedded_scm {
+ int i = scm_ilength ($1);
- delete $4;
- delete $2;
+ SCM tab = scm_make_vector (gh_int2scm (i), SCM_EOL);
+ for (SCM s = $1; s != SCM_EOL; s = gh_cdr (s)) {
+ SCM pt = gh_cdar (s);
+ if (scm_ilength (pt) != 3)
+ THIS->parser_error ("Need three args");
+ scm_hashq_set_x (tab, gh_caar(s), pt);
+ }
+
+ $$ = tab;
}
;
mudela_header_body:
- {
- $$ = new Header;
+ {
+ $$ = new Scope;
+ THIS->lexer_p_-> scope_l_arr_.push ($$);
}
- | mudela_header_body STRING '=' string ';' {
- (*$$)[*$2] = *$4;
- delete $2;
- delete $4;
+ | mudela_header_body assignment semicolon {
+
}
;
mudela_header:
HEADER '{' mudela_header_body '}' {
$$ = $3;
+ THIS->lexer_p_-> scope_l_arr_.pop ();
}
;
/*
DECLARATIONS
*/
-add_declaration:
+assignment:
STRING {
THIS->remember_spot ();
}
- /* cont */ '=' identifier_init optional_semicolon {
- THIS->lexer_p_->set_identifier (*$1, $4);
- $4->init_b_ = THIS->init_parse_b_;
- $4->set_spot (THIS->pop_spot ());
+ /* cont */ '=' identifier_init {
+ THIS->lexer_p_->set_identifier (ly_scm2string ($1), $4);
+
+/*
+ TODO: devise standard for protection in parser.
+ if (SCM_NIMP($4))
+ scm_unprotect_object ($4);
+
+ The parser stack lives on the C-stack, which means that
+all objects can be unprotected as soon as they're here.
+
+*/
+ Identifier * id =unsmob_identifier ($4);
+ Input spot = THIS->pop_spot ();
+ if (id) id->set_spot (spot);
}
;
-simple_identifier_init: identifier_init
- ;
+
+
+
identifier_init:
score_block {
- $$ = new Score_identifier ($1, SCORE_IDENTIFIER);
-
+ $$ = (new Score_identifier ($1, SCORE_IDENTIFIER))->self_scm();
}
- | notenames_block {
- $$ = new Notename_table_identifier ($1, NOTENAME_TABLE_IDENTIFIER);
- }
- | paper_block {
- $$ = new Paper_def_identifier ($1, PAPER_IDENTIFIER);
- }
- | midi_block {
- $$ = new Midi_def_identifier ($1, MIDI_IDENTIFIER);
-
+ | output_def {
+ $$ = (new Music_output_def_identifier ($1, MUSIC_OUTPUT_DEF_IDENTIFIER))->self_scm();
}
- | script_definition {
- $$ = new General_script_def_identifier ($1, SCRIPT_IDENTIFIER);
-
+ | translator_spec_block {
+ $$ = (new Translator_group_identifier ($1, TRANS_IDENTIFIER))->self_scm();
}
| Music {
- $$ = new Music_identifier ($1, MUSIC_IDENTIFIER);
-
- }
- | symtables {
- $$ = new Lookup_identifier ($1, IDENTIFIER);
-
+ $$ = $1->self_scm ();
}
| post_request {
- $$ = new Request_identifier ($1, POST_REQUEST_IDENTIFIER);
+ $$ = $1->self_scm ();
}
| explicit_duration {
- $$ = new Duration_identifier ($1, DURATION_IDENTIFIER);
+ $$ = (new Duration_identifier ($1, DURATION_IDENTIFIER))->self_scm ();
}
- | real {
- $$ = new Real_identifier (new Real ($1), REAL_IDENTIFIER);
+ | number_expression {
+ $$ = $1;
}
| string {
- $$ = new String_identifier ($1, STRING_IDENTIFIER);
- }
- | int {
- $$ = new int_identifier (new int ($1), INT_IDENTIFIER);
+ $$ = $1;
}
- | translator_spec {
- $$ = new Translator_identifier ($1, TRANS_IDENTIFIER);
+ | embedded_scm {
+ $$ = $1;
}
;
-translator_spec:
+translator_spec_block:
TRANSLATOR '{' translator_spec_body '}'
- { $$ = $3; }
+ {
+ $$ = $3;
+ }
;
translator_spec_body:
TRANS_IDENTIFIER {
- $$ = $1->access_Translator (true);
+ $$ = $1->access_content_Translator_group (true);
$$-> set_spot (THIS->here_input ());
}
- | TYPE STRING ';' {
- Translator* t = get_translator_l (*$2);
- Translator_group * tg = t->access_Translator_group ();
+ | TYPE STRING semicolon {
+ Translator* t = get_translator_l (ly_scm2string ($2));
+ Translator_group * tg = dynamic_cast<Translator_group*> (t);
if (!tg)
THIS->parser_error (_("Need a translator group for a context"));
- t = t->clone ();
- t->set_spot (THIS->here_input ());
- $$ = t;
- delete $2;
- }
- | translator_spec_body STRING '=' simple_identifier_init ';' {
- Identifier* id = $4;
- String_identifier *s = id->access_String_identifier ();
- Real_identifier *r= id->access_Real_identifier ();
- int_identifier *i = id->access_int_identifier ();
-
- String str;
- if (s) str = *s->access_String (false);
- if (i) str = to_str (*i->access_int (false));
- if (r) str = to_str (*r->access_Real (false));
- if (!s && !i && !r)
+ tg = dynamic_cast<Translator_group*> (t->clone ());
+ tg->set_spot (THIS->here_input ());
+ $$ = tg;
+ }
+ | translator_spec_body STRING '=' embedded_scm {
+ Translator_group* tg = $$;
+ tg->set_property (ly_scm2string ($2), $4);
+ }
+ | translator_spec_body STRING '=' identifier_init semicolon {
+ SCM v = gh_int2scm (0);
+ if (gh_string_p ($4) || gh_number_p ($4) || gh_boolean_p ($4))
+ v = $4;
+ else
THIS->parser_error (_("Wrong type for property value"));
- delete $4;
- $$->set_property (*$2, str);
+ /* ugh*/
+ Translator_group* tg = dynamic_cast<Translator_group*> ($$);
+
+ tg->set_property (ly_scm2string ($2), v);
}
- | translator_spec_body STRING ';' {
- $$->type_str_ = *$2;
- delete $2;
+ | translator_spec_body NAME STRING semicolon {
+ $$->type_str_ = ly_scm2string ($3);
+ }
+ | translator_spec_body CONSISTS STRING semicolon {
+ dynamic_cast<Translator_group*> ($$)-> set_element (ly_scm2string ($3), true);
}
- | translator_spec_body CONSISTS STRING ';' {
- $$->access_Translator_group ()-> set_element (*$3, true);
- delete $3;
+ | translator_spec_body CONSISTSEND STRING semicolon {
+ dynamic_cast<Translator_group*> ($$)-> set_element (ly_scm2string ($3), true);
}
- | translator_spec_body ACCEPTS STRING ';' {
- $$->access_Translator_group ()-> set_acceptor (*$3, true);
- delete $3;
+ | translator_spec_body ACCEPTS STRING semicolon {
+ dynamic_cast<Translator_group*> ($$)-> set_acceptor (ly_scm2string ($3), true);
}
- | translator_spec_body REMOVE STRING ';' {
- $$->access_Translator_group ()-> set_element (*$3, false);
- delete $3;
+ | translator_spec_body REMOVE STRING semicolon {
+ dynamic_cast<Translator_group*> ($$)-> set_element (ly_scm2string ($3), false);
}
;
SCORE
*/
score_block:
- SCORE { THIS->remember_spot ();
- THIS->error_level_i_ =0;
+ SCORE {
}
/*cont*/ '{' score_body '}' {
$$ = $4;
- $$->set_spot (THIS->pop_spot ());
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;
+ {
+ Identifier *id =
+ unsmob_identifier (THIS->lexer_p_->lookup_identifier ("$defaultpaper"));
+ $$->add_output (id ? id->access_content_Music_output_def (true) : new Paper_def );
+ }
}
;
-score_body: {
+score_body:
+ Music {
$$ = new Score;
+
+ $$->set_spot (THIS->here_input ());
+ SCM m = $1->self_scm ();
+// scm_unprotect_object (m);
+ $$->music_ = m;
}
| SCORE_IDENTIFIER {
- $$ = $1->access_Score (true);
+ $$ = $1->access_content_Score (true);
}
| score_body mudela_header {
$$->header_p_ = $2;
}
- | score_body Music {
- if ($$->music_p_)
- $2->warning (_ ("More than one music block"));
- $$->music_p_ = $2;
- }
| score_body output_def {
$$->add_output ($2);
}
}
;
-output_def:
- paper_block {
- $$ = $1;
- }
- | midi_block {
- $$= $1;
- }
- ;
-
-intastint_list:
- /* */ { $$ =new Array<int>; }
- | intastint_list int '*' int {
- $$->push ($2); $$->push ($4);
- }
- | intastint_list int {
- $$->push ($2); $$->push (1);
- }
- ;
-
/*
- PAPER
+ MIDI
*/
-paper_block:
- PAPER '{' paper_def_body '}' {
- $$ = $3;
- THIS-> lexer_p_->scope_l_arr_.pop ();
+output_def:
+ music_output_def_body '}' {
+ $$ = $1;
+ THIS-> lexer_p_-> scope_l_arr_.pop();
}
;
-optional_semicolon:
- /* empty */
- | ';'
- ;
+music_output_def_body:
+ MIDI '{' {
+ Identifier *id = unsmob_identifier (THIS->lexer_p_->lookup_identifier ("$defaultmidi"));
-paper_def_body:
- /* empty */ {
- Paper_def *p = THIS->default_paper_p ();
+
+ Midi_def* p =0;
+ if (id)
+ p = dynamic_cast<Midi_def*> (id->access_content_Music_output_def (true));
+ else
+ p = new Midi_def;
+
+ $$ = p;
+ THIS->lexer_p_->scope_l_arr_.push (p->scope_p_);
+ }
+ | PAPER '{' {
+ Identifier *id = unsmob_identifier (THIS->lexer_p_->lookup_identifier ("$defaultpaper"));
+ Paper_def *p = 0;
+ if (id)
+ p = dynamic_cast<Paper_def*> (id->access_content_Music_output_def (true));
+ else
+ p = new Paper_def;
THIS-> lexer_p_-> scope_l_arr_.push (p->scope_p_);
$$ = p;
}
- | PAPER_IDENTIFIER optional_semicolon {
- Paper_def *p = $1->access_Paper_def (true);
+ | PAPER '{' MUSIC_OUTPUT_DEF_IDENTIFIER {
+ Music_output_def *p = $3->access_content_Music_output_def (true);
THIS->lexer_p_->scope_l_arr_.push (p->scope_p_);
$$ = p;
}
- | paper_def_body int '=' symtables { // ugh, what a syntax
- $$->set_lookup ($2, $4);
+ | MIDI '{' MUSIC_OUTPUT_DEF_IDENTIFIER {
+ Music_output_def *p = $3->access_content_Music_output_def (true);
+ THIS->lexer_p_->scope_l_arr_.push (p->scope_p_);
+ $$ = p;
}
- | paper_def_body STRING '=' simple_identifier_init ';' {
- THIS->lexer_p_->set_identifier (*$2, $4);
- delete $2;
+ | music_output_def_body assignment semicolon {
+
}
- | paper_def_body translator_spec {
+ | music_output_def_body translator_spec_block {
$$-> assign_translator ($2);
}
- | paper_def_body SHAPE '=' shape_array ';' {
- $$->shape_int_a_ = *$4;
- delete $4;
+ | music_output_def_body tempo_request semicolon {
+ /*
+ junk this ? there already is tempo stuff in
+ music.
+ */
+ dynamic_cast<Midi_def*> ($$)->set_tempo ($2->dur_.length_mom (), $2->metronome_i_);
+ }
+ | music_output_def_body bare_int '=' FONT STRING { // ugh, what a syntax
+ SCM sl = Lookup::make_lookup();
+ Lookup * l =unsmob_lookup (sl);
+ l->font_name_ = ly_scm2string ($5);
+ dynamic_cast<Paper_def*> ($$)->set_lookup ($2, sl);
}
- | paper_def_body error {
+ | music_output_def_body error {
}
;
-real_primary:
- REAL {
- $$ = $1;
- }
- | REAL_IDENTIFIER {
- $$= *$1->access_Real (false);
- }
- | dim
- | '(' real ')' {
- $$ = $2;
+tempo_request:
+ TEMPO steno_duration '=' bare_unsigned {
+ $$ = new Tempo_req;
+ $$->dur_ = *$2;
+ delete $2;
+ $$-> metronome_i_ = $4;
}
;
-real:
- real_mult_expression
- | real '+' real_mult_expression {
- $$ = $1 + $3;
- }
- | real '-' real_mult_expression {
- $$ = $1 - $3;
+Music_list: /* empty */ {
+ $$ = gh_cons (SCM_EOL, SCM_EOL);
}
- ;
+ | Music_list Music {
+ SCM s = $$;
+ SCM c = gh_cons ($2->self_scm (), SCM_EOL);
+// scm_unprotect_object ($2->self_scm ()); /* UGH */
-real_mult_expression:
- real_primary
- | real_mult_expression '*' real_primary {
- $$ = $1 * $3;
+
+ if (gh_pair_p (gh_cdr (s)))
+ gh_set_cdr_x (gh_cdr (s), c); /* append */
+ else
+ gh_set_car_x (s, c); /* set first cons */
+ gh_set_cdr_x (s, c) ; /* remember last cell */
}
- | real_mult_expression '/' real_primary {
- $$ = $1 / $3;
+ | Music_list error {
}
;
-shape_array:
- /* empty */ {
- $$ = new Array<Interval>;
- }
- | shape_array dim dim {
- $$->push(Interval($2, $2 + $3));
- };
-/*
- MIDI
-*/
-midi_block:
- MIDI
-
- '{' midi_body '}' { $$ = $3; }
+Music:
+ Simple_music
+ | Composite_music
;
-midi_body: /* empty */ {
- $$ = THIS->default_midi_p ();
+Alternative_music:
+ /* empty */ {
+ $$ = 0;
}
- | MIDI_IDENTIFIER {
- $$ = $1-> access_Midi_def (true);
+ | ALTERNATIVE Music_sequence {
+ $$ = $2;
+ $2->set_spot (THIS->here_input ());
}
- | midi_body translator_spec {
- $$-> assign_translator ($2);
+ ;
+
+
+
+
+Repeated_music:
+ REPEAT STRING bare_unsigned Music Alternative_music
+ {
+ Music_sequence* m = dynamic_cast <Music_sequence*> ($5);
+ if (m && $3 < m->length_i ())
+ $5->origin ()->warning (_ ("More alternatives than repeats. Junking excess alternatives."));
+
+ Repeated_music * r = new Repeated_music ($4, $3 >? 1, m);
+ $$ = r;
+ r->type_ = ly_scm2string ($2);
+ r->fold_b_ = (r->type_ == "fold");
+ r->volta_fold_b_ = (r->type_ == "volta");
+ r->set_spot (*$4->origin ());
}
- | midi_body tempo_request ';' {
- $$->set_tempo ($2->dur_.length (), $2->metronome_i_);
- delete $2;
+ ;
+
+Music_sequence: '{' Music_list '}' {
+ $$ = new Music_sequence (gh_car ($2));
}
- | midi_body error {
+ ;
+Sequential_music:
+ SEQUENTIAL '{' Music_list '}' {
+ $$ = new Sequential_music (gh_car ($3));
+ }
+ | '{' Music_list '}' {
+ $$ = new Sequential_music (gh_car ($2));
}
;
-tempo_request:
- TEMPO entered_notemode_duration '=' unsigned {
- $$ = new Tempo_req;
- $$->dur_ = *$2;
- delete $2;
- $$-> metronome_i_ = $4;
+Simultaneous_music:
+ SIMULTANEOUS '{' Music_list '}'{
+ $$ = new Simultaneous_music (gh_car ($3));
+ }
+ | '<' Music_list '>' {
+ $$ = new Simultaneous_music (gh_car ($2));
}
;
-Music_list: /* empty */ {
- $$ = new Music_list;
+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"));
+ }
+
+ $$ = new Output_property (pred,$3, $5);
}
- | Music_list Music {
- $$->add_music ($2);
+ | MUSIC_IDENTIFIER { $$ = unsmob_music ($1)->clone (); }
+ | property_def
+ | translator_change
+ | Simple_music '*' bare_unsigned '/' bare_unsigned {
+ $$ = $1;
+ $$->compress (Moment($3, $5 ));
}
- | Music_list error {
+ | Simple_music '*' bare_unsigned {
+ $$ = $1;
+ $$->compress (Moment ($3, 1));
}
;
-Sequential_music: '{' Music_list '}' {
- $$ = new Sequential_music ($2);
+Composite_music:
+ CONTEXT STRING Music {
+ Context_specced_music *csm = new Context_specced_music ($3);
+
+ csm->translator_type_str_ = ly_scm2string ($2);
+ csm->translator_id_str_ = "";
+
+
+ $$ = csm;
}
- ;
+ | AUTOCHANGE STRING Music {
+ Auto_change_music * chm = new Auto_change_music (ly_scm2string ($2), $3);
-Simultaneous_music: '<' Music_list '>' {
- $$ = new Simultaneous_music ($2);
+ $$ = chm;
+ chm->set_spot (*$3->origin ());
}
- ;
-Music:
- request_chord { $$ = $1; }
- | TYPE STRING Music {
- $$ = $3;
- $$->translator_type_str_ = *$2;
- delete $2;
+ | GRACE Music {
+ $$ = new Grace_music ($2);
}
- | TYPE STRING '=' STRING Music {
- $$ = $5;
- $$->translator_type_str_ = *$2;
- $$->translator_id_str_ = *$4;
- delete $2;
- delete $4;
+ | CONTEXT STRING '=' STRING Music {
+ Context_specced_music *csm = new Context_specced_music ($5);
+
+ csm->translator_type_str_ = ly_scm2string ($2);
+ csm->translator_id_str_ = ly_scm2string ($4);
+
+ $$ = csm;
+ }
+ | TIMES {
+ THIS->remember_spot ();
+ }
+ /* CONTINUED */
+ bare_unsigned '/' bare_unsigned Music
+
+ {
+ $$ = new Time_scaled_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;
+ delete $2; // ugh
+ }
+ | TRANSPOSE steno_tonic_pitch Music {
+ $$ = new Transposed_music ($3, *$2);
+ delete $2; // ugh
}
- | MUSIC_IDENTIFIER { $$ = $1->access_Music (true); }
| NOTES
{ THIS->lexer_p_->push_note_state (); }
Music
{ $$ = $3;
THIS->lexer_p_->pop_state ();
}
-
- | LYRIC
+ | 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 ();
- }
- | property_def
- | translator_change
+ }
| relative_music { $$ = $1; }
+ | re_rhythmed_music { $$ = $1; }
;
relative_music:
RELATIVE absolute_musical_pitch Music {
$$ = new Relative_octave_music ($3, *$2);
- delete $2;
+ delete $2; // ugh
+ }
+ ;
+
+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;
- t-> change_to_type_str_ = *$2;
- t-> change_to_id_str_ = *$4;
+ t-> change_to_type_str_ = ly_scm2string ($2);
+ t-> change_to_id_str_ = ly_scm2string ($4);
$$ = t;
$$->set_spot (THIS->here_input ());
- delete $2;
- delete $4;
}
;
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;
+
+ t->set_mus_property ("symbol", scm_string_to_symbol ($4));
+ t->set_mus_property ("value", $6);
+
+ Context_specced_music *csm = new Context_specced_music (t);
+ $$ = csm;
$$->set_spot (THIS->here_input ());
- delete $2;
- delete $4;
- delete $6;
+
+ csm-> translator_type_str_ = ly_scm2string ($2);
}
;
scalar:
- STRING { $$ = new Scalar (*$1); delete $1; }
- | int { $$ = new Scalar ($1); }
+ string { $$ = $1; }
+ | bare_int { $$ = gh_int2scm ($1); }
+ | embedded_scm { $$ = $1; }
;
-
request_chord:
pre_requests simple_element post_requests {
- THIS->add_requests ((Simultaneous_music*)$2);//ugh
+ Music_sequence *l = dynamic_cast<Music_sequence*>($2);
+ if (l) {
+ for (int i=0; i < $1->size(); i++)
+ l->append_music ($1->elem(i));
+ for (int i=0; i < $3->size(); i++)
+ l->append_music ($3->elem(i));
+ }
+ else
+ programming_error ("Need Sequence to add music to");
$$ = $2;
+
}
| command_element
;
-
-
-
command_element:
command_req {
- $$ = new Request_chord;
+ $$ = new Request_chord (gh_cons ($1->self_scm (), SCM_EOL));
$$-> set_spot (THIS->here_input ());
$1-> set_spot (THIS->here_input ());
- ((Simultaneous_music*)$$) ->add_music ($1);//ugh
-
+ }
+ | PARTIAL duration_length ';' {
+ Translation_property * p = new Translation_property;
+ p->set_mus_property ("symbol", ly_symbol2scm ( "measurePosition"));
+ Moment m = - $2->length_mom ();
+ p->set_mus_property ("value", m.make_scm());
+ delete $2; // ugh
+ Context_specced_music * sp = new Context_specced_music (p);
+ $$ =sp ;
+ sp-> translator_type_str_ = "Score";
}
;
command_req:
- abbrev_command_req
- | verbose_command_req ';' { $$ = $1; }
+ shorthand_command_req
+ | verbose_command_req semicolon { $$ = $1; }
;
-abbrev_command_req:
- '|' {
+shorthand_command_req:
+ extender_req {
+ $$ = $1;
+ }
+ | hyphen_req {
+ $$ = $1;
+ }
+ | '|' {
$$ = new Barcheck_req;
}
- | COMMAND_IDENTIFIER {
- $$ = $1->access_Request (true);
+ | '~' {
+ $$ = new Tie_req;
+ }
+ | '[' {
+ Span_req*b= new Span_req;
+ b->span_dir_ = START;
+ b->span_type_str_ = "beam";
+ $$ =b;
+ }
+ | ']' {
+ Span_req*b= new Span_req;
+ b->span_dir_ = STOP;
+ b->span_type_str_ = "beam";
+ $$ = b;
+ }
+ | BREATHE {
+ $$ = new Breathing_sign_req;
}
;
+
verbose_command_req:
+
BAR STRING {
- $$ = new Bar_req (*$2);
- delete $2;
+ $$ = new Bar_req (ly_scm2string ($2));
+ }
+ | COMMANDSPANREQUEST bare_int STRING {
+ Span_req * sp_p = new Span_req;
+ sp_p-> span_dir_ = Direction($2);
+ sp_p->span_type_str_ = ly_scm2string ($3);
+ sp_p->set_spot (THIS->here_input ());
+ $$ = sp_p;
+ }
+ | MARK {
+ Mark_req * m = new Mark_req;
+ $$ = m;
}
| MARK STRING {
- $$ = new Mark_req (*$2);
- delete $2;
+ Mark_req *m = new Mark_req;
+ m->set_mus_property ("label", $2);
+ $$ = m;
+
}
- | MARK unsigned {
- $$ = new Mark_req (to_str ($2));
+ | MARK bare_unsigned {
+ Mark_req *m = new Mark_req;
+ m->set_mus_property ("label", gh_int2scm ($2));
+ $$ = m;
}
- | TIME_T unsigned '/' unsigned {
+
+ | TIME_T bare_unsigned '/' bare_unsigned {
Time_signature_change_req *m = new Time_signature_change_req;
m->beats_i_ = $2;
m->one_beat_i_=$4;
$$ = m;
}
- | PENALTY '=' int {
+ | PENALTY bare_int {
Break_req * b = new Break_req;
- b->penalty_i_ = $3;
- b-> set_spot (THIS->here_input ());
+ b->penalty_f_ = $2 / 100.0;
+ b->set_spot (THIS->here_input ());
$$ = b;
}
| SKIP duration_length {
Skip_req * skip_p = new Skip_req;
skip_p->duration_ = *$2;
- delete $2;
+ delete $2; // ugh
$$ = skip_p;
}
| tempo_request {
$$ = $1;
}
- | CADENZA unsigned {
- $$ = new Cadenza_req ($2);
- }
- | PARTIAL duration_length {
- $$ = new Partial_measure_req ($2->length ());
- delete $2;
- }
| CLEF STRING {
- $$ = new Clef_change_req (*$2);
- delete $2;
+ $$ = new Clef_change_req (ly_scm2string ($2));
+
}
- | KEY NOTENAME_PITCH {
+ | KEY {
Key_change_req *key_p= new Key_change_req;
- key_p->pitch_arr_.push(*$2);
- key_p->ordinary_key_b_ = true;
$$ = key_p;
- delete $2;
}
- | KEYSIGNATURE pitch_list {
+ | KEY NOTENAME_PITCH SCM_IDENTIFIER {
Key_change_req *key_p= new Key_change_req;
- key_p->pitch_arr_ = *$2;
- key_p->ordinary_key_b_ = false;
- $$ = key_p;
- delete $2;
- }
- | GROUPING intastint_list {
- $$ = get_grouping_req (*$2); delete $2;
+
+ key_p->set_mus_property ("pitch-alist", $3);
+ ((Music* )key_p)->transpose (* $2);
+ $$ = key_p;
}
;
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 {
+ | post_requests 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_request:
+ verbose_request
+ | request_with_dir
+ | close_request
+ ;
+
+
+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->articulation_str_ = ly_scm2string (s);
+ else THIS->parser_error (_ ("Expecting string as script definition"));
+ $$ = a;
}
;
-structured_post_request:
- script_req
- | post_request
+request_with_dir:
+ script_dir request_that_take_dir {
+ if (Script_req * gs = dynamic_cast<Script_req*> ($2))
+ gs->dir_ = Direction ($1);
+ else if ($1)
+ $2->origin ()->warning (_ ("Can't specify direction for this request"));
+ $$ = $2;
+ }
;
+
+verbose_request:
+ REQUEST_IDENTIFIER {
+ $$ = dynamic_cast<Request*> (unsmob_music ($1)->clone ());
+ $$->set_spot (THIS->here_input ());
+ }
+ | TEXTSCRIPT STRING STRING {
+ Text_script_req *ts_p = new Text_script_req;
+ ts_p-> text_str_ = ly_scm2string ($2);
+ ts_p-> style_str_ = ly_scm2string ($3);
+ ts_p->set_spot (THIS->here_input ());
-post_request:
- POST_REQUEST_IDENTIFIER {
- $$ = (Request*)$1->access_Request (true);
+ $$ = ts_p;
}
- | dynamic_req {
- $$ = $1;
+ | SPANREQUEST bare_int STRING {
+ Span_req * sp_p = new Span_req;
+ sp_p->span_dir_ = Direction($2);
+ sp_p->span_type_str_ = ly_scm2string ($3);
+ sp_p->set_spot (THIS->here_input ());
+ $$ = sp_p;
}
- | abbrev_type {
- Abbreviation_req* a = new Abbreviation_req;
+ | tremolo_type {
+ Tremolo_req* a = new Tremolo_req;
+ a->set_spot (THIS->here_input ());
a->type_i_ = $1;
$$ = a;
}
+ | SCRIPT STRING {
+ Articulation_req * a = new Articulation_req;
+ a->articulation_str_ = ly_scm2string ($2);
+ a->set_spot (THIS->here_input ());
+ $$ = a;
+ }
;
sup_quotes:
$$ ++;
}
;
+
sub_quotes:
',' {
$$ = 1;
}
;
-explicit_musical_pitch:
- MUSICAL_PITCH '{' int_list '}' {/* ugh */
- Array<int> &a = *$3;
- ARRAY_SIZE(a,3);
- $$ = new Musical_pitch;
- $$->octave_i_ = a[0];
- $$->notename_i_ = a[1];
- $$->accidental_i_ = a[2];
- delete &a;
+steno_tonic_pitch:
+ TONICNAME_PITCH {
+ $$ = $1;
+ }
+ | TONICNAME_PITCH sup_quotes {
+ $$ = $1;
+ $$->octave_i_ += $2;
+ }
+ | TONICNAME_PITCH sub_quotes {
+ $$ = $1;
+ $$->octave_i_ += - $2;
}
;
musical_pitch:
- steno_musical_pitch
- | explicit_musical_pitch
- ;
-
-steno_notepitch:
- musical_pitch {
- $$ = new Note_req;
-
- $$->pitch_ = *$1;
- delete $1;
+ steno_musical_pitch {
+ $$ = $1;
}
- | steno_notepitch '!' {
- $$->forceacc_b_ = ! $$->forceacc_b_;
+ | MUSICAL_PITCH embedded_scm {
+ int sz = scm_ilength ($2);
+ if (sz != 3) {
+ THIS->parser_error (_f ("Expecting %d arguments", 3));
+ $2 = gh_list (gh_int2scm (0), gh_int2scm (0), gh_int2scm (0), SCM_UNDEFINED);
+ }
+ $$ = new Musical_pitch ($2);
}
;
-
explicit_duration:
- DURATION '{' int_list '}' {
+ DURATION embedded_scm {
$$ = new Duration;
- Array<int> &a = *$3;
- ARRAY_SIZE(a,2);
-
- $$-> durlog_i_ = a[0];
- $$-> dots_i_ = a[1];
-
- delete &a;
+ if (scm_ilength ($2) == 2)
+ {
+ $$-> durlog_i_ = gh_scm2int (gh_car($2));
+ $$-> dots_i_ = gh_scm2int (gh_cadr($2));
+ }
+ else
+ THIS->parser_error (_("Must have 2 arguments for duration"));
}
;
-dynamic_req:
- ABSDYNAMIC '{' unsigned '}' {
- Absolute_dynamic_req *ad_p = new Absolute_dynamic_req;
- ad_p ->loudness_ = (Dynamic_req::Loudness)$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;
+extender_req:
+ EXTENDER {
+ if (!THIS->lexer_p_->lyric_state_b ())
+ THIS->parser_error (_ ("Have to be in Lyric mode for lyrics"));
+ $$ = new Extender_req;
}
;
-plet_fraction:
- unsigned '/' unsigned {
- $$[0] = $1;
- $$[1] = $3;
- }
- |
- '/' unsigned {
- int num = $2 >? 1;
- $$[0] = guess_plet_a[(num <? GUESS_PLET) - 1];
- $$[1] = num;
+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_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*> ($$)->span_dir_ = START;
}
- ;
-
+
close_request_parens:
- '~' {
- $$ = '~';
- }
- | '(' {
- $$='(';
- }
- | ']' {
- $$ = ']';
+ '(' {
+ Span_req* s= new Span_req;
+ $$ = s;
+ s->span_type_str_ = "slur";
}
| E_SMALLER {
- $$ = '<';
+ Span_req*s =new Span_req;
+ $$ = s;
+ s->span_type_str_ = "crescendo";
}
| E_BIGGER {
- $$ = '>';
+ Span_req*s =new Span_req;
+ $$ = s;
+ s->span_type_str_ = "decrescendo";
}
- | 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*> ($$)->span_dir_ = STOP;
}
;
open_request_parens:
E_EXCLAMATION {
- $$ = '!';
+ Span_req *s = new Span_req;
+ s->span_type_str_ = "crescendo";
+ $$ = s;
}
| ')' {
- $$=')';
- }
- | '[' {
- $$='[';
- }
- | open_abbrev_parens
- | open_plet_parens
- ;
-
-
-
-script_definition:
- SCRIPT '{' script_body '}' { $$ = $3; }
- ;
-
-script_body:
- STRING int int int int int {
- Script_def *s = new Script_def;
- s->set_from_input (*$1,$2, $3,$4,$5, $6);
- $$ = s;
- delete $1;
- }
- ;
-
-script_req:
- script_dir gen_script_def {
- Musical_script_req *m = new Musical_script_req;
- $$ = m;
- m->scriptdef_p_ = $2;
- m->set_spot (THIS->here_input ());
- if (!m->dir_)
- m->dir_ = (Direction)$1;
+ Span_req* s= new Span_req;
+ $$ = s;
+ s->span_type_str_ = "slur";
}
;
-gen_script_def:
- text_def {
- $$ = $1;
- ((Text_def*) $$)->align_dir_ = LEFT; /* UGH */
- }
- | mudela_script {
- $$ = $1;
- $$-> set_spot (THIS->here_input ());
- }
- | finger {
- $$ = $1;
- ((Text_def*)$$)->align_dir_ = RIGHT; /* UGH */
- }
- ;
-
-text_def:
+gen_text_def:
string {
- Text_def *t = new Text_def;
+ Text_script_req *t = new Text_script_req;
$$ = t;
- t->text_str_ = *$1;
- delete $1;
+ t->text_str_ = ly_scm2string ($1);
+
$$->set_spot (THIS->here_input ());
}
- ;
-
-finger:
- DIGIT {
- Text_def* t = new Text_def;
+ | DIGIT {
+ Text_script_req* t = new Text_script_req;
$$ = t;
t->text_str_ = to_str ($1);
t->style_str_ = "finger";
;
script_abbreviation:
- '^' { $$ = get_scriptdef ('^'); }
- | '+' { $$ = get_scriptdef ('+'); }
- | '-' { $$ = get_scriptdef ('-'); }
- | '|' { $$ = get_scriptdef ('|'); }
- | 'o' { $$ = get_scriptdef ('o'); }
- | '>' { $$ = get_scriptdef ('>'); }
+ '^' {
+ $$ = gh_str02scm ("hat");
+ }
+ | '+' {
+ $$ = gh_str02scm("plus");
+ }
+ | '-' {
+ $$ = gh_str02scm ("dash");
+ }
+ | '|' {
+ $$ = gh_str02scm ("bar");
+ }
+ | '>' {
+ $$ = gh_str02scm ("larger");
+ }
| '.' {
- $$ = get_scriptdef ('.');
+ $$ = gh_str02scm ("dot");
}
;
-mudela_script:
- SCRIPT_IDENTIFIER { $$ = $1->access_General_script_def (true); }
- | script_definition { $$ = $1; }
- | script_abbreviation {
- $$ = THIS->lexer_p_->lookup_identifier (*$1)->access_General_script_def (true);
- delete $1;
- }
- ;
script_dir:
- '_' { $$ = -1; }
- | '^' { $$ = 1; }
- | '-' { $$ = 0; }
+ '_' { $$ = DOWN; }
+ | '^' { $$ = UP; }
+ | '-' { $$ = CENTER; }
;
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;
}
- ;
-
-dots:
- '.' { $$ = 1; }
- | dots '.' { $$ ++; }
+ | duration_length '*' bare_unsigned {
+ $$->tuplet_iso_i_ *= $3;
+ }
+ | duration_length '/' bare_unsigned {
+ $$->tuplet_type_i_ *= $3;
+ }
;
entered_notemode_duration:
- /* */ {
- $$ = new Duration (THIS->default_duration_);
- }
- | dots {
- $$ = new Duration (THIS->default_duration_);
- $$->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;
}
;
steno_duration:
- unsigned {
+ bare_unsigned {
$$ = new Duration;
- if (!Duration::duration_type_b ($1))
+ if (!is_duration_b ($1))
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_);
+ $$->durlog_i_ = intlog2 ($1);
}
}
| DURATION_IDENTIFIER {
- $$ = $1->access_Duration (true);
+ $$ = $1->access_content_Duration (true);
}
| steno_duration '.' {
$$->dots_i_ ++;
}
- | steno_duration '*' unsigned {
- $$->plet_.iso_i_ *= $3;
- }
- | steno_duration '/' unsigned {
- $$->plet_.type_i_ *= $3;
- }
;
-abbrev_type:
+tremolo_type:
':' {
$$ =0;
}
- | ':' unsigned {
- if (!Duration::duration_type_b ($2))
+ | ':' bare_unsigned {
+ if (!is_duration_b ($2))
THIS->parser_error (_f ("not a duration: %d", $2));
- else if ($2 < 8)
- THIS->parser_error (_ ("can't abbreviate"));
$$ = $2;
}
;
-
simple_element:
- steno_notepitch 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"));
- $1->set_duration (*$2);
- int durlog_i = $2->durlog_i_;
- $$ = THIS->get_note_element ($1, $2);
- }
- | RESTNAME notemode_duration {
- $$ = THIS->get_rest_element (*$1, $2);
- delete $1; // delete notename
- }
- | MEASURES notemode_duration {
- Multi_measure_rest_req* m = new Multi_measure_rest_req;
- m->duration_ = *$2;
- delete $2;
+ THIS->parser_error (_ ("Have to be in Note mode for notes"));
+
+
+ Note_req *n = new Note_req;
+
+ n->pitch_ = *$1;
+ n->duration_ = *$4;
+
+ n->cautionary_b_ = $3 % 2;
+ n->forceacc_b_ = $2 % 2 || n->cautionary_b_;
+
+
+ Simultaneous_music*v = new Request_chord (gh_list (n->self_scm (), SCM_UNDEFINED));
+ v->set_spot ($1->spot ());
+ n->set_spot ($1->spot ());
+ $$ = v;
+
+ delete $1;
+ delete $4;
+ }
+ | RESTNAME optional_notemode_duration {
+
+ SCM e = SCM_UNDEFINED;
+ if (ly_scm2string ($1) =="s")
+ { /* Space */
+ Skip_req * skip_p = new Skip_req;
+ skip_p->duration_ = *$2;
+
+ skip_p->set_spot (THIS->here_input());
+ e = skip_p->self_scm ();
+ }
+ else
+ {
+ Rest_req * rest_req_p = new Rest_req;
+ rest_req_p->duration_ = *$2;
+ rest_req_p->set_spot (THIS->here_input());
+ e = rest_req_p->self_scm ();
+ }
+ Simultaneous_music* velt_p = new Request_chord (gh_list (e,SCM_UNDEFINED));
+ velt_p->set_spot (THIS->here_input());
+
+ delete $2; // ugh
+ $$ = velt_p;
+ }
+ | MEASURES optional_notemode_duration {
+ Skip_req * sk = new Skip_req;
+ sk->duration_ = *$2;
+
+
+ Span_req *sp1 = new Span_req;
+ Span_req *sp2 = new Span_req;
+ sp1-> span_dir_ = START;
+ sp2-> span_dir_ = STOP;
+ sp1->span_type_str_ = sp2->span_type_str_ = "rest";
+
+ Request_chord * rqc1 = new Request_chord (gh_list (sp1->self_scm (), SCM_UNDEFINED));
+ Request_chord * rqc2 = new Request_chord (gh_list (sk->self_scm (), SCM_UNDEFINED));;
+ Request_chord * rqc3 = new Request_chord(gh_list (sp2->self_scm (), SCM_UNDEFINED));;
+
+ SCM ms = gh_list (rqc1->self_scm (), rqc2->self_scm (), rqc3->self_scm (), SCM_UNDEFINED);
- Simultaneous_music*velt_p = new Request_chord;
- velt_p->set_spot (THIS->here_input ());
- velt_p->add_music (m);
- $$ = velt_p;
+ $$ = new Sequential_music (ms);
}
- | STRING notemode_duration {
+ | STRING optional_notemode_duration {
if (!THIS->lexer_p_->lyric_state_b ())
- THIS->parser_error (_ ("have to be in Lyric mode for lyrics"));
- $$ = THIS->get_word_element (*$1, $2);
- delete $1;
+ THIS->parser_error (_ ("Have to be in Lyric mode for lyrics"));
+ Lyric_req* lreq_p = new Lyric_req;
+ lreq_p ->text_str_ = ly_scm2string ($1);
+ lreq_p->duration_ = *$2;
+ lreq_p->set_spot (THIS->here_input());
+ Simultaneous_music* velt_p = new Request_chord (gh_list (lreq_p->self_scm (), SCM_UNDEFINED));
+
+ delete $2; // ugh
+ $$= velt_p;
+
+ }
+ | chord {
+ if (!THIS->lexer_p_->chord_state_b ())
+ THIS->parser_error (_ ("Have to be in Chord mode for chords"));
+ $$ = $1;
}
;
-/*
- UTILITIES
- */
-pitch_list: {
+chord:
+ steno_tonic_pitch optional_notemode_duration chord_additions chord_subtractions chord_inversion chord_bass {
+ $$ = THIS->get_chord (*$1, $3, $4, $5, $6, *$2);
+ };
+
+chord_additions:
+ {
$$ = new Array<Musical_pitch>;
+ }
+ | CHORD_COLON chord_notes {
+ $$ = $2;
}
- | pitch_list musical_pitch {
- $$->push (*$2);
- delete $2;
+ ;
+
+chord_notes:
+ chord_step {
+ $$ = $1
+ }
+ | chord_notes '.' chord_step {
+ $$ = $1;
+ $$->concat (*$3);
+ }
+ ;
+
+chord_subtractions:
+ {
+ $$ = new Array<Musical_pitch>;
+ }
+ | CHORD_CARET chord_notes {
+ $$ = $2;
}
;
-int_list:
- /**/ {
- $$ = new Array<int>
+chord_inversion:
+ {
+ $$ = 0;
}
- | int_list int {
- $$->push ($2);
+ | '/' steno_tonic_pitch {
+ $$ = $2;
+ $$->set_spot (THIS->here_input ());
}
;
-unsigned:
- UNSIGNED {
- $$ = $1;
+chord_bass:
+ {
+ $$ = 0;
}
- | DIGIT {
- $$ = $1;
- };
+ | CHORD_BASS steno_tonic_pitch {
+ $$ = $2;
+ $$->set_spot (THIS->here_input ());
+ }
+ ;
-int:
- unsigned {
- $$ = $1;
+chord_step:
+ chord_note {
+ $$ = new Array<Musical_pitch>;
+ $$->push (*$1);
}
- | '-' unsigned {
- $$ = -$2;
+ | CHORDMODIFIER_PITCH {
+ $$ = new Array<Musical_pitch>;
+ $$->push (*$1);
}
- | INT_IDENTIFIER {
- $$ = *$1->access_int (false);
+ | CHORDMODIFIER_PITCH chord_note { /* Ugh. */
+ $$ = new Array<Musical_pitch>;
+ $$->push (*$1);
+ $$->push (*$2);
}
;
-string_primary:
- STRING {
+chord_note:
+ bare_unsigned {
+ $$ = new Musical_pitch;
+ $$->notename_i_ = ($1 - 1) % 7;
+ $$->octave_i_ = $1 > 7 ? 1 : 0;
+ $$->accidental_i_ = 0;
+ }
+ | bare_unsigned '+' {
+ $$ = new Musical_pitch;
+ $$->notename_i_ = ($1 - 1) % 7;
+ $$->octave_i_ = $1 > 7 ? 1 : 0;
+ $$->accidental_i_ = 1;
+ }
+ | bare_unsigned CHORD_MINUS {
+ $$ = new Musical_pitch;
+ $$->notename_i_ = ($1 - 1) % 7;
+ $$->octave_i_ = $1 > 7 ? 1 : 0;
+ $$->accidental_i_ = -1;
+ }
+ ;
+
+/*
+ UTILITIES
+ */
+number_expression:
+ bare_number {
$$ = $1;
}
- | STRING_IDENTIFIER {
- $$ = $1->access_String (true);
+ | '-' number_expression %prec UNARY_MINUS {
+ $$ = scm_difference ($2, SCM_UNDEFINED);
+ }
+ | number_expression '*' number_expression {
+ $$ = scm_product ($1, $3);
+ }
+ | number_expression '/' number_expression {
+ $$ = scm_divide ($1, $3);
+ }
+ | number_expression '+' number_expression {
+ $$ = scm_sum ($1, $3);
+ }
+ | number_expression '-' number_expression {
+ $$ = scm_difference ($1, $3);
+ }
+ | '(' number_expression ')' {
+ $$ = $2;
}
;
-string:
- string_primary {
+bare_number:
+ UNSIGNED {
+ $$ = gh_int2scm ($1);
+ }
+ | DIGIT {
+ $$ = gh_int2scm ($1);
+ }
+ | REAL {
+ $$ = gh_double2scm ($1);
+ }
+ | NUMBER_IDENTIFIER {
$$ = $1;
}
- | string '+' string_primary {
- *$$ += *$3;
- delete $3;
+ | REAL CM_T {
+ $$ = gh_double2scm ($1 CM);
+ }
+ | REAL PT_T {
+ $$ = gh_double2scm ($1 PT);
+ }
+ | REAL IN_T {
+ $$ = gh_double2scm ($1 INCH);
+ }
+ | REAL MM_T {
+ $$ = gh_double2scm ($1 MM);
+ }
+ | REAL CHAR_T {
+ $$ = gh_double2scm ($1 CHAR);
}
;
-dim:
- real_primary unit { $$ = $1*$2; }
- ;
+bare_unsigned:
+ bare_number {
+ if (scm_integer_p ($1) == SCM_BOOL_T) {
+ $$ = gh_scm2int ($1);
-unit: CM_T { $$ = 1 CM; }
- |IN_T { $$ = 1 INCH; }
- |MM_T { $$ = 1 MM; }
- |PT_T { $$ = 1 PT; }
- ;
+ } else {
+ THIS->parser_error (_("need integer number arg"));
+ $$ = 0;
+ }
+ if ($$ < 0) {
+ THIS->parser_error (_("Must be positive integer"));
+ $$ = -$$;
+ }
-/*
- symbol tables
-*/
-symtables:
- SYMBOLTABLES '{' symtables_body '}' { $$ = $3; }
+ }
;
-
-symtables_body:
- {
- $$ = new Lookup;
+bare_int:
+ bare_number {
+ if (scm_integer_p ($1) == SCM_BOOL_T)
+ {
+ int k = gh_scm2int ($1);
+ $$ = k;
+ } else
+ {
+ THIS->parser_error (_("need integer number arg"));
+ $$ = 0;
+ }
}
- | IDENTIFIER {
- $$ = $1->access_Lookup (true);
+ | '-' bare_int {
+ $$ = -$2;
}
- | 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;
+string:
+ STRING {
+ $$ = $1;
}
- | symtables_body STRING '=' symtable {
- $$->add (*$2, $4);
- delete $2;
+ | STRING_IDENTIFIER {
+ $$ = $1;
+ }
+ | string '+' string {
+ $$ = scm_string_append (scm_listify ($1, $3, SCM_UNDEFINED));
}
;
-symtable:
- TABLE '{' symtable_body '}' { $$ = $3; }
- ;
-symtable_body:
- { $$ = new Symtable; }
- | symtable_body STRING symboldef {
- $$->add (*$2, *$3);
- delete $2;
- delete $3;
- }
+exclamations:
+ { $$ = 0; }
+ | exclamations '!' { $$ ++; }
;
-symboldef:
- STRING box {
- $$ = new Atom (*$1, *$2);
- delete $1;
- delete $2;
- }
- | STRING {
- Box b (Interval (0,0), Interval (0,0));
- $$ = new Atom (*$1, b);
- delete $1;
- }
+questions:
+ { $$ = 0; }
+ | questions '?' { $$ ++; }
;
-box:
- dinterval dinterval {
- $$ = new Box (*$1, *$2);
- delete $1;
- delete $2;
- }
- ;
-dinterval: dim dim {
- $$ = new Interval ($1, $2);
- }
+semicolon:
+ ';'
;
%%
yyparse ((void*)this);
}
+
projects / lilypond.git / blobdiff