partial: 0.0.38.hanjan

[lilypond.git] / src / inputmusic.cc

diff --git a/src/inputmusic.cc b/src/inputmusic.cc
index 447d84e41a460136281c93798595d945c49c89be..b7ad70b0ab34b61deaa4f0c0540157f9c7ce6e90 100644 (file)
--- a/src/inputmusic.cc
+++ b/src/inputmusic.cc
@@ -1,7 +1,24 @@
 #include "debug.hh"
 #include "inputmusic.hh"
 #include "voice.hh"
-#include "request.hh"
+#include "musicalrequest.hh"
+
+void
+Input_music::check_plet(Voice_element* velt_l)
+{
+    for (iter_top(velt_l->reqs,i); i.ok(); i++)
+       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_ );
+               break;
+           }
+           Moment moment = 0;
+           set_plet_backwards( moment, start_moment, i->plet()->dur_i_, i->plet()->type_i_ );
+           i.del();
+           break;
+        }
+}
 
 void
 Simple_music::add(Voice_element*v)
@@ -36,6 +53,16 @@ Simple_music::print() const
     voice_.print();
     mtor << "}\n";
 }
+bool
+Simple_music::find_plet_start_bo(char c, Moment& moment_r)
+{
+    return voice_.find_plet_start_bo(c, moment_r);
+}
+void 
+Simple_music::set_plet_backwards(Moment& now_moment_r, Moment until_moment, int num_i, int den_i)
+{
+    voice_.set_plet_backwards(now_moment_r, until_moment, num_i, den_i);
+}
 
 /* *************** */
 
@@ -74,6 +101,22 @@ Complex_music::set_default_group(String g)
     for (iter_top(elts,i); i.ok(); i++)
            i->set_default_group(g);
 }
+bool
+Complex_music::find_plet_start_bo(char c, Moment& moment_r)
+{
+    for (iter_bot(elts,i); i.ok(); i--) {
+        if ( i->find_plet_start_bo(c, moment_r) )
+           return true;
+    }
+    return false;
+}
+void 
+Complex_music::set_plet_backwards(Moment& now_moment_r, Moment until_moment, int num_i, int den_i)
+{
+    for (iter_bot(elts,i); i.ok(); i--) {
+       i->set_plet_backwards(now_moment_r, until_moment, num_i, den_i);
+    }
+}
 /* *************************************************************** */
 
 void
@@ -97,6 +140,8 @@ Music_voice::add_elt(Voice_element*v)
     c = elts.bottom();
     Simple_music *s = c->simple();
     s->add(v);             
+
+    check_plet(v);
 }
 
 Moment
@@ -142,6 +187,8 @@ Music_general_chord::add_elt(Voice_element*v)
     Simple_music*vs = new Simple_music;
     vs->add(v);
     elts.bottom().add(vs);
+
+    check_plet(v);
 }
 
 void
@@ -162,7 +209,7 @@ Music_general_chord::translate_time(Moment t)
 Moment
 Music_general_chord::length()const
 {
-    Moment l =0.0;
+    Moment l =0;
     
     for (iter_top(elts,i); i.ok(); i++) 
        l = l >? i->length();