lilypond-0.0.77.jcn1

diff --git a/lily/include/music-iterator.hh b/lily/include/music-iterator.hh
index 143587be88af2f4efad572c6352ce04e3cd151d1..93d21e5c2a54c07f036a4867ccd84e4ee85929cf 100644 (file)
--- a/lily/include/music-iterator.hh
+++ b/lily/include/music-iterator.hh
@@ -69,12 +69,12 @@ protected:
     virtual bool ok()const;
 };
 
-class Voice_element_iterator : public Music_iterator {
-    const Voice_element * elt_l_;
+class Request_chord_iterator : public Music_iterator {
+    const Request_chord * elt_l_;
     Moment elt_duration_;
     bool last_b_;
 public:
-    Voice_element_iterator(Voice_element*);
+    Request_chord_iterator(Request_chord*);
     NAME_MEMBERS();
 
 protected:

diff --git a/lily/include/music-list.hh b/lily/include/music-list.hh
index 6ea2ae0f478907d4d587a40f53fb37cd35f62112..ad745eff28561445c3321f1eb3e722c97c73e98a 100644 (file)
--- a/lily/include/music-list.hh
+++ b/lily/include/music-list.hh
@@ -53,11 +53,11 @@ public:
     virtual MInterval time_int()const;
 };
 
-class Voice_element : public Chord {
+class Request_chord : public Chord {
 public:
     NAME_MEMBERS();
-    Voice_element();
-    VIRTUAL_COPY_CONS(Voice_element,Music);
+    Request_chord();
+    VIRTUAL_COPY_CONS(Request_chord,Music);
 };
 
 /**

diff --git a/lily/include/musical-request.hh b/lily/include/musical-request.hh
index 08cce94c9a9435880a14d657d73a12b628ce4024..782541d68925c7222f945442ff3d1ca55df2715b 100644 (file)
--- a/lily/include/musical-request.hh
+++ b/lily/include/musical-request.hh
@@ -16,7 +16,7 @@
 
 
 /**
-  A request which is coupled to a #Voice_element#
+  A request which is coupled to a #Request_chord#
   Base class only
  */
 class Musical_req  : public virtual Request  {

diff --git a/lily/music-iterator.cc b/lily/music-iterator.cc
index b88271e158139ccae880b9cdf575ea06ec4b4894..bc6b717fda942a8b3c01fcaf0a75d2b2f52b81fd 100644 (file)
--- a/lily/music-iterator.cc
+++ b/lily/music-iterator.cc
@@ -12,7 +12,7 @@
 #include "request.hh"
 #include "debug.hh"
 
-IMPLEMENT_STATIC_NAME(Music_iterator);
+
 IMPLEMENT_IS_TYPE_B(Music_iterator);
 
 Chord_iterator::~Chord_iterator(){}
@@ -117,8 +117,8 @@ Music_iterator::static_get_iterator_p(Music *m,
     Music_iterator * p =0;
     if (m->is_type_b( Change_reg::static_name()))
        p = new Change_iterator((Change_reg*)m);
-    else if (m->is_type_b( Voice_element::static_name()))
-       p = new Voice_element_iterator( (Voice_element*) m);
+    else if (m->is_type_b( Request_chord::static_name()))
+       p = new Request_chord_iterator( (Request_chord*) m);
     else if (m->is_type_b( Chord::static_name())) 
        p =  new Chord_iterator( (Chord*) m);
     else if (m->is_type_b( Voice::static_name())) 
@@ -204,7 +204,7 @@ Chord_iterator::process_and_next(Moment until)
 //    assert(!ok() || next_moment() > until);
 }
 
-IMPLEMENT_STATIC_NAME(Chord_iterator);
+
 IMPLEMENT_IS_TYPE_B1(Chord_iterator,Music_iterator);
 
 Moment
@@ -266,7 +266,7 @@ Voice_iterator::~Voice_iterator()
     delete iter_p_;
 }
 
-IMPLEMENT_STATIC_NAME(Voice_iterator);
+
 IMPLEMENT_IS_TYPE_B1(Voice_iterator,Music_iterator);
 
 void
@@ -309,7 +309,7 @@ Change_iterator::Change_iterator(Change_reg * ch)
     change_l_ = ch;
 }
 
-IMPLEMENT_STATIC_NAME(Change_iterator);
+
 IMPLEMENT_IS_TYPE_B1(Change_iterator,Music_iterator);
 
 /*
@@ -336,16 +336,16 @@ Change_iterator::process_and_next(Moment mom)
 
 /* ******************** */
 
-IMPLEMENT_STATIC_NAME(Voice_element_iterator);
-IMPLEMENT_IS_TYPE_B1(Voice_element_iterator,Music_iterator);
+
+IMPLEMENT_IS_TYPE_B1(Request_chord_iterator,Music_iterator);
 
 void
-Voice_element_iterator::construct_children()
+Request_chord_iterator::construct_children()
 {
     get_req_translator_l();
 }
 
-Voice_element_iterator::Voice_element_iterator(Voice_element*el_l)
+Request_chord_iterator::Request_chord_iterator(Request_chord*el_l)
 {
     elt_l_ = el_l;
     elt_duration_ = el_l->time_int().length(); 
@@ -354,7 +354,7 @@ Voice_element_iterator::Voice_element_iterator(Voice_element*el_l)
 
 
 bool
-Voice_element_iterator::ok()const
+Request_chord_iterator::ok()const
 {
     return (elt_duration_ && !last_b_) || first_b_; 
 }
@@ -362,7 +362,7 @@ Voice_element_iterator::ok()const
 
 
 Moment
-Voice_element_iterator::next_moment()const
+Request_chord_iterator::next_moment()const
 {
     Moment m(0);
     if  (!first_b_) 
@@ -371,14 +371,14 @@ Voice_element_iterator::next_moment()const
 }
 
 void
-Voice_element_iterator::do_print() const
+Request_chord_iterator::do_print() const
 {
 #ifndef NPRINT
     mtor << "duration: " << elt_duration_;
 #endif
 }
 void
-Voice_element_iterator::process_and_next(Moment mom)
+Request_chord_iterator::process_and_next(Moment mom)
 {
     if ( first_b_ ) {
        for (PCursor<Music*> i(elt_l_->music_p_list_); i.ok(); i++) {

diff --git a/lily/music-list.cc b/lily/music-list.cc
index 9008ddc27a4d0353510a3c542516a7885de26010..b169a74727cbdde085b07488de8312f99ca78e04 100644 (file)
--- a/lily/music-list.cc
+++ b/lily/music-list.cc
@@ -18,9 +18,9 @@ Music_list::Music_list(Music_list const&s)
        add(i->clone());
 }
 
-IMPLEMENT_STATIC_NAME(Music_list);
-IMPLEMENT_STATIC_NAME(Chord);
-IMPLEMENT_STATIC_NAME(Voice);
+
+
+
 IMPLEMENT_IS_TYPE_B1(Music_list, Music);
 IMPLEMENT_IS_TYPE_B1(Voice,Music_list);
 IMPLEMENT_IS_TYPE_B1(Chord,Music_list);
@@ -97,10 +97,10 @@ Music_list::do_print()const
 #endif 
 }
 
-IMPLEMENT_IS_TYPE_B1(Voice_element, Chord);
-IMPLEMENT_STATIC_NAME(Voice_element);
+IMPLEMENT_IS_TYPE_B1(Request_chord, Chord);
+
 
-Voice_element::Voice_element()
+Request_chord::Request_chord()
 {
     multi_level_i_ =0;
 }

diff --git a/lily/my-lily-parser.cc b/lily/my-lily-parser.cc
index 69be888d94c3bebcdea41904490e6bacb2c9dcae..5c14442745860ffb32fef0245173469b6d690165 100644 (file)
--- a/lily/my-lily-parser.cc
+++ b/lily/my-lily-parser.cc
@@ -126,7 +126,7 @@ My_lily_parser::set_last_duration(Duration const *d)
 Chord*
 My_lily_parser::get_word_element(Text_def* tdef_p, Duration * duration_p)
 {
-    Chord* velt_p = new Voice_element;
+    Chord* velt_p = new Request_chord;
     
     Lyric_req* lreq_p = new Lyric_req(tdef_p);
 
@@ -142,7 +142,7 @@ My_lily_parser::get_word_element(Text_def* tdef_p, Duration * duration_p)
 Chord *
 My_lily_parser::get_rest_element(String s,  Duration * duration_p )
 {    
-    Chord* velt_p = new Voice_element;
+    Chord* velt_p = new Request_chord;
     velt_p->set_spot( here_input());
 
     if (s=="s") { /* Space */
@@ -171,7 +171,7 @@ My_lily_parser::get_rest_element(String s,  Duration * duration_p )
 Chord *
 My_lily_parser::get_note_element(Note_req *rq, Duration * duration_p )
 {
-    Chord*v = new Voice_element;
+    Chord*v = new Request_chord;
     v->set_spot( here_input());
 
     v->add(rq);

diff --git a/lily/parser.y b/lily/parser.y
index 4f074fb2dc0b7f03a32d708b8fe9cd825ec927fd..995d541ea8a894e76cc8d3204f171310127d3bf1 100644 (file)
--- a/lily/parser.y
+++ b/lily/parser.y
@@ -573,7 +573,7 @@ simple_element:
 
 command_elt:
 /* empty */    {
-               $$ = new Voice_element;
+               $$ = new Request_chord;
                $$-> set_spot( THIS->here_input());
        }
 /* cont: */