From: fred <fred>
Date: Sun, 24 Mar 2002 19:47:14 +0000 (+0000)
Subject: lilypond-0.0.73pre
X-Git-Tag: release/1.5.59~4503
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=7faaa001f479b8616fcb6e9318a0449333904a60;p=lilypond.git

lilypond-0.0.73pre
---

diff --git a/init/engraver.ini b/init/engraver.ini
index 086e378ae1..d0a6f457bc 100644
--- a/init/engraver.ini
+++ b/init/engraver.ini
@@ -3,14 +3,15 @@
 %
 
 \requestengraver {
-	 "Score_engraver"
+	"Score_engraver"
 	\alias "Score";
-%	\consists "Score_bar_engraver";
 	\consists "Bar_align_engraver";
 	\consists "Clef_align_engraver";
 	\consists "Key_align_engraver";
 	\consists "Meter_align_engraver";
 	\consists "Score_horizontal_align_engraver";
+	\consists "Vertical_align_engraver";
+	\consists "Span_bar_engraver";
 
 	\contains\requestengraver {
 		"Staff_engravers"
@@ -32,7 +33,7 @@
 			\consists "Note_column_engraver";
 			\consists "Slur_engraver";
 			\contains \requestengraver {
-				 "Voice_engravers"
+				"Engraver_group_engraver"
 				\alias "Voice";
 				\consists "Note_head_engraver" ;
 				\consists "Tie_engraver";
@@ -47,7 +48,7 @@
 			"Voice_group_engravers"
 			\alias "Voice_group";
 			\contains\requestengraver{
-				"Voice_engravers"
+				"Engraver_group_engraver"
 				\consists "Lyric_engraver";
 				\consists "Swallow_engraver";
 			}
diff --git a/input/multi.ly b/input/multi.ly
index 275db41102..02b1dcfaf6 100644
--- a/input/multi.ly
+++ b/input/multi.ly
@@ -19,7 +19,7 @@ EndMudelaHeader
 		{ \octave c'; c4 c4 
 			< \multi 1;  { c2 c2 } { c'2 c'2 } > 
 			< \multi 2;  { \stem -1; c2 c2 } { \stem 1; c'2 c'2 } > 
-			< \multi 3;  { \clef "bass"; c2 c2 } { \bar "||"; \key cis ; c'2 c'2 } > 
+			< \multi 3;  { \clef "bass"; c2 c2 } { \meter 2/4;\bar "||"; \key fis cis gis; c'2 c'2 } > 
 	 			c2 c1 
 
 		}
diff --git a/lily/score-align-grav.cc b/lily/score-align-grav.cc
index 79ab3ca962..b56e6777c2 100644
--- a/lily/score-align-grav.cc
+++ b/lily/score-align-grav.cc
@@ -30,7 +30,7 @@ Score_align_engraver::do_pre_move_processing()
 void
 Score_align_engraver::acknowledge_element(Score_elem_info inf)
 {
-    if (inf.elem_l_->name() == type_ch_C_ ) {
+    if (inf.elem_l_->is_type_b(type_ch_C_ )) {
 	
 	if (! align_p_ ) {
 	    align_p_ = new Horizontal_group_item;
@@ -42,4 +42,4 @@ Score_align_engraver::acknowledge_element(Score_elem_info inf)
 }
 
 IMPLEMENT_STATIC_NAME(Score_align_engraver)
-IMPLEMENT_IS_TYPE_B1(Score_align_engraver,Request_engraver);
+IMPLEMENT_IS_TYPE_B1(Score_align_engraver,Engraver);
diff --git a/lily/score-halign-grav.cc b/lily/score-halign-grav.cc
index 24116b2233..15d266599a 100644
--- a/lily/score-halign-grav.cc
+++ b/lily/score-halign-grav.cc
@@ -29,7 +29,7 @@ Score_horizontal_align_engraver::do_pre_move_processing()
 void
 Score_horizontal_align_engraver::acknowledge_element(Score_elem_info i)
 {
-    Request_engraver* reg = i.origin_grav_l_arr_[0];
+    Engraver* reg = i.origin_grav_l_arr_[0];
     if (reg->is_type_b( 
 	Score_align_engraver::static_name()) )
     {
@@ -46,5 +46,5 @@ Score_horizontal_align_engraver::acknowledge_element(Score_elem_info i)
     }
 }
 IMPLEMENT_STATIC_NAME(Score_horizontal_align_engraver);
-IMPLEMENT_IS_TYPE_B1(Score_horizontal_align_engraver,Request_engraver);
+IMPLEMENT_IS_TYPE_B1(Score_horizontal_align_engraver,Engraver);
 ADD_THIS_ENGRAVER(Score_horizontal_align_engraver);