release: 1.1.15

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

diff --git a/lily/include/command-request.hh b/lily/include/command-request.hh
index a76a3518615ff765dbb8e1c73e9de2f3fc1c5caf..81990b4f3f29f864aa343c42aeff569b068536e1 100644 (file)
--- a/lily/include/command-request.hh
+++ b/lily/include/command-request.hh
@@ -16,23 +16,11 @@
 #include "musical-pitch.hh"
 
 /** Request which are  assumed to be "happening" before the
-  musical requests. */
+  musical requests.  Not coupled to a note or rest. */
 class Command_req  : public virtual Request  {
 public:
   REQUESTMETHODS(Command_req);
 
-    DEFAULTACCESSOR(Measure_grouping_req)
-    DEFAULTACCESSOR(Clef_change_req)
-    DEFAULTACCESSOR(Key_change_req)
-    DEFAULTACCESSOR(Partial_measure_req)
-    DEFAULTACCESSOR(Time_signature_change_req)
-    DEFAULTACCESSOR(Bar_req)
-    DEFAULTACCESSOR(Cadenza_req)
-    DEFAULTACCESSOR(Timing_req)
-    DEFAULTACCESSOR(Command_script_req)
-    DEFAULTACCESSOR(Break_req)
-    DEFAULTACCESSOR(Mark_req)
-  DEFAULTACCESSOR(Bracket_req)
 };
 
 
@@ -59,12 +47,16 @@ public:
   REQUESTMETHODS(Command_script_req);
 };
 
+class Command_tie_req : public Command_req {
+public:
+  REQUESTMETHODS(Command_tie_req);
+};
+
 /** Baseclass for time_signature/partial req. It has to be handled by
   Staff_{walker,column} baseclass.  */
 class Timing_req  : public Command_req  {
 public:
   REQUESTMETHODS(Timing_req);
-  DEFAULTACCESSOR(Tempo_req)
 };
 
 
@@ -145,7 +137,7 @@ public:
 class Key_change_req  : public Command_req  {
 public:
   Array<Musical_pitch> pitch_arr_;
-  bool minor_b_;
+  int modality_i_;
   bool ordinary_key_b_;
 
   Key_change_req();
@@ -160,7 +152,6 @@ public:
   int sharps_i();
 
   void transpose (Musical_pitch  d);
-  /// is minor key?
   bool minor_b() const;
 };
 
@@ -177,4 +168,5 @@ public:
   REQUESTMETHODS(Bracket_req);
 };
 
+
 #endif // COMMANDREQUEST_HH