%{ // -*-Fundamental-*-
/*
- parser.yy -- YACC -> C++ parser for mudela
+ parser.yy -- Bison/C++ parser for mudela
source file of the GNU LilyPond music typesetter
- (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
- Jan Nieuwenhuizen <jan@digicash.com>
+ (c) 1997 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ Jan Nieuwenhuizen <janneke@gnu.org>
*/
#include <iostream.h>
-
+#include "notename-table.hh"
#include "scalar.hh"
#include "translation-property.hh"
#include "script-def.hh"
#include "paper-def.hh"
#include "midi-def.hh"
#include "main.hh"
+#include "file-path.hh"
#include "keyword.hh"
#include "debug.hh"
#include "parseconstruct.hh"
-#include "dimen.hh"
+#include "dimension.hh"
#include "identifier.hh"
#include "command-request.hh"
#include "musical-request.hh"
#include "file-results.hh"
#include "mudela-version.hh"
#include "scope.hh"
+#include "relative-music.hh"
+
// mmm
-Mudela_version oldest_version ("0.1.14");
-Mudela_version version ("0.1.14");
+Mudela_version oldest_version ("1.0.3");
+Mudela_version version ("1.0.4");
// needed for bison.simple's malloc() and free()
#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))
+
%}
%union {
Array<Interval>* intarr;
- Array<Melodic_req*> *melreqvec;/* should clean up naming */
+ Array<Musical_pitch> *pitch_arr;
Array<String> * strvec;
Array<int> *intvec;
Box *box;
- Chord * chord;
+ Simultaneous_music *chord;
Duration *duration;
Identifier *id;
Translator* trans;
Music *music;
- Music_list *musiclist;
+ Music_list *music_list;
Score *score;
Header *header;
Interval *interval;
Lookup*lookup;
- Melodic_req * melreq;
+
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;
/* tokens which are not keywords */
-%token ALIAS
+%token ABSDYNAMIC
+%token ACCEPTS
%token BAR
%token BEAMPLET
-%token MAEBTELP
-%token PENALTY
%token CADENZA
-%token CLEAR
%token CLEF
-%token CONTAINS
-%token CONSISTS
-%token ACCEPTS
%token CM_T
+%token CONSISTS
%token DURATION
-%token ABSDYNAMIC
%token END
+%token FONT
%token GROUPING
-%token TRANSLATOR
%token HEADER
%token IN_T
-%token LYRIC
%token KEY
-%token MELODIC
+%token KEYSIGNATURE
+%token LYRIC
+%token MAEBTELP
+%token MARK
+%token MEASURES
%token MIDI
-%token MELODIC_REQUEST
-%token METER
%token MM_T
-%token MULTI
+%token MUSIC
+%token MUSICAL_PITCH
%token NOTENAMES
+%token NOTES
%token OCTAVE
%token OUTPUT
%token PAPER
%token PARTIAL
+%token PENALTY
%token PLET
-%token TELP
+%token PROPERTY
%token PT_T
+%token RELATIVE
%token SCORE
%token SCRIPT
%token SHAPE
%token SKIP
%token SPANDYNAMIC
-%token STAFF
-%token START_T
%token SYMBOLTABLES
%token TABLE
-%token TRANSPOSE
+%token TELP
%token TEMPO
+%token TIME_T
+%token TRANSLATOR
+%token TRANSPOSE
%token TYPE
-%token TEXID
-%token MEASURES
-%token TEXTSTYLE
-%token TITLE
-%token PROPERTY
%token VERSION
/* escaped */
%type <i> dots
%token <i> DIGIT
-%token <melreq> NOTENAME_IDENTIFIER
+%token <pitch> NOTENAME_PITCH
%token <id> DURATION_IDENTIFIER
%token <id> IDENTIFIER
-%token <id> MELODIC_REQUEST_IDENTIFIER
+%token <id> NOTENAME_TABLE_IDENTIFIER
%token <id> MUSIC_IDENTIFIER
-%token <id> VOICE_IDENTIFIER
%token <id> POST_REQUEST_IDENTIFIER
%token <id> SCRIPT_IDENTIFIER
%token <id> COMMAND_IDENTIFIER
%type <i> open_abbrev_parens
%type <i> open_plet_parens close_plet_parens
%type <i> sub_quotes sup_quotes
-%type <music> simple_element music_elt full_element lyrics_elt command_elt
+%type <music> simple_element request_chord command_element
%type <i> abbrev_type
%type <i> int unsigned
%type <i> script_dir
%type <id> identifier_init simple_identifier_init
-%type <duration> explicit_steno_duration notemode_duration
+%type <duration> steno_duration notemode_duration
%type <duration> entered_notemode_duration explicit_duration
%type <interval> dinterval
-%type <intvec> intastint_list
+%type <intvec> intastint_list int_list
%type <lookup> symtables symtables_body
-%type <melreq> melodic_request steno_melodic_req
-%type <notereq> steno_note_req
-%type <melreqvec> pitch_list
+
+%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 <moment> duration_length
+%type <duration> duration_length
%type <scalar> scalar
-%type <music> Music transposed_music
+%type <music> Music relative_music Sequential_music Simultaneous_music
%type <music> property_def translator_change
-%type <musiclist> Voice Voice_body
-%type <chord> Chord Chord_body
+%type <music_list> Music_list
%type <paper> paper_block paper_body
%type <real> dim real
%type <real> real_mult_expression real_primary
%type <symtable> symtable symtable_body
%type <trans> translator_spec translator_spec_body
%type <tempo> tempo_request
-%type <string> concat_strings
-
+%type <notenametab> notenames_body notenames_block
%expect 1
%%
mudela: /* empty */
- | mudela mudela_header {
- delete THIS->default_header_p_ ;
- THIS->default_header_p_ = $2;
- }
- | mudela score_block {
- score_global_array.push ($2);
- }
+ | mudela toplevel_expression {}
| mudela add_declaration { }
| mudela error
| mudela check_version { }
- | mudela add_notenames { }
+ ;
+
+toplevel_expression:
+ notenames_block {
+ THIS->lexer_p_->set_notename_table ($1);
+ }
+ | mudela_header {
+ delete header_global_p;
+ header_global_p = $1;
+ }
+ | 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 {
+ Identifier * id = new
+ Midi_def_identifier ($1, MIDI_IDENTIFIER);
+ THIS->lexer_p_->set_identifier ("$defaultmidi", id)
+ }
;
check_version:
Mudela_version ver (*$2);
if (!((ver >= oldest_version) && (ver <= version))) {
if (THIS->ignore_version_b_) {
- THIS->here_input ().error ("Incorrect mudela version");
+ 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 ("Incorrect mudela version");
+ THIS->parser_error (_f ("incorrect mudela version: %s (%s, %s)", ver.str (), oldest_version.str (), version.str ()));
}
}
}
;
-add_notenames:
- NOTENAMES '{' notenames_body '}'
+
+notenames_block:
+ NOTENAMES '{' notenames_body '}' { $$ = $3; }
;
+
+
+
notenames_body:
/**/ {
+ $$ = new Notename_table;
}
- | notenames_body CLEAR {
- THIS->clear_notenames ();
+ | NOTENAME_TABLE_IDENTIFIER {
+ $$ = $1-> access_Notename_table();
}
- | notenames_body STRING '=' melodic_request {
- THIS->add_notename (*$2, $4);
+ | notenames_body STRING '=' explicit_musical_pitch {
+ (*$$)[*$2] = *$4;
+
+ delete $4;
delete $2;
}
;
{
$$ = new Header;
}
- | mudela_header_body STRING '=' concat_strings ';' {
+ | mudela_header_body STRING '=' string ';' {
(*$$)[*$2] = *$4;
delete $2;
delete $4;
;
-concat_strings:
- {
- $$ = new String;
- }
- | concat_strings STRING {
- *$$ += *$2;
- }
-
-
/*
DECLARATIONS
*/
-
add_declaration:
STRING {
THIS->remember_spot ();
$$ = new Score_identifier ($1, SCORE_IDENTIFIER);
}
+ | notenames_block {
+ $$ = new Notename_table_identifier ($1, NOTENAME_TABLE_IDENTIFIER);
+ }
| paper_block {
$$ = new Paper_def_identifier ($1, PAPER_IDENTIFIER);
}
| post_request {
$$ = new Request_identifier ($1, POST_REQUEST_IDENTIFIER);
}
- | melodic_request {
- $$ = new Request_identifier ($1, MELODIC_REQUEST_IDENTIFIER);
-
- }
| explicit_duration {
$$ = new Duration_identifier ($1, DURATION_IDENTIFIER);
}
translator_spec_body:
TRANS_IDENTIFIER {
- $$ = $1->translator ();
+ $$ = $1->access_Translator ();
$$-> set_spot (THIS->here_input ());
}
| TYPE STRING ';' {
- $$ = get_translator_l (*$2)->clone ();
- $$->set_spot (THIS->here_input ());
+ Translator* t = get_translator_l (*$2);
+ t = t->clone ();
+ t->set_spot (THIS->here_input ());
+ $$ = t;
delete $2;
}
- | translator_spec_body STRING '=' scalar ';' {
- $$-> set_property (*$2, *$4);
- 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)
+ THIS->parser_error (_("Wrong type for property value"));
+
delete $4;
+ $$->set_property (*$2, str);
}
| translator_spec_body CONSISTS STRING ';' {
$$->group_l ()->consists_str_arr_.push (*$3);
$$ = $4;
$$->set_spot (THIS->pop_spot ());
if (!$$->def_p_arr_.size ())
- $$->add (THIS->default_paper_p ());
+ $$->add_output (THIS->default_paper_p ());
/* handle error levels. */
$$->errorlevel_i_ = THIS->error_level_i_;
THIS->error_level_i_ = 0;
- if (!$$->header_p_ && THIS->default_header_p_)
- $$->header_p_ = new Header (*THIS->default_header_p_);
}
;
$$ = new Score;
}
| SCORE_IDENTIFIER {
- $$ = $1->score ();
+ $$ = $1->access_Score ();
}
| score_body mudela_header {
$$->header_p_ = $2;
}
| score_body Music {
if ($$->music_p_)
- $2->warning ("More than one music block");
+ $2->warning (_ ("More than one music block"));
$$->music_p_ = $2;
}
| score_body output_def {
- $$->add ($2);
+ $$->add_output ($2);
}
| score_body error {
| intastint_list int '*' int {
$$->push ($2); $$->push ($4);
}
- ;
+ | intastint_list int {
+ $$->push ($2); $$->push (1);
+ }
+ ;
/*
$$ = p;
}
| PAPER_IDENTIFIER optional_semicolon {
- Paper_def *p = $1->paperdef ();
+ Paper_def *p = $1->access_Paper_def ();
THIS->lexer_p_->scope_l_arr_.push (p->scope_p_);
$$ = p;
}
$$->outfile_str_ = *$3;
delete $3;
}
- | paper_body symtables { $$->set ($2); }
+ | paper_body int '=' symtables { // ugh, what a syntax
+ $$->set_lookup ($2, $4);
+ }
| paper_body STRING '=' simple_identifier_init optional_semicolon {
Identifier* id = $4;
id->init_b_ = THIS->init_parse_b_;
if (id->is_type_b (Translator_identifier::static_name ()))
{
- $$->assign_translator (*$2, id->translator ());
+ $$->assign_translator (*$2, id->access_Translator ());
delete id;
}
else
THIS->lexer_p_->set_identifier (*$2, id);
+ delete $2;
}
-/*
- | paper_body STRING '=' translator_spec {
- $$-> assign_translator (*$2, $4);
- delete $2;
- }
-*/
| paper_body SHAPE '=' shape_array ';' {
$$->shape_int_a_ = *$4;
delete $4;
$$ = $1;
}
| REAL_IDENTIFIER {
- Real *r_p = $1->real ();
+ Real *r_p = $1->access_Real ();
$$ = * r_p;
DOUT << "Lookup real: " << *r_p << "\n";
delete r_p;
midi_body: /* empty */ {
$$ = THIS->default_midi_p ();
}
+ | MIDI_IDENTIFIER {
+ $$ = $1-> access_Midi_def ();
+ }
| midi_body STRING '=' translator_spec {
$$-> assign_translator (*$2, $4);
delete $2;
}
;
-/*
- MUSIC
-*/
-
-Voice:
- '{' Voice_body '}' {
- $$ = $2;
+Music_list: /* empty */ {
+ $$ = new Music_list;
+ }
+ | Music_list Music {
+ $$->add_music ($2);
+ }
+ | Music_list error {
}
;
-Voice_body:
- /**/ {
- $$ = new Voice;
- $$->set_spot (THIS->here_input ());
- }
- | Voice_body Music {
- $$->add ($2);
+
+Sequential_music: '{' Music_list '}' {
+ $$ = new Sequential_music ($2);
}
;
+Simultaneous_music: '<' Music_list '>' {
+ $$ = new Simultaneous_music ($2);
+ }
+ ;
Music:
- full_element { $$ = $1; }
+ request_chord { $$ = $1; }
| TYPE STRING Music {
$$ = $3;
$$->translator_type_str_ = *$2;
delete $2;
delete $4;
}
- | Voice { $$ = $1; }
- | Chord { $$ = $1; }
- | transposed_music { $$ = $1; }
- | MUSIC_IDENTIFIER { $$ = $1->music (); }
- | MELODIC
+ | Simultaneous_music { $$ = $1; }
+ | Sequential_music { $$ = $1; }
+ | TRANSPOSE musical_pitch Music {
+ $$ = $3;
+ $$ -> transpose (*$2);
+ delete $2;
+ }
+ | MUSIC_IDENTIFIER { $$ = $1->access_Music (); }
+ | NOTES
{ THIS->lexer_p_->push_note_state (); }
Music
- { $$=$3; THIS->lexer_p_->pop_state (); }
+ { $$ = $3;
+ THIS->lexer_p_->pop_state ();
+ }
| LYRIC
{ THIS->lexer_p_->push_lyric_state (); }
Music
- { $$ = $3; THIS->lexer_p_->pop_state (); }
+ {
+ $$ = $3;
+ THIS->lexer_p_->pop_state ();
+ }
| property_def
| translator_change
+ | relative_music { $$ = $1; }
+ ;
+
+relative_music:
+ RELATIVE absolute_musical_pitch Music {
+ $$ = new Relative_octave_music ($3, *$2);
+ delete $2;
+ }
;
translator_change:
;
-Chord:
- '<' Chord_body '>' { $$ = $2; }
- | MULTI unsigned Chord {
- $$ = $3;
- $$->multi_level_i_=$2;
- }
- ;
-
-Chord_body:
- /**/ {
- $$ = new Chord;
- $$-> multi_level_i_ = 1;
- $$->set_spot (THIS->here_input ());
- }
- | Chord_body Music {
- $$->add ($2);
- }
- ;
-
-transposed_music:
- TRANSPOSE steno_melodic_req Music {
- $$ = $3;
- $$ -> transpose ($2);
-
- delete $2;
- }
- ;
-
-/*
- VOICE ELEMENTS
-*/
-full_element:
+request_chord:
pre_requests simple_element post_requests {
- THIS->add_requests ((Chord*)$2);//ugh
+ THIS->add_requests ((Simultaneous_music*)$2);//ugh
$$ = $2;
}
- | command_elt
- | voice_command ';' { $$ = 0; }
+ | command_element
;
-simple_element:
- music_elt
- | lyrics_elt
- ;
-command_elt:
+
+
+command_element:
command_req {
$$ = new Request_chord;
$$-> set_spot (THIS->here_input ());
$1-> set_spot (THIS->here_input ());
- ((Chord*)$$) ->add ($1);//ugh
+ ((Simultaneous_music*)$$) ->add_music ($1);//ugh
}
;
$$ = new Barcheck_req;
}
| COMMAND_IDENTIFIER {
- $$ = $1->request ();
+ $$ = $1->access_Request ();
}
;
$$ = new Bar_req (*$2);
delete $2;
}
+ | MARK STRING {
+ $$ = new Mark_req (*$2);
+ delete $2;
+ }
+ | MARK unsigned {
+ $$ = new Mark_req (to_str ($2));
+ }
+ | 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 {
Break_req * b = new Break_req;
b->penalty_i_ = $3;
b-> set_spot (THIS->here_input ());
$$ = b;
}
- | METER unsigned '/' unsigned {
- Meter_change_req *m = new Meter_change_req;
- m->set ($2,$4);
- $$ = m;
- }
| SKIP duration_length {
Skip_req * skip_p = new Skip_req;
- skip_p->duration_.set_plet ($2->num (),
- $2->den ());
-
+ skip_p->duration_ = *$2;
delete $2;
$$ = skip_p;
}
$$ = new Cadenza_req ($2);
}
| PARTIAL duration_length {
- $$ = new Partial_measure_req (*$2);
+ $$ = new Partial_measure_req ($2->length ());
delete $2;
}
| CLEF STRING {
$$ = new Clef_change_req (*$2);
delete $2;
}
- | KEY pitch_list {
+ | KEY NOTENAME_PITCH {
+ 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_change_req *key_p= new Key_change_req;
- key_p->melodic_p_arr_ = *$2;
+ key_p->pitch_arr_ = *$2;
+ key_p->ordinary_key_b_ = false;
$$ = key_p;
delete $2;
}
post_request:
POST_REQUEST_IDENTIFIER {
- $$ = (Request*)$1->request ();
+ $$ = (Request*)$1->access_Request ();
}
| dynamic_req {
$$ = $1;
$$ = 1;
}
| sub_quotes ',' {
- $$++ ;
+ $$ ++ ;
}
;
-/*
- URG!!
-
- Whitespace mustn't be stripped. So what?
- Python is cool, and there even the amount *and* type of whitespace
- is significant. So this is not uncool per se, maybe context-free
- just sucks for humans.
- jcn
-*/
-steno_melodic_req:
- NOTENAME_IDENTIFIER {
- Melodic_req* m = $1->clone ()->musical ()->melodic ();
- $$ = THIS->get_melodic_req (m, 0 + THIS->default_octave_i_);
+steno_musical_pitch:
+ NOTENAME_PITCH {
+ $$ = $1;
}
- | NOTENAME_IDENTIFIER sup_quotes {
- Melodic_req* m = $1->clone ()->musical ()->melodic ();
- $$ = THIS->get_melodic_req (m, $2 + THIS->default_octave_i_);
+ | NOTENAME_PITCH sup_quotes {
+ $$ = $1;
+ $$->octave_i_ += $2;
}
- | NOTENAME_IDENTIFIER sub_quotes {
- Melodic_req* m = $1->clone ()->musical ()->melodic ();
- $$ = THIS->get_melodic_req (m, -$2 + THIS->default_octave_i_);
+ | NOTENAME_PITCH sub_quotes {
+ $$ = $1;
+ $$->octave_i_ += - $2;
}
;
-steno_note_req:
- steno_melodic_req {
+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_notepitch:
+ musical_pitch {
$$ = new Note_req;
- *(Melodic_req *) $$ = *$1;
+
+ $$->pitch_ = *$1;
delete $1;
}
- | steno_note_req '!' {
+ | steno_notepitch '!' {
$$->forceacc_b_ = ! $$->forceacc_b_;
}
- /* have to duration here. */
;
-melodic_request:
- MELODIC_REQUEST '{' int int int '}' {/* ugh */
- $$ = new Melodic_req;
- $$->octave_i_ = $3;
- $$->notename_i_ = $4;
- $$->accidental_i_ = $5;
- }
- ;
explicit_duration:
- DURATION '{' int unsigned '}' {
+ DURATION '{' int_list '}' {
$$ = new Duration;
- $$-> durlog_i_ = $3;
- $$-> dots_i_ = $4;
+ Array<int> &a = *$3;
+ ARRAY_SIZE(a,2);
+
+ $$-> durlog_i_ = a[0];
+ $$-> dots_i_ = a[1];
+
+ delete &a;
}
;
$$ = MAEBTELP;
THIS->plet_.type_i_ = $2[1];
THIS->plet_.iso_i_ = $2[0];
- THIS->default_duration_.plet_.type_i_ = $2[1];
- THIS->default_duration_.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_.iso_i_ = 1;
- THIS->default_duration_.plet_.type_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_.type_i_ = $2[1];
- THIS->default_duration_.plet_.iso_i_ = $2[0];
+ THIS->default_duration_.plet_ = THIS->plet_;
}
;
'[' ':' unsigned {
$$ = '[';
if (!Duration::duration_type_b ($3))
- THIS->parser_error (String ("Not a duration: ") + $3);
+ THIS->parser_error (_f ("not a duration: %d", $3));
else if ($3 < 8)
- THIS->parser_error ("Can't abbreviate");
+ THIS->parser_error (_ ("can't abbreviate"));
else
THIS->set_abbrev_beam ($3);
}
$$ = BEAMPLET;
THIS->plet_.type_i_ = $2[1];
THIS->plet_.iso_i_ = $2[0];
- THIS->default_duration_.plet_.type_i_ = $2[1];
- THIS->default_duration_.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_.type_i_ = $2[1];
- THIS->default_duration_.plet_.iso_i_ = $2[0];
+ THIS->default_duration_.plet_ = THIS->plet_;
}
;
gen_script_def:
text_def {
$$ = $1;
- ((Text_def*) $$)->align_i_ = CENTER; /* UGH */
+ ((Text_def*) $$)->align_dir_ = LEFT; /* UGH */
}
| mudela_script {
$$ = $1;
}
| finger {
$$ = $1;
- ((Text_def*)$$)->align_i_ = CENTER;
+ ((Text_def*)$$)->align_dir_ = RIGHT; /* UGH */
}
;
text_def:
- STRING {
+ string {
Text_def *t = new Text_def;
$$ = t;
t->text_str_ = *$1;
delete $1;
- t->style_str_ = THIS->textstyle_str_;
$$->set_spot (THIS->here_input ());
}
;
DIGIT {
Text_def* t = new Text_def;
$$ = t;
- t->text_str_ = String ($1);
+ t->text_str_ = to_str ($1);
t->style_str_ = "finger";
$$->set_spot (THIS->here_input ());
}
;
mudela_script:
- SCRIPT_IDENTIFIER { $$ = $1->script (); }
+ SCRIPT_IDENTIFIER { $$ = $1->access_General_script_def (true); }
| script_definition { $$ = $1; }
| script_abbreviation {
- $$ = THIS->lexer_p_->lookup_identifier (*$1)->script ();
+ $$ = THIS->lexer_p_->lookup_identifier (*$1)->access_General_script_def (true);
delete $1;
}
;
}
;
-voice_command:
- DURATION STRING {
- THIS->set_duration_mode (*$2);
- delete $2;
- }
- | DURATION entered_notemode_duration {
- THIS->set_default_duration ($2);
- delete $2;
- }
- | OCTAVE {
- /*
- This is weird, but default_octave_i_
- is used in steno_note_req too
-
- c' -> default_octave_i_ == 1
- */
-
- /* why can't we have \oct 0 iso \oct{c'}*/
- // because that's silly.
-
- // for relative octaves, the octave setting is done
- // automatically by the parsing of steno_melodic_req!
- if (!THIS->relative_octave_mode_b_)
- THIS->default_octave_i_ = 1;
- }
- /* cont */
- steno_melodic_req {
- if (!THIS->relative_octave_mode_b_)
- THIS->default_octave_i_ = $3->octave_i_;
- delete $3;
- }
- | OCTAVE STRING {
- THIS->set_octave_mode (*$2);
- delete $2;
- }
- | TEXTSTYLE STRING {
- THIS->textstyle_str_ = *$2;
- delete $2;
+absolute_musical_pitch:
+ steno_musical_pitch {
+ $$ = $1;
}
;
duration_length:
- {
- $$ = new Moment (0,1);
- }
- | duration_length explicit_steno_duration {
- *$$ += $2->length ();
+ steno_duration {
+ $$ = $1;
}
;
entered_notemode_duration:
/* */ {
$$ = new Duration (THIS->default_duration_);
- // get sticky plet part too
- $$->set_plet (THIS->plet_.iso_i_, THIS->plet_.type_i_);
}
| dots {
$$ = new Duration (THIS->default_duration_);
- // get sticky plet part too
- $$->set_plet (THIS->plet_.iso_i_, THIS->plet_.type_i_);
$$->dots_i_ = $1;
}
- | explicit_steno_duration {
+ | steno_duration {
THIS->set_last_duration ($1);
- $$ = $1;
}
;
}
;
-explicit_steno_duration:
+steno_duration:
unsigned {
$$ = new Duration;
if (!Duration::duration_type_b ($1))
- THIS->parser_error ("Not a duration:" + String ($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_);
}
}
| DURATION_IDENTIFIER {
- $$ = $1->duration ();
+ $$ = $1->access_Duration ();
}
- | explicit_steno_duration '.' {
+ | steno_duration '.' {
$$->dots_i_ ++;
}
- | explicit_steno_duration '*' unsigned {
- $$->plet_.iso_i_ = $3; /* ugh. should do *= */
+ | steno_duration '*' unsigned {
+ $$->plet_.iso_i_ *= $3;
}
- | explicit_steno_duration '/' unsigned {
- $$->plet_.type_i_ = $3; /* ugh. should do *= iso = */
+ | steno_duration '/' unsigned {
+ $$->plet_.type_i_ *= $3;
}
;
}
| ':' unsigned {
if (!Duration::duration_type_b ($2))
- THIS->parser_error ("Not a duration:" + String ($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;
}
-
;
-music_elt:
- steno_note_req notemode_duration {
+
+
+simple_element:
+ steno_notepitch 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"));
$1->set_duration (*$2);
int durlog_i = $2->durlog_i_;
$$ = THIS->get_note_element ($1, $2);
m->duration_ = *$2;
delete $2;
- Chord*velt_p = new Request_chord;
+ Simultaneous_music*velt_p = new Request_chord;
velt_p->set_spot (THIS->here_input ());
- velt_p->add (m);
+ velt_p->add_music (m);
$$ = velt_p;
}
- ;
-
-lyrics_elt:
- text_def notemode_duration {
- /* this sux! text-def should be feature of lyric-engraver. */
+ | STRING 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);
+ THIS->parser_error (_ ("have to be in Lyric mode for lyrics"));
+ $$ = THIS->get_word_element (*$1, $2);
+ delete $1;
+ }
+ ;
- };
/*
UTILITIES
*/
pitch_list: {
- $$ = new Array<Melodic_req*>;
+ $$ = new Array<Musical_pitch>;
+ }
+ | pitch_list musical_pitch {
+ $$->push (*$2);
+ delete $2;
+ }
+ ;
+
+
+int_list:
+ /**/ {
+ $$ = new Array<int>
}
- | pitch_list NOTENAME_IDENTIFIER {
- $$->push ($2->clone ()->musical ()->melodic ());
+ | int_list int {
+ $$->push ($2);
}
;
$$ = -$2;
}
| INT_IDENTIFIER {
- int *i_p = $1->intid ();
+ int *i_p = $1->access_int ();
$$ = *i_p;
delete i_p;
}
$$ = $1;
}
| STRING_IDENTIFIER {
- String *s_p = $1->string ();
- // $$ = * r_p;
+ String *s_p = $1->access_String ();
+
$$ = s_p;
DOUT << "Lookup string: " << *s_p << "\n";
}
$$ = new Lookup;
}
| IDENTIFIER {
- $$ = $1->lookup ();
+ $$ = $1->access_Lookup ();
}
- | symtables_body TEXID STRING {
- $$->texsetting = *$3;
+ | symtables_body FONT STRING {
+ $$->font_ = *$3;
+ $$->font_path_ = global_path.find (*$3);
+ if (!$$->font_path_.length_i ())
+ THIS->here_input ().error (_f("can't open file: `%s'", $3->ch_C()));
+
delete $3;
}
| symtables_body STRING '=' symtable {
projects / lilypond.git / blobdiff