X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fparser.yy;h=a76260f9ddb51a7ca60d7e1a0e50bb4c5b6b2089;hb=7ed4019033adf7db7a8f64c4eb7b7f6d0449402f;hp=ca673730c75d8297ed3af4bc5e2f7302da3cf571;hpb=55fa3168d0fb5326341ff56d7a1638c89eb2ebaf;p=lilypond.git

diff --git a/lily/parser.yy b/lily/parser.yy
index ca673730c7..a76260f9dd 100644
--- a/lily/parser.yy
+++ b/lily/parser.yy
@@ -5,16 +5,14 @@
 
   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 "scalar.hh"
+#include "lily-guile.hh"
+#include "notename-table.hh"
 #include "translation-property.hh"
-#include "script-def.hh"
-#include "symtable.hh"
 #include "lookup.hh"
 #include "misc.hh"
 #include "my-lily-lexer.hh"
@@ -24,45 +22,42 @@
 #include "file-path.hh"
 #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"
 #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"
-#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 "lyric-combine-music.hh"
+#include "transposed-music.hh"
+#include "time-scaled-music.hh"
+#include "repeated-music.hh"
+#include "mudela-version.hh"
+#include "grace-music.hh"
+#include "auto-change-music.hh"
 
 // mmm
-Mudela_version oldest_version ("1.0.1");
-Mudela_version version ("1.0.2");
+Mudela_version oldest_version ("1.3.4");
 
 
+
+void
+print_mudela_versions (ostream &os)
+{
+  os << _f ("Oldest supported input version: %s", oldest_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
-};
-
-Paper_def* current_paper = 0;
-
 #ifndef NDEBUG
 #define YYDEBUG 1
 #endif
@@ -74,48 +69,44 @@ Paper_def* current_paper = 0;
 #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<Real>* realarr;
     Array<Musical_pitch> *pitch_arr;
-    Array<String> * strvec;
+    Link_array<Request> *reqvec;
     Array<int> *intvec;
-    Box *box;
-    Simultaneous_music *chord;
+    Notename_table *chordmodifiertab;
     Duration *duration;
     Identifier *id;
-    Translator* trans;
+    String * string;
     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;
-    String *string;
-    Atom * symbol;
-    Symtable * symtable;
-    Symtables * symtables;
-    Text_def * textdef;
+
+ /* 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_group* trans;
     char c;
-    const char *consstr;
     int i;
-    int pair[2];
     int ii[10];
 }
 %{
@@ -136,77 +127,78 @@ yylex (YYSTYPE *s,  void * v_l)
 %pure_parser
 
 /* tokens which are not keywords */
-
-%token ALIAS
+%token AUTOCHANGE
+%token TEXTSCRIPT
+%token ACCEPTS
+%token ALTERNATIVE
 %token BAR
-%token BEAMPLET
-%token MAEBTELP
-%token PENALTY
+%token BREATHE
 %token CADENZA
-%token CLEAR
+%token CHORDMODIFIERS
+%token CHORDS
+%token HYPHEN
 %token CLEF
-%token CONTAINS
-%token RELATIVE
-%token CONSISTS
-%token ACCEPTS
 %token CM_T
+%token CONSISTS
+%token SEQUENTIAL
+%token SIMULTANEOUS
+%token CONSISTSEND
 %token DURATION
-%token ABSDYNAMIC
-%token END
-%token GROUPING
-%token TRANSLATOR
+%token EXTENDER
+%token FONT
+%token GRACE
 %token HEADER
 %token IN_T
-%token LYRIC
+%token INVALID
 %token KEY
 %token KEYSIGNATURE
+%token LYRICS
 %token MARK
-%token MUSIC
-%token MUSICAL_PITCH
-%token MELODIC
+%token MEASURES
 %token MIDI
-%token TIME_T
 %token MM_T
-%token MULTI
+%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 REPETITIONS
+%token ADDLYRICS
+%token SCM_T
 %token SCORE
 %token SCRIPT
 %token SHAPE
 %token SKIP
-%token SPANDYNAMIC
-%token STAFF
-%token START_T
-%token SYMBOLTABLES
-%token TABLE
-%token TRANSPOSE
+%token SPANREQUEST
 %token TEMPO
+%token TIME_T
+%token TIMES
+%token TRANSLATOR
+%token TRANSPOSE
 %token TYPE
-%token FONT
-%token MEASURES
-%token TITLE
-%token PROPERTY
-%token VERSION
+%token CONTEXT
 
 /* escaped */
-%token E_EXCLAMATION E_SMALLER E_BIGGER E_CHAR
+%token E_CHAR E_EXCLAMATION E_SMALLER E_BIGGER 
+%token CHORD_BASS CHORD_COLON CHORD_MINUS CHORD_CARET 
 
-%type <i>	dots
+%type <i>	exclamations questions
 %token <i>	DIGIT
 %token <pitch>	NOTENAME_PITCH
+%token <pitch>	TONICNAME_PITCH
+%token <pitch>	CHORDMODIFIER_PITCH
 %token <id>	DURATION_IDENTIFIER
 %token <id>	IDENTIFIER
-
+%token <id>	NOTENAME_TABLE_IDENTIFIER
 %token <id>	MUSIC_IDENTIFIER
-%token <id>	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
@@ -214,125 +206,151 @@ 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
+%token <scm>	DURATION RESTNAME
+%token <scm>	STRING
+%token <scm>	SCM_T
 %token <i>	UNSIGNED
 
 
 %type <outputdef> output_def
-%type <header> 	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 <scope> 	mudela_header mudela_header_body
+%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
+%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 <duration> steno_duration notemode_duration
+%type <i>	optional_modality 
+%type <id>	identifier_init  
+%type <duration> steno_duration optional_notemode_duration
 %type <duration> entered_notemode_duration explicit_duration
-%type <interval>	dinterval
-%type <intvec>	intastint_list
-%type <lookup>	symtables symtables_body
-
+%type <intvec>	 int_list
+%type <reqvec>  pre_requests post_requests
+%type <request> gen_text_def
 %type <pitch>   explicit_musical_pitch steno_musical_pitch musical_pitch absolute_musical_pitch
-%type <notereq>	steno_notepitch
+%type <pitch>   steno_tonic_pitch
+
 %type <pitch_arr>	pitch_list
+%type <music>	chord
+%type <pitch_arr>	chord_additions chord_subtractions chord_notes chord_step
+%type <pitch>	chord_note chord_inversion chord_bass
 %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 <scm>  embedded_scm scalar
+%type <music>	Music Sequential_music Simultaneous_music Music_sequence
+%type <music>	relative_music re_rhythmed_music
 %type <music>	property_def translator_change
 %type <music_list> Music_list
-%type <paper>	paper_block paper_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 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
-%type <string>	string
-%type <string>	string_primary
+%type <request>	extender_req
+%type <request> hyphen_req
+%type <scm>	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 <realarr>	real_array
+
+%type <scm>	script_abbreviation
+%type <trans>	translator_spec_block translator_spec_body
 %type <tempo> 	tempo_request
+%type <notenametab> notenames_body notenames_block chordmodifiers_block
 
-%expect 1
 
 
+%left '-' '+'
+%left '*' '/'
+%left UNARY_MINUS
+
 %%
 
 mudela:	/* empty */
-	| mudela mudela_header {
+	| mudela toplevel_expression {}
+	| mudela assignment  { }
+	| mudela error
+	| mudela INVALID	{
+		THIS->error_level_i_  =1;
+	}
+	;
+
+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);
 	}
