release: 1.3.110

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

diff --git a/lily/include/musical-request.hh b/lily/include/musical-request.hh
index f3d1adcbb1878420bbcd9b26084249b3caa32562..4b8eecd87728bc754ef3eb179deb1bfe44b67bda 100644 (file)
--- a/lily/include/musical-request.hh
+++ b/lily/include/musical-request.hh
@@ -24,6 +24,7 @@ public:
   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);
 };
 
@@ -73,6 +74,8 @@ 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 (Pitch delta);
@@ -81,42 +84,12 @@ protected:
   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  {