From 129bc2cb7ee90d6a1cb5c2a82d911453e481d790 Mon Sep 17 00:00:00 2001
From: fred <fred>
Date: Mon, 18 Oct 1999 13:18:25 +0000
Subject: [PATCH] lilypond-1.2.15

---
 lily/midi-def.cc |  4 ++--
 lily/parser.yy   | 20 +++++++++++++-------
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/lily/midi-def.cc b/lily/midi-def.cc
index 5bda659f5d..47899ae066 100644
--- 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 feb3ae516e..4d84041f38 100644
--- 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 {
-- 
2.11.4.GIT