lilypond-0.0.70pre

diff --git a/lily/include/score-align-reg.hh b/lily/include/score-align-reg.hh
index 533e47103c9c72810ebc9ba7cb87a7bc91a3407c..3f7e15ca4f793c6d68c82063f68271f40f19c454 100644 (file)
--- a/lily/include/score-align-reg.hh
+++ b/lily/include/score-align-reg.hh
@@ -14,12 +14,12 @@
 
 class Score_align_register: public Request_register
 {
-    
-    const char* type_ch_C_;
     Horizontal_group_item  * align_p_;
 public:
+    
+    const char* type_ch_C_;
     int priority_i_;
-    Score_align_register(char const*);
+    Score_align_register();
     NAME_MEMBERS();
 protected:
     virtual void acknowledge_element(Score_elem_info);

diff --git a/lily/score-align-reg.cc b/lily/score-align-reg.cc
index 74af8c27bb6afcf4be2e6ee561d8a81bf39b95d8..3b118dbb21a9fdc0d106d2c8fdc8195a4eaec1ef 100644 (file)
--- a/lily/score-align-reg.cc
+++ b/lily/score-align-reg.cc
@@ -11,9 +11,9 @@
 #include "score-align-reg.hh"
 #include "item.hh"
 
-Score_align_register::Score_align_register(const char *nm)
+Score_align_register::Score_align_register()
 {
-    type_ch_C_ = nm;
+    type_ch_C_ = 0;
     priority_i_ =0;
     align_p_=0;
 }
@@ -31,6 +31,7 @@ void
 Score_align_register::acknowledge_element(Score_elem_info inf)
 {
     if (inf.elem_l_->name() == type_ch_C_ ) {
+       
        if (! align_p_ ) {
            align_p_ = new Horizontal_group_item;
            announce_element(Score_elem_info(align_p_,0));

diff --git a/lily/score-align-regs.cc b/lily/score-align-regs.cc
index 526b9a711fd90ae97cc24c299207f144eab03597..bde475795c7105b07ba1e476db30688a8c4fe446 100644 (file)
--- a/lily/score-align-regs.cc
+++ b/lily/score-align-regs.cc
@@ -17,7 +17,8 @@ class C ## _align_register : public Score_align_register              \
 {                                                                      \
 public:                                                                        \
     NAME_MEMBERS();                                                    \
-    C ## _align_register() : Score_align_register(T::static_name()) {\
+    C ## _align_register() : Score_align_register() \
+    { type_ch_C_ = T::static_name();\
     priority_i_ = p;}  \
 };                                                                     \
 IMPLEMENT_STATIC_NAME(C ## _align_register)    ;                       \