release: 1.3.93

[lilypond.git] / lily / include / request.hh

diff --git a/lily/include/request.hh b/lily/include/request.hh
index 7d976a648e5dfe7b015bdb35571ed4ff7481cf6e..f1cd68f48301f949e49e364fe264b87f3617b159 100644 (file)
--- 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
@@ -17,8 +17,6 @@
 #include "music.hh"
 #include "direction.hh"
 
-#define DEFAULTACCESSOR(T)  virtual T *access_ ## T () { return 0; }
-
 
 /** An atom of musical information.  This is an abstract class for any
   piece of music that does not contain other Music.
@@ -27,55 +25,25 @@
 
  */
 class Request : public Music {
-
 public:
-    
-  virtual ~Request(){}
-
-  DECLARE_MY_RUNTIME_TYPEINFO;
-  VIRTUAL_COPY_CONS(Request,Music);
-    
-  /*  accessors for children
-      maybe checkout RTTI
-  */
-
-  DEFAULTACCESSOR(Barcheck_req)
-  DEFAULTACCESSOR(Script_req)
-  DEFAULTACCESSOR(Span_req)
-  DEFAULTACCESSOR(Spacing_req)
-  DEFAULTACCESSOR(Musical_req)
-  DEFAULTACCESSOR(Command_req)
-    
-  bool equal_b (Request*) const;
+  VIRTUAL_COPY_CONS(Music);
+  bool equal_b (Request const*) const;
 protected:
-  virtual bool do_equal_b (Request*) const;
-  virtual void do_print() const;
-};
-
-
-#define REQUESTMETHODS(T)      \
-virtual T * access_ ## T() { return this;}\
-DECLARE_MY_RUNTIME_TYPEINFO;\
-VIRTUAL_COPY_CONS(T, Request);\
-virtual void do_print() const
+  virtual bool do_equal_b (Request const*) 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 ();
 };
 
 
@@ -86,14 +54,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_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