lilypond-0.0.44

diff --git a/lily/include/musical-request.hh b/lily/include/musical-request.hh
index 761efce6bd37e0061e75a2f22963c1d752113434..d9a13deda938217da2cc4b232f24526f41ccc463 100644 (file)
--- a/lily/include/musical-request.hh
+++ b/lily/include/musical-request.hh
@@ -11,6 +11,7 @@
 #define MUSICALREQUESTS_HH
 
 #include "request.hh"
+#include "duration.hh"
 
 
 /**
@@ -38,14 +39,13 @@ struct Skip_req : Musical_req {
   This request is used only a base class.
  */
 struct Rhythmic_req : virtual Musical_req {
-    int balltype;
-    int dots;
-    Moment plet_factor;
+    Duration duration_;
+    
     /* *************** */
+    void set_duration(Duration);
     static int compare(const Rhythmic_req &, const Rhythmic_req &);
     virtual Moment duration() const;
     Rhythmic_req();
-    Rhythmic_req(int,int);
     REQUESTMETHODS(Rhythmic_req, rhythmic);
 };
 
@@ -133,7 +133,7 @@ public:
 struct Stem_req : Rhythmic_req {
     /// preferred direction for the stem
     int dir_i_;
-    Stem_req(int s, int dots);
+    Stem_req();
     REQUESTMETHODS(Stem_req,stem);
 };
 

diff --git a/lily/voice-elt.cc b/lily/voice-elt.cc
index 5b59242c75b7d84bfed9c0f28f82374fdc015de4..4c1249b14072d7fb54f874b8f447ce84288a7057 100644 (file)
--- a/lily/voice-elt.cc
+++ b/lily/voice-elt.cc
@@ -52,12 +52,12 @@ Voice_element::Voice_element()
 {
     voice_l_ = 0;
     duration = 0;
-    defined_ch_c_l_ = 0;
+    defined_ch_C_ = 0;
 }
 
 Voice_element::Voice_element(Voice_element const&src)
 {
-    defined_ch_c_l_ = src.defined_ch_c_l_;
+    defined_ch_C_ = src.defined_ch_C_;
 
     voice_l_=0;
     for (iter_top(src.reqs, i); i.ok(); i++)
@@ -97,9 +97,10 @@ Voice_element::set_plet_backwards(Moment& now_moment_r,
     for ( PCursor<Request*> i( reqs.top() ); i.ok(); i++ ) {
        if (i->beam() && i->beam()->spantype == Span_req::START )
            i->beam()->nplet = den_i;
-       if (i->rhythmic())
-           i->rhythmic()->plet_factor = Moment(num_i, den_i);
-       if (i->stem())
-           i->stem()->plet_factor = Moment(num_i, den_i);
+       if (i->rhythmic()) {
+           i->rhythmic()->duration_.plet_.type_i_ = den_i;
+           i->rhythmic()->duration_.plet_.iso_i_  = num_i;
+           
+       }
     }
 }