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 da3d1c484caab60213011825f98c0fb22d00ab02..5fb7299a69cbfc8c4730ce39a97a44e15116e9b0 100644 (file)
--- a/lily/include/musical-request.hh
+++ b/lily/include/musical-request.hh
@@ -16,7 +16,6 @@
 #include "musical-pitch.hh"
 #include "array.hh"
 
-
 /** a request with a duration.
   This request is used only used as a base class.
  */
@@ -46,13 +45,13 @@ struct Tremolo_req : public Request {
 };
 
 
-/** 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:
-
-  String text_str_;
-  VIRTUAL_COPY_CONS(Music);
+class Lyric_req : public Rhythmic_req
+{
+protected:
+  VIRTUAL_COPY_CONS (Music);
 };
 
 
@@ -68,17 +67,16 @@ protected:
 
 class Text_script_req : public Script_req
 {
-public:
-  String text_str_;  // to be deprecated
-  String style_str_; // to be deprecated
-
-  SCM text_scm_;
-
 protected:
-  VIRTUAL_COPY_CONS(Music);
-  virtual bool do_equal_b (Request const*)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