release: 1.1.43

[lilypond.git] / lily / command-request.cc

diff --git a/lily/command-request.cc b/lily/command-request.cc
index 9255f63cfb60ea1b05f52ea80d698351c381cf0e..335c92904251d2de49e8a0dbf46790dda6e176cb 100644 (file)
--- a/lily/command-request.cc
+++ b/lily/command-request.cc
@@ -3,24 +3,13 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "command-request.hh"
 #include "debug.hh"
 #include "musical-request.hh"
 
-void
-Command_script_req::do_print() const
-{}
-Command_script_req::Command_script_req(){}
-Command_script_req::~Command_script_req(){}
-
-IMPLEMENT_IS_TYPE_B1(Command_script_req,Command_req);
-
-
-IMPLEMENT_IS_TYPE_B1(Cadenza_req, Timing_req);
-
 void
 Cadenza_req::do_print() const
 {
@@ -50,21 +39,12 @@ Bar_req::do_equal_b (Request*r) const
   return b && type_str_ == b->type_str_;
 }
 
-
-IMPLEMENT_IS_TYPE_B1(Bar_req,Command_req);
-
-IMPLEMENT_IS_TYPE_B2(Bracket_req, Command_req, Span_req);
-
 void
 Bar_req::do_print() const
 {
+#ifndef NPRINT
   DOUT << type_str_;
-}
-
-void
-Bracket_req::do_print () const
-{
-  Span_req::do_print ();
+#endif
 }
 
 Bar_req::Bar_req (String s)
@@ -74,7 +54,7 @@ Bar_req::Bar_req (String s)
 
 Partial_measure_req::Partial_measure_req (Moment m)
 {
-  duration_ =m;
+  length_mom_ =m;
 }
 
 bool
@@ -82,36 +62,16 @@ Partial_measure_req::do_equal_b (Request* r) const
 {
   Partial_measure_req *p = dynamic_cast <Partial_measure_req *> (r);
 
-  return p&& p->duration_ == duration_;
+  return p&& p->length_mom_ == length_mom_;
 }
 
-
-IMPLEMENT_IS_TYPE_B1(Timing_req,Command_req);
-
-void
-Timing_req::do_print() const{}
-
-
-IMPLEMENT_IS_TYPE_B1(Command_req,Request);
-
-void
-Command_req::do_print() const{}
-
-IMPLEMENT_IS_TYPE_B1(Barcheck_req,Timing_req);
-
-void
-Barcheck_req::do_print() const{}
-
 bool
 Barcheck_req::do_equal_b (Request*r) const
 {
   Barcheck_req *b = dynamic_cast<Barcheck_req*> (r);
-  return r;
+  return b;
 }
 
-
-IMPLEMENT_IS_TYPE_B1(Clef_change_req,Command_req);
-
 void
 Clef_change_req::do_print() const
 {
@@ -125,19 +85,14 @@ Clef_change_req::Clef_change_req (String s)
   clef_str_ = s;
 }
 
-
-
-
-IMPLEMENT_IS_TYPE_B1(Partial_measure_req,Timing_req);
-
 void
 Partial_measure_req::do_print() const
 {
-  DOUT << duration_;
+  DOUT << length_mom_;
 }
 
 
-IMPLEMENT_IS_TYPE_B1(Time_signature_change_req,Timing_req);
+
 
 void
 Time_signature_change_req::do_print() const
@@ -174,21 +129,16 @@ Tempo_req::do_print() const
 {
   DOUT << dur_.str() << " = " << metronome_i_;
 }
-IMPLEMENT_IS_TYPE_B1(Tempo_req, Timing_req);
+
 
 bool
 Tempo_req::do_equal_b (Request *r) const
 {
   Tempo_req *t = dynamic_cast <Tempo_req *> (r);
 
-  return t&& t->dur_.length()== dur_.length () && metronome_i_ == t->metronome_i_;
+  return t&& t->dur_.length_mom ()== dur_.length_mom () && metronome_i_ == t->metronome_i_;
 }
 
-
-
-
-IMPLEMENT_IS_TYPE_B1(Measure_grouping_req,Timing_req);
-
 void
 Measure_grouping_req::do_print() const
 {
@@ -299,7 +249,7 @@ Key_change_req::transpose (Musical_pitch d)
     }
 }
 
-IMPLEMENT_IS_TYPE_B1(Key_change_req,Command_req);
+
 void
 Key_change_req::squash_octaves()
 {
@@ -326,20 +276,13 @@ Key_change_req::Key_change_req()
   ordinary_key_b_= false;
 }
 
-IMPLEMENT_IS_TYPE_B1(Break_req, Command_req);
+
 
 Break_req::Break_req ()
 {
   penalty_i_ = 0;
 }
 
-void
-Break_req::do_print () const
-{
-}
-
-IMPLEMENT_IS_TYPE_B1 (Mark_req, Command_req);
-
 Mark_req::Mark_req (String s)
 {
   str_ = s;