lilypond-0.0.50

diff --git a/init/register.ini b/init/register.ini
index b8447d2dc4f0429bc98f20aa93eb4562f57e0fa1..e5822087ba5e56a8cdd2a627736446a975549a9c 100644 (file)
--- 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 fc1aef825b00ad80e76e6d03eed287d6822a6a78..f5687a166503e6a74592d62995bde7145e06a044 100644 (file)
--- 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 24e09501e360ed3f35f8ff9d7bdba51e22837c6a..25b8281ebd7039871bc5502204eb77d06e747681 100644 (file)
--- 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 0694a3b83f3fefc007d4dc7fc45ae1ce2e849703..dbff99f0a11334750e4678d340241491bb8edf85 100644 (file)
--- 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 caf3e524a66e8539a790e0a60a2074526f510caf..6af18c1c8b4c5e5f347aa08bd1a5fbe73da254d9 100644 (file)
--- 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 8acf6a1fec944100ff2276340d20ccd8c84498f2..0921ef27f077b0507de63433fcb8fbdd62b1fdb0 100644 (file)
--- 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 1bb9db32d4224379d12ad0726c99e38f7d133413..c0465584928437002d577e9ee2f01a4c6a1b682c 100644 (file)
--- 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;