release: 1.5.29

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

diff --git a/lily/include/musical-request.hh b/lily/include/musical-request.hh
index 9dee1567a09cfadb1fd50c91ff5b07548a940ad2..17f5446ea2b670ed3fdc080444965b287dfd8c52 100644 (file)
--- a/lily/include/musical-request.hh
+++ b/lily/include/musical-request.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
@@ -21,18 +21,16 @@
  */
 class Rhythmic_req  : public virtual Request  {
 public:
-  Duration duration_;
-
   bool do_equal_b (Request const*) const;
   void compress (Moment);
   virtual Moment length_mom () const;
   static int compare (Rhythmic_req const&,Rhythmic_req const&);
-  VIRTUAL_COPY_CONS(Music);
+  VIRTUAL_COPY_CONS (Music);
 };
 
 class Skip_req  : public Rhythmic_req  {
 public:
-  VIRTUAL_COPY_CONS(Music);
+  VIRTUAL_COPY_CONS (Music);
 };
 
 
@@ -58,11 +56,11 @@ protected:
 class Articulation_req : public Script_req
 {
 public:
-  String get_articulation_str();
+  String get_articulation_str ();
 protected:
   virtual bool do_equal_b (Request const*) const;
 
-  VIRTUAL_COPY_CONS(Music);
+  VIRTUAL_COPY_CONS (Music);
 };
 
 class Text_script_req : public Script_req
@@ -76,33 +74,11 @@ protected:
 /// request which has some kind of pitch
 struct Melodic_req :virtual Request
 {
-  Pitch pitch_;
-
   static int compare (Melodic_req const&,Melodic_req const&);
   
 protected:
-  /// transpose. #delta# is relative to central c.
-  virtual void transpose (Pitch delta);
   virtual bool do_equal_b (Request const*) const;
 
-  VIRTUAL_COPY_CONS(Music);
-};
-
-/// specify tonic of a chord
-struct Tonic_req : public Melodic_req
-{
-  VIRTUAL_COPY_CONS (Music);
-};
-
-/// specify inversion of a chord
-struct Inversion_req : public Melodic_req
-{
-  VIRTUAL_COPY_CONS (Music);
-};
-
-/// specify bass of a chord
-struct Bass_req : public Melodic_req
-{
   VIRTUAL_COPY_CONS (Music);
 };
 
@@ -117,11 +93,11 @@ struct Bass_req : public Melodic_req
 class Note_req  : public Rhythmic_req, virtual public Melodic_req  {
 public:
     
-  Note_req();
+  Note_req ();
 protected:
 
   bool do_equal_b (Request const*) const;
-  VIRTUAL_COPY_CONS(Music);
+  VIRTUAL_COPY_CONS (Music);
 };
 
 /**
@@ -129,20 +105,20 @@ Put a rest on the staff. Why a request? It might be a good idea to not typeset t
 */
 class Rest_req : public Rhythmic_req {
 public:
-  VIRTUAL_COPY_CONS(Music);
+  VIRTUAL_COPY_CONS (Music);
 };
 
 
 /// an extender line
 class Extender_req : public Request  {
 public:
-  VIRTUAL_COPY_CONS(Music);
+  VIRTUAL_COPY_CONS (Music);
 };
 
 /// a centred hyphen
 class Hyphen_req : public Request  {
 public:
-  VIRTUAL_COPY_CONS(Music);
+  VIRTUAL_COPY_CONS (Music);
 };
 
 /** is anyone  playing a note?
@@ -161,7 +137,7 @@ public:
 class Melisma_req : public Span_req
 {
 public:
-  VIRTUAL_COPY_CONS(Music);
+  VIRTUAL_COPY_CONS (Music);
 };
 
 
@@ -180,4 +156,10 @@ public:
   VIRTUAL_COPY_CONS (Music);
 };
 
+class Glissando_req : public Request
+{
+public:
+  VIRTUAL_COPY_CONS (Music);
+};
+
 #endif // MUSICALREQUESTS_HH