From: fred <fred>
Date: Sun, 24 Mar 2002 19:38:55 +0000 (+0000)
Subject: lilypond-0.0.50
X-Git-Tag: release/1.5.59~4979
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=e59f28f7334c682b6ec38c0a46d46d36155411b7;p=lilypond.git

lilypond-0.0.50
---

diff --git a/init/register.ini b/init/register.ini
index b8447d2dc4..e5822087ba 100644
--- a/init/register.ini
+++ b/init/register.ini
@@ -14,6 +14,7 @@ melodicregs = \inputregister {
 		\inputregister { Stem_beam_register }
 		\inputregister { Text_register }
 		\inputregister { Script_register }
+		\inputregister { Note_column_register }
 		\inputregister { Voice_registers
 			\inputregister { Notehead_register }
 			\inputregister { Slur_register }
diff --git a/lily/clef-reg.cc b/lily/clef-reg.cc
index fc1aef825b..f5687a1665 100644
--- a/lily/clef-reg.cc
+++ b/lily/clef-reg.cc
@@ -50,7 +50,7 @@ Clef_register::read_req(Clef_change_req*c_l)
 void
 Clef_register::acknowledge_element(Staff_elem_info info)
 {
-    if (info.elem_p_->name() == Bar::static_name()) {
+    if (info.elem_l_->name() == Bar::static_name()) {
 	if (!clef_p_){
 	    create_clef();
 	    clef_p_->change = false;
diff --git a/lily/include/staff-elem-info.hh b/lily/include/staff-elem-info.hh
index 24e09501e3..25b8281ebd 100644
--- a/lily/include/staff-elem-info.hh
+++ b/lily/include/staff-elem-info.hh
@@ -15,7 +15,7 @@
 
 /// data container.
 struct Staff_elem_info {
-    Staff_elem * elem_p_;
+    Staff_elem * elem_l_;
     Request*req_l_;
     Voice const * voice_l_;
     Array<Request_register*> origin_reg_l_arr_;
diff --git a/lily/key-reg.cc b/lily/key-reg.cc
index 0694a3b83f..dbff99f0a1 100644
--- a/lily/key-reg.cc
+++ b/lily/key-reg.cc
@@ -44,7 +44,7 @@ Key_register::acknowledge_element(Staff_elem_info info)
 	change_key_b_ = true;
     }
     
-    if (info.elem_p_->name() == Bar::static_name()) 
+    if (info.elem_l_->name() == Bar::static_name()) 
 	default_key_b_ = true;
 
 }
diff --git a/lily/local-key-reg.cc b/lily/local-key-reg.cc
index caf3e524a6..6af18c1c8b 100644
--- a/lily/local-key-reg.cc
+++ b/lily/local-key-reg.cc
@@ -36,7 +36,7 @@ Local_key_register::acknowledge_element(Staff_elem_info info)
 	if( note_l_->forceacc_b_ ||
 	    local_key_.oct(note_l_->octave_i_).acc(note_l_->notename_i_)
 	    != note_l_->accidental_i_) {
-	    Item * support_l_ = info.elem_p_->item();
+	    Item * support_l_ = info.elem_l_->item();
 	
 
 	    if (!key_item_p_) {
@@ -48,7 +48,7 @@ Local_key_register::acknowledge_element(Staff_elem_info info)
 	    local_key_.oct(note_l_->octave_i_)
 		.set(note_l_->notename_i_, note_l_->accidental_i_);
 	}
-    } else if (info.elem_p_->name()==Key_item::static_name()) { 
+    } else if (info.elem_l_->name()==Key_item::static_name()) { 
 	Key_register * key_reg_l =
 	    (Key_register*)info.origin_reg_l_arr_[0];
 	key_C_ = &key_reg_l->key_;
diff --git a/lily/slur-reg.cc b/lily/slur-reg.cc
index 8acf6a1fec..0921ef27f0 100644
--- a/lily/slur-reg.cc
+++ b/lily/slur-reg.cc
@@ -37,8 +37,8 @@ Slur_register::try_request(Request *req_l)
 void
 Slur_register::acknowledge_element(Staff_elem_info info)
 {
-    if (info.elem_p_->name() == Notehead::static_name()) { 
-	Notehead *head_p =(Notehead*) info.elem_p_ ;// ugh
+    if (info.elem_l_->name() == Notehead::static_name()) { 
+	Notehead *head_p =(Notehead*) info.elem_l_ ;// ugh
 	for (int i = 0; i < slur_l_stack_.size(); i++)
 	    slur_l_stack_[i]->add(head_p );
 	for (int i = 0; i < end_slur_l_arr_.size(); i++)
diff --git a/lily/staff-elem-info.cc b/lily/staff-elem-info.cc
index 1bb9db32d4..c046558492 100644
--- a/lily/staff-elem-info.cc
+++ b/lily/staff-elem-info.cc
@@ -11,14 +11,14 @@
 
 Staff_elem_info::Staff_elem_info(Staff_elem*s_l, Request*r_l)
 {
-    elem_p_ = s_l;
+    elem_l_ = s_l;
     voice_l_ =  (r_l)?r_l->voice_l():0;
     req_l_ = r_l;
 }
 
 Staff_elem_info::Staff_elem_info()
 {
-    elem_p_ = 0;
+    elem_l_ = 0;
     voice_l_ = 0;
 
     req_l_ = 0;