* VERSION (MY_PATCH_LEVEL): make 1.7.0

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

diff --git a/lily/include/musical-request.hh b/lily/include/musical-request.hh
index cd3e27b315eacc767470acac68a9c15ba6134f40..d9b67bb9b6a4f0a137c1e0aa8fde957b8334ef48 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--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
@@ -37,9 +37,14 @@ public:
 struct Tremolo_req : public Request {
   VIRTUAL_COPY_CONS (Music);
   Tremolo_req ();
+};
+
+struct Chord_tremolo_notify_req : public Request
+{
 
-  void set_type (int);
-  int get_type () const;
+  Rational factor_;
+  VIRTUAL_COPY_CONS(Chord_tremolo_notify_req);
+  Chord_tremolo_notify_req();
 };
 
 
@@ -56,7 +61,7 @@ protected:
 class Articulation_req : public Script_req
 {
 public:
-  String get_articulation_str ();
+  String get_articulation_string ();
 protected:
   virtual bool do_equal_b (Request const*) const;
 
@@ -70,6 +75,12 @@ protected:
   virtual bool do_equal_b (Request const*) const;
 };
 
+class String_number_req : public Script_req
+{
+protected:
+  VIRTUAL_COPY_CONS (Music);
+  virtual bool do_equal_b (Request const*) const;
+};
 
 /// request which has some kind of pitch
 struct Melodic_req :virtual Request
@@ -77,8 +88,6 @@ 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);
   virtual bool do_equal_b (Request const*) const;
 
   VIRTUAL_COPY_CONS (Music);
@@ -135,7 +144,7 @@ public:
 
 
 /**
-   instruct lyric context to alter typesetting (unimplemented).  */
+   instruct lyric context to alter typesetting.  */
 class Melisma_req : public Span_req
 {
 public:
@@ -164,4 +173,10 @@ public:
   VIRTUAL_COPY_CONS (Music);
 };
 
+class Bass_figure_req:  public Rhythmic_req
+{
+public:
+  VIRTUAL_COPY_CONS(Music);
+};
+
 #endif // MUSICALREQUESTS_HH