-	| mudela add_declaration { }
-	| mudela error
-	| mudela check_version { }
-	| mudela add_notenames { }
-	;
-
-check_version:
-	VERSION STRING ';'		{
-	 	Mudela_version ver (*$2);
-		if (!((ver >= oldest_version) && (ver <= version))) {
-			if (THIS->ignore_version_b_) {
-				THIS->here_input ().error (_f ("incorrect mudela version: %s (%s, %s)", ver.str (), oldest_version.str (), version.str ()));
-			} else {
-				THIS->fatal_error_i_ = 1;
-				THIS->parser_error (_f ("incorrect mudela version: %s (%s, %s)", ver.str (), oldest_version.str (), version.str ()));
-			}
-		}
+	| 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 {
+		// junk value
+	}	
 	;
 
-add_notenames:
-	NOTENAMES '{' notenames_body '}'
+embedded_scm:
+	SCM_T
 	;
+
+
+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);
+		(*$$)[ly_scm2string ($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 semicolon { 
+
 	}
 	;
 
 mudela_header:
 	HEADER '{' mudela_header_body '}'	{
 		$$ = $3;
+		THIS->lexer_p_-> scope_l_arr_.pop ();		
 	}
 	;
 
@@ -340,23 +358,30 @@ mudela_header:
 /*
 	DECLARATIONS
 */
-
-add_declaration:
+assignment:
 	STRING {
 		THIS->remember_spot ();
 	}
-	/* cont */ '=' identifier_init optional_semicolon {
-	    THIS->lexer_p_->set_identifier (*$1, $4);
+	/* cont */ '=' identifier_init  {
+	    THIS->lexer_p_->set_identifier (ly_scm2string ($1), $4);
 	    $4->init_b_ = THIS->init_parse_b_;
 	    $4->set_spot (THIS->pop_spot ());
 	}
 	;
 
+
+
 identifier_init:
 	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);
 	}
@@ -364,82 +389,90 @@ identifier_init:
 		$$ = new Midi_def_identifier ($1, MIDI_IDENTIFIER);
 
 	}
