lilypond-1.2.15

diff --git a/lily/midi-def.cc b/lily/midi-def.cc
index 5bda659f5dd62d5a76fd7ed9a924c0a41cf54aff..47899ae06640c4c2ff45302ca4752ebdfd5b162b 100644 (file)
--- a/lily/midi-def.cc
+++ b/lily/midi-def.cc
@@ -59,10 +59,10 @@ void
 Midi_def::print() const
 {
 #ifndef NPRINT
+  DEBUG_OUT << "MIDI {\n";
   Music_output_def::print ();
-  DEBUG_OUT << "Midi {";
   DEBUG_OUT << "4/min: " << Moment (60) / (whole_in_seconds_mom_ * Moment (4));
-  DEBUG_OUT << "}\n";
+  DEBUG_OUT << "}\n";  
 #endif
 }
 

diff --git a/lily/parser.yy b/lily/parser.yy
index feb3ae516ee5759604babdb716a40d984e357c21..4d84041f3866a08ff32d687678451aacae4409fe 100644 (file)
--- a/lily/parser.yy
+++ b/lily/parser.yy
@@ -652,15 +652,21 @@ real_array:
 */
 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_IDENTIFIER       {
-               $$ = $1-> access_content_Midi_def (true);
+               Midi_def * p =$1-> access_content_Midi_def (true);
+               $$ = p;
+               THIS->lexer_p_->scope_l_arr_.push (p->scope_p_);
        }
        | midi_body assignment semicolon {
 
@@ -1002,10 +1008,10 @@ verbose_command_req:
                m->one_beat_i_=$4;
                $$ = m;
        }
-       | PENALTY int   {
+       | PENALTY int   {
                Break_req * b = new Break_req;
-               b->penalty_i_ = $2;
-               b-> set_spot (THIS->here_input ());
+               b->penalty_f_ = $2 / 100.0;
+               b->set_spot (THIS->here_input ());
                $$ = b;
        }
        | SKIP duration_length {