lilypond-0.0.59

diff --git a/lily/include/musical-request.hh b/lily/include/musical-request.hh
index 029579056d74e0481ea1bd3cf570f7d39f304cd6..eaba302d2bb8d5a486f2e98080cdeb1f2c6f7c7a 100644 (file)
--- a/lily/include/musical-request.hh
+++ b/lily/include/musical-request.hh
@@ -10,6 +10,7 @@
 #ifndef MUSICALREQUESTS_HH
 #define MUSICALREQUESTS_HH
 
+#include "lily-proto.hh"
 #include "request.hh"
 #include "duration.hh"
 
@@ -24,6 +25,7 @@ public:
     virtual Skip_req* skip() { return 0; }
     virtual Dynamic_req* dynamic() { return 0; }
     virtual Absolute_dynamic_req * absdynamic() { return 0; }
+    virtual Tie_req * tie() { return 0; }
     virtual Subtle_req * subtle() { return 0; }
     virtual Span_dynamic_req * span_dynamic() { return 0; }
     REQUESTMETHODS(Musical_req, musical);
@@ -191,6 +193,14 @@ public:
     Beam_req();
 };
 
+/**
+  Start a tie at this voice element, end it at the next
+ */
+class Tie_req : public Musical_req {
+public:
+    REQUESTMETHODS(Tie_req, tie);
+};
+
 /// a slur
 class Slur_req  : public Span_req  {
 public:

diff --git a/lily/include/slur-reg.hh b/lily/include/slur-reg.hh
index f53ed992b3564d6cfde1c73f36e2508aa9a6ac70..e9a27a43d6e3d8fd5877a0fb1478ce16e1285d68 100644 (file)
--- a/lily/include/slur-reg.hh
+++ b/lily/include/slur-reg.hh
@@ -20,6 +20,7 @@ class Slur_register :public Request_register {
 protected:
     virtual ~Slur_register();
     virtual bool try_request(Request*);
+    virtual bool acceptable_request_b(Request*);
     virtual void process_requests();
     virtual void acknowledge_element(Staff_elem_info);
     virtual void pre_move_processing();