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 "lily-guile.hh"
-#include "notename-table.hh"
-#include "scalar.hh"
#include "translation-property.hh"
#include "lookup.hh"
#include "misc.hh"
#include "midi-def.hh"
#include "main.hh"
#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"
+#include "output-property.hh"
-// mmm
-Mudela_version oldest_version ("1.0.14");
-Mudela_version version ("1.0.15");
+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.42");
-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 ();
- }
-};
+void
+print_mudela_versions (ostream &os)
+{
+ os << _f ("Oldest supported input version: %s", oldest_version.str ())
+ << endl;
+}
-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;
Link_array<Request> *reqvec;
- Array<String> * strvec;
Array<int> *intvec;
- Notename_table *chordmodifiertab;
Duration *duration;
Identifier *id;
+ String * string;
Music *music;
Music_list *music_list;
Score *score;
Musical_pitch * pitch;
Midi_def* midi;
Moment *moment;
- Notename_table *notenametab;
Paper_def *paper;
Real real;
Request * request;
- Scalar *scalar;
- String *string;
+ /* 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;
- Translator* trans;
- char c;
+ Translator_group* trans;
int i;
- int ii[10];
}
%{
%pure_parser
/* tokens which are not keywords */
-
-%token ABSDYNAMIC
+%token AUTOCHANGE
+%token TEXTSCRIPT
%token ACCEPTS
%token ALTERNATIVE
%token BAR
-%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 EXTENDER
%token FONT
-%token GROUPING
+%token GRACE
%token HEADER
+%token HYPHEN
%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 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 exclamations questions
+%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> REQUEST_IDENTIFIER
%token <id> REAL_IDENTIFIER
%token <id> MIDI_IDENTIFIER
%token <id> PAPER_IDENTIFIER
%token <real> REAL
-%token <string> DURATION RESTNAME
-%token <string> STRING
+%token <scm> DURATION RESTNAME
+%token <scm> STRING
+%token <scm> SCM_T
%token <i> UNSIGNED
%type <i> sub_quotes sup_quotes
%type <music> simple_element request_chord command_element Simple_music Composite_music
%type <music> Alternative_music Repeated_music
-%type <i> abbrev_type
+%type <i> tremolo_type
%type <i> int unsigned
%type <i> script_dir
-%type <i> optional_modality
+%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_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 <pitch_arr> pitch_list chord_additions chord_subtractions chord_notes chord_step
+%type <music> chord
+%type <pitch> chord_note chord_inversion chord_bass
%type <midi> midi_block midi_body
%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> real_expression real real_with_dimension
-%type <request> abbrev_command_req
+%type <real> real real_with_dimension
+%type <request> shorthand_command_req
%type <request> post_request
%type <request> command_req verbose_command_req
%type <request> extender_req
-%type <string> string
+%type <request> hyphen_req
+%type <scm> string
%type <score> score_block score_body
-%type <intarr> shape_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
-
+%type <scm> notenames_body notenames_block chordmodifiers_block
+%type <scm> script_abbreviation
mudela: /* empty */
| mudela toplevel_expression {}
- | mudela assignment { }
+ | 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_->set_chordmodifier_table ($1);
+ THIS->lexer_p_->chordmodifier_tab_ = $1;
}
| mudela_header {
delete header_global_p;
Midi_def_identifier ($1, MIDI_IDENTIFIER);
THIS->lexer_p_->set_identifier ("$defaultmidi", id)
}
- | embedded_scm {
- }
+ | embedded_scm {
+ // junk value
+ }
;
embedded_scm:
- SCMFILE STRING semicolon {
- read_lily_scm_file (*$2);
- delete $2;
- }
- | SCM_T STRING semicolon {
- 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 ()));
- }
- }
- }
+ SCM_T
;
chordmodifiers_block:
- CHORDMODIFIERS '{' notenames_body '}' { $$ = $3; }
+ CHORDMODIFIERS notenames_body { $$ = $2; }
;
notenames_block:
- NOTENAMES '{' notenames_body '}' { $$ = $3; }
+ NOTENAMES notenames_body { $$ = $2; }
;
notenames_body:
- /**/ {
- $$ = new Notename_table;
- }
- | NOTENAME_TABLE_IDENTIFIER {
- $$ = $1-> access_content_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;
}
;
THIS->remember_spot ();
}
/* cont */ '=' identifier_init {
- THIS->lexer_p_->set_identifier (*$1, $4);
- $4->init_b_ = THIS->init_parse_b_;
+ THIS->lexer_p_->set_identifier (ly_scm2string ($1), $4);
+
$4->set_spot (THIS->pop_spot ());
}
;
$$ = 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);
- }
| paper_block {
$$ = new Paper_def_identifier ($1, PAPER_IDENTIFIER);
}
}
| translator_spec_block {
- $$ = new Translator_identifier ($1, TRANS_IDENTIFIER);
+ $$ = new Translator_group_identifier ($1, TRANS_IDENTIFIER);
}
| Music {
$$ = new Music_identifier ($1, MUSIC_IDENTIFIER);
$$ = new Real_identifier (new Real ($1), REAL_IDENTIFIER);
}
| string {
- $$ = new String_identifier ($1, STRING_IDENTIFIER);
+ $$ = new String_identifier (new String (ly_scm2string ($1)), STRING_IDENTIFIER);
}
| int {
$$ = new int_identifier (new int ($1), INT_IDENTIFIER);
translator_spec_body:
TRANS_IDENTIFIER {
- $$ = $1->access_content_Translator (true);
+ $$ = $1->access_content_Translator_group (true);
$$-> set_spot (THIS->here_input ());
}
| TYPE STRING semicolon {
- Translator* t = get_translator_l (*$2);
+ 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;
+ tg = dynamic_cast<Translator_group*> (t->clone ());
+ tg->set_spot (THIS->here_input ());
+ $$ = tg;
+ }
+ | translator_spec_body STRING '=' embedded_scm {
+ Translator_group* tg = dynamic_cast<Translator_group*> ($$);
+ tg->set_property (ly_scm2string ($2), $4);
}
| translator_spec_body STRING '=' identifier_init semicolon {
Identifier* id = $4;
Real_identifier *r= dynamic_cast<Real_identifier*>(id);
int_identifier *i = dynamic_cast<int_identifier*> (id);
- String str;
- if (s) str = *s->access_content_String (false);
- if (i) str = to_str (*i->access_content_int (false));
- if (r) str = to_str (*r->access_content_Real (false));
+ SCM v;
+ if (s) v = ly_str02scm (s->access_content_String (false)->ch_C());
+ if (i) v = gh_int2scm (*i->access_content_int (false));
+ if (r) v = gh_double2scm (*r->access_content_Real (false));
if (!s && !i && !r)
THIS->parser_error (_("Wrong type for property value"));
delete $4;
/* ugh*/
- Translator_group * tr = dynamic_cast<Translator_group*>($$);
- tr->set_property (*$2, str);
+ Translator_group* tg = dynamic_cast<Translator_group*> ($$);
+
+ tg->set_property (ly_scm2string ($2), v);
}
| translator_spec_body NAME STRING semicolon {
- $$->type_str_ = *$3;
- delete $3;
+ $$->type_str_ = ly_scm2string ($3);
}
| translator_spec_body CONSISTS STRING semicolon {
- dynamic_cast<Translator_group*> ($$)-> set_element (*$3, true);
- delete $3;
+ dynamic_cast<Translator_group*> ($$)-> set_element (ly_scm2string ($3), true);
+ }
+ | translator_spec_body CONSISTSEND STRING semicolon {
+ dynamic_cast<Translator_group*> ($$)-> set_element (ly_scm2string ($3), true);
}
| translator_spec_body ACCEPTS STRING semicolon {
- dynamic_cast<Translator_group*> ($$)-> set_acceptor (*$3, true);
- delete $3;
+ dynamic_cast<Translator_group*> ($$)-> set_acceptor (ly_scm2string ($3), true);
}
| translator_spec_body REMOVE STRING semicolon {
- dynamic_cast<Translator_group*> ($$)-> set_element (*$3, false);
- delete $3;
+ dynamic_cast<Translator_group*> ($$)-> set_element (ly_scm2string ($3), false);
}
;
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 ());
-
+ {
+ Identifier *id =
+ THIS->lexer_p_->lookup_identifier ("$defaultpaper");
+ $$->add_output (id ? id->access_content_Paper_def (true) : new Paper_def );
+ }
}
;
-score_body: {
+score_body:
+ Music {
$$ = new Score;
+ $$->set_spot (THIS->here_input ());
+ $$->music_p_ = $1;
}
| SCORE_IDENTIFIER {
$$ = $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);
}
}
;
-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 ();
+ Identifier *id = THIS->lexer_p_->lookup_identifier ("$defaultpaper");
+ Paper_def *p = id ? id->access_content_Paper_def (true) : new Paper_def;
THIS-> lexer_p_-> scope_l_arr_.push (p->scope_p_);
$$ = p;
}
}
| paper_def_body int '=' FONT STRING { // ugh, what a syntax
Lookup * l = new Lookup;
- l->font_name_ = *$5;
- delete $5;
+ l->font_name_ = ly_scm2string ($5);
$$->set_lookup ($2, l);
}
| paper_def_body assignment semicolon {
-
+
+ }
+ | paper_def_body SCM_T '=' SCM_T {
+ if (!gh_symbol_p ($2))
+ THIS->parser_error ("expect a symbol as lvalue");
+ else
+ $$->default_properties_.set ($2, $4);
+ }
+ | paper_def_body SCM_T '=' real semicolon {
+ if (!gh_symbol_p ($2))
+ THIS->parser_error ("expect a symbol as lvalue");
+ else
+ $$->default_properties_.set ($2, gh_double2scm ($4));
}
| 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 error {
}
;
-real:
- real_expression { $$ = $1; }
- ;
-
real_with_dimension:
REAL CM_T {
| REAL MM_T {
$$ = $1 MM;
}
+ | REAL CHAR_T {
+ $$ = $1 CHAR;
+ }
;
-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>;
- }
- | shape_array real real {
- $$->push(Interval($2, $2 + $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 ();
+ Identifier *id = THIS->lexer_p_->lookup_identifier ("$defaultmidi");
+ Midi_def* p = id
+ ? id->access_content_Midi_def (true) : new Midi_def ;
+
+ $$ = 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);
}
| midi_body tempo_request semicolon {
+ /*
+ junk this ? there already is tempo stuff in
+ music.
+ */
$$->set_tempo ($2->dur_.length_mom (), $2->metronome_i_);
delete $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->type_ = ly_scm2string ($2);
+ r->fold_b_ = (r->type_ == "fold");
+ r->volta_fold_b_ = (r->type_ == "volta");
+ 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 ());
}
;
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_IDENTIFIER { $$ = $1->access_content_Music (true); }
| 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;
- delete $2;
+ CONTEXT STRING Music {
+ Context_specced_music *csm = new Context_specced_music ($3);
+
+ csm->translator_type_str_ = ly_scm2string ($2);
+ csm->translator_id_str_ = "";
+
+
+ $$ = csm;
}
- | TYPE STRING '=' STRING Music {
- $$ = $5;
- $$->translator_type_str_ = *$2;
- $$->translator_id_str_ = *$4;
- delete $2;
- delete $4;
+ | AUTOCHANGE STRING Music {
+ Auto_change_music * chm = new Auto_change_music (ly_scm2string ($2), $3);
+
+ $$ = 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_ = ly_scm2string ($2);
+ csm->translator_id_str_ = ly_scm2string ($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;
- 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->var_str_ = ly_scm2string ($4);
+ t->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; }
+ | int { $$ = gh_int2scm ($1); }
+ | embedded_scm { $$ = $1; }
;
request_chord:
pre_requests simple_element post_requests {
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));
+ if (l) {
+ 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));
+ }
+ else
+ programming_error ("Need Sequence to add music to");
$$ = $2;
}
$1-> set_spot (THIS->here_input ());
((Simultaneous_music*)$$) ->add_music ($1);//ugh
}
+ | PARTIAL duration_length ';' {
+ Translation_property * p = new Translation_property;
+ p->var_str_ = "measurePosition";
+ p->value_ = (new Moment (-$2->length_mom ()))->smobify_self ();
+ delete $2;
+ Context_specced_music * sp = new Context_specced_music (p);
+ $$ =sp ;
+ sp-> translator_type_str_ = "Score";
+ }
;
command_req:
- abbrev_command_req
+ shorthand_command_req
| verbose_command_req semicolon { $$ = $1; }
;
-abbrev_command_req:
+shorthand_command_req:
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;
}
| ']' {
- Beam_req*b= new Beam_req;
- b->spantype_ = STOP;
- $$ = 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 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->mark_label_ = $2;
+ $$ = m;
+
}
| MARK unsigned {
- $$ = new Mark_req (to_str ($2));
+ Mark_req *m = new Mark_req;
+ m->mark_label_ = gh_int2scm ($2);
+ $$ = m;
}
+
| TIME_T unsigned '/' unsigned {
Time_signature_change_req *m = new Time_signature_change_req;
m->beats_i_ = $2;
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 {
| tempo_request {
$$ = $1;
}
- | CADENZA unsigned {
- $$ = new Cadenza_req ($2);
- }
- | PARTIAL duration_length {
- $$ = new Partial_measure_req ($2->length_mom ());
- delete $2;
- }
| CLEF STRING {
- $$ = new Clef_change_req (*$2);
- delete $2;
+ $$ = new Clef_change_req (ly_scm2string ($2));
+
}
- | KEY NOTENAME_PITCH optional_modality {
+ | KEY {
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_ = 0;
$$ = key_p;
- delete $2;
}
- | KEYSIGNATURE pitch_list {
+/* UGH. optional. */
+
+ | KEY NOTENAME_PITCH optional_modality {
Key_change_req *key_p= new Key_change_req;
- key_p->pitch_arr_ = *$2;
- key_p->ordinary_key_b_ = false;
+ Key_def d;
+ d.pitch_arr_.push (*$2);
+ d.ordinary_key_b_ = true;
+ d.modality_i_ = $3;
+
+ key_p->key_ = new Key_def (d);
$$ = 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++));
- }
-
+ | KEYSIGNATURE pitch_list {
+ Key_change_req *key_p= new Key_change_req;
+ Key_def d;
+ d.pitch_arr_ = *$2;
+ d.ordinary_key_b_ = false;
- $$ = mr_p;
+ key_p->key_ = new Key_def(d);
+ $$ = key_p;
delete $2;
}
;
gen_text_def
| verbose_request
| script_abbreviation {
- Identifier*i = THIS->lexer_p_->lookup_identifier ("dash-" + *$1);
+ Identifier*i = THIS->lexer_p_->lookup_identifier ("dash-" + ly_scm2string ($1));
Articulation_req *a = new Articulation_req;
a->articulation_str_ = *i->access_content_String (false);
- delete $1;
$$ = a;
}
;
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 ());
- delete $3;
- $$ =ad_p;
- }
- | SPANDYNAMIC '{' int int '}' {
- Span_dynamic_req * sp_p = new Span_dynamic_req;
- sp_p-> dynamic_dir_ = Direction($3);
- sp_p->spantype_ = Direction($4);
+ | 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 ());
+
+ $$ = ts_p;
+ }
+ | SPANREQUEST 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_ = *$2;
+ a->articulation_str_ = ly_scm2string ($2);
a->set_spot (THIS->here_input ());
$$ = a;
- delete $2;
}
;
}
;
-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;
- }
- ;
-
musical_pitch:
- steno_musical_pitch
- | explicit_musical_pitch
+ steno_musical_pitch {
+ $$ = $1;
+ }
+ | 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:
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";
}
;
string {
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 ());
}
| DIGIT {
script_abbreviation:
'^' {
- $$ = new String ("hat");
+ $$ = gh_str02scm ("hat");
}
| '+' {
- $$ = new String ("plus");
+ $$ = gh_str02scm("plus");
}
| '-' {
- $$ = new String ("dash");
+ $$ = gh_str02scm ("dash");
}
| '|' {
- $$ = new String ("bar");
+ $$ = gh_str02scm ("bar");
}
| '>' {
- $$ = new String ("larger");
+ $$ = gh_str02scm ("larger");
}
| '.' {
- $$ = new String ("dot");
+ $$ = gh_str02scm ("dot");
}
;
$$ = $1;
}
| duration_length '*' unsigned {
- $$->plet_.iso_i_ *= $3;
+ $$->tuplet_iso_i_ *= $3;
}
| duration_length '/' unsigned {
- $$->plet_.type_i_ *= $3;
+ $$->tuplet_type_i_ *= $3;
}
;
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;
}
;
steno_duration:
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);
+ $$->durlog_i_ = intlog2 ($1);
}
}
| DURATION_IDENTIFIER {
;
-abbrev_type:
+tremolo_type:
':' {
$$ =0;
}
| ':' unsigned {
- if (!Duration::duration_type_b ($2))
+ 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:
- 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;
n->pitch_ = *$1;
- delete $1;
n->duration_ = *$4;
- delete $4;
+
n->cautionary_b_ = $3 % 2;
n->forceacc_b_ = $2 % 2 || n->cautionary_b_;
Simultaneous_music*v = new Request_chord;
- v->set_spot (THIS->here_input ());
- n->set_spot (THIS->here_input ());
+ v->set_spot ($1->spot ());
+ n->set_spot ($1->spot ());
v->add_music (n);
$$ = v;
+
+ delete $1;
+ delete $4;
+
}
- | 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;
+ | RESTNAME optional_notemode_duration {
+ Simultaneous_music* velt_p = new Request_chord;
+ velt_p->set_spot (THIS->here_input());
+
+ if (ly_scm2string ($1) =="s")
+ { /* Space */
+ Skip_req * skip_p = new Skip_req;
+ skip_p->duration_ = *$2;
+
+ skip_p->set_spot (THIS->here_input());
+ velt_p->add_music (skip_p);
+ }
+ else
+ {
+ Rest_req * rest_req_p = new Rest_req;
+ rest_req_p->duration_ = *$2;
+ rest_req_p->set_spot (THIS->here_input());
+
+ velt_p->add_music (rest_req_p);
+ }
+
+ delete $2;
+ $$ = velt_p;
+ }
+ | MEASURES optional_notemode_duration {
+ Skip_req * sk = new Skip_req;
+ sk->duration_ = *$2;
+ Music_list * ms = new Music_list;
+ Request_chord * rqc1 = new Request_chord;
+ Request_chord * rqc2 = new Request_chord;
+ Request_chord * rqc3 = new Request_chord;
+
+ 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";
+ rqc1->add_music (sp1);
+ rqc2->add_music (sk);
+ rqc3->add_music (sp2);
+
+ ms->add_music (rqc1);
+ ms->add_music (rqc2);
+ ms->add_music (rqc3);
- 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"));
+ Simultaneous_music* velt_p = new Request_chord;
+
+ 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());
+
+ velt_p->add_music (lreq_p);
+
+ delete $2;
+ $$= velt_p;
+
}
| 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);
+ steno_tonic_pitch optional_notemode_duration chord_additions chord_subtractions chord_inversion chord_bass {
+ $$ = THIS->get_chord (*$1, $3, $4, $5, $6, *$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 {
+ | CHORD_COLON 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;
}
| '/' steno_tonic_pitch {
- $$ = $2
+ $$ = $2;
+ $$->set_spot (THIS->here_input ());
}
;
-notemode_chord_inversion:
+chord_bass:
{
$$ = 0;
}
- | '/' steno_musical_pitch {
- $$ = $2
+ | CHORD_BASS steno_tonic_pitch {
+ $$ = $2;
+ $$->set_spot (THIS->here_input ());
+ }
+ ;
+
+chord_step:
+ chord_note {
+ $$ = new Array<Musical_pitch>;
+ $$->push (*$1);
+ }
+ | 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 {
$$ = $1;
}
| STRING_IDENTIFIER {
- $$ = $1->access_content_String (true);
+ $$ = ly_str02scm ($1->access_content_String (true)->ch_C ());
}
| string '+' string {
- *$$ += *$3;
- delete $3;
+ $$ = scm_string_append (scm_listify ($1, $3, SCM_UNDEFINED));
}
;
-
-
-dots:
- { $$ = 0; }
- | dots '.' { $$ ++; }
- ;
-
-
-
exclamations:
{ $$ = 0; }
| exclamations '!' { $$ ++; }
projects / lilypond.git / blobdiff