lilypond-0.0.44

diff --git a/Documentation/CodingStyle.pod b/Documentation/CodingStyle.pod
index 66ee04705f59eff746f3ebbdfc1ec86ae65bc0ef..2f65fb775ebbc3235b9aa8b2d1fddc66965bbb2b 100644 (file)
--- a/Documentation/CodingStyle.pod
+++ b/Documentation/CodingStyle.pod
@@ -311,6 +311,12 @@ user built array.
 
 const. Note that the proper order C<Type const> i.s.o. C<const Type>
 
+=item C<C>
+
+A const pointer. This would be equivalent to C<_c_l>, but since any
+"const" pointer has to be a link (you can't delete a const pointer),
+it is superfluous.
+
 =item C<l>
 
 temporary pointer to object (link)

diff --git a/lily/bar-reg.cc b/lily/bar-reg.cc
index c7c0d05e3d5f61d64a4028c8c1ffa47c4e8518ad..c28443df62571a5884d0aaf2a0e53b8d51fc5b25 100644 (file)
--- a/lily/bar-reg.cc
+++ b/lily/bar-reg.cc
@@ -35,7 +35,7 @@ Bar_register::process_requests()
 {
     if (bar_req_l_ ) {
        bar_p_ = new Bar(bar_req_l_->type_str_);
-    } else if (!get_staff_info().time_c_l_->whole_in_measure_) {
+    } else if (!get_staff_info().time_C_->whole_in_measure_) {
        bar_p_ = new Bar("|");
     }
     

diff --git a/lily/clef-reg.cc b/lily/clef-reg.cc
index b4775721bb42992e7bb07ed9d7c8c32c31c838a1..2492703cdf9ae90b5576f5f4bbe714f913cdea05 100644 (file)
--- a/lily/clef-reg.cc
+++ b/lily/clef-reg.cc
@@ -45,7 +45,7 @@ void
 Clef_register::read_req(Clef_change_req*c_l)
 {
     if (!set_type(c_l->clef_str_))
-       error("unknown clef type ", c_l->defined_ch_c_l_);
+       error("unknown clef type ", c_l->defined_ch_C_);
 }
 
 bool
@@ -65,7 +65,7 @@ Clef_register::try_request(Request * r_l)
 void
 Clef_register::process_requests()
 {
-    Time_description const *time_l = get_staff_info().time_c_l_;
+    Time_description const *time_l = get_staff_info().time_C_;
     if (!clef_req_l_ && (!time_l->whole_in_measure_|| !time_l->when_)) {
        clef_p_ = new Clef_item;
        clef_p_->change = false;

diff --git a/lily/include/input-score.hh b/lily/include/input-score.hh
index a7468e03fa59f378cafb074089d3b2477e5b0374..36baf691c989ccb4f76956886418e88e28e46abd 100644 (file)
--- a/lily/include/input-score.hh
+++ b/lily/include/input-score.hh
@@ -19,7 +19,7 @@
 /// the total music def of one movement
 struct Input_score {
     /// defined where?    
-    char const * defined_ch_c_l_;
+    char const * defined_ch_C_;
     int errorlevel_i_;
     
     /// paper_, staffs_ and commands_ form the problem definition.

diff --git a/lily/include/input-staff.hh b/lily/include/input-staff.hh
index 23495bd74400996583b4cc026cb0e1023c64407b..25e1431162082ec463009fb974cc513da230c09a 100644 (file)
--- a/lily/include/input-staff.hh
+++ b/lily/include/input-staff.hh
@@ -14,7 +14,7 @@
 
 struct Input_staff {
     
-    char const * defined_ch_c_l_;
+    char const * defined_ch_C_;
     String type;
     
     IPointerList<Input_music*> music_;

diff --git a/lily/include/local-key-reg.hh b/lily/include/local-key-reg.hh
index 9611449383c7f1dcf9d5ce2debf0c0c4ef4bb3d8..628ccc7c421ea814e6b6e649698ebd0bb85ed7d6 100644 (file)
--- a/lily/include/local-key-reg.hh
+++ b/lily/include/local-key-reg.hh
@@ -13,7 +13,7 @@
 struct Local_key_register : Request_register {
     Local_key local_key_;
     Local_key_item* key_item_p_;
-    Key const *key_c_l_;
+    Key const *key_C_;
     /* *************** */
     virtual void process_requests();
     virtual void acknowledge_element(Staff_elem_info);

diff --git a/lily/include/request.hh b/lily/include/request.hh
index 6e9bfd4df2c95f87f875fc52a8fbb48e9315abc0..66e62d484344a43ae15bd09ca9a7085184e368bb 100644 (file)
--- a/lily/include/request.hh
+++ b/lily/include/request.hh
@@ -23,7 +23,7 @@
 class Request {
 public:
     Voice_element*elt_l_;
-    char const* defined_ch_c_l_;
+    char const* defined_ch_C_;
     
     /* *************** */
     Voice  * voice_l();

diff --git a/lily/include/score.hh b/lily/include/score.hh
index 4f10a7f95f0b99a5b879700cb546dde230ed267a..293801a98e499420e0a3348bc6e046fa188159b4 100644 (file)
--- a/lily/include/score.hh
+++ b/lily/include/score.hh
@@ -28,7 +28,7 @@ struct Score {
     IPointerList<Score_column*> cols_;
     PScore *pscore_p_;
 
-    char const *defined_ch_c_l_;
+    char const *defined_ch_C_;
     int errorlevel_i_;
     
     /* *************************************************************** */

diff --git a/lily/include/staff-elem-info.hh b/lily/include/staff-elem-info.hh
index 4e3392027d57c909a6ff22a8912dc4ab38d69a0a..2dcbc845a94ebf1e5e254c704c6196e8ae306a74 100644 (file)
--- a/lily/include/staff-elem-info.hh
+++ b/lily/include/staff-elem-info.hh
@@ -28,8 +28,8 @@ struct Staff_elem_info {
 struct Staff_info {
     int *c0_position_i_;
     Staff_walker *walk_l_;
-    Time_description const *time_c_l_;
-    Rhythmic_grouping const *rhythmic_c_l_;
+    Time_description const *time_C_;
+    Rhythmic_grouping const *rhythmic_C_;
     bool break_allowed_b_;
 };
 

diff --git a/lily/include/text-def.hh b/lily/include/text-def.hh
index b59df7f532b8ae53c09e8d6db3615249fbc9a8b1..50bb98105c88567b26af165e4a1073437556217a 100644 (file)
--- a/lily/include/text-def.hh
+++ b/lily/include/text-def.hh
@@ -14,7 +14,7 @@ struct Text_def  {
     int align_i_;
     String text_str_;
     String style_str_;
-    char const* defined_ch_c_l_;
+    char const* defined_ch_C_;
   
 
     /* *************** */

diff --git a/lily/include/voice-element.hh b/lily/include/voice-element.hh
index cf398bc9b676dffe87e9df87088991edf42a60f2..0b606f1301a0a31c7d58294916f22068c793b979 100644 (file)
--- a/lily/include/voice-element.hh
+++ b/lily/include/voice-element.hh
@@ -18,7 +18,7 @@
     *the requests, */
 struct Voice_element {
     Moment duration;
-    char const* defined_ch_c_l_;
+    char const* defined_ch_C_;
     Voice const *voice_l_;
     IPointerList<Request*> reqs;
 

diff --git a/lily/input-music.cc b/lily/input-music.cc
index 5c8aa72472c0fd186eefd380f627c5c3df39e14f..26377e7f531893569fc44e704fcee20a5ea4e78c 100644 (file)
--- a/lily/input-music.cc
+++ b/lily/input-music.cc
@@ -11,7 +11,7 @@ Input_music::check_plet(Voice_element* velt_l)
        if ( i->plet() ) {
            Moment start_moment = 0;
            if ( !find_plet_start_bo( i->plet()->type_c_, start_moment ) ) {
-               error( "begin of plet not found", i->defined_ch_c_l_ );
+               error( "begin of plet not found", i->defined_ch_C_ );
                break;
            }
            Moment moment = 0;

diff --git a/lily/input-score.cc b/lily/input-score.cc
index d68dd10959a189a6182af9eac612448592875d2c..ed7d831eeaaefa50f2ec18bc03fb002c3250c04c 100644 (file)
--- a/lily/input-score.cc
+++ b/lily/input-score.cc
@@ -40,7 +40,7 @@ Input_score::Input_score(Input_score const&s)
 {
     paper_p_ = (s.paper_p_)? new Paper_def(*s.paper_p_) :0;
     midi_p_ = (s.midi_p_)? new Midi_def(*s.midi_p_) : 0;
-    defined_ch_c_l_ = s.defined_ch_c_l_;
+    defined_ch_C_ = s.defined_ch_C_;
     errorlevel_i_ = s.errorlevel_i_;
 }
 
@@ -48,7 +48,7 @@ Score*
 Input_score::parse()
 {
     Score *s_p = new Score;
-    s_p->defined_ch_c_l_= defined_ch_c_l_;
+    s_p->defined_ch_C_= defined_ch_C_;
     s_p->errorlevel_i_ = errorlevel_i_;
     if (midi_p_)
        s_p->set(new Midi_def(*midi_p_));
@@ -72,7 +72,7 @@ Input_score::~Input_score()
 
 Input_score::Input_score()
 {
-    defined_ch_c_l_=0;
+    defined_ch_C_=0;
     paper_p_= 0;
     midi_p_ = 0;
     errorlevel_i_ = 0;

diff --git a/lily/input-staff.cc b/lily/input-staff.cc
index 2d42e2a1baefb866947abcf2739273a0c762d807..9262851f3cdf07a00836d1d66e01923d4058ec82 100644 (file)
--- a/lily/input-staff.cc
+++ b/lily/input-staff.cc
@@ -20,7 +20,7 @@
 Input_staff::Input_staff(String s)
 {
     type= s;
-    defined_ch_c_l_ = 0;
+    defined_ch_C_ = 0;
 }
 
 void
@@ -38,7 +38,7 @@ Input_staff::parse(Score*score_l)
     else if (type == "lyric")
        p = new Lyric_staff;
     else {
-       error( "Unknown staff-type `" + type +"\'", defined_ch_c_l_ );
+       error( "Unknown staff-type `" + type +"\'", defined_ch_C_ );
        exit( 1 );
     }
 
@@ -55,7 +55,7 @@ Input_staff::Input_staff(Input_staff const&s)
 {    
     for (iter_top(s.music_,i); i.ok(); i++)
        add(i->clone());
-    defined_ch_c_l_ = s.defined_ch_c_l_;
+    defined_ch_C_ = s.defined_ch_C_;
     type = s.type;
 }
 

diff --git a/lily/key-reg.cc b/lily/key-reg.cc
index 865eea264e7fb862c60fe906a290f275aa505d29..8b8b2373b3dc1fd5a7e303654bb4ff9613638ba8 100644 (file)
--- a/lily/key-reg.cc
+++ b/lily/key-reg.cc
@@ -49,7 +49,7 @@ Key_register::acknowledge_element(Staff_elem_info info)
 void
 Key_register::process_requests()
 {
-    Time_description const *time_l = get_staff_info().time_c_l_;
+    Time_description const *time_l = get_staff_info().time_C_;
 
     if (!keyreq_l_ &&
        (!time_l->whole_in_measure_|| !time_l->when_)) {

diff --git a/lily/local-key-reg.cc b/lily/local-key-reg.cc
index bf7eb9c352e25ef0ef6c1cc42bb72ca63e70ae16..0ce36e955c1d4d9cd6039bec008880dc32860374 100644 (file)
--- a/lily/local-key-reg.cc
+++ b/lily/local-key-reg.cc
@@ -16,7 +16,7 @@
 Local_key_register::Local_key_register()
 {
     key_item_p_ = 0;
-    key_c_l_ = 0;
+    key_C_ = 0;
 }
 
 void
@@ -51,19 +51,19 @@ Local_key_register::acknowledge_element(Staff_elem_info info)
     } else if (info.elem_p_->name()==Key_item::static_name()) { 
        Key_register * key_reg_l =
            (Key_register*)info.origin_reg_l_arr_[0];
-       key_c_l_ = &key_reg_l->key_;
-       local_key_.reset(*key_c_l_);
+       key_C_ = &key_reg_l->key_;
+       local_key_.reset(*key_C_);
     }  
 }
 
 void
 Local_key_register::process_requests()
 {
-    Time_description const * time_c_l_ = get_staff_info().time_c_l_;
-    if (! time_c_l_->whole_in_measure_){
-       if (key_c_l_)  
-           local_key_.reset(*key_c_l_);
-       else if( time_c_l_->when_ >Moment(0))
+    Time_description const * time_C_ = get_staff_info().time_C_;
+    if (! time_C_->whole_in_measure_){
+       if (key_C_)  
+           local_key_.reset(*key_C_);
+       else if( time_C_->when_ >Moment(0))
            warning ("Help me! can't figure  current key", 0);
     }
 }

diff --git a/lily/midi-item.cc b/lily/midi-item.cc
index 2bc00a3a0fdbd55a995ef29539919bc73c7b13d7..04e1286197df176309c04ec81b864255bbe20305 100644 (file)
--- a/lily/midi-item.cc
+++ b/lily/midi-item.cc
@@ -213,7 +213,7 @@ Midi_track::Midi_track( int number_i )
 
     number_i_ = number_i;
        
-    char const* data_ch_c_l = ""
+    char const* data_ch_C = ""
 //        "00" "ff58" "0404" "0218" "08"
 //     "00" "ff51" "0307" "a120"
 // why a key at all, in midi?
@@ -225,10 +225,10 @@ Midi_track::Midi_track( int number_i )
 
     String data_str;
     // only for format 0 (currently using format 1)?
-    data_str += String_convert::hex2bin_str( data_ch_c_l );
+    data_str += String_convert::hex2bin_str( data_ch_C );
 
-    char const* footer_ch_c_l = "00" "ff2f" "00";
-    String footer_str = String_convert::hex2bin_str( footer_ch_c_l );
+    char const* footer_ch_C = "00" "ff2f" "00";
+    String footer_str = String_convert::hex2bin_str( footer_ch_C );
 
     set( "MTrk", data_str, footer_str );
 }

diff --git a/lily/midi-stream.cc b/lily/midi-stream.cc
index 88e5eb2dc605568b454956c0ac7d150dbc66083c..e6a2e35b3c83a3eec383e71a73a00dea5d8750e4 100644 (file)
--- a/lily/midi-stream.cc
+++ b/lily/midi-stream.cc
@@ -73,8 +73,8 @@ Midi_stream::header()
 //                00 01   one track
 //                00 60   96 per quarter-note
 
-//    char const ch_c_l = "0000" "0006" "0001" "0001" "0060";
-//    str += String_convert::hex2bin_str( ch_c_l );
+//    char const ch_C = "0000" "0006" "0001" "0001" "0060";
+//    str += String_convert::hex2bin_str( ch_C );
 //    *os_p_ << str;
 
 //      *this << Midi_header( 1, 1, tempo_i_ );

diff --git a/lily/score.cc b/lily/score.cc
index cb764b2f7a014ca395e1c82eb2c23cdf3ff64f45..09b5439667a4cc62ad9755ec4b61c37455879f9c 100644 (file)
--- a/lily/score.cc
+++ b/lily/score.cc
@@ -27,7 +27,7 @@ Score::setup_music()
     *mlog << "\nSetting up music ..." << flush;
     if (last() == Moment(0)) {
        errorlevel_i_ |= 1;
-       error("Need to have music in a score.", defined_ch_c_l_);
+       error("Need to have music in a score.", defined_ch_C_);
     }
 
     for (iter_top(staffs_,i); i.ok(); i++) {
@@ -234,7 +234,7 @@ Score::Score()
     paper_p_ = 0;
     midi_p_ = 0;
     errorlevel_i_ = 0;
-    defined_ch_c_l_ = 0;
+    defined_ch_C_ = 0;
 }
 
 Score::~Score()
@@ -263,7 +263,7 @@ Score::paper_output()
     
     the_output << "% outputting Score, defined at: " <<
        source_l_g->
-       sourcefile_l (defined_ch_c_l_)->file_line_no_str(defined_ch_c_l_) << "\n";
+       sourcefile_l (defined_ch_C_)->file_line_no_str(defined_ch_C_) << "\n";
     pscore_p_->output(the_output);
 }
 

diff --git a/lily/scores.cc b/lily/scores.cc
index a6df7ead96730c30376bb83a255abe3b11f17daf..3115cb50072409d290ee74dd801570f65e67c79c 100644 (file)
--- a/lily/scores.cc
+++ b/lily/scores.cc
@@ -15,7 +15,7 @@ do_scores()
        Input_score* &is_p = score_array_global[i];
        if (is_p->errorlevel_i_) {
            warning("Score contains errors. Will not process it. ",
-                   is_p->defined_ch_c_l_);
+                   is_p->defined_ch_C_);
            delete is_p;
            continue;
        } 

diff --git a/lily/slur-reg.cc b/lily/slur-reg.cc
index 34bffee73d162c8af81999099d7df9e9b52ad944..a076664dd73fc3f5daa654b242fa19d5f84b03d1 100644 (file)
--- a/lily/slur-reg.cc
+++ b/lily/slur-reg.cc
@@ -58,7 +58,7 @@ Slur_register::process_requests()
        if (slur_req_l->spantype == Span_req::STOP) {
            if (slur_l_stack_.empty())
                warning("can't find slur to end",
-                     slur_req_l->defined_ch_c_l_);
+                     slur_req_l->defined_ch_C_);
            else {
                end_slur_l_arr_.push(slur_l_stack_.pop());
                requests_arr_.pop();
@@ -95,6 +95,6 @@ Slur_register::post_move_processing()
 Slur_register::~Slur_register()
 {
     for (int i=0; i < requests_arr_.size(); i++) {
-       warning("unterminated slur", requests_arr_[i]->defined_ch_c_l_);
+       warning("unterminated slur", requests_arr_[i]->defined_ch_C_);
     }
 }

diff --git a/lily/staff-walker.cc b/lily/staff-walker.cc
index 9a817f0190e6b7ae8b53fe48ff0c5e62640d5f5f..32cd6dab1f64fc4f12234bb1fb0d66d5b7c8145f 100644 (file)
--- a/lily/staff-walker.cc
+++ b/lily/staff-walker.cc
@@ -69,7 +69,7 @@ Staff_walker::process_timing_reqs()
        if (tr_l->partial()) {
            time_.setpartial(tr_l->partial()->duration_);
        } else if (tr_l->barcheck() && time_.whole_in_measure_) {
-           warning( "Barcheck failed", tr_l->defined_ch_c_l_ );
+           warning( "Barcheck failed", tr_l->defined_ch_C_ );
        } else if (tr_l->cadenza()) {
            time_.set_cadenza(tr_l->cadenza()->on_b_);
        } else if (tr_l->measuregrouping()) {

diff --git a/lily/text-def.cc b/lily/text-def.cc
index cd2961b65e429f57c6d3ed9adb7ec44798a9f8f2..22affae7edbc6a29546f2d0ea61c2344849eafdd 100644 (file)
--- a/lily/text-def.cc
+++ b/lily/text-def.cc
@@ -8,7 +8,7 @@ Text_def::Text_def()
 {   
     align_i_ = 1;                      // right
     style_str_ = "roman";
-    defined_ch_c_l_ = 0;
+    defined_ch_C_ = 0;
 }
 bool
 Text_def::compare(Text_def const &def)

diff --git a/lily/walk-regs.cc b/lily/walk-regs.cc
index 425167422f70bdef03dd428df5385a775417f376..b258bd559d23b42ebcabe28b4eb30b1d68da02da 100644 (file)
--- a/lily/walk-regs.cc
+++ b/lily/walk-regs.cc
@@ -153,7 +153,7 @@ Walker_registers::try_request(Request * r)
            change_group(cr_l->groupchange(), 0, 0);
        } else 
            warning("junking request: "  + String(r->name()),
-                   r->defined_ch_c_l_);
+                   r->defined_ch_C_);
     }
     return b;
 }
@@ -166,8 +166,8 @@ Walker_registers::get_staff_info() return inf;
        inf.break_allowed_b_ = walk_l_->score_walk_l_->break_allowed_b();
     inf.c0_position_i_ = &walk_l_->c0_position_i_;
     inf.walk_l_ = walk_l_;
-    inf.time_c_l_ = &walk_l_->time_;
-    inf.rhythmic_c_l_ = walk_l_->default_grouping;
+    inf.time_C_ = &walk_l_->time_;
+    inf.rhythmic_C_ = walk_l_->default_grouping;
 }
 
 Paper_def*