X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fparser.yy;h=73a7557a4758d7be0d0324e8012df4c010377889;hb=b43244dd4eeca1a96e0cdb258231ef0b6cca1a8f;hp=f9a3094e02f639af689a3444d1b39f79d93789aa;hpb=151617937a431d3db3e94a16db011600acdb4288;p=lilypond.git

diff --git a/lily/parser.yy b/lily/parser.yy
index f9a3094e02..73a7557a47 100644
--- a/lily/parser.yy
+++ b/lily/parser.yy
@@ -10,11 +10,11 @@
 */
 
 #include <iostream.h>
-
+#include "lily-guile.hh"
+#include "notename-table.hh"
 #include "scalar.hh"
 #include "translation-property.hh"
 #include "script-def.hh"
-#include "symtable.hh"
 #include "lookup.hh"
 #include "misc.hh"
 #include "my-lily-lexer.hh"
@@ -25,7 +25,7 @@
 #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"
@@ -34,31 +34,40 @@
 #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 "scope.hh"
 #include "relative-music.hh"
-
+#include "transposed-music.hh"
+#include "compressed-music.hh"
+#include "repeated-music.hh"
 
 // mmm
-Mudela_version oldest_version ("1.0.3");
-Mudela_version version ("1.0.3");
+Mudela_version oldest_version ("1.0.14");
+Mudela_version version ("1.0.15");
 
 
 // needed for bison.simple's malloc() and free()
 #include <malloc.h>
 
-int const GUESS_PLET = 5;
-int guess_plet_a[GUESS_PLET] =
-{ 
-  1,
-  3,
-  2,
-  3,
-  4
+struct Assignment {
+	String *name_p_;
+	Identifier *id_p_;
+	~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 ();
+	}
 };
 
 Paper_def* current_paper = 0;
@@ -76,7 +85,6 @@ Paper_def* current_paper = 0;
 #define yyerror THIS->parser_error
 #define ARRAY_SIZE(a,s)   if (a.size () != s) THIS->parser_error (_f("expecting %d arguments", s))
 
-
 %}
 
 
@@ -85,39 +93,34 @@ Paper_def* current_paper = 0;
     Array<Musical_pitch> *pitch_arr;
     Array<String> * strvec;
     Array<int> *intvec;
-    Box *box;
-    Simultaneous_music *chord;
+    Notename_table *chordmodifiertab;
     Duration *duration;
+    General_script_def * script;
     Identifier *id;
-    Translator* trans;
     Music *music;
     Music_list *music_list;
     Score *score;
-    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;
+    Simultaneous_music *chord;
     String *string;
-    Atom * symbol;
-    Symtable * symtable;
-    Symtables * symtables;
-    Text_def * textdef;
     Tempo_req *tempo;
+    Text_def * textdef;
+    Translator* trans;
     char c;
     const char *consstr;
     int i;
-    int pair[2];
     int ii[10];
 }
 %{
@@ -139,61 +142,54 @@ yylex (YYSTYPE *s,  void * v_l)
 
 /* tokens which are not keywords */
 
-%token ALIAS
+%token ABSDYNAMIC
+%token ACCEPTS
+%token ALTERNATIVE
 %token BAR
-%token BEAMPLET
-%token MAEBTELP
-%token PENALTY
 %token CADENZA
-%token CLEAR
+%token CHORDMODIFIERS
+%token CHORDS
 %token CLEF
-%token CONTAINS
-%token RELATIVE
-%token CONSISTS
-%token ACCEPTS
 %token CM_T
+%token CONSISTS
 %token DURATION
-%token ABSDYNAMIC
-%token END
+%token EXTENDER
+%token FONT
 %token GROUPING
-%token TRANSLATOR
 %token HEADER
 %token IN_T
-%token LYRIC
 %token KEY
 %token KEYSIGNATURE
+%token LYRICS
 %token MARK
-%token MUSIC
-%token MUSICAL_PITCH
-%token NOTES
+%token MEASURES
 %token MIDI
-%token TIME_T
 %token MM_T
-
+%token MUSICAL_PITCH
+%token NAME
 %token NOTENAMES
-%token OCTAVE
-%token OUTPUT
+%token NOTES
 %token PAPER
 %token PARTIAL
-%token PLET
-%token TELP
+%token PENALTY
+%token PROPERTY
 %token PT_T
+%token RELATIVE
+%token REMOVE
+%token REPEAT
+%token SCM_T
+%token SCMFILE
 %token SCORE
 %token SCRIPT
 %token SHAPE
 %token SKIP
 %token SPANDYNAMIC
-
-%token START_T
-%token SYMBOLTABLES
-%token TABLE
-%token TRANSPOSE
 %token TEMPO
+%token TIME_T
+%token TIMES
+%token TRANSLATOR
+%token TRANSPOSE
 %token TYPE
-%token FONT
-%token MEASURES
-%token TITLE
-%token PROPERTY
 %token VERSION
 
 /* escaped */
@@ -202,9 +198,11 @@ yylex (YYSTYPE *s,  void * v_l)
 %type <i>	dots
 %token <i>	DIGIT
 %token <pitch>	NOTENAME_PITCH
+%token <pitch>	TONICNAME_PITCH
+%token <pitch>	CHORDMODIFIER_PITCH
 %token <id>	DURATION_IDENTIFIER
 %token <id>	IDENTIFIER
-
+%token <id>	NOTENAME_TABLE_IDENTIFIER
 %token <id>	MUSIC_IDENTIFIER
 %token <id>	POST_REQUEST_IDENTIFIER
 %token <id>	SCRIPT_IDENTIFIER
@@ -216,7 +214,6 @@ yylex (YYSTYPE *s,  void * v_l)
 %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
@@ -224,73 +221,104 @@ yylex (YYSTYPE *s,  void * v_l)
 
 
 %type <outputdef> output_def
-%type <header> 	mudela_header mudela_header_body
-%type <box>	box
+%type <scope> 	mudela_header mudela_header_body
 %type <i>	open_request_parens close_request_parens
-%type <i>	open_abbrev_parens
-%type <i>	open_plet_parens close_plet_parens
 %type <i>	sub_quotes sup_quotes
-%type <music>	simple_element  request_chord command_element
+%type <music>	simple_element  request_chord command_element Simple_music  Composite_music 
+%type <music>	Alternative_music Repeated_music
 %type <i>	abbrev_type
 %type <i>	int unsigned
 %type <i>	script_dir
-%type <id>	identifier_init simple_identifier_init
+%type <i>	optional_modality
+%type <id>	identifier_init simple_identifier_init block_identifier
 %type <duration> steno_duration 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 <pitch>   steno_tonic_pitch
 %type <notereq>	steno_notepitch
 %type <pitch_arr>	pitch_list
+%type <music>	chord notemode_chord
+%type <pitch_arr>	chord_additions chord_subtractions chord_notes
+%type <pitch>	chord_addsub chord_note chord_inversion notemode_chord_inversion
 %type <midi>	midi_block midi_body
 %type <duration>	duration_length
 
 %type <scalar>  scalar
-%type <music>	Music transposed_music relative_music Sequential_music Simultaneous_music
+%type <music>	Music  relative_music Sequential_music Simultaneous_music
 %type <music>	property_def translator_change
 %type <music_list> Music_list
-%type <paper>	paper_block paper_body
-%type <real>	dim real
-%type <real>	real_mult_expression real_primary
-%type <real>	unit
+%type <paper>	paper_block paper_def_body
+%type <real>	real_expression real dimension
 %type <request> abbrev_command_req
 %type <request>	post_request structured_post_request
-%type <pair>	plet_fraction
 %type <request> command_req verbose_command_req
-%type <request>	script_req  dynamic_req
+%type <request>	script_req  dynamic_req extender_req
 %type <string>	string
-%type <string>	string_primary
 %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 <tempo> 	tempo_request
+%type <notenametab> notenames_body notenames_block chordmodifiers_block
+
+%expect 7
 
-%expect 1
 
+%left '-' '+'
+%left '*' '/'
+%left UNARY_MINUS
 
 %%
 
 mudela:	/* empty */
-	| mudela mudela_header {
+	| mudela toplevel_expression {}
+	| mudela assignment { }
+	| mudela error
+	| mudela check_version { }
+	;
+
+toplevel_expression:
+	notenames_block			{
+		THIS->lexer_p_->set_notename_table ($1);
+	}
+	| chordmodifiers_block			{
+		THIS->lexer_p_->set_chordmodifier_table ($1);
+	}
+	| mudela_header {
 		delete header_global_p;
-		header_global_p = $2;
+		header_global_p = $1;
 	}
-	| mudela score_block {
-		score_global_array.push ($2);
+	| 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)
+	}
+	| embedded_scm { 
 	}
-	| mudela add_declaration { }
-	| mudela error
-	| mudela check_version { }
-	| mudela add_notenames { }
 	;
 
+embedded_scm:
+	SCMFILE STRING ';' {
+		read_lily_scm_file (*$2);
+		delete $2;
+	}
+	| SCM_T STRING ';' {
+		gh_eval_str ($2->ch_l ());
+		delete $2;
+	};
+
 check_version:
 	VERSION STRING ';'		{
 	 	Mudela_version ver (*$2);
@@ -305,36 +333,47 @@ check_version:
 	}
 	;
 
-add_notenames:
-	NOTENAMES '{' notenames_body '}'
+
+chordmodifiers_block:
+	CHORDMODIFIERS '{' notenames_body '}'  {  $$ = $3; }
+	;
+
+
+notenames_block:
+	NOTENAMES '{' notenames_body '}'  {  $$ = $3; }
 	;
+
+
+
 notenames_body:
 	/**/	{
+		$$ = new Notename_table;
 	}
-	| notenames_body CLEAR	{
-		THIS->clear_notenames ();
+	| NOTENAME_TABLE_IDENTIFIER	{
+		$$ = $1-> access_content_Notename_table(true);
 	}
 	| notenames_body STRING '=' explicit_musical_pitch {
-		THIS->add_notename (*$2, *$4);
+		(*$$)[*$2] = *$4;
+
 		delete $4;
 		delete $2;
 	}
 	;
 
 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 ';' { 
+
 	}
 	;
 
 mudela_header:
 	HEADER '{' mudela_header_body '}'	{
 		$$ = $3;
+		THIS->lexer_p_-> scope_l_arr_.pop ();		
 	}
 	;
 
@@ -342,23 +381,36 @@ mudela_header:
 /*
 	DECLARATIONS
 */
-
-add_declaration:
+assignment:
 	STRING {
 		THIS->remember_spot ();
 	}
-	/* cont */ '=' identifier_init optional_semicolon {
+	/* cont */ '=' identifier_init  {
 	    THIS->lexer_p_->set_identifier (*$1, $4);
 	    $4->init_b_ = THIS->init_parse_b_;
 	    $4->set_spot (THIS->pop_spot ());
 	}
 	;
 
+
+simple_identifier_init: identifier_init
+	;
+
 identifier_init:
+	block_identifier
+	;
+
+block_identifier:
 	score_block {
 		$$ = new Score_identifier ($1, SCORE_IDENTIFIER);
 
 	}
+	| chordmodifiers_block {
+		$$ = new Notename_table_identifier ($1, NOTENAME_TABLE_IDENTIFIER);
+	}
+	| notenames_block {
+		$$ = new Notename_table_identifier ($1, NOTENAME_TABLE_IDENTIFIER);
+	}
 	| paper_block {
 		$$ = new Paper_def_identifier ($1, PAPER_IDENTIFIER);
 	}
@@ -366,29 +418,20 @@ identifier_init:
 		$$ = new Midi_def_identifier ($1, MIDI_IDENTIFIER);
 
 	}
-	| script_definition {
-		$$ = new General_script_def_identifier ($1, SCRIPT_IDENTIFIER);
-
+	| translator_spec {
+		$$ = new Translator_identifier ($1, TRANS_IDENTIFIER);
 	}
 	| Music  {
 		$$ = new Music_identifier ($1, MUSIC_IDENTIFIER);
-
 	}
-	| symtables {
-		$$ = new Lookup_identifier ($1, IDENTIFIER);
 
-	}
 	| post_request {
 		$$ = new Request_identifier ($1, POST_REQUEST_IDENTIFIER);
 	}
 	| explicit_duration {
 		$$ = new Duration_identifier ($1, DURATION_IDENTIFIER);
 	}
-	| simple_identifier_init
-	;
-
-simple_identifier_init:
-	real {
+	| real {
 		$$ = new Real_identifier (new Real ($1), REAL_IDENTIFIER);
 	}
 	| string {
@@ -397,8 +440,9 @@ simple_identifier_init:
 	| int	{
 		$$ = new int_identifier (new int ($1), INT_IDENTIFIER);
 	}
-	| translator_spec {
-		$$ = new Translator_identifier ($1, TRANS_IDENTIFIER);
+	| script_definition {
+		$$ = new General_script_def_identifier ($1, SCRIPT_IDENTIFIER);
+
 	}
 	;
 
@@ -409,11 +453,16 @@ translator_spec:
 
 translator_spec_body:
 	TRANS_IDENTIFIER	{
-		$$ = $1->access_Translator ();
+		$$ = $1->access_content_Translator (true);
 		$$-> set_spot (THIS->here_input ());
 	}
 	| TYPE STRING ';'	{
 		Translator* t = get_translator_l (*$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;
@@ -421,26 +470,36 @@ translator_spec_body:
 	}
 	| 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_identifier *s = dynamic_cast<String_identifier*> (id);
+		Real_identifier *r= dynamic_cast<Real_identifier*>(id);
+		int_identifier *i = dynamic_cast<int_identifier*> (id);
 	
 		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) 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));
 		if (!s && !i && !r)
 			THIS->parser_error (_("Wrong type for property value"));
 
 		delete $4;
-		$$->set_property (*$2, str);
+		/* ugh*/
+		Translator_group * tr = dynamic_cast<Translator_group*>($$);
+		tr->set_property (*$2, str);
+	}
+	| translator_spec_body NAME STRING ';' {
+		$$->type_str_ = *$3;
+		delete $3;
 	}
 	| translator_spec_body CONSISTS STRING ';' {
-		$$->group_l ()->consists_str_arr_.push (*$3);
+		dynamic_cast<Translator_group*> ($$)-> set_element (*$3, true);
 		delete $3;
 	}
 	| translator_spec_body ACCEPTS STRING ';' {
-		$$->group_l ()->accepts_str_arr_.push (*$3);
+		dynamic_cast<Translator_group*> ($$)-> set_acceptor (*$3, true);
+		delete $3;
+	}
+	| translator_spec_body REMOVE STRING ';' {
+		dynamic_cast<Translator_group*> ($$)-> set_element (*$3, false);
 		delete $3;
 	}
 	;
@@ -450,7 +509,6 @@ translator_spec_body:
 */
 score_block:
 	SCORE { THIS->remember_spot ();
-		THIS->error_level_i_ =0;
 	}
 	/*cont*/ '{' score_body '}' 	{
 		$$ = $4;
@@ -458,9 +516,6 @@ score_block:
 		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;
 	}
 	;
 
@@ -468,7 +523,7 @@ score_body:		{
 		$$ = new Score;
 	}
 	| SCORE_IDENTIFIER {
-		$$ = $1->access_Score ();
+		$$ = $1->access_content_Score (true);
 	}
 	| score_body mudela_header 	{
 		$$->header_p_ = $2;
@@ -510,7 +565,7 @@ intastint_list:
 	PAPER
 */
 paper_block:
-	PAPER '{' paper_body '}' 	{ 
+	PAPER '{' paper_def_body '}' 	{ 
 		$$ = $3;
 		THIS-> lexer_p_->scope_l_arr_.pop ();
 	}
@@ -521,86 +576,98 @@ optional_semicolon:
 	| ';'
 	;
 
-paper_body:
+optional_dot:
+	/* empty */
+	| '.'
+	;
+
+paper_def_body:
 	/* empty */		 	{
 		Paper_def *p = THIS->default_paper_p ();
 		THIS-> lexer_p_-> scope_l_arr_.push (p->scope_p_);
 		$$ = p;
 	}
 	| PAPER_IDENTIFIER optional_semicolon	{
-		Paper_def *p = $1->access_Paper_def ();
+		Paper_def *p = $1->access_content_Paper_def (true);
 		THIS->lexer_p_->scope_l_arr_.push (p->scope_p_);
 		$$ = p;
 	}
-	| paper_body OUTPUT STRING ';'	{ 
-		$$->outfile_str_ = *$3;
-		delete $3;
+	| paper_def_body int '=' FONT STRING		{ // ugh, what a syntax
+		Lookup * l = new Lookup;
+		l->font_name_ = *$5;
+		delete $5;
+		$$->set_lookup ($2, l);
+	}
+	| paper_def_body assignment ';' {
+
 	}
-	| paper_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->access_Translator ());
-		delete id;
-	      }
-	    else
-	      THIS->lexer_p_->set_identifier (*$2, id);
-	      delete $2;
-	}
-	| paper_body SHAPE '=' shape_array ';' {
+	| paper_def_body translator_spec {
+		$$->assign_translator ($2);
+	}
+	| paper_def_body SHAPE '=' shape_array ';' {
 		$$->shape_int_a_ = *$4;
 		delete $4;
 	}
-	| paper_body error {
+	| paper_def_body error {
 
 	}
 	;
 
-real_primary:
-	REAL		{
-		$$ = $1;
+
+real:
+	real_expression  	{ $$ = $1; }
+	;
+
+
+dimension:
+	REAL CM_T	{
+		$$ = $1 CM;
 	}
-	| REAL_IDENTIFIER		{
-		Real *r_p = $1->access_Real ();
-		$$ = * r_p;
-		DOUT << "Lookup real: " << *r_p << "\n";
-		delete r_p;
+	| REAL PT_T	{
+		$$ = $1 PT;
 	}
-	| dim
-	| '(' real ')' {
-		$$ = $2;
+	| REAL IN_T	{
+		$$ = $1 INCH;
+	}
+	| REAL MM_T	{
+		$$ = $1 MM;
 	}
 	;
 
-real:
-	real_mult_expression
-	| real '+' real_mult_expression {
-		$$ = $1 + $3;
+real_expression:
+	REAL		{
+		$$ = $1;
 	}
-	| real '-' real_mult_expression {
-		$$ = $1 - $3;
+	| dimension
+	| REAL_IDENTIFIER		{
+		$$= *$1->access_content_Real (false);
 	}
-	;
-
-real_mult_expression:
-	real_primary
-	| real_mult_expression '*' real_primary {
+	| '-'  real_expression %prec UNARY_MINUS {
+		$$ = -$2;
+	}
+	| real_expression '*' real_expression {
 		$$ = $1 * $3;
 	}
-	| real_mult_expression '/' real_primary {
+	| real_expression '/' real_expression {
 		$$ = $1 / $3;
 	}
+	| real_expression '+' real_expression {
+		$$ = $1  + $3;
+	}
+	| real_expression '-' real_expression {
+		$$ = $1 - $3;
+	}
+	| '(' real_expression ')'	{
+		$$ = $2;
+	}
 	;
+		
 
 shape_array:
 	/* empty */ {
 		$$ = new Array<Interval>;
 	}
-	| shape_array dim dim {
+	| shape_array real real {
 		$$->push(Interval($2, $2 + $3));
 	};
 
@@ -617,15 +684,10 @@ midi_body: /* empty */ 		{
 		$$ = THIS->default_midi_p ();
 	}
 	| MIDI_IDENTIFIER	{
-		$$ = $1-> access_Midi_def ();		
+		$$ = $1-> access_content_Midi_def (true);
 	}
-	| midi_body STRING '=' translator_spec	{
-		$$-> assign_translator (*$2, $4);
-		delete $2;
-	}
-	| midi_body OUTPUT STRING ';'	{
-		$$->outfile_str_ = *$3;
-		delete $3;
+	| midi_body translator_spec	{
+		$$-> assign_translator ($2);
 	}
 	| midi_body tempo_request ';' {
 		$$->set_tempo ($2->dur_.length (), $2->metronome_i_);
@@ -637,7 +699,7 @@ midi_body: /* empty */ 		{
 	;
 
 tempo_request:
-	TEMPO entered_notemode_duration '=' unsigned	{
+	TEMPO steno_duration '=' unsigned	{
 		$$ = new Tempo_req;
 		$$->dur_ = *$2;
 		delete $2;
@@ -656,6 +718,30 @@ Music_list: /* empty */ {
 	;
 
 
+Music:
+	Simple_music
+	| Composite_music
+	;
+
+Alternative_music: {
+		Music_list* m = new Music_list;
+		$$ = new Sequential_music (m);
+	}
+	| ALTERNATIVE Simultaneous_music {
+		$$ = $2;
+	}
+	| ALTERNATIVE Sequential_music {
+		$$ = $2;
+	}
+	;
+
+Repeated_music: REPEAT unsigned Music Alternative_music	{
+		Music_sequence* m = dynamic_cast <Music_sequence*> ($4);
+		assert (m);
+		$$ = new Repeated_music ($3, $2 >? 1, m);
+	}
+	;
+
 Sequential_music: '{' Music_list '}'		{
 		$$ = new Sequential_music ($2);
 	}
@@ -665,9 +751,24 @@ Simultaneous_music: '<' Music_list '>'	{
 		$$ = new Simultaneous_music ($2);
 	}
 	;
-Music:
+
+Simple_music:
 	request_chord		{ $$ = $1; }
-	| TYPE STRING Music	{
+	| MUSIC_IDENTIFIER { $$ = $1->access_content_Music (true); }
+	| property_def
+	| translator_change
+	| Simple_music '*' unsigned '/' unsigned 	{
+		/* urg */
+		$$ = new Compressed_music ($3, $5, $1);
+	}
+	| Simple_music '*' unsigned		 {
+		$$ = new Compressed_music ($3, 1, $1);
+	}
+	;
+
+
+Composite_music:
+	TYPE STRING Music	{
 		$$ = $3;
 		$$->translator_type_str_ = *$2;
 		delete $2;
@@ -679,26 +780,47 @@ Music:
 		delete $2;
 		delete $4;
 	}
+	| TIMES {
+		THIS->remember_spot ();
+	}
+	/* CONTINUED */ 
+		unsigned '/' unsigned Music 	
+
+	{
+		$$ = new Compressed_music ($3, $5, $6);
+		$$->set_spot (THIS->pop_spot ());
+	}
+	| Repeated_music		{ $$ = $1; }
 	| Simultaneous_music		{ $$ = $1; }
 	| Sequential_music		{ $$ = $1; }
-	| transposed_music	{ $$ = $1; }
-	| MUSIC_IDENTIFIER { $$ = $1->access_Music (); }
+	| TRANSPOSE musical_pitch Music {
+		$$ = new Transposed_music ($3, *$2);
+		delete $2;
+	}
+	| TRANSPOSE steno_tonic_pitch Music {
+		$$ = new Transposed_music ($3, *$2);
+		delete $2;
+	}
 	| NOTES
 		{ THIS->lexer_p_->push_note_state (); }
 	Music
 		{ $$ = $3;
 		  THIS->lexer_p_->pop_state ();
 		}
-
-	| 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; }
 	;
 
@@ -742,15 +864,6 @@ scalar:
 	;
 
 
-transposed_music:
-	TRANSPOSE musical_pitch Music {
-		$$ = $3;
-		$$ -> transpose (*$2);
-		delete $2;
-	}
-	;
-
-
 request_chord:
 	pre_requests simple_element post_requests	{
 	 	THIS->add_requests ((Simultaneous_music*)$2);//ugh
@@ -759,16 +872,12 @@ request_chord:
 	| command_element
 	;
 
-
-
-
 command_element:
 	command_req {
 		$$ = new Request_chord;
 		$$-> set_spot (THIS->here_input ());
 		$1-> set_spot (THIS->here_input ());
 		((Simultaneous_music*)$$) ->add_music ($1);//ugh
-
 	}
 	;
 
@@ -782,10 +891,24 @@ abbrev_command_req:
 		$$ = new Barcheck_req;
 	}
 	| COMMAND_IDENTIFIER	{
-		$$ = $1->access_Request ();
+		$$ = $1->access_content_Request (true);
+	}
+	| '~'	{
+		$$ = new Tie_req;
+	}
+	| '['		{
+		Beam_req*b= new Beam_req;
+		b->spantype_ = START;
+		$$ =b;
+	}
+	| ']'		{
+		Beam_req*b= new Beam_req;
+		b->spantype_ = STOP;
+		$$ = b;
 	}
 	;
 
+
 verbose_command_req:
 	BAR STRING 			{
 		$$ = new Bar_req (*$2);
@@ -830,10 +953,11 @@ verbose_command_req:
 		$$ = new Clef_change_req (*$2);
 		delete $2;
 	}
-	| KEY NOTENAME_PITCH 	{
+	| KEY NOTENAME_PITCH optional_modality	{
 		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;
 		delete $2;
 	}
@@ -878,7 +1002,7 @@ structured_post_request:
 
 post_request:
 	POST_REQUEST_IDENTIFIER	{
-		$$ = (Request*)$1->access_Request ();
+		$$ = (Request*)$1->access_content_Request (true);
 	}
 	| dynamic_req {
 		$$ = $1;
@@ -888,6 +1012,18 @@ post_request:
 		a->type_i_ = $1;
 		$$ = a;
 	}
+	| extender_req {
+		$$ = $1;
+	}
+	;
+
+optional_modality:
+	/* empty */	{
+		$$ = 0;
+	}
+	| int	{
+		$$ = $1;
+	}
 	;
 
 sup_quotes:
@@ -921,6 +1057,20 @@ steno_musical_pitch:
 	}
 	;
 
+steno_tonic_pitch:
+	TONICNAME_PITCH	{
+		$$ = $1;
+	}
+	| TONICNAME_PITCH sup_quotes 	{
+		$$ = $1;
+		$$->octave_i_ +=  $2;
+	}
+	| TONICNAME_PITCH sub_quotes	 {
+		$$ = $1;
+		$$->octave_i_ += - $2;
+	}
+	;
+
 explicit_musical_pitch:
 	MUSICAL_PITCH '{' int_list '}'	{/* ugh */
 		Array<int> &a = *$3;
@@ -948,6 +1098,10 @@ steno_notepitch:
 	| steno_notepitch  '!' 		{
 		$$->forceacc_b_ = ! $$->forceacc_b_;
 	}
+	| steno_notepitch  '?' 		{
+		$$->forceacc_b_ = ! $$->forceacc_b_;
+		$$->cautionary_b_ = ! $$->cautionary_b_;
+	}
 	;
 
 
@@ -964,6 +1118,16 @@ explicit_duration:
 	}
 	;
 
+extender_req:
+	EXTENDER {
+		if (!THIS->lexer_p_->lyric_state_b ())
+			THIS->parser_error (_ ("have to be in Lyric mode for lyrics"));
+		Extender_req * e_p = new Extender_req;
+		e_p->spantype_ = START;
+		$$ = e_p;
+		THIS->extender_req = e_p;
+	};
+
 dynamic_req:
 	ABSDYNAMIC '{' unsigned '}'	{
 		Absolute_dynamic_req *ad_p = new Absolute_dynamic_req;
@@ -972,91 +1136,27 @@ dynamic_req:
 	}
 	| SPANDYNAMIC '{' int int '}' {
 		Span_dynamic_req * sp_p = new Span_dynamic_req;
-		sp_p->spantype = (Span_req::Spantype)$4;
+		sp_p->spantype_ = (Direction)$4;
 		sp_p-> dynamic_dir_  = (Direction)$3;
 		$$ = sp_p;
 	}
 	;
 
-plet_fraction:
-	unsigned '/' unsigned {
-		$$[0] = $1;
-		$$[1] = $3;
-	}
-	|
-	'/' unsigned {
-		int num = $2 >? 1;
-		$$[0] = guess_plet_a[(num <? GUESS_PLET) - 1];
-		$$[1] = num;
-	}
-	;
 
-close_plet_parens:
-	']' plet_fraction {
-		$$ = MAEBTELP;
-		THIS->plet_.type_i_ = $2[1];
-		THIS->plet_.iso_i_ = $2[0];
-		THIS->default_duration_.plet_ = THIS->plet_;
-	}
-	| TELP {
-		$$ = TELP;
-		THIS->plet_.type_i_ = 1;
-		THIS->plet_.iso_i_ = 1;
-		THIS->default_duration_.plet_ = THIS->plet_;
-	}
-	| TELP plet_fraction {
-		$$ = TELP;
-		THIS->plet_.type_i_ = $2[1];
-		THIS->plet_.iso_i_ = $2[0];
-		THIS->default_duration_.plet_ = THIS->plet_;
-	}
-	;
 
 close_request_parens:
-	'~'	{
-		$$ = '~';
-	}
-	| '('	{
+	'('	{
 		$$='(';
 	}
-	| ']'	{
-		$$ = ']';
-	}
 	| E_SMALLER {
 		$$ = '<';
 	}
 	| E_BIGGER {
 		$$ = '>';
 	}
-	| 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_parens:
 	E_EXCLAMATION 	{
@@ -1065,11 +1165,6 @@ open_request_parens:
 	| ')'	{
 		$$=')';
 	}
-	| '['	{
-		$$='[';
-	}
-	| open_abbrev_parens
-	| open_plet_parens
 	;
 
 
@@ -1146,10 +1241,10 @@ script_abbreviation:
 	;
 
 mudela_script:
-	SCRIPT_IDENTIFIER		{ $$ = $1->access_General_script_def (true); }
+	SCRIPT_IDENTIFIER		{ $$ = $1->access_content_General_script_def (true); }
 	| script_definition		{ $$ = $1; }
 	| script_abbreviation		{
-		$$ = THIS->lexer_p_->lookup_identifier (*$1)->access_General_script_def (true);
+		$$ = THIS->lexer_p_->lookup_identifier (*$1)->access_content_General_script_def (true);
 		delete $1;
 	}
 	;
@@ -1162,8 +1257,17 @@ script_dir:
 
 pre_requests:
 	{
+		if (THIS->extender_req)
+		  {
+		    Extender_req * e_p = new Extender_req;
+		    e_p->spantype_ = STOP;
+		    THIS->pre_reqs.push (e_p);
+		    THIS->extender_req = 0;
+		  }
+			
 	}
 	| 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 ());
@@ -1182,6 +1286,12 @@ duration_length:
 	steno_duration {
 		$$ = $1;
 	}
+	| duration_length '*' unsigned {
+		$$->plet_.iso_i_ *= $3;
+	}
+	| duration_length '/' unsigned {
+		$$->plet_.type_i_ *= $3;
+	}
 	;
 
 dots:
@@ -1215,21 +1325,14 @@ steno_duration:
 			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->access_Duration ();
+		$$ = $1->access_content_Duration (true);
 	}
 	| steno_duration '.' 	{
 		$$->dots_i_ ++;
 	}
-	| steno_duration '*' unsigned  {
-		$$->plet_.iso_i_ *= $3;
-	}
-	| steno_duration '/' unsigned {
-		$$->plet_.type_i_ *= $3;
-	}
 	;
 
 
@@ -1252,8 +1355,7 @@ simple_element:
 	steno_notepitch 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_;
+		$1->duration_ = *$2;
 		$$ = THIS->get_note_element ($1, $2);
 	}
 	| RESTNAME notemode_duration		{
@@ -1269,7 +1371,6 @@ simple_element:
 		velt_p->set_spot (THIS->here_input ());
 		velt_p->add_music (m);
 		$$ = velt_p;
-
 	}
 	| STRING notemode_duration 			{
 		if (!THIS->lexer_p_->lyric_state_b ())
@@ -1277,8 +1378,99 @@ simple_element:
 		$$ = THIS->get_word_element (*$1, $2);
 		delete $1;
 	}
+	| chord {
+		if (!THIS->lexer_p_->chord_state_b ())
+			THIS->parser_error (_ ("have to be in Chord mode for chords"));
+		$$ = $1;
+	}
+	| '@' notemode_chord '@' {
+		if (!THIS->lexer_p_->note_state_b ())
+			THIS->parser_error (_ ("have to be in Note mode for @chords"));
+		$$ = $2;
+	}
 	;
 
+chord:
+	steno_tonic_pitch notemode_duration chord_additions chord_subtractions chord_inversion {
+                $$ = THIS->get_chord (*$1, $3, $4, $5, *$2);
+        };
+
+notemode_chord:
+	steno_musical_pitch notemode_duration chord_additions chord_subtractions notemode_chord_inversion {
+                $$ = THIS->get_chord (*$1, $3, $4, $5, *$2);
+        };
+
+chord_additions: 
+	{
+		$$ = new Array<Musical_pitch>;
+	} 
+	| '-' chord_notes {
+		$$ = $2;
+	}
+	;
+
+chord_notes:
+	{
+		$$ = new Array<Musical_pitch>;
+	}
+	| chord_notes chord_addsub {
+		$$ = $1;
+		$$->push (*$2);
+	}
+	;
+
+chord_addsub:
+	chord_note optional_dot
+	| CHORDMODIFIER_PITCH optional_dot
+	;
+
+chord_inversion:
+	{
+		$$ = 0;
+	}
+	| '/' steno_tonic_pitch {
+		$$ = $2
+	}
+	;
+
+notemode_chord_inversion:
+	{
+		$$ = 0;
+	}
+	| '/' steno_musical_pitch {
+		$$ = $2
+	}
+	;
+
+chord_note:
+	unsigned {
+		$$ = new Musical_pitch;
+		$$->notename_i_ = ($1 - 1) % 7;
+		$$->octave_i_ = $1 > 7 ? 1 : 0;
+		$$->accidental_i_ = 0;
+        } 
+	| unsigned '+' {
+		$$ = new Musical_pitch;
+		$$->notename_i_ = ($1 - 1) % 7;
+		$$->octave_i_ = $1 > 7 ? 1 : 0;
+		$$->accidental_i_ = 1;
+	}
+	| unsigned '-' {
+		$$ = new Musical_pitch;
+		$$->notename_i_ = ($1 - 1) % 7;
+		$$->octave_i_ = $1 > 7 ? 1 : 0;
+		$$->accidental_i_ = -1;
+	}
+        ;
+
+chord_subtractions: 
+	{
+		$$ = new Array<Musical_pitch>;
+	} 
+	| '^' chord_notes {
+		$$ = $2;
+	}
+	;
 
 /*
 	UTILITIES
@@ -1318,111 +1510,28 @@ int:
 		$$ = -$2;
 	}
 	| INT_IDENTIFIER	{
-		int *i_p = $1->access_int ();
-		$$ = *i_p;
-		delete i_p;
+		$$ = *$1->access_content_int (false);
 	}
 	;
 
-string_primary:
+
+string:
 	STRING		{
 		$$ = $1;
 	}
 	| STRING_IDENTIFIER	{
-		String *s_p = $1->access_String ();
-
-		$$ = s_p;
-		DOUT << "Lookup string: " << *s_p << "\n";
-	}
-	;
-
-string:
-	string_primary {
-		$$ = $1;
+		$$ = $1->access_content_String (true);
 	}
-	| string '+' string_primary {
+	| string '+' string {
 		*$$ += *$3;
 		delete $3;
 	}
 	;
 
-dim:
-	real_primary unit	{ $$ = $1*$2; }
-	;
-
-
-unit:	CM_T		{ $$ = 1 CM; }
-	|IN_T		{ $$ = 1 INCH; }
-	|MM_T		{ $$ = 1 MM; }
-	|PT_T		{ $$ = 1 PT; }
-	;
-
-/*
-	symbol tables
-*/
-symtables:
-	SYMBOLTABLES '{' symtables_body '}'	{ $$ = $3; }
-	;
-
-symtables_body:
-	 		{
-		$$ = new Lookup;
-	}
-	| IDENTIFIER		{
-		$$ = $1->access_Lookup ();
-	}
-	| symtables_body FONT STRING 		{
-		$$->font_ = *$3;
-		$$->font_path_ = global_path.find (*$3);
-		if  (!$$->font_path_.length_i ())
-			THIS->here_input ().error (_f("can't open file: `%s'", $3->ch_C()));
-
-		delete $3;
-	}
-	| symtables_body STRING '=' symtable		{
-		$$->add (*$2, $4);
-		delete $2;
-	}
-	;
-
-symtable:
-	TABLE '{' symtable_body '}' { $$ = $3; }
-	;
 
-symtable_body:
-				{ $$ = new Symtable; }
-	| symtable_body	STRING	symboldef {
-		$$->add (*$2, *$3);
-		delete $2;
-		delete $3;
-	}
-	;
 
-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;
-	}
-	;
 
-box:
-	dinterval dinterval 	{
-		$$ = new Box (*$1, *$2);
-		delete $1;
-		delete $2;
-	}
-	;
 
-dinterval: dim	dim		{
-		$$ = new Interval ($1, $2);
-	}
-	;
 
 %%
 
@@ -1439,3 +1548,4 @@ My_lily_parser::do_yyparse ()
 	yyparse ((void*)this);
 }
 
+