source file of the GNU LilyPond music typesetter
- (c) 1997 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--1999 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 "lyric-combine-music.hh"
#include "transposed-music.hh"
#include "time-scaled-music.hh"
-#include "new-repeated-music.hh"
+#include "repeated-music.hh"
#include "mudela-version.hh"
#include "grace-music.hh"
+#include "auto-change-music.hh"
// mmm
Mudela_version oldest_version ("1.1.52");
void
print_mudela_versions (ostream &os)
{
- os << "Oldest supported input version: " << oldest_version.str () << endl;
+ os << _f ("Oldest supported input version: %s", oldest_version.str ())
+ << endl;
}
// needed for bison.simple's malloc() and free()
#include <malloc.h>
#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))
%}
Array<Real>* realarr;
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;
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;
+ Translator_group* trans;
char c;
int i;
int ii[10];
%pure_parser
/* tokens which are not keywords */
-
+%token AUTOCHANGE
%token TEXTSCRIPT
%token ACCEPTS
%token ALTERNATIVE
%token CLEF
%token CM_T
%token CONSISTS
+%token SEQUENTIAL
+%token SIMULTANEOUS
%token CONSISTSEND
%token DURATION
%token EXTENDER
%token REPETITIONS
%token ADDLYRICS
%token SCM_T
-%token SCMFILE
%token SCORE
%token SCRIPT
%token SHAPE
%token VERSION
/* escaped */
-%token E_EXCLAMATION E_SMALLER E_BIGGER E_CHAR
+%token E_EXCLAMATION E_SMALLER E_BIGGER E_CHAR CHORD_MINUS CHORD_CARET
%type <i> exclamations questions
%token <i> DIGIT
%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> abbrev_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 optional_notemode_duration
%type <duration> entered_notemode_duration explicit_duration
%type <midi> midi_block midi_body
%type <duration> duration_length
-%type <scalar> scalar
+%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 <request> command_req verbose_command_req
%type <request> extender_req
%type <request> hyphen_req
-%type <string> string
+%type <scm> string
%type <score> score_block score_body
%type <realarr> real_array
-%type <string> script_abbreviation
+%type <scm> script_abbreviation
%type <trans> translator_spec_block translator_spec_body
%type <tempo> tempo_request
%type <notenametab> notenames_body notenames_block chordmodifiers_block
mudela: /* empty */
| mudela toplevel_expression {}
- | mudela assignment { }
+ | mudela assignment { }
| mudela error
| mudela INVALID {
THIS->error_level_i_ =1;
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 {
- if (THIS->lexer_p_->main_input_b_ && safe_global_b)
- error (_("Cannot evaluate Scheme in safe mode"));
- gh_eval_str ($2->ch_l ());
- delete $2;
- };
+ SCM_T
+ ;
chordmodifiers_block:
$$ = $1-> access_content_Notename_table(true);
}
| notenames_body STRING '=' explicit_musical_pitch {
- (*$$)[*$2] = *$4;
+ (*$$)[ly_scm2string ($2)] = *$4;
delete $4;
- delete $2;
}
;
THIS->remember_spot ();
}
/* cont */ '=' identifier_init {
- THIS->lexer_p_->set_identifier (*$1, $4);
+ THIS->lexer_p_->set_identifier (ly_scm2string ($1), $4);
$4->init_b_ = THIS->init_parse_b_;
$4->set_spot (THIS->pop_spot ());
}
}
| 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_ch_C_to_scm (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 (*$3, true);
- delete $3;
+ 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);
}
;
}
| 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 {
URG URG.
*/
if ($3->size () % 2)
- warning ("Need even number of args for shape array");
+ warning (_ ("Need even number of args for shape array"));
for (int i=0; i < $3->size (); i+=2)
{
*/
midi_block:
MIDI
-
- '{' midi_body '}' { $$ = $3; }
+ '{' midi_body '}' {
+ $$ = $3;
+ THIS-> lexer_p_-> scope_l_arr_.pop();
+ }
;
midi_body: /* empty */ {
- $$ = THIS->default_midi_p ();
+ Midi_def * p =THIS->default_midi_p ();
+ $$ = p;
+ THIS->lexer_p_->scope_l_arr_.push (p->scope_p_);
}
| MIDI_IDENTIFIER {
- $$ = $1-> access_content_Midi_def (true);
+ Midi_def * p =$1-> access_content_Midi_def (true);
+ $$ = p;
+ THIS->lexer_p_->scope_l_arr_.push (p->scope_p_);
}
| midi_body assignment semicolon {
{
Music_sequence* m = dynamic_cast <Music_sequence*> ($5);
if (m && $3 < m->length_i ())
- $5->warning ("More alternatives than repeats. Junking excess alternatives.");
+ $5->warning (_ ("More alternatives than repeats. Junking excess alternatives."));
Repeated_music * r = new Repeated_music ($4, $3 >? 1, m);
$$ = r;
- r->fold_b_ = (*$2 == "fold");
- r->semi_fold_b_ = (*$2 == "semi");
- delete $2;
+ r->fold_b_ = (ly_scm2string ($2) == "fold");
+ r->volta_fold_b_ = (ly_scm2string ($2) == "volta");
r->set_spot ($4->spot ());
}
;
}
;
-Sequential_music: '{' Music_list '}' {
+Sequential_music:
+ SEQUENTIAL '{' Music_list '}' {
+ $$ = new Sequential_music ($3);
+ $$->set_spot ($3->spot ());
+ }
+ | '{' Music_list '}' {
$$ = new Sequential_music ($2);
$$->set_spot ($2->spot ());
}
;
-Simultaneous_music: '<' Music_list '>' {
+Simultaneous_music:
+ SIMULTANEOUS '{' Music_list '}'{
+ $$ = new Simultaneous_music ($3);
+ $$->set_spot ($3->spot ());
+ }
+ | '<' Music_list '>' {
$$ = new Simultaneous_music ($2);
$$->set_spot ($2->spot ());
}
| property_def
| translator_change
| Simple_music '*' unsigned '/' unsigned {
- /* urg */
- $$ = new Time_scaled_music ($3, $5, $1);
+ $$ = $1;
+ $$->compress (Moment($3, $5 ));
}
| Simple_music '*' unsigned {
- $$ = new Time_scaled_music ($3, 1, $1);
+ $$ = $1;
+ $$->compress (Moment ($3, 1));
}
;
CONTEXT STRING Music {
Context_specced_music *csm = new Context_specced_music ($3);
- csm->translator_type_str_ = *$2;
+ csm->translator_type_str_ = ly_scm2string ($2);
csm->translator_id_str_ = "";
- delete $2;
+
$$ = csm;
}
+ | 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_ = *$2;
- csm->translator_id_str_ = *$4;
- delete $2;
- delete $4;
+ csm->translator_type_str_ = ly_scm2string ($2);
+ csm->translator_id_str_ = ly_scm2string ($4);
$$ = csm;
}
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-> var_str_ = *$4;
- t-> value_ = *$6;
+ t->var_str_ = ly_scm2string ($4);
+ t->value_ = $6;
Context_specced_music *csm = new Context_specced_music (t);
$$ = csm;
$$->set_spot (THIS->here_input ());
- csm-> translator_type_str_ = *$2;
-
- delete $2;
- delete $4;
- delete $6;
+ 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; }
;
b->span_type_str_ = "beam";
$$ =b;
}
+ | '[' ':' unsigned {
+ if (!Duration::duration_type_b ($3))
+ THIS->parser_error (_f ("not a duration: %d", $3));
+ else if ($3 < 8)
+ THIS->parser_error (_ ("Can't abbreviate"));
+ else
+ THIS->set_abbrev_beam ($3);
+
+ Chord_tremolo_req* a = new Chord_tremolo_req;
+ a->span_dir_ = START;
+ a->type_i_ = THIS->abbrev_beam_type_i_;
+ $$=a;
+ }
| ']' {
- Span_req*b= new Span_req;
- b->span_dir_ = STOP;
- b->span_type_str_ = "beam";
- $$ = b;
+ if (!THIS->abbrev_beam_type_i_)
+ {
+ Span_req*b= new Span_req;
+ b->span_dir_ = STOP;
+ b->span_type_str_ = "beam";
+ $$ = b;
+ }
+ else
+ {
+ Chord_tremolo_req* a = new Chord_tremolo_req;
+ a->span_dir_ = STOP;
+ a->type_i_ = THIS->abbrev_beam_type_i_;
+ THIS->set_abbrev_beam (0);
+ $$ = a;
+ }
}
| BREATHE {
$$ = new Breathing_sign_req;
verbose_command_req:
BAR STRING {
- $$ = new Bar_req (*$2);
- delete $2;
+ $$ = new Bar_req (ly_scm2string ($2));
}
| MARK STRING {
- $$ = new Mark_req (*$2);
- delete $2;
+ $$ = new Mark_req (ly_scm2string ($2));
+
}
| MARK unsigned {
$$ = new Mark_req (to_str ($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 {
delete $2;
}
| CLEF STRING {
- $$ = new Clef_change_req (*$2);
- delete $2;
+ $$ = new Clef_change_req (ly_scm2string ($2));
+
}
+/* UGH. optional. */
| KEY NOTENAME_PITCH optional_modality {
Key_change_req *key_p= new Key_change_req;
key_p->key_.pitch_arr_.push (*$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;
}
;
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;
}
;
}
| TEXTSCRIPT STRING STRING {
Text_script_req *ts_p = new Text_script_req;
- ts_p-> text_str_ = *$2;
- ts_p-> style_str_ = *$3;
+ ts_p-> text_str_ = ly_scm2string ($2);
+ ts_p-> style_str_ = ly_scm2string ($3);
ts_p->set_spot (THIS->here_input ());
- delete $3;
- delete $2;
+
$$ = ts_p;
}
| SPANREQUEST int STRING {
Span_req * sp_p = new Span_req;
sp_p-> span_dir_ = Direction($2);
- sp_p->span_type_str_ = *$3;
+ sp_p->span_type_str_ = ly_scm2string ($3);
sp_p->set_spot (THIS->here_input ());
$$ = sp_p;
}
}
| 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;
+
}
;
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"));
+ THIS->parser_error (_ ("Have to be in Lyric mode for lyrics"));
$$ = new Hyphen_req;
}
;
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");
}
;
if (!Duration::duration_type_b ($2))
THIS->parser_error (_f ("not a duration: %d", $2));
else if ($2 < 8)
- THIS->parser_error (_ ("can't abbreviate"));
+ THIS->parser_error (_ ("Can't abbreviate"));
$$ = $2;
}
;
simple_element:
musical_pitch exclamations questions optional_notemode_duration {
if (!THIS->lexer_p_->note_state_b ())
- THIS->parser_error (_ ("have to be in Note mode for notes"));
+ THIS->parser_error (_ ("Have to be in Note mode for notes"));
Note_req *n = new Note_req;
delete $1;
n->duration_ = *$4;
delete $4;
+ if (THIS->abbrev_beam_type_i_)
+ {
+ if (n->duration_.plet_b ())
+ THIS->parser_error (_ ("Can't abbreviate tuplet"));
+ else
+ n->duration_.set_plet (1, 2);
+ }
n->cautionary_b_ = $3 % 2;
n->forceacc_b_ = $2 % 2 || n->cautionary_b_;
$$ = v;
}
| RESTNAME optional_notemode_duration {
- $$ = THIS->get_rest_element (*$1, $2);
- delete $1; // delete notename
+ $$ = THIS->get_rest_element (ly_scm2string ($1), $2);
+
}
| MEASURES optional_notemode_duration {
Multi_measure_rest_req* m = new Multi_measure_rest_req;
}
| 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"));
+ $$ = THIS->get_word_element (ly_scm2string ($1), $2);
+
}
| 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;
}
;
{
$$ = new Array<Musical_pitch>;
}
- | '-' chord_notes {
+ | CHORD_MINUS chord_notes {
$$ = $2;
}
;
{
$$ = new Array<Musical_pitch>;
}
- | '^' chord_notes {
+ | CHORD_CARET chord_notes {
$$ = $2;
}
;
-/*
- forevery : X : optional_X sucks. Devise a solution.
-*/
-
chord_inversion:
{
$$ = 0;
$$ = new Array<Musical_pitch>;
$$->push (*$1);
}
- | CHORDMODIFIER_PITCH chord_note {
+ | 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;
$$ = $1;
}
| STRING_IDENTIFIER {
- $$ = $1->access_content_String (true);
+ $$ = ly_ch_C_to_scm ($1->access_content_String (true)->ch_C ());
}
| string '+' string {
- *$$ += *$3;
- delete $3;
+ $$ = scm_string_append (scm_listify ($1, $3, SCM_UNDEFINED));
}
;
projects / lilypond.git / blobdiff