X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fparser.yy;h=34e329be2e236bf75729c44e51321d2264007359;hb=d6048913c2c793a6298a3e16a1a25c76711463b1;hp=64c9dd8bae3ba872d1365d55b42b721cb5514b5a;hpb=2b3853cd624f78756ba0f891fe220776a496d288;p=lilypond.git

diff --git a/lily/parser.yy b/lily/parser.yy
index 64c9dd8bae..34e329be2e 100644
--- a/lily/parser.yy
+++ b/lily/parser.yy
@@ -14,8 +14,6 @@
 #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"
@@ -31,7 +29,7 @@
 #include "command-request.hh"
 #include "musical-request.hh"
 #include "my-lily-parser.hh"
-#include "text-def.hh"
+#include "context-specced-music.hh"
 #include "translator-group.hh"
 #include "score.hh"
 #include "music-list.hh"
@@ -42,27 +40,21 @@
 #include "scope.hh"
 #include "relative-music.hh"
 #include "transposed-music.hh"
-#include "compressed-music.hh"
-#include "repeated-music.hh"
+#include "time-scaled-music.hh"
+#include "new-repeated-music.hh"
 
 // mmm
-Mudela_version oldest_version ("1.0.7");
-Mudela_version version ("1.0.10");
-
+Mudela_version oldest_version ("1.0.16");
+Mudela_version version ("1.0.19");
 
+void
+print_mudela_versions (ostream &os)
+{
+  os << "Mudela versions: oldest  " << oldest_version.str () << " current " << version.str () <<endl;
+}
 // 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_;
