release: 0.0.34

[lilypond.git] / src / parser.y

diff --git a/src/parser.y b/src/parser.y
index f761069e3e7b8c7a1efa1502891dc7f18ae4b925..d065f19cae89b1209754f347b42bceaef4c91dba 100644 (file)
--- 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: