From 7064dd94ef1ef866bd787862454b1f5fe3705358 Mon Sep 17 00:00:00 2001 From: fred Date: Sun, 24 Mar 2002 19:35:58 +0000 Subject: [PATCH] lilypond-0.0.44 --- Documentation/CodingStyle.pod | 6 ++++++ lily/bar-reg.cc | 2 +- lily/clef-reg.cc | 4 ++-- lily/include/input-score.hh | 2 +- lily/include/input-staff.hh | 2 +- lily/include/local-key-reg.hh | 2 +- lily/include/request.hh | 2 +- lily/include/score.hh | 2 +- lily/include/staff-elem-info.hh | 4 ++-- lily/include/text-def.hh | 2 +- lily/include/voice-element.hh | 2 +- lily/input-music.cc | 2 +- lily/input-score.cc | 6 +++--- lily/input-staff.cc | 6 +++--- lily/key-reg.cc | 2 +- lily/local-key-reg.cc | 16 ++++++++-------- lily/midi-item.cc | 8 ++++---- lily/midi-stream.cc | 4 ++-- lily/score.cc | 6 +++--- lily/scores.cc | 2 +- lily/slur-reg.cc | 4 ++-- lily/staff-walker.cc | 2 +- lily/text-def.cc | 2 +- lily/walk-regs.cc | 6 +++--- 24 files changed, 51 insertions(+), 45 deletions(-) diff --git a/Documentation/CodingStyle.pod b/Documentation/CodingStyle.pod index 66ee04705f..2f65fb775e 100644 --- a/Documentation/CodingStyle.pod +++ b/Documentation/CodingStyle.pod @@ -311,6 +311,12 @@ user built array. const. Note that the proper order C i.s.o. C +=item 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 temporary pointer to object (link) diff --git a/lily/bar-reg.cc b/lily/bar-reg.cc index c7c0d05e3d..c28443df62 100644 --- 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 b4775721bb..2492703cdf 100644 --- 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 a7468e03fa..36baf691c9 100644 --- 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 23495bd744..25e1431162 100644 --- 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 music_; diff --git a/lily/include/local-key-reg.hh b/lily/include/local-key-reg.hh index 9611449383..628ccc7c42 100644 --- 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 6e9bfd4df2..66e62d4843 100644 --- 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 4f10a7f95f..293801a98e 100644 --- a/lily/include/score.hh +++ b/lily/include/score.hh @@ -28,7 +28,7 @@ struct Score { IPointerList 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 4e3392027d..2dcbc845a9 100644 --- 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 b59df7f532..50bb98105c 100644 --- 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 cf398bc9b6..0b606f1301 100644 --- 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 reqs; diff --git a/lily/input-music.cc b/lily/input-music.cc index 5c8aa72472..26377e7f53 100644 --- 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 d68dd10959..ed7d831eea 100644 --- 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 2d42e2a1ba..9262851f3c 100644 --- 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 865eea264e..8b8b2373b3 100644 --- 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 bf7eb9c352..0ce36e955c 100644 --- 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 2bc00a3a0f..04e1286197 100644 --- 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 88e5eb2dc6..e6a2e35b3c 100644 --- 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 cb764b2f7a..09b5439667 100644 --- 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 a6df7ead96..3115cb5007 100644 --- 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 34bffee73d..a076664dd7 100644 --- 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 9a817f0190..32cd6dab1f 100644 --- 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 cd2961b65e..22affae7ed 100644 --- 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 425167422f..b258bd559d 100644 --- 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* -- 2.39.5