X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Finclude%2Fcommand-request.hh;h=2acf5d4ba1820a7d265c9606189f6747be7c0dfb;hb=8da6cef580cce3365b219f6aca429b434cb60fcf;hp=47507b8c3c23581507344cb9ace51ff237e2631a;hpb=78ed9c22a8cbf56ff5390553e0a2854aa42cbbc5;p=lilypond.git

diff --git a/lily/include/command-request.hh b/lily/include/command-request.hh
index 47507b8c3c..2acf5d4ba1 100644
--- a/lily/include/command-request.hh
+++ b/lily/include/command-request.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
@@ -14,12 +14,11 @@
 #include "array.hh"
 #include "duration.hh"
 #include "musical-pitch.hh"
-#include "key-def.hh"
+#include "protected-scm.hh"
 
 class Break_req : public Request {
 public:
-  enum { DISALLOW = -10000, FORCE = 10000 };
-  int penalty_i_;
+
   Break_req ();
 protected:
   VIRTUAL_COPY_CONS(Music);
@@ -27,92 +26,31 @@ protected:
 
 class Mark_req : public Request {
 public:
-  Mark_req (String);
-  String str_;
-protected:
-  virtual void do_print () const;  
-  VIRTUAL_COPY_CONS(Music);
-};
-
-
-/** Baseclass for time_signature/partial req. It has to be handled by
-  Staff_{walker,column} baseclass.  */
-class Timing_req  : public Request  {
-public:
+  virtual bool do_equal_b (Request const*) const;
+  SCM mark_label ();
   VIRTUAL_COPY_CONS(Music);
 };
 
-
-class Tempo_req : public Timing_req
+/*
+    int metronome_i_;
+ */
+class Tempo_req : public Request
 {
 public:
   Duration dur_;
-  int metronome_i_;
 
-  Tempo_req();
-protected:
-    virtual void do_print () const;
-  VIRTUAL_COPY_CONS(Music);
-  bool do_equal_b (Request *) const;
-};
-
-class Partial_measure_req  : public Timing_req  {
-public:
-  Moment length_mom_;
 
-  Partial_measure_req (Moment);
-protected:
-  VIRTUAL_COPY_CONS(Music);
-  virtual void do_print () const;
-  bool do_equal_b (Request*) const;
-};
-
-/**
-  todo: allow C time_signature
- */
-class Time_signature_change_req  : public Timing_req  {
-public:
-  int beats_i_;
-  int one_beat_i_;
-
-  Time_signature_change_req();
+  Tempo_req();
 protected:
-  virtual void do_print () const;
-  bool do_equal_b (Request*) const;
-  VIRTUAL_COPY_CONS(Music);
-};
 
-/// toggle Cadenza mode
-class Cadenza_req  : public Timing_req  {
-public:
-  /// turn on?
-  bool on_b_;
-  Cadenza_req (bool);
-protected:
-  virtual void do_print () const;
-  
-  bool do_equal_b (Request*) const;
   VIRTUAL_COPY_CONS(Music);
+  bool do_equal_b (Request const *) const;
 };
 
 /// check if we're at start of a  measure.
-class Barcheck_req  : public Timing_req  {
-public:
-  bool do_equal_b (Request *) const;
-  VIRTUAL_COPY_CONS(Music);
-};
-
-
-/** draw a (repeat)-bar. This something different than #Barcheck_req#,
-  the latter should only happen at the start of a measure.  */
-class Bar_req  : public Request  {
+class Barcheck_req  : public Request  {
 public:
-  String type_str_;
-  Bar_req (String);
-protected:
-  virtual void do_print () const;
-  bool do_equal_b (Request*) const;
-
+  bool do_equal_b (Request const *) const;
   VIRTUAL_COPY_CONS(Music);
 };
 
@@ -122,29 +60,16 @@ class Breathing_sign_req : public Request {
 
 /**
     Handle key changes.
-    Routines for sharps and flats are separated, 
-    so that caller may identify non-conventional keys.
 */
 class Key_change_req  : public Request
 {
 public:
-  Key_change_req ();
-  Key_def key_;
-
-protected:
-  VIRTUAL_COPY_CONS(Music);
-  //  void transpose (Musical_pitch  d);
-  virtual void do_print () const;
-};
-
-class Clef_change_req  : public Request  {
-public:
-  String clef_str_;
-  Clef_change_req (String);
+  SCM pitch_alist ();
+  
 protected:
-  virtual void do_print () const;
   VIRTUAL_COPY_CONS(Music);
+  void transpose (Musical_pitch  d);
+  bool do_equal_b (Request const * )const; 
 };
 
-
 #endif // COMMANDREQUEST_HH