patch::: 1.3.96.jcn9

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

diff --git a/lily/include/musical-request.hh b/lily/include/musical-request.hh
index ee5728441c41752f5e6f4828c3c9f0f66c84a084..5fb7299a69cbfc8c4730ce39a97a44e15116e9b0 100644 (file)
--- a/lily/include/musical-request.hh
+++ b/lily/include/musical-request.hh
@@ -16,14 +16,13 @@
 #include "musical-pitch.hh"
 #include "array.hh"
 
-
 /** a request with a duration.
   This request is used only used as a base class.
  */
 class Rhythmic_req  : public virtual Request  {
 public:
   Duration duration_;
-  virtual void do_print () const;
+
 
   bool do_equal_b (Request const*) const;
   void compress (Moment);
@@ -42,17 +41,17 @@ struct Tremolo_req : public Request {
   VIRTUAL_COPY_CONS (Music);
   Tremolo_req ();
   int type_i_;
-  virtual void do_print () const;
+
 };
 
 
-/** a syllable  or lyric is a string with rhythm.
+/**
+   a syllable or lyric is a string with rhythm.
   */
-class Lyric_req  : public  Rhythmic_req  {
-public:
-  virtual void do_print () const;
-  String text_str_;
-  VIRTUAL_COPY_CONS(Music);
+class Lyric_req : public Rhythmic_req
+{
+protected:
+  VIRTUAL_COPY_CONS (Music);
 };
 
 
@@ -62,22 +61,22 @@ public:
   String articulation_str_;
 protected:
   virtual bool do_equal_b (Request const*) const;
-  virtual void do_print () const;
+
   VIRTUAL_COPY_CONS(Music);
 };
 
-class Text_script_req : public Script_req {
-public:
-  String text_str_;
-
-  // should be generic property of some kind.. 
-  String style_str_;
+class Text_script_req : public Script_req
+{
 protected:
-  VIRTUAL_COPY_CONS(Music);
-  virtual bool do_equal_b (Request const*)const;
-  virtual void do_print () const;
+  VIRTUAL_COPY_CONS (Music);
+  virtual bool do_equal_b (Request const*) const;
 };
 
+class Dynamic_script_req : public Script_req
+{
+protected:
+  VIRTUAL_COPY_CONS (Music);
+};
 
 /// request which has some kind of pitch
 struct Melodic_req :virtual Request
@@ -90,7 +89,7 @@ protected:
   /// transpose. #delta# is relative to central c.
   virtual void transpose (Musical_pitch delta);
   virtual bool do_equal_b (Request const*) const;
-  virtual void do_print () const;
+
   VIRTUAL_COPY_CONS(Music);
 };
 
@@ -122,7 +121,7 @@ public:
   bool cautionary_b_;
   Note_req();
 protected:
-  virtual void do_print () const;
+
   bool do_equal_b (Request const*) const;
   VIRTUAL_COPY_CONS(Music);
 };
@@ -176,4 +175,11 @@ class Melisma_playing_req : public Request
 public:
   VIRTUAL_COPY_CONS (Music);
 };
+
+class Arpeggio_req : public Request
+{
+public:
+  VIRTUAL_COPY_CONS (Music);
+};
+
 #endif // MUSICALREQUESTS_HH