release: 1.3.93

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

diff --git a/lily/include/command-request.hh b/lily/include/command-request.hh
index 845598a3ad96cf0fa273356cb743b46647a288c1..078e02dd2f07e109ff913db02fa5fb0852662c46 100644 (file)
--- a/lily/include/command-request.hh
+++ b/lily/include/command-request.hh
@@ -26,9 +26,8 @@ protected:
 
 class Mark_req : public Request {
 public:
-  Protected_scm mark_label_;
-protected:
   virtual bool do_equal_b (Request const*) const;
+  SCM mark_label ();
   VIRTUAL_COPY_CONS(Music);
 };
 
@@ -49,7 +48,7 @@ public:
 
   Tempo_req();
 protected:
-    virtual void do_print () const;
+
   VIRTUAL_COPY_CONS(Music);
   bool do_equal_b (Request const *) const;
 };
@@ -65,7 +64,7 @@ public:
 
   Time_signature_change_req();
 protected:
-  virtual void do_print () const;
+
   bool do_equal_b (Request const *) const;
   VIRTUAL_COPY_CONS(Music);
 };
@@ -83,12 +82,9 @@ public:
   the latter should only happen at the start of a measure.  */
 class Bar_req  : public Request  {
 public:
-  String type_str_;
+
   Bar_req (String);
 protected:
-  virtual bool do_equal_b (Request const*) const;
-  virtual void do_print () const;
-
   VIRTUAL_COPY_CONS(Music);
 };
 
@@ -102,8 +98,8 @@ class Breathing_sign_req : public Request {
 class Key_change_req  : public Request
 {
 public:
-  Protected_scm pitch_alist_;
-
+  SCM pitch_alist ();
+  
 protected:
   VIRTUAL_COPY_CONS(Music);
   void transpose (Musical_pitch  d);
@@ -115,7 +111,7 @@ public:
   String clef_str_;
   Clef_change_req (String);
 protected:
-  virtual void do_print () const;
+
   VIRTUAL_COPY_CONS(Music);
 };