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 f98b1bee8679e2f9c95dcf0ceddeda31fd71cb5f..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>
 */
 
 
@@ -13,7 +13,7 @@
 #include "lily-proto.hh"
 #include "request.hh"
 #include "duration.hh"
-#include "musical-pitch.hh"
+#include "pitch.hh"
 #include "array.hh"
 
 /** a request with a duration.
@@ -24,12 +24,13 @@ public:
   bool do_equal_b (Request const*) const;
   void compress (Moment);
   virtual Moment length_mom () const;
-  VIRTUAL_COPY_CONS(Music);
+  static int compare (Rhythmic_req const&,Rhythmic_req const&);
+  VIRTUAL_COPY_CONS (Music);
 };
 
 class Skip_req  : public Rhythmic_req  {
 public:
-  VIRTUAL_COPY_CONS(Music);
+  VIRTUAL_COPY_CONS (Music);
 };
 
 
@@ -55,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
@@ -73,60 +74,30 @@ protected:
 /// request which has some kind of pitch
 struct Melodic_req :virtual Request
 {
+  static int compare (Melodic_req const&,Melodic_req const&);
+  
 protected:
-  /// transpose. #delta# is relative to central c.
-  virtual void transpose (Musical_pitch delta);
   virtual bool do_equal_b (Request const*) const;
 
-  VIRTUAL_COPY_CONS(Music);
-};
-
-
-/*
-  TODO: junk these, and set
-
-    (tonic . #t)
-
-  or maybe
-
-    (chord-type . tonic/inversion/bass) 
-
-  
- */
-/// 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);
 };
 
 /*
-  Put a note of specified type, height, and with accidental on the staff.
-
-  force-accidental -- force/supress printing of accidental.
-     
-  cautionary --  Cautionary, i.e. parenthesized accidental.
+   Put a note of specified type, height, and with accidental on the staff.
+    /// force/supress printing of accidental.
+  bool forceacc_b_;
+  /// Cautionary, i.e. parenthesized accidental.
+  bool cautionary_b_;
 
  */
 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);
 };
 
 /**
@@ -134,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?
@@ -166,7 +137,7 @@ public:
 class Melisma_req : public Span_req
 {
 public:
-  VIRTUAL_COPY_CONS(Music);
+  VIRTUAL_COPY_CONS (Music);
 };
 
 
@@ -185,4 +156,10 @@ public:
   VIRTUAL_COPY_CONS (Music);
 };
 
+class Glissando_req : public Request
+{
+public:
+  VIRTUAL_COPY_CONS (Music);
+};
+
 #endif // MUSICALREQUESTS_HH