X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Frequest.hh;h=0b8ec16d6aaa27e985c41202e36ae9656d0dbf86;hb=bb36bac02a64770871780231ecc709cb18b20932;hp=bd90bde2aac510602aca46f143f17f5f9b45de59;hpb=615a9212789c2cb2994748c023d0e19f3a83a0fd;p=lilypond.git

diff --git a/lily/include/request.hh b/lily/include/request.hh
index bd90bde2aa..0b8ec16d6a 100644
--- a/lily/include/request.hh
+++ b/lily/include/request.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #ifndef REQUEST_HH
@@ -25,43 +25,26 @@
 
  */
 class Request : public Music {
-
 public:
-    
   virtual ~Request(){}
-
-  
   VIRTUAL_COPY_CONS(Music);
-    
-  bool equal_b (Request*) const;
+  bool equal_b (Request const*) const;
 protected:
-  virtual bool do_equal_b (Request*) const;
+  virtual bool do_equal_b (Request const*) const;
   virtual void do_print() const;
 };
 
 
-#define REQUESTMETHODS(T)	\
-\
-VIRTUAL_COPY_CONS(Request);\
-virtual void do_print() const
-
-
 
-/** Put a script above or below this ``note'' or bar. eg upbow, downbow. Why
-  a request? These symbols may conflict with slurs and brackets, so
-  this also a request */
-
-class Script_req  : public virtual Request { 
+class Script_req : public virtual Request
+{
 public:
   Direction dir_;
-  General_script_def *scriptdef_p_;
-  
-  bool do_equal_b (Request*) const;
+  void set_direction (Direction d ) { dir_ =  d; }
+  Direction get_direction () const { return dir_; }
 
-  Script_req();
-  REQUESTMETHODS(Script_req);
-  ~Script_req();
-  Script_req (Script_req const&);
+  VIRTUAL_COPY_CONS(Music);
+  Script_req ();
 };
 
 
@@ -72,14 +55,22 @@ public:
 class Span_req  : public virtual Request  {
 public:
   /// should the spanner start or stop, or is it unwanted?
-  enum Spantype {
-    NOSPAN, START, STOP
-  } spantype;
-  bool do_equal_b (Request*) const;
-  REQUESTMETHODS(Span_req);
-
+  Direction span_dir_;
+  String span_type_str_;
+  
   Span_req();
+protected:
+  virtual bool do_equal_b (Request const*) const;
+  virtual void do_print() const;
+  VIRTUAL_COPY_CONS(Music);
 };
 
+/**
+  Start a tie at this note, end it at the next
+ */
+class Tie_req : public Request {
+public:
+  VIRTUAL_COPY_CONS(Music);
+};
 
 #endif