-	| script_definition {
-		$$ = new General_script_def_identifier ($1, SCRIPT_IDENTIFIER);
-
+	| translator_spec_block {
+		$$ = new Translator_group_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);
+		$$ = new Request_identifier ($1, 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 {
-		$$ = 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 {
-		$$ = new Translator_identifier ($1, TRANS_IDENTIFIER);
-	}
 	;
 
-translator_spec:
+translator_spec_block:
 	TRANSLATOR '{' translator_spec_body '}'
-		{ $$ = $3; }
+		{
+		$$ = $3;
+	}
 	;
 
 translator_spec_body:
 	TRANS_IDENTIFIER	{
-		$$ = $1->access_Translator ();
+		$$ = $1->access_content_Translator_group (true);
 		$$-> set_spot (THIS->here_input ());
 	}
-	| TYPE STRING ';'	{
-		Translator* t = get_translator_l (*$2);
-		t = t->clone ();
-		t->set_spot (THIS->here_input ());
-		$$ = t;
-		delete $2;
+	| TYPE STRING semicolon	{
+		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"));
+		
+		tg = dynamic_cast<Translator_group*> (t->clone ());
+		tg->set_spot (THIS->here_input ());
+		$$ = tg;
 	}
-	| translator_spec_body STRING '=' simple_identifier_init ';'	{ 
+	| 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;
-		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));
+		SCM v;
+		if (s) v = ly_str02scm (s->access_content_String (false)->ch_C());
+		if (i) v = gh_int2scm (*i->access_content_int (false));
+		if (r) v = gh_double2scm (*r->access_content_Real (false));
 		if (!s && !i && !r)
 			THIS->parser_error (_("Wrong type for property value"));
 
 		delete $4;
-		$$->set_property (*$2, str);
+		/* ugh*/
+		Translator_group* tg = dynamic_cast<Translator_group*> ($$);
+		
+		tg->set_property (ly_scm2string ($2), v);
 	}
-	| translator_spec_body CONSISTS STRING ';' {
-		$$->group_l ()->consists_str_arr_.push (*$3);
-		delete $3;
+	| translator_spec_body NAME STRING semicolon {
+		$$->type_str_ = ly_scm2string ($3);
 	}
-	| translator_spec_body ACCEPTS STRING ';' {
-		$$->group_l ()->accepts_str_arr_.push (*$3);
-		delete $3;
+	| translator_spec_body CONSISTS STRING semicolon {
+		dynamic_cast<Translator_group*> ($$)-> set_element (ly_scm2string ($3), true);
+	}
+	| translator_spec_body CONSISTSEND STRING semicolon {
+		dynamic_cast<Translator_group*> ($$)-> set_element (ly_scm2string ($3), true);
+	}
+	| translator_spec_body ACCEPTS STRING semicolon {
+		dynamic_cast<Translator_group*> ($$)-> set_acceptor (ly_scm2string ($3), true);
+	}
+	| translator_spec_body REMOVE STRING semicolon {
+		dynamic_cast<Translator_group*> ($$)-> set_element (ly_scm2string ($3), false);
 	}
 	;
 
@@ -447,26 +480,21 @@ translator_spec_body:
 	SCORE
 */
 score_block:
-	SCORE { THIS->remember_spot ();
-		THIS->error_level_i_ =0;
+	SCORE { 
 	}
 	/*cont*/ '{' score_body '}' 	{
 		$$ = $4;
-		$$->set_spot (THIS->pop_spot ());
 		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;
 	}
 	;
 
 score_body:		{
 		$$ = new Score;
+		$$->set_spot (THIS->here_input ());
 	}
 	| SCORE_IDENTIFIER {
-		$$ = $1->access_Score ();
+		$$ = $1->access_content_Score (true);
 	}
 	| score_body mudela_header 	{
 		$$->header_p_ = $2;
@@ -493,137 +521,160 @@ output_def:
 	}
 	;
 
-intastint_list:
-	/* */	{ $$ =new Array<int>; }
-	| intastint_list int '*' int	{
-		$$->push ($2); $$->push ($4);
-	}
-	| intastint_list int	{
-		$$->push ($2); $$->push (1);
-	}
-	;	
-
 
 /*
 	PAPER
 */
 paper_block:
-	PAPER '{' paper_body '}' 	{ 
+	PAPER '{' paper_def_body '}' 	{ 
 		$$ = $3;
 		THIS-> lexer_p_->scope_l_arr_.pop ();
 	}
 	;
 
-optional_semicolon:
-	/* empty */
-	| ';'
-	;
 
-paper_body:
+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_IDENTIFIER 	{
+		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_ = ly_scm2string ($5);
+		$$->set_lookup ($2, l);
 	}
-	| 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 ';' {
-		$$->shape_int_a_ = *$4;
-		delete $4;
+	| paper_def_body assignment semicolon {
+		
+	}
+	| paper_def_body SCM_T '=' SCM_T {
+		if (!gh_symbol_p ($2))
+			THIS->parser_error ("expect a symbol as lvalue");
+		else
+			$$->default_properties_[$2] = $4;
+	}
+	| paper_def_body SCM_T '=' real semicolon {
+		if (!gh_symbol_p ($2))
+			THIS->parser_error ("expect a symbol as lvalue");
+		else
+			$$->default_properties_[$2] = gh_double2scm ($4);
+	}
+	| paper_def_body translator_spec_block {
+		$$->assign_translator ($2);
 	}
-	| paper_body error {
+	| paper_def_body SHAPE real_array  semicolon {
+		/*
+			URG URG.
+		*/
+		if ($3->size () % 2)
+			warning (_ ("Need even number of args for shape array"));
+
+		for (int i=0; i < $3->size ();  i+=2)
+		{
+			Real l = $3->elem (i);
+			$$->shape_int_a_.push (Interval (l,
+							 l + $3->elem (i+1)));
+		}
+		delete $3;
+	}
+	| paper_def_body error {
 
 	}
 	;
 
-real_primary:
-	REAL		{
-		$$ = $1;
+
+
+real_with_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		{
+		$$ = $1;
 	}
-	| real '-' real_mult_expression {
-		$$ = $1 - $3;
+	| real_with_dimension
+	| REAL_IDENTIFIER		{
+		$$= *$1->access_content_Real (false);
 	}
-	;
-
-real_mult_expression:
-	real_primary
-	| real_mult_expression '*' real_primary {
+	| '-'  real %prec UNARY_MINUS {
+		$$ = -$2;
+	}
+	| real '*' real {
 		$$ = $1 * $3;
 	}
-	| real_mult_expression '/' real_primary {
+	| real '/' real {
 		$$ = $1 / $3;
 	}
+	| real '+' real {
+		$$ = $1  + $3;
+	}
+	| real '-' real {
+		$$ = $1 - $3;
+	}
+	| '(' real ')'	{
+		$$ = $2;
+	}
 	;
+		
 
-shape_array:
-	/* empty */ {
-		$$ = new Array<Interval>;
+real_array:
+	real {
+		$$ = new Array<Real>;
+		$$->push ($1);
+	}
+	|  /* empty */ {
+		$$ = new Array<Real>;
 	}
-	| shape_array dim dim {
-		$$->push(Interval($2, $2 + $3));
-	};
+	| real_array ',' real {
+		$$->push($3);
+	}
+	;
 
 /*
 	MIDI
 */
 midi_block:
 	MIDI
-
-	'{' midi_body '}' 	{ $$ = $3; }
+	'{' midi_body '}' 	{
+		$$ = $3;
+		THIS-> lexer_p_-> scope_l_arr_.pop();
+	}
 	;
 
 midi_body: /* empty */ 		{
-		$$ = THIS->default_midi_p ();
+		Midi_def * p =THIS->default_midi_p ();
+		$$ = p;
+		THIS->lexer_p_->scope_l_arr_.push (p->scope_p_);
 	}
-	| midi_body STRING '=' translator_spec	{
-		$$-> assign_translator (*$2, $4);
-		delete $2;
+	| MIDI_IDENTIFIER	{
+		Midi_def * p =$1-> access_content_Midi_def (true);
+		$$ = p;
+		THIS->lexer_p_->scope_l_arr_.push (p->scope_p_);
 	}
-	| midi_body OUTPUT STRING ';'	{
-		$$->outfile_str_ = *$3;
-		delete $3;
+	| midi_body assignment semicolon {
+
 	}
-	| midi_body tempo_request ';' {
-		$$->set_tempo ($2->dur_.length (), $2->metronome_i_);
+	| midi_body translator_spec_block	{
+		$$-> assign_translator ($2);
+	}
+	| midi_body tempo_request semicolon {
+		$$->set_tempo ($2->dur_.length_mom (), $2->metronome_i_);
 		delete $2;
 	}
 	| midi_body error {
@@ -632,7 +683,7 @@ midi_body: /* empty */ 		{
 	;
 
 tempo_request:
-	TEMPO entered_notemode_duration '=' unsigned	{
+	TEMPO steno_duration '=' unsigned	{
 		$$ = new Tempo_req;
 		$$->dur_ = *$2;
 		delete $2;
@@ -642,6 +693,7 @@ tempo_request:
 
 Music_list: /* empty */ {
 		$$ = new Music_list;
+		$$->set_spot (THIS->here_input ());
 	}
 	| Music_list Music {
 		$$->add_music ($2);
@@ -651,50 +703,153 @@ Music_list: /* empty */ {
 	;
 
 
-Sequential_music: '{' Music_list '}'		{
+Music:
+	Simple_music
+	| Composite_music
+	;
+
+Alternative_music:
+	/* empty */ {
+		$$ = 0;
+	}
+	| ALTERNATIVE Music_sequence {
+		$$ = $2;
+		$2->set_spot (THIS->here_input ());
+	}
+	;
+
+
+
+
+Repeated_music:
+	REPEAT STRING unsigned Music Alternative_music
+	{
+		Music_sequence* m = dynamic_cast <Music_sequence*> ($5);
+		if (m && $3 < m->length_i ())
+			$5->warning (_ ("More alternatives than repeats.  Junking excess alternatives."));
+
+		Repeated_music * r = new Repeated_music ($4, $3 >? 1, m);
+		$$ = r;
+		r->fold_b_ = (ly_scm2string ($2) == "fold");
+		r->volta_fold_b_ =  (ly_scm2string ($2) == "volta");
+		r->set_spot ($4->spot  ());
+	}
+	;
+
+Music_sequence: '{' Music_list '}'	{
+		$$ = new Music_sequence ($2);
+		$$->set_spot ($2->spot ());
+	}
+	;
+
+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 ());
 	}
 	;
-Music:
+
+Simple_music:
 	request_chord		{ $$ = $1; }
-	| TYPE STRING Music	{
-		$$ = $3;
-		$$->translator_type_str_ = *$2;
-		delete $2;
+	| MUSIC_IDENTIFIER { $$ = $1->access_content_Music (true); }
+	| property_def
+	| translator_change
+	| Simple_music '*' unsigned '/' unsigned 	{
+		$$ = $1;
+		$$->compress (Moment($3, $5 ));
 	}
-	| TYPE STRING '=' STRING Music {
-		$$ = $5;
-		$$->translator_type_str_ = *$2;
-		$$->translator_id_str_ = *$4;
-		delete $2;
-		delete $4;
+	| Simple_music '*' unsigned		 {
+		$$ = $1;
+		$$->compress (Moment ($3, 1));
 	}
+	;
+
+
+Composite_music:
+	CONTEXT STRING Music	{
+		Context_specced_music *csm =  new Context_specced_music ($3);
+
+		csm->translator_type_str_ = ly_scm2string ($2);
+		csm->translator_id_str_ = "";
+
+
+		$$ = 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_ = ly_scm2string ($2);
+		csm->translator_id_str_ = ly_scm2string ($4);
+
+		$$ = csm;
+	}
+	| TIMES {
+		THIS->remember_spot ();
+	}
+	/* CONTINUED */ 
+		unsigned '/' unsigned Music 	
+
+	{
+		$$ = new Time_scaled_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 (); }
-	| MELODIC
+	| 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; }
+	| re_rhythmed_music	{ $$ = $1; } 
 	;
 
 relative_music:
@@ -704,91 +859,144 @@ relative_music:
 	}
 	;
 
+re_rhythmed_music:
+	ADDLYRICS Music Music {
+		Lyric_combine_music * l = new Lyric_combine_music ($2, $3);
+		$$ = l;
+	}
+	;
+
 translator_change:
 	TRANSLATOR STRING '=' STRING  {
 		Change_translator * t = new Change_translator;
-		t-> change_to_type_str_ = *$2;
-		t-> change_to_id_str_ = *$4;
+		t-> change_to_type_str_ = ly_scm2string ($2);
+		t-> change_to_id_str_ = ly_scm2string ($4);
 
 		$$ = t;
 		$$->set_spot (THIS->here_input ());
-		delete $2;
-		delete $4;
 	}
 	;
 
 property_def:
-	PROPERTY STRING '.' STRING '=' scalar	{
+	PROPERTY STRING '.' STRING '='  scalar {
 		Translation_property *t = new Translation_property;
-		t-> translator_type_str_ = *$2;
-		t-> var_str_ = *$4;
-		t-> value_ = *$6;
-		$$ = t;
+
+		t->var_str_ = ly_scm2string ($4);
+		t->value_ = $6;
+
+		Context_specced_music *csm = new Context_specced_music (t);
+		$$ = csm;
 		$$->set_spot (THIS->here_input ());
-		delete $2;
-		delete $4;
-		delete $6;
+
+		csm-> translator_type_str_ = ly_scm2string ($2);
 	}
 	;
 
 scalar:
-	STRING		{ $$ = new Scalar (*$1); delete $1; }
-	| int		{ $$ = new Scalar ($1); }
-	;
-
-
-transposed_music:
-	TRANSPOSE musical_pitch Music {
-		$$ = $3;
-		$$ -> transpose (*$2);
-		delete $2;
-	}
+	string		{ $$ = $1; }
+	| int		{ $$ = gh_int2scm ($1); }
+	| embedded_scm 	{ $$ = $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
 	;
 
-
-
-
 command_element:
 	command_req {
 		$$ = new Request_chord;
 		$$-> set_spot (THIS->here_input ());
 		$1-> set_spot (THIS->here_input ());
 		((Simultaneous_music*)$$) ->add_music ($1);//ugh
-
+	}
+	| PARTIAL duration_length ';' 	{
+		Translation_property * p = new Translation_property;
+		p->var_str_ = "measurePosition";
+		p->value_ =  (new Moment (-$2->length_mom ()))->smobify_self ();
+		delete $2;
+		Context_specced_music * sp = new Context_specced_music (p);
+		$$ =sp ;
+		sp-> translator_type_str_ = "Score";
 	}
 	;
 
 command_req:
 	abbrev_command_req
-	| verbose_command_req ';'	{ $$ = $1; }
+	| verbose_command_req semicolon	{ $$ = $1; }
 	;
 
 abbrev_command_req:
-	'|'				{
+	extender_req {
+		$$ = $1;
+	}
+	| hyphen_req {
+		$$ = $1;
+	}
+	| '|'				{
 		$$ = new Barcheck_req;
 	}
-	| COMMAND_IDENTIFIER	{
-		$$ = $1->access_Request ();
+	| '~'	{
+		$$ = new Tie_req;
+	}
+	| '['		{
+		Span_req*b= new Span_req;
+		b->span_dir_ = START;
+		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;
+	}
+	| ']'		{
+		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));
@@ -799,10 +1007,10 @@ verbose_command_req:
 		m->one_beat_i_=$4;
 		$$ = m;
 	}
-	| PENALTY '=' int	{
+	| PENALTY int 	{
 		Break_req * b = new Break_req;
-		b->penalty_i_ = $3;
-		b-> set_spot (THIS->here_input ());
+		b->penalty_f_ = $2 / 100.0;
+		b->set_spot (THIS->here_input ());
 		$$ = b;
 	}
 	| SKIP duration_length {
@@ -814,75 +1022,109 @@ verbose_command_req:
 	| tempo_request {
 		$$ = $1;
 	}
-	| CADENZA unsigned	{
-		$$ = new Cadenza_req ($2);
-	}
-	| PARTIAL duration_length 	{
-		$$ = new Partial_measure_req ($2->length ());
-		delete $2;
-	}
 	| CLEF STRING {
-		$$ = new Clef_change_req (*$2);
-		delete $2;
+		$$ = new Clef_change_req (ly_scm2string ($2));
+
 	}
-	| KEY NOTENAME_PITCH 	{
+/* UGH. optional.  */
+	| 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->key_.pitch_arr_.push (*$2);
+		key_p->key_.ordinary_key_b_ = true;
+		key_p->key_.modality_i_ = $3;
 		$$ = 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->key_.pitch_arr_ = *$2;
+		key_p->key_.ordinary_key_b_ = false;
 		$$ = key_p;
 		delete $2;
 	}
-	| GROUPING intastint_list {
-		$$ = get_grouping_req (*$2); 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);
+		$$->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;
+	;
+
+post_request:
+	verbose_request
+	| request_with_dir
+	| close_request
+	;
+
+
+request_that_take_dir:
+	gen_text_def
+	| verbose_request
+	| script_abbreviation {
+		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);
+		$$ = a;
 	}
 	;
 
-structured_post_request:
-	script_req
-	| post_request
+request_with_dir:
+	script_dir request_that_take_dir	{
+		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;
+	}
 	;
+	
+verbose_request:
+	REQUEST_IDENTIFIER	{
+		$$ = (Request*)$1->access_content_Request (true);
+		$$->set_spot (THIS->here_input ());
+	}
+	| TEXTSCRIPT STRING STRING 	{
+		Text_script_req *ts_p = new Text_script_req;
+		ts_p-> text_str_ = ly_scm2string ($2);
+		ts_p-> style_str_ = ly_scm2string ($3);
+		ts_p->set_spot (THIS->here_input ());
 
-post_request:
-	POST_REQUEST_IDENTIFIER	{
-		$$ = (Request*)$1->access_Request ();
+		$$ = ts_p;
 	}
-	| dynamic_req {
-		$$ = $1;
+	| SPANREQUEST int STRING {
+		Span_req * sp_p = new Span_req;
+		sp_p-> span_dir_  = Direction($2);
+		sp_p->span_type_str_ = ly_scm2string ($3);
+		sp_p->set_spot (THIS->here_input ());
+		$$ = sp_p;
 	}
 	| abbrev_type	{
-		Abbreviation_req* a = new Abbreviation_req;
+		Tremolo_req* a = new Tremolo_req;
+		a->set_spot (THIS->here_input ());
 		a->type_i_ = $1;
 		$$ = a;
 	}
+	| SCRIPT STRING 	{ 
+		Articulation_req * a = new Articulation_req;
+		a->articulation_str_ = ly_scm2string ($2);
+		a->set_spot (THIS->here_input ());
+		$$ = a;
+
+	}
+	;
+
+optional_modality:
+	/* empty */	{
+		$$ = 0;
+	}
+	| int	{
+		$$ = $1;
+	}
 	;
 
 sup_quotes:
@@ -893,6 +1135,7 @@ sup_quotes:
 		$$ ++;
 	}
 	;
+
 sub_quotes:
 	',' {
 		$$ = 1;
@@ -916,202 +1159,127 @@ 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 int int '}'	{/* ugh */
+	MUSICAL_PITCH '{' int_list '}'	{/* ugh */
+		Array<int> &a = *$3;
+		ARRAY_SIZE(a,3);
 		$$ = new Musical_pitch;
-		$$->octave_i_ = $3;
-		$$->notename_i_ = $4;
-		$$->accidental_i_ = $5;
+		$$->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;
-		
-		$$->pitch_ = *$1;
-		delete $1;
+musical_pitch:
+	steno_musical_pitch {
+		$$ = $1;
+		THIS->set_last_pitch ($1);
 	}
-	| steno_notepitch  '!' 		{
-		$$->forceacc_b_ = ! $$->forceacc_b_;
+	| explicit_musical_pitch {
+		$$ = $1;
+		THIS->set_last_pitch ($1);
 	}
 	;
 
-
 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];
 
-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;
+		delete &a;		
 	}
 	;
 
-plet_fraction:
-	unsigned '/' unsigned {
-		$$[0] = $1;
-		$$[1] = $3;
-	}
-	|
-	'/' unsigned {
-		int num = $2 >? 1;
-		$$[0] = guess_plet_a[(num <? GUESS_PLET) - 1];
-		$$[1] = num;
+extender_req:
+	EXTENDER {
+		if (!THIS->lexer_p_->lyric_state_b ())
+			THIS->parser_error (_ ("Have to be in Lyric mode for lyrics"));
+		$$ = new Extender_req;
 	}
 	;
 
-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_;
+hyphen_req:
+	HYPHEN {
+		if (!THIS->lexer_p_->lyric_state_b ())
+			THIS->parser_error (_ ("Have to be in Lyric mode for lyrics"));
+		$$ = new Hyphen_req;
 	}
 	;
 
-close_request_parens:
-	'~'	{
-		$$ = '~';
-	}
-	| '('	{
-		$$='(';
+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;
-	}
-	;
-
-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;
+		Span_req* s= new Span_req;
+		$$ = s;
+		s->span_type_str_ = "slur";
 	}
 	;
 
-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;
+		t->text_str_ = ly_scm2string ($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";
@@ -1120,41 +1288,39 @@ finger:
 	;
 
 script_abbreviation:
-	'^'		{ $$ = get_scriptdef ('^'); }
-	| '+'		{ $$ = get_scriptdef ('+'); }
-	| '-'		{ $$ = get_scriptdef ('-'); }
- 	| '|'		{ $$ = get_scriptdef ('|'); }
-	| 'o'		{ $$ = get_scriptdef ('o'); }
-	| '>'		{ $$ = get_scriptdef ('>'); }
+	'^'		{
+		$$ = gh_str02scm  ("hat");
+	}
+	| '+'		{
+		$$ = gh_str02scm("plus");
+	}
+	| '-' 		{
+		$$ = gh_str02scm ("dash");
+	}
+ 	| '|'		{
+		$$ = gh_str02scm ("bar");
+	}
+	| '>'		{
+		$$ = gh_str02scm ("larger");
+	}
 	| '.' 		{
-		$$ = get_scriptdef ('.');
+		$$ = gh_str02scm ("dot");
 	}
 	;
 
-mudela_script:
-	SCRIPT_IDENTIFIER		{ $$ = $1->access_General_script_def (true); }
-	| script_definition		{ $$ = $1; }
-	| script_abbreviation		{
-		$$ = THIS->lexer_p_->lookup_identifier (*$1)->access_General_script_def (true);
-		delete $1;
-	}
-	;
 
 script_dir:
-	'_'	{ $$ = -1; }
-	| '^'	{ $$ = 1; }
-	| '-'	{ $$ = 0; }
+	'_'	{ $$ = DOWN; }
+	| '^'	{ $$ = UP; }
+	| '-'	{ $$ = CENTER; }
 	;
 
 pre_requests:
 	{
+		$$ = 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);
 	}
 	;
 
@@ -1168,28 +1334,25 @@ 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		{
-		$$ = new Duration (THIS->default_duration_);
-		$$->dots_i_  = $1;
-	}
-	| steno_duration	{
+	steno_duration	{
 		THIS->set_last_duration ($1);
 	}
 	;
 
-notemode_duration:
-	entered_notemode_duration {
+optional_notemode_duration:
+	{
+		$$ = new Duration (THIS->default_duration_);
+	}
+	| entered_notemode_duration {
 		$$ = $1;
 	}
 	;
@@ -1201,21 +1364,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;
-	}
 	;
 
 
@@ -1227,26 +1383,47 @@ abbrev_type:
 		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:
-	steno_notepitch notemode_duration  {
+	musical_pitch exclamations questions optional_notemode_duration {
 		if (!THIS->lexer_p_->note_state_b ())
-			THIS->parser_error (_ ("have to be in Note mode for notes"));
-		$1->set_duration (*$2);
-		int durlog_i = $2->durlog_i_;
-		$$ = THIS->get_note_element ($1, $2);
+			THIS->parser_error (_ ("Have to be in Note mode for notes"));
+
+
+		Note_req *n = new Note_req;
+		
+		n->pitch_ = *$1;
+		delete $1;
+		n->duration_ = *$4;
+		delete $4;
+		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_;
+
+		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);
-		delete $1;  // delete notename
+	| RESTNAME optional_notemode_duration		{
+		$$ = THIS->get_rest_element (ly_scm2string ($1), $2);
+
 	}
-	| MEASURES notemode_duration  	{
+	| MEASURES optional_notemode_duration  	{
 		Multi_measure_rest_req* m = new Multi_measure_rest_req;
 		m->duration_ = *$2;
 		delete $2;
@@ -1255,16 +1432,120 @@ simple_element:
 		velt_p->set_spot (THIS->here_input ());
 		velt_p->add_music (m);
 		$$ = velt_p;
+	}
+	| REPETITIONS optional_notemode_duration  	{
+		Repetitions_req* r = new Repetitions_req;
+		r->duration_ = *$2;
+		delete $2;
 
+		Simultaneous_music*velt_p = new Request_chord;
+		velt_p->set_spot (THIS->here_input ());
+		velt_p->add_music (r);
+		$$ = velt_p;
 	}
-	| STRING notemode_duration 			{
+	| STRING optional_notemode_duration 	{
 		if (!THIS->lexer_p_->lyric_state_b ())
-			THIS->parser_error (_ ("have to be in Lyric mode for lyrics"));
-		$$ = THIS->get_word_element (*$1, $2);
-		delete $1;
+			THIS->parser_error (_ ("Have to be in Lyric mode for lyrics"));
+		$$ = 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"));
+		$$ = $1;
 	}
 	;
 
+chord:
+	steno_tonic_pitch optional_notemode_duration chord_additions chord_subtractions chord_inversion chord_bass {
+                $$ = THIS->get_chord (*$1, $3, $4, $5, $6, *$2);
+        };
+
+chord_additions: 
+	{
+		$$ = new Array<Musical_pitch>;
+	} 
+	| CHORD_COLON chord_notes {
+		$$ = $2;
+	}
+	;
+
+chord_notes:
+	chord_step {
+		$$ = $1
+	}
+	| chord_notes '.' chord_step {
+		$$ = $1;
+		$$->concat (*$3);
+	}
+	;
+
+chord_subtractions: 
+	{
+		$$ = new Array<Musical_pitch>;
+	} 
+	| CHORD_CARET chord_notes {
+		$$ = $2;
+	}
+	;
+
+
+chord_inversion:
+	{
+		$$ = 0;
+	}
+	| '/' steno_tonic_pitch {
+		$$ = $2;
+		$$->set_spot (THIS->here_input ());
+	}
+	;
+
+chord_bass:
+	{
+		$$ = 0;
+	}
+	| CHORD_BASS steno_tonic_pitch {
+		$$ = $2;
+		$$->set_spot (THIS->here_input ());
+	}
+	;
+
+chord_step:
+	chord_note {
+		$$ = new Array<Musical_pitch>;
+		$$->push (*$1);
+	}
+	| CHORDMODIFIER_PITCH {
+		$$ = new Array<Musical_pitch>;
+		$$->push (*$1);
+	}
+	| CHORDMODIFIER_PITCH chord_note { /* Ugh. */
+		$$ = new Array<Musical_pitch>;
+		$$->push (*$1);
+		$$->push (*$2);
+	}
+	;
+
+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 CHORD_MINUS {
+		$$ = new Musical_pitch;
+		$$->notename_i_ = ($1 - 1) % 7;
+		$$->octave_i_ = $1 > 7 ? 1 : 0;
+		$$->accidental_i_ = -1;
+	}
+        ;
 
 /*
 	UTILITIES
@@ -1278,13 +1559,24 @@ pitch_list:			{
 	}
 	;
 
+
+int_list:
+	/**/			{
+		$$ = new Array<int>
+	}
+	| int_list int 		{
+		$$->push ($2);		
+	}
+	;
+
 unsigned:
 	UNSIGNED	{
 		$$ = $1;
 	}
-	| DIGIT {
+	| DIGIT		{
 		$$ = $1;
-	};
+	}
+	;
 
 int:
 	unsigned {
@@ -1294,112 +1586,38 @@ int:
 		$$ = -$2;
 	}
 	| INT_IDENTIFIER	{
-		int *i_p = $1->access_int ();
-		$$ = *i_p;
-		delete i_p;
+		$$ = *$1->access_content_int (false);
 	}
 	;
 
-string_primary:
-	STRING		{
-		$$ = $1;
-	}
-	| STRING_IDENTIFIER	{
-		String *s_p = $1->access_String ();
-
-		$$ = s_p;
-		DOUT << "Lookup string: " << *s_p << "\n";
-	}
-	;
 
 string:
-	string_primary {
+	STRING		{
 		$$ = $1;
 	}
-	| string '+' string_primary {
-		*$$ += *$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;
+	| STRING_IDENTIFIER	{
+		$$ = ly_str02scm ($1->access_content_String (true)->ch_C ());
 	}
-	| symtables_body STRING '=' symtable		{
-		$$->add (*$2, $4);
-		delete $2;
+	| string '+' string {
+		$$ = scm_string_append (scm_listify ($1, $3, SCM_UNDEFINED));
 	}
 	;
 
-symtable:
-	TABLE '{' symtable_body '}' { $$ = $3; }
-	;
 
-symtable_body:
-				{ $$ = new Symtable; }
-	| symtable_body	STRING	symboldef {
-		$$->add (*$2, *$3);
-		delete $2;
-		delete $3;
-	}
+exclamations:
+		{ $$ = 0; }
+	| exclamations '!'	{ $$ ++; }
 	;
 
-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;
-	}
+questions:
+		{ $$ = 0; }
+	| questions '?'	{ $$ ++; }
 	;
 
-box:
-	dinterval dinterval 	{
-		$$ = new Box (*$1, *$2);
-		delete $1;
-		delete $2;
-	}
-	;
 
-dinterval: dim	dim		{
-		$$ = new Interval ($1, $2);
-	}
+semicolon:
+	';'
 	;
-
 %%
 
 void
@@ -1415,3 +1633,4 @@ My_lily_parser::do_yyparse ()
 	yyparse ((void*)this);
 }
 
+