From: fred <fred>
Date: Sun, 24 Mar 2002 19:32:56 +0000 (+0000)
Subject: lilypond-0.0.34
X-Git-Tag: release/1.5.59~5322
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=e693c845a798c15d25d493b8abd139c5eead9e83;p=lilypond.git

lilypond-0.0.34
---

diff --git a/src/parser.y b/src/parser.y
index f761069e3e..d065f19cae 100644
--- a/src/parser.y
+++ b/src/parser.y
@@ -39,7 +39,7 @@ int fatal_error_i = 0;
     String *string;
     const char *consstr;
     Paperdef *paper;
-    Mididef* midi;
+    Midi_def* midi;
     Input_music *music;
     Music_general_chord *chord;
     Music_voice *mvoice; 
@@ -201,7 +201,7 @@ score_block:
 	/*cont*/ '{' score_body '}' 	{
 		$$ = $4;
 		$$->defined_ch_c_l_ = define_spots.pop();
-		if (!$$->paper_p_)
+		if (!$$->paper_p_ && ! $$->midi_p_)
 			$$->paper_p_ = default_paper();
 
 		/* handle error levels. */
@@ -267,7 +267,7 @@ midi_block:
 	;
 
 midi_body: { 
-		$$ = new Mididef; 
+		$$ = new Midi_def; 
 	}
 	| midi_body OUTPUT STRING	{ 
 		$$->outfile_str_ = *$3; 
@@ -300,9 +300,6 @@ staff_init:
 		$$ = new Input_staff(*$1);
 		delete $1;
 	}
-	| MIDI		{
-		$$ = new Input_staff("midi");
-	}
 	;
 
 staff_body: