release: 1.3.145

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

diff --git a/lily/include/command-request.hh b/lily/include/command-request.hh
index 11491edc4163c9fa705cc74991586b2eda8b012f..8c4cbeeb51fb9e5928af904a09b836c6a6cb1a6d 100644 (file)
--- 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 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
@@ -11,162 +11,59 @@
 #define COMMANDREQUEST_HH
 
 #include "request.hh"
-#include "varray.hh"
+#include "array.hh"
 #include "duration.hh"
+#include "pitch.hh"
+#include "protected-scm.hh"
 
-/** Request which are  assumed to be "happening" before the
-  musical requests. */
-class Command_req  : public virtual Request  {
+class Break_req : public Request {
 public:
-  REQUESTMETHODS(Command_req, command);
-  virtual Measure_grouping_req * measuregrouping() { return 0; }
-  virtual Clef_change_req * clefchange() { return 0; }
-  virtual Key_change_req * keychange() { return 0; }
-  virtual Partial_measure_req * partial() { return 0; }
-  virtual Meter_change_req * meterchange() { return 0; }
-  virtual Bar_req *bar() { return 0; }
-  virtual Cadenza_req *cadenza() { return 0; }
-  virtual Disallow_break_req *disallowbreak() { return 0; }
-  virtual Timing_req*timing() {  return 0; }
-  virtual Command_script_req*commandscript() { return 0;}
-  virtual Break_force_req *forcebreak () { return 0; }
+protected:
+  VIRTUAL_COPY_CONS (Music);
 };
 
-
-class Break_force_req : public Command_req {
-public:
-  REQUESTMETHODS(Break_force_req, forcebreak);
-};
-
-class Command_script_req : public Command_req,  public Script_req {
-public:
-  // huh? 
-  Command_script_req();
-  ~Command_script_req();
-  REQUESTMETHODS(Command_script_req, commandscript);
-};
-
-
-class Disallow_break_req : public Command_req {
-public:
-  REQUESTMETHODS(Disallow_break_req, disallowbreak);
-};
-
-
-/** Baseclass for meter/partial req. It has to be handled by
-  Staff_{walker,column} baseclass.  */
-class Timing_req  : public Command_req  {
-public:
-  REQUESTMETHODS(Timing_req, timing);
-  virtual Tempo_req * tempo(){return 0; }
-};
-
-
-class Tempo_req : public Timing_req
-{
+class Mark_req : public Request {
 public:
-  Duration dur_;
-  int metronome_i_;
-
-  Tempo_req();
-  REQUESTMETHODS(Tempo_req, tempo);
-  bool do_equal_b (Request *) const;
-};
-
-class Partial_measure_req  : public Timing_req  {
-public:
-  Moment duration_;
-
-  Partial_measure_req (Moment);
-  REQUESTMETHODS(Partial_measure_req, partial);
-  bool do_equal_b (Request*) const;
+  virtual bool do_equal_b (Request const*) const;
+  SCM mark_label ();
+  VIRTUAL_COPY_CONS (Music);
 };
 
-/**
-  todo: allow C meter
+/*
+    int metronome_i_;
  */
-class Meter_change_req  : public Timing_req  {
-public:
-  int beats_i_, one_beat_i_;
-
-  Meter_change_req();
-  void set (int,int);
-  bool do_equal_b (Request*) const;
-  REQUESTMETHODS(Meter_change_req, meterchange);
-};
-
-/// toggle Cadenza mode
-class Cadenza_req  : public Timing_req  {
+class Tempo_req : public Request
+{
 public:
-  /// turn on?
-  bool on_b_;
-  bool do_equal_b (Request*) const;
-  Cadenza_req (bool);
-  REQUESTMETHODS(Cadenza_req,cadenza);
+  Tempo_req ();
+protected:
+  VIRTUAL_COPY_CONS (Music);
 };
 
 /// check if we're at start of a  measure.
-class Barcheck_req  : public Timing_req  {
+class Barcheck_req  : public Request  {
 public:
-  bool do_equal_b (Request *) const;
-  REQUESTMETHODS(Barcheck_req,barcheck);
+  bool do_equal_b (Request const *) const;
+  VIRTUAL_COPY_CONS (Music);
 };
 
-class Measure_grouping_req : public Timing_req  {
-public:
-  Array<int> beat_i_arr_;
-  Array<Moment> elt_length_arr_;
-  bool do_equal_b (Request *) const;
-  REQUESTMETHODS(Measure_grouping_req, measuregrouping);
-};
-
-/** 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 Command_req  {
-public:
-  String type_str_;
-  Bar_req (String);
-  bool do_equal_b (Request*) const;
-
-  REQUESTMETHODS(Bar_req,bar);
+class Breathing_sign_req : public Request {
+  VIRTUAL_COPY_CONS (Music);
 };
 
-
 /**
     Handle key changes.
-    Routines for sharps and flats are separated, 
-    so that caller may identify non-conventional keys.
 */
-class Key_change_req  : public Command_req  {
-public:
-  Array<Melodic_req*> melodic_p_arr_;
-  bool minor_b_;
-
-  /// don't ignore the  octaves in #melodic_p_arr_#?
-  bool multi_octave_b_;
-  Key_change_req();
-  Key_change_req (Key_change_req const&);
-  ~Key_change_req();
-  REQUESTMETHODS(Key_change_req, keychange);
-
-  /// squash the octaves to 1
-  void squash_octaves();
-  /// return number of flats in key
-  int flats_i();
-
-  /// return number of sharps in key
-  int sharps_i();
-
-  void transpose (Melodic_req const * d) const;
-  /// is minor key?
-  int minor_b();
-};
-
-class Clef_change_req  : public Command_req  {
+class Key_change_req  : public Request
+{
 public:
-  String clef_str_;
-  Clef_change_req (String);
-  REQUESTMETHODS(Clef_change_req, clefchange);
+  SCM pitch_alist ();
+  
+protected:
+  VIRTUAL_COPY_CONS (Music);
+  bool do_equal_b (Request const * ) const;
+  void transpose (Pitch  d);
 };
 
 #endif // COMMANDREQUEST_HH
+