@@ -102,13 +94,12 @@ Paper_def* current_paper = 0;
 %union {
     Array<Interval>* intarr;
     Array<Musical_pitch> *pitch_arr;
+    Link_array<Request> *reqvec;
     Array<String> * strvec;
     Array<int> *intvec;
-    Box *box;
-    Simultaneous_music *chord;
+    Notename_table *chordmodifiertab;
     Duration *duration;
     Identifier *id;
-    Translator* trans;
     Music *music;
     Music_list *music_list;
     Score *score;
@@ -119,23 +110,17 @@ Paper_def* current_paper = 0;
     Musical_pitch * pitch;
     Midi_def* midi;
     Moment *moment;
-    Note_req *notereq;
     Notename_table *notenametab;
     Paper_def *paper;
     Real real;
     Request * request;
-    General_script_def * script;
     Scalar *scalar;
+
     String *string;
-    Atom * symbol;
-    Symtable * symtable;
-    Symtables* symtables;
-    Text_def * textdef;
     Tempo_req *tempo;
+    Translator* trans;
     char c;
-    const char *consstr;
     int i;
-    int pair[2];
     int ii[10];
 }
 %{
@@ -157,17 +142,18 @@ yylex (YYSTYPE *s,  void * v_l)
 
 /* tokens which are not keywords */
 
-%token ABSDYNAMIC
+%token TEXTSCRIPT
 %token ACCEPTS
 %token ALTERNATIVE
 %token BAR
-%token BEAMPLET
 %token CADENZA
+%token CHORDMODIFIERS
+%token CHORDS
 %token CLEF
 %token CM_T
 %token CONSISTS
+%token CONSISTSEND
 %token DURATION
-%token END
 %token EXTENDER
 %token FONT
 %token GROUPING
@@ -176,22 +162,17 @@ yylex (YYSTYPE *s,  void * v_l)
 %token KEY
 %token KEYSIGNATURE
 %token LYRICS
-%token MAEBTELP
 %token MARK
 %token MEASURES
 %token MIDI
 %token MM_T
-%token MUSIC
 %token MUSICAL_PITCH
 %token NAME
 %token NOTENAMES
 %token NOTES
-%token OCTAVE
-%token OUTPUT
 %token PAPER
 %token PARTIAL
 %token PENALTY
-%token PLET
 %token PROPERTY
 %token PT_T
 %token RELATIVE
@@ -203,31 +184,29 @@ yylex (YYSTYPE *s,  void * v_l)
 %token SCRIPT
 %token SHAPE
 %token SKIP
-%token SPANDYNAMIC
-%token SYMBOLTABLES
-%token TABLE
-%token TELP
+%token SPANREQUEST
 %token TEMPO
 %token TIME_T
 %token TIMES
 %token TRANSLATOR
 %token TRANSPOSE
 %token TYPE
+%token CONTEXT
 %token VERSION
 
 /* escaped */
 %token E_EXCLAMATION E_SMALLER E_BIGGER E_CHAR
 
-%type <i>	dots
+%type <i>	dots exclamations questions
 %token <i>	DIGIT
 %token <pitch>	NOTENAME_PITCH
+%token <pitch>	TONICNAME_PITCH
+%token <pitch>	CHORDMODIFIER_PITCH
 %token <id>	DURATION_IDENTIFIER
 %token <id>	IDENTIFIER
 %token <id>	NOTENAME_TABLE_IDENTIFIER
 %token <id>	MUSIC_IDENTIFIER
-%token <id>	POST_REQUEST_IDENTIFIER
-%token <id>	SCRIPT_IDENTIFIER
-%token <id>	COMMAND_IDENTIFIER
+%token <id>	REQUEST_IDENTIFIER
 %token <id>	REAL_IDENTIFIER
 %token <id>	STRING_IDENTIFIER
 %token <id>	TRANS_IDENTIFIER
@@ -235,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
@@ -244,53 +222,51 @@ yylex (YYSTYPE *s,  void * v_l)
 
 %type <outputdef> output_def
 %type <scope> 	mudela_header mudela_header_body
-%type <box>	box
-%type <i>	open_request_parens close_request_parens
-%type <i>	open_abbrev_parens
-%type <i>	open_plet_parens close_plet_parens
+%type <request>	open_request_parens close_request_parens open_request close_request
+%type <request> request_with_dir request_that_take_dir verbose_request
 %type <i>	sub_quotes sup_quotes
-%type <music>	simple_element  request_chord command_element Simple_music  Composite_music
+%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 <i>	optional_modality
-%type <id>	identifier_init simple_identifier_init block_identifier
+%type <id>	identifier_init  
 %type <duration> steno_duration notemode_duration
 %type <duration> entered_notemode_duration explicit_duration
-%type <interval>	dinterval
 %type <intvec>	intastint_list int_list
-%type <symtables>	symtables symtables_body
-
+%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 <notereq>	steno_notepitch
+%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 <midi>	midi_block midi_body
 %type <duration>	duration_length
 
 %type <scalar>  scalar
-%type <music>	Music  relative_music Sequential_music Simultaneous_music
+%type <music>	Music  relative_music Sequential_music Simultaneous_music Music_sequence
 %type <music>	property_def translator_change
 %type <music_list> Music_list
 %type <paper>	paper_block paper_def_body
-%type <real>	real_expression real dimension
+%type <real>	real_expression real real_with_dimension
 %type <request> abbrev_command_req
-%type <request>	post_request structured_post_request
-%type <pair>	plet_fraction
+%type <request>	post_request 
 %type <request> command_req verbose_command_req
-%type <request>	script_req  dynamic_req extender_req
+%type <request>	extender_req
 %type <string>	string
 %type <score>	score_block score_body
 %type <intarr>	shape_array
-%type <script>	script_definition script_body mudela_script gen_script_def
-%type <textdef> text_def finger
+
 %type <string>	script_abbreviation
-%type <symbol>	symboldef
-%type <symtable>	symtable symtable_body
-%type <trans>	translator_spec translator_spec_body
+%type <trans>	translator_spec_block translator_spec_body
 %type <tempo> 	tempo_request
-%type <notenametab> notenames_body notenames_block
-%expect 3
+%type <notenametab> notenames_body notenames_block chordmodifiers_block
+
+
 
 
 %left '-' '+'
@@ -310,6 +286,9 @@ 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 = $1;
@@ -332,17 +311,17 @@ toplevel_expression:
 	;
 
 embedded_scm:
-	SCMFILE STRING ';' {
+	SCMFILE STRING semicolon {
 		read_lily_scm_file (*$2);
 		delete $2;
 	}
-	| SCM_T STRING ';' {
+	| SCM_T STRING semicolon {
 		gh_eval_str ($2->ch_l ());
 		delete $2;
 	};
 
 check_version:
-	VERSION STRING ';'		{
+	VERSION STRING semicolon		{
 	 	Mudela_version ver (*$2);
 		if (!((ver >= oldest_version) && (ver <= version))) {
 			if (THIS->ignore_version_b_) {
@@ -356,6 +335,11 @@ check_version:
 	;
 
 
+chordmodifiers_block:
+	CHORDMODIFIERS '{' notenames_body '}'  {  $$ = $3; }
+	;
+
+
 notenames_block:
 	NOTENAMES '{' notenames_body '}'  {  $$ = $3; }
 	;
@@ -382,7 +366,7 @@ mudela_header_body:
 		$$ = new Scope;
 		THIS->lexer_p_-> scope_l_arr_.push ($$);
 	}
-	| mudela_header_body assignment ';' { 
+	| mudela_header_body assignment semicolon { 
 
 	}
 	;
@@ -410,18 +394,15 @@ assignment:
 	;
 
 
-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);
 	}
@@ -432,10 +413,7 @@ block_identifier:
 		$$ = new Midi_def_identifier ($1, MIDI_IDENTIFIER);
 
 	}
-	| symtables {
-		$$ = new Symtables_identifier ($1, IDENTIFIER);
-	}
-	| translator_spec {
+	| translator_spec_block {
 		$$ = new Translator_identifier ($1, TRANS_IDENTIFIER);
 	}
 	| Music  {
@@ -443,7 +421,7 @@ block_identifier:
 	}
 
 	| post_request {
-		$$ = new Request_identifier ($1, POST_REQUEST_IDENTIFIER);
+		$$ = new Request_identifier ($1, REQUEST_IDENTIFIER);
 	}
 	| explicit_duration {
 		$$ = new Duration_identifier ($1, DURATION_IDENTIFIER);
@@ -457,15 +435,13 @@ block_identifier:
 	| int	{
 		$$ = new int_identifier (new int ($1), INT_IDENTIFIER);
 	}
-	| script_definition {
-		$$ = new General_script_def_identifier ($1, SCRIPT_IDENTIFIER);
-
-	}
 	;
 
-translator_spec:
+translator_spec_block:
 	TRANSLATOR '{' translator_spec_body '}'
-		{ $$ = $3; }
+		{
+		$$ = $3;
+	}
 	;
 
 translator_spec_body:
@@ -473,7 +449,7 @@ translator_spec_body:
 		$$ = $1->access_content_Translator (true);
 		$$-> set_spot (THIS->here_input ());
 	}
-	| TYPE STRING ';'	{
+	| TYPE STRING semicolon	{
 		Translator* t = get_translator_l (*$2);
 		Translator_group * tg = dynamic_cast<Translator_group*> (t);
 
@@ -485,7 +461,7 @@ translator_spec_body:
 		$$ = t;
 		delete $2;
 	}
-	| translator_spec_body STRING '=' simple_identifier_init ';'	{ 
+	| translator_spec_body STRING '=' identifier_init semicolon	{ 
 		Identifier* id = $4;
 		String_identifier *s = dynamic_cast<String_identifier*> (id);
 		Real_identifier *r= dynamic_cast<Real_identifier*>(id);
@@ -499,21 +475,27 @@ translator_spec_body:
 			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 ';' {
+	| translator_spec_body NAME STRING semicolon {
 		$$->type_str_ = *$3;
 		delete $3;
 	}
-	| translator_spec_body CONSISTS STRING ';' {
+	| translator_spec_body CONSISTS STRING semicolon {
 		dynamic_cast<Translator_group*> ($$)-> set_element (*$3, true);
 		delete $3;
 	}
-	| translator_spec_body ACCEPTS STRING ';' {
+	| translator_spec_body CONSISTSEND STRING semicolon {
+		dynamic_cast<Translator_group*> ($$)-> set_element (*$3, true);
+		delete $3;
+	}
+	| translator_spec_body ACCEPTS STRING semicolon {
 		dynamic_cast<Translator_group*> ($$)-> set_acceptor (*$3, true);
 		delete $3;
 	}
-	| translator_spec_body REMOVE STRING ';' {
+	| translator_spec_body REMOVE STRING semicolon {
 		dynamic_cast<Translator_group*> ($$)-> set_element (*$3, false);
 		delete $3;
 	}
@@ -524,7 +506,6 @@ translator_spec_body:
 */
 score_block:
 	SCORE { THIS->remember_spot ();
-		THIS->error_level_i_ =0;
 	}
 	/*cont*/ '{' score_body '}' 	{
 		$$ = $4;
@@ -532,9 +513,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;
 	}
 	;
 
@@ -590,9 +568,10 @@ paper_block:
 	}
 	;
 
-optional_semicolon:
+
+optional_dot:
 	/* empty */
-	| ';'
+	| '.'
 	;
 
 paper_def_body:
@@ -601,22 +580,24 @@ paper_def_body:
 		THIS-> lexer_p_-> scope_l_arr_.push (p->scope_p_);
 		$$ = p;
 	}
-	| PAPER_IDENTIFIER optional_semicolon	{
+	| PAPER_IDENTIFIER 	{
 		Paper_def *p = $1->access_content_Paper_def (true);
 		THIS->lexer_p_->scope_l_arr_.push (p->scope_p_);
 		$$ = p;
 	}
-	| paper_def_body int '=' symtables		{ // ugh, what a syntax
-		Lookup * l = new Lookup (*$4);
+	| 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_def_body assignment semicolon {
 
 	}
-	| paper_def_body translator_spec {
+	| paper_def_body translator_spec_block {
 		$$->assign_translator ($2);
 	}
-	| paper_def_body SHAPE '=' shape_array ';' {
+	| paper_def_body SHAPE '=' shape_array semicolon {
 		$$->shape_int_a_ = *$4;
 		delete $4;
 	}
@@ -631,7 +612,7 @@ real:
 	;
 
 
-dimension:
+real_with_dimension:
 	REAL CM_T	{
 		$$ = $1 CM;
 	}
@@ -650,7 +631,7 @@ real_expression:
 	REAL		{
 		$$ = $1;
 	}
-	| dimension
+	| real_with_dimension
 	| REAL_IDENTIFIER		{
 		$$= *$1->access_content_Real (false);
 	}
@@ -698,11 +679,11 @@ midi_body: /* empty */ 		{
 	| MIDI_IDENTIFIER	{
 		$$ = $1-> access_content_Midi_def (true);
 	}
-	| midi_body translator_spec	{
+	| midi_body translator_spec_block	{
 		$$-> assign_translator ($2);
 	}
-	| midi_body tempo_request ';' {
-		$$->set_tempo ($2->dur_.length (), $2->metronome_i_);
+	| midi_body tempo_request semicolon {
+		$$->set_tempo ($2->dur_.length_mom (), $2->metronome_i_);
 		delete $2;
 	}
 	| midi_body error {
@@ -711,7 +692,7 @@ midi_body: /* empty */ 		{
 	;
 
 tempo_request:
-	TEMPO entered_notemode_duration '=' unsigned	{
+	TEMPO steno_duration '=' unsigned	{
 		$$ = new Tempo_req;
 		$$->dur_ = *$2;
 		delete $2;
@@ -735,23 +716,33 @@ Music:
 	| Composite_music
 	;
 
-Alternative_music: {
-		Music_list* m = new Music_list;
-		$$ = new Sequential_music (m);
+Alternative_music:
+	/* empty */ {
+		$$ = 0;
 	}
-	| ALTERNATIVE Simultaneous_music {
+	| ALTERNATIVE Music_sequence {
 		$$ = $2;
 	}
-	| ALTERNATIVE Sequential_music {
-		$$ = $2;
+	;
+
+
+
+
+Repeated_music:
+	REPEAT STRING unsigned Music Alternative_music
+	{
+		Music_sequence* m = dynamic_cast <Music_sequence*> ($5);
+
+		New_repeated_music * r = new New_repeated_music ($4, $3 >? 1, m);
+		$$ = r;
+		r->fold_b_ = (*$2 == "fold");
+		r->semi_fold_b_ =  (*$2 == "semi");
+		delete $2;
 	}
 	;
 
-Repeated_music: REPEAT unsigned '{' Music '}' Alternative_music	{
-		// s/r conflicts -> '{' '}' 
-		Music_sequence* m = dynamic_cast <Music_sequence*> ($6);
-		assert (m);
-		$$ = new Repeated_music ($4, $2, m);
+Music_sequence: '{' Music_list '}'	{
+		$$ = new Music_sequence ($2);
 	}
 	;
 
@@ -770,30 +761,44 @@ Simple_music:
 	| MUSIC_IDENTIFIER { $$ = $1->access_content_Music (true); }
 	| property_def
 	| translator_change
+	| Simple_music '*' unsigned '/' unsigned 	{
+		/* urg */
+		$$ = new Time_scaled_music ($3, $5, $1);
+	}
+	| Simple_music '*' unsigned		 {
+		$$ = new Time_scaled_music ($3, 1, $1);
+	}
 	;
 
 
 Composite_music:
-	TYPE STRING Music	{
-		$$ = $3;
-		$$->translator_type_str_ = *$2;
+	CONTEXT STRING Music	{
+		Context_specced_music *csm =  new Context_specced_music ($3);
+
+		csm->translator_type_str_ = *$2;
+		csm->translator_id_str_ = "";
 		delete $2;
+
+		$$ = csm;
 	}
-	| TYPE STRING '=' STRING Music {
-		$$ = $5;
-		$$->translator_type_str_ = *$2;
-		$$->translator_id_str_ = *$4;
+	| 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;
 	}
 	| TIMES {
 		THIS->remember_spot ();
 	}
 	/* CONTINUED */ 
-		int '/' int Music 	
+		unsigned '/' unsigned Music 	
 
 	{
-		$$ = new Compressed_music ($3, $5, $6);
+		$$ = new Time_scaled_music ($3, $5, $6);
 		$$->set_spot (THIS->pop_spot ());
 	}
 	| Repeated_music		{ $$ = $1; }
@@ -803,13 +808,23 @@ Composite_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 ();
 		}
-
+	| CHORDS
+		{ THIS->lexer_p_->push_chord_state (); }
+	Music
+		{
+		  $$ = $3;
+		  THIS->lexer_p_->pop_state ();
+	}
 	| LYRICS
 		{ THIS->lexer_p_->push_lyric_state (); }
 	Music
@@ -843,11 +858,16 @@ translator_change:
 property_def:
 	PROPERTY STRING '.' STRING '=' scalar	{
 		Translation_property *t = new Translation_property;
-		t-> translator_type_str_ = *$2;
+
 		t-> var_str_ = *$4;
 		t-> value_ = *$6;
-		$$ = t;
+
+		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;
@@ -855,15 +875,20 @@ property_def:
 	;
 
 scalar:
-	STRING		{ $$ = new Scalar (*$1); delete $1; }
+	string		{ $$ = new Scalar (*$1); delete $1; }
 	| int		{ $$ = new Scalar ($1); }
 	;
 
 
 request_chord:
 	pre_requests simple_element post_requests	{
-	 	THIS->add_requests ((Simultaneous_music*)$2);//ugh
+		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));
  		$$ = $2;
+		
 	}
 	| command_element
 	;
@@ -879,26 +904,31 @@ command_element:
 
 command_req:
 	abbrev_command_req
-	| verbose_command_req ';'	{ $$ = $1; }
+	| verbose_command_req semicolon	{ $$ = $1; }
 	;
 
 abbrev_command_req:
-	'|'				{
+	extender_req {
+		$$ = $1;
+	}
+	| '|'				{
 		$$ = new Barcheck_req;
 	}
-	| COMMAND_IDENTIFIER	{
-		$$ = $1->access_content_Request (true);
+	| '~'	{
+		$$ = new Tie_req;
 	}
-/*
 	| '['		{
-		$$ = new Beam_req;
-		$$->spantype = Span_req::START;
+		Span_req*b= new Span_req;
+		b->span_dir_ = START;
+		b->span_type_str_ = "beam";
+		$$ =b;
 	}
 	| ']'		{
-		$$ = new Beam_req;
-		$$->spantype = Span_req::STOP;
+		Span_req*b= new Span_req;
+		b->span_dir_ = STOP;
+		b->span_type_str_ = "beam";
+		$$ = b;
 	}
-*/
 	;
 
 
@@ -920,9 +950,9 @@ verbose_command_req:
 		m->one_beat_i_=$4;
 		$$ = m;
 	}
-	| PENALTY '=' int	{
+	| PENALTY int	{
 		Break_req * b = new Break_req;
-		b->penalty_i_ = $3;
+		b->penalty_i_ = $2;
 		b-> set_spot (THIS->here_input ());
 		$$ = b;
 	}
@@ -939,7 +969,7 @@ verbose_command_req:
 		$$ = new Cadenza_req ($2);
 	}
 	| PARTIAL duration_length 	{
-		$$ = new Partial_measure_req ($2->length ());
+		$$ = new Partial_measure_req ($2->length_mom ());
 		delete $2;
 	}
 	| CLEF STRING {
@@ -954,59 +984,99 @@ verbose_command_req:
 		$$ = key_p;
 		delete $2;
 	}
-	| KEYSIGNATURE pitch_list 	{
+	| KEYSIGNATURE pitch_list {
 		Key_change_req *key_p= new Key_change_req;
 		key_p->pitch_arr_ = *$2;
 		key_p->ordinary_key_b_ = false;
 		$$ = key_p;
 		delete $2;
 	}
-	| GROUPING intastint_list {
-		$$ = get_grouping_req (*$2); delete $2;
+	| 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++));
+		    }
+
+
+		$$ = mr_p;
+		delete $2;
 	}
 	;
 
 post_requests:
 	{
-		/* something silly happened.  Junk this stuff*/
-		if (!THIS->post_reqs.empty ())
-		{
-			warning ("Junking post-requests");
-			THIS->post_reqs.clear ();
-		}
+		$$ = new Link_array<Request>;
 	}
-	| post_requests structured_post_request {
+	| post_requests post_request {
 		$2->set_spot (THIS->here_input ());
-		THIS->post_reqs.push ($2);
-	}
-	| post_requests close_request_parens	{
-		Array<Request*>& r = *THIS->get_parens_request ($2);
-		for (int i = 0; i < r.size (); i++ )
-			r[i]->set_spot (THIS->here_input ());
-		THIS->post_reqs.concat (r);
-		delete &r;
+		$$->push ($2);
 	}
 	;
 
-structured_post_request:
-	script_req
-	| post_request
+post_request:
+	verbose_request
+	| request_with_dir
+	| close_request
 	;
 
-post_request:
-	POST_REQUEST_IDENTIFIER	{
+
+request_that_take_dir:
+	gen_text_def
+	| verbose_request
+	| script_abbreviation {
+		Identifier*i = THIS->lexer_p_->lookup_identifier ("dash-" + *$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;
+		else if ($1)
+			$2->warning ("Can't specify direction for this request");
+		$$ = $2;
+	}
+	;
+	
+verbose_request:
+	REQUEST_IDENTIFIER	{
 		$$ = (Request*)$1->access_content_Request (true);
+		$$->set_spot (THIS->here_input ());
 	}
-	| dynamic_req {
-		$$ = $1;
+	| TEXTSCRIPT STRING STRING 	{
+		Text_script_req *ts_p = new Text_script_req;
+		ts_p-> text_str_ = *$2;
+		ts_p-> style_str_ = *$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->set_spot (THIS->here_input ());
+		$$ = sp_p;
 	}
 	| abbrev_type	{
 		Abbreviation_req* a = new Abbreviation_req;
+		a->set_spot (THIS->here_input ());
 		a->type_i_ = $1;
 		$$ = a;
 	}
-	| extender_req {
-		$$ = $1;
+	| SCRIPT STRING 	{ 
+		Articulation_req * a = new Articulation_req;
+		a->articulation_str_ = *$2;
+		a->set_spot (THIS->here_input ());
+		$$ = a;
+		delete $2;
 	}
 	;
 
@@ -1027,6 +1097,7 @@ sup_quotes:
 		$$ ++;
 	}
 	;
+
 sub_quotes:
 	',' {
 		$$ = 1;
@@ -1050,6 +1121,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;
@@ -1067,23 +1152,6 @@ musical_pitch:
 	| explicit_musical_pitch
 	;
 
-steno_notepitch:
-	musical_pitch	{
-		$$ = new Note_req;
-		
-		$$->pitch_ = *$1;
-		delete $1;
-	}
-	| steno_notepitch  '!' 		{
-		$$->forceacc_b_ = ! $$->forceacc_b_;
-	}
-	| steno_notepitch  '?' 		{
-		$$->forceacc_b_ = ! $$->forceacc_b_;
-		$$->cautionary_b_ = ! $$->cautionary_b_;
-	}
-	;
-
-
 explicit_duration:
 	DURATION '{' int_list '}'	{
 		$$ = new Duration;
@@ -1101,174 +1169,65 @@ 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 = Span_req::START;
-		$$ = e_p;
-		THIS->extender_req = e_p;
-	};
-
-dynamic_req:
-	ABSDYNAMIC '{' unsigned '}'	{
-		Absolute_dynamic_req *ad_p = new Absolute_dynamic_req;
-		ad_p ->loudness_ = (Dynamic_req::Loudness)$3;
-		$$ =ad_p;
-	}
-	| SPANDYNAMIC '{' int int '}' {
-		Span_dynamic_req * sp_p = new Span_dynamic_req;
-		sp_p->spantype = (Span_req::Spantype)$4;
-		sp_p-> dynamic_dir_  = (Direction)$3;
-		$$ = sp_p;
+		$$ = new Extender_req;
 	}
 	;
 
-plet_fraction:
-	unsigned '/' unsigned {
-		$$[0] = $1;
-		$$[1] = $3;
-	}
-	|
-	'/' unsigned {
-		int num = $2 >? 1;
-		$$[0] = guess_plet_a[(num <? GUESS_PLET) - 1];
-		$$[1] = num;
-	}
-	;
-
-close_plet_parens:
-	']' plet_fraction {
-		$$ = MAEBTELP;
-		THIS->plet_.type_i_ = $2[1];
-		THIS->plet_.iso_i_ = $2[0];
-		THIS->default_duration_.plet_ = THIS->plet_;
-	}
-	| TELP {
-		$$ = TELP;
-		THIS->plet_.type_i_ = 1;
-		THIS->plet_.iso_i_ = 1;
-		THIS->default_duration_.plet_ = THIS->plet_;
-	}
-	| TELP plet_fraction {
-		$$ = TELP;
-		THIS->plet_.type_i_ = $2[1];
-		THIS->plet_.iso_i_ = $2[0];
-		THIS->default_duration_.plet_ = THIS->plet_;
+close_request:
+	close_request_parens {
+		$$ = $1;
+		dynamic_cast<Span_req*> ($$)->span_dir_ = START;
 	}
-	;
-
+	
 close_request_parens:
-	'~'	{
-		$$ = '~';
-	}
-	| '('	{
-		$$='(';
-	}
-	| ']'	{
-		$$ = ']';
+	'('	{
+		Span_req* s= new Span_req;
+		$$ = s;
+		s->span_type_str_ = "slur";
 	}
 	| E_SMALLER {
-		$$ = '<';
+		Span_req*s =new Span_req;
+		$$ = s;
+		s->span_type_str_ = "crescendo";
 	}
 	| E_BIGGER {
-		$$ = '>';
+		Span_req*s =new Span_req;
+		$$ = s;
+		s->span_type_str_ = "decrescendo";
 	}
-	| close_plet_parens
 	;
 
-open_abbrev_parens:
-	'[' ':' unsigned {
-		$$ = '[';
-		if (!Duration::duration_type_b ($3))
-			THIS->parser_error (_f ("not a duration: %d", $3));
-		else if ($3 < 8)
-			THIS->parser_error (_ ("can't abbreviate"));
-		else
-			THIS->set_abbrev_beam ($3);
-	}
-	;
 
-open_plet_parens:
-	'[' plet_fraction {
-		$$ = BEAMPLET;
-		THIS->plet_.type_i_ = $2[1];
-		THIS->plet_.iso_i_ = $2[0];
-		THIS->default_duration_.plet_ = THIS->plet_;
-	}
-	| PLET plet_fraction {
-		$$ = PLET;
-		THIS->plet_.type_i_ = $2[1];
-		THIS->plet_.iso_i_ = $2[0];
-		THIS->default_duration_.plet_ = THIS->plet_;
+open_request:
+	open_request_parens {
+		$$ = $1;
+		dynamic_cast<Span_req*> ($$)->span_dir_ = STOP;
 	}
 	;
 
 open_request_parens:
 	E_EXCLAMATION 	{
-		$$ = '!';
+		Span_req *s =  new Span_req;
+		s->span_type_str_ = "crescendo";
+		$$ = s;
 	}
 	| ')'	{
-		$$=')';
-	}
-	| '['	{
-		$$='[';
-	}
-	| open_abbrev_parens
-	| open_plet_parens
-	;
-
-
-
-script_definition:
-	SCRIPT '{' script_body '}' 	{ $$ = $3; }
-	;
-
-script_body:
-	STRING int int int int int		{
-		Script_def *s = new Script_def;
-		s->set_from_input (*$1,$2, $3,$4,$5, $6);
-		$$  = s;
-		delete $1;
+		Span_req* s= new Span_req;
+		$$ = s;
+		s->span_type_str_ = "slur";
 	}
 	;
 
-script_req:
-	script_dir gen_script_def	{
-		Musical_script_req *m = new Musical_script_req;
-		$$ = m;
-		m->scriptdef_p_ = $2;
-		m->set_spot (THIS->here_input ());
-		if (!m->dir_)
-		  m->dir_  = (Direction)$1;
-	}
-	;
-
-gen_script_def:
-	text_def	{ 
-		$$ = $1;
-		((Text_def*) $$)->align_dir_ = LEFT; /* UGH */
-	}
-	| mudela_script	{ 
-		$$ = $1;
-		$$-> set_spot (THIS->here_input ());
-	}
-	| finger {
-		$$ = $1;
-		((Text_def*)$$)->align_dir_ = RIGHT; /* UGH */
-	}
-	;
-
-text_def:
+gen_text_def:
 	string {
-		Text_def *t  = new Text_def;
+		Text_script_req *t  = new Text_script_req;
 		$$ = t;
 		t->text_str_ = *$1;
 		delete $1;
 		$$->set_spot (THIS->here_input ());
 	}
-	;
-
-finger:
-	 DIGIT {
-		Text_def* t  = new Text_def;
+	| DIGIT {
+		Text_script_req* t  = new Text_script_req;
 		$$ = t;
 		t->text_str_ = to_str ($1);
 		t->style_str_ = "finger";
@@ -1277,50 +1236,39 @@ finger:
 	;
 
 script_abbreviation:
-	'^'		{ $$ = get_scriptdef ('^'); }
-	| '+'		{ $$ = get_scriptdef ('+'); }
-	| '-'		{ $$ = get_scriptdef ('-'); }
- 	| '|'		{ $$ = get_scriptdef ('|'); }
-	| 'o'		{ $$ = get_scriptdef ('o'); }
-	| '>'		{ $$ = get_scriptdef ('>'); }
+	'^'		{
+		$$ = new String ("hat");
+	}
+	| '+'		{
+		$$ = new String ("plus");
+	}
+	| '-' 		{
+		$$ = new String ("dash");
+	}
+ 	| '|'		{
+		$$ = new String ("bar");
+	}
+	| '>'		{
+		$$ = new String ("larger");
+	}
 	| '.' 		{
-		$$ = get_scriptdef ('.');
+		$$ = new String ("dot");
 	}
 	;
 
-mudela_script:
-	SCRIPT_IDENTIFIER		{ $$ = $1->access_content_General_script_def (true); }
-	| script_definition		{ $$ = $1; }
-	| script_abbreviation		{
-		$$ = THIS->lexer_p_->lookup_identifier (*$1)->access_content_General_script_def (true);
-		delete $1;
-	}
-	;
 
 script_dir:
-	'_'	{ $$ = -1; }
-	| '^'	{ $$ = 1; }
-	| '-'	{ $$ = 0; }
+	'_'	{ $$ = DOWN; }
+	| '^'	{ $$ = UP; }
+	| '-'	{ $$ = CENTER; }
 	;
 
 pre_requests:
 	{
-		if (THIS->extender_req)
-		  {
-		    Extender_req * e_p = new Extender_req;
-		    e_p->spantype = Span_req::STOP;
-		    THIS->pre_reqs.push (e_p);
-		    THIS->extender_req = 0;
-		  }
-			
+		$$ = new Link_array<Request>;
 	}
-	| pre_requests open_request_parens {
-
-		Array<Request*>& r = *THIS->get_parens_request ($2);
-		for (int i = 0; i < r.size (); i++ )
-			r[i]->set_spot (THIS->here_input ());
-		THIS->pre_reqs.concat (r);
-		delete &r;
+	| pre_requests open_request {
+		$$->push ($2);
 	}
 	;
 
@@ -1334,20 +1282,19 @@ duration_length:
 	steno_duration {
 		$$ = $1;
 	}
-	;
-
-dots:
-	'.'		{ $$ = 1; }
-	| dots '.'	{ $$ ++; }
+	| duration_length '*' unsigned {
+		$$->plet_.iso_i_ *= $3;
+	}
+	| duration_length '/' unsigned {
+		$$->plet_.type_i_ *= $3;
+	}
 	;
 
 entered_notemode_duration:
-	/* */		{
-		$$ = new Duration (THIS->default_duration_);
-	}
-	| dots		{
+	dots		{
 		$$ = new Duration (THIS->default_duration_);
-		$$->dots_i_  = $1;
+		if ($1)
+			$$->dots_i_  = $1;
 	}
 	| steno_duration	{
 		THIS->set_last_duration ($1);
@@ -1367,7 +1314,6 @@ 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	{
@@ -1376,12 +1322,6 @@ steno_duration:
 	| steno_duration '.' 	{
 		$$->dots_i_ ++;
 	}
-	| steno_duration '*' unsigned  {
-		$$->plet_.iso_i_ *= $3;
-	}
-	| steno_duration '/' unsigned {
-		$$->plet_.type_i_ *= $3;
-	}
 	;
 
 
@@ -1399,13 +1339,28 @@ abbrev_type:
 	;
 
 
-
 simple_element:
-	steno_notepitch notemode_duration  {
+	musical_pitch exclamations questions notemode_duration  {
 		if (!THIS->lexer_p_->note_state_b ())
 			THIS->parser_error (_ ("have to be in Note mode for notes"));
-		$1->duration_ = *$2;
-		$$ = THIS->get_note_element ($1, $2);
+
+
+		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->add_music (n);
+
+		$$ = v;
 	}
 	| RESTNAME notemode_duration		{
 		$$ = THIS->get_rest_element (*$1, $2);
@@ -1427,8 +1382,106 @@ 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_subtractions: 
+	{
+		$$ = new Array<Musical_pitch>;
+	} 
+	| '^' 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
+	}
+	;
+
+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;
+	}
+        ;
 
 /*
 	UTILITIES
@@ -1488,75 +1541,28 @@ string:
 
 
 
-/*
-	symbol tables
-*/
-symtables:
-	SYMBOLTABLES '{' symtables_body '}'	{ $$ = $3; }
-	;
-
-symtables_body:
-	 		{
-		$$ = new Symtables;
-	}
-	| IDENTIFIER		{
-		$$ = $1->access_content_Symtables (true);
-	}
-	| 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;
-	}
+dots:
+			{ $$ = 0; }
+	| dots '.'	{ $$ ++; }
 	;
 
-symtable:
-	TABLE '{' symtable_body '}' { $$ = $3; }
-	;
 
-symtable_body:
-				{ $$ = new Symtable; }
-	| symtable_body	STRING	symboldef {
-		$$->elem (*$2) = *$3;
-		delete $2;
-		delete $3;
-	}
-	;
 
-symboldef:
-	STRING unsigned box		{
-		// ignore #args
-		$$ = new Atom (*$1, *$3);
-		delete $1;
-		delete $3;
-	}
-	| STRING unsigned {
-		Box b (Interval (0,0), Interval (0,0));
-		// ignore #args
-		$$ = new Atom (*$1, b);
-		delete $1;
-	}
+exclamations:
+		{ $$ = 0; }
+	| exclamations '!'	{ $$ ++; }
 	;
 
-box:
-	dinterval dinterval 	{
-		$$ = new Box (*$1, *$2);
-		delete $1;
-		delete $2;
-	}
+questions:
+		{ $$ = 0; }
+	| questions '?'	{ $$ ++; }
 	;
 
-dinterval: real	real		{
-		$$ = new Interval ($1, $2);
-	}
-	;
 
+semicolon:
+	';'
+	;
 %%
 
 void
@@ -1573,3 +1579,4 @@ My_lily_parser::do_yyparse ()
 }
 
 
+