X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fcommand-request.cc;h=6cbd2bc92fc13983d4f5bbd8658d361c25698e5c;hb=670a98f23a2561c6a4a4a19bb72c776189715541;hp=1ab0353bc558ab32d3c74da961a4e5e34e09e678;hpb=afa5829cd270e1b0c616b7ba5c5e6cdc0e920e5f;p=lilypond.git

diff --git a/lily/command-request.cc b/lily/command-request.cc
index 1ab0353bc5..6cbd2bc92f 100644
--- a/lily/command-request.cc
+++ b/lily/command-request.cc
@@ -1,26 +1,15 @@
 /*
-  commandrequest.cc -- implement Nonmusical reqs
+  command-request.cc -- implement non-musical reqs
 
   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(){}
-
-
-
-
-
-
 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_;
 }
 
-
-
-
-
-
 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,26 +62,9 @@ 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_;
 }
 
-
-
-
-void
-Timing_req::do_print() const{}
-
-
-
-
-void
-Command_req::do_print() const{}
-
-
-
-void
-Barcheck_req::do_print() const{}
-
 bool
 Barcheck_req::do_equal_b (Request*r) const
 {
@@ -109,9 +72,6 @@ Barcheck_req::do_equal_b (Request*r) const
   return b;
 }
 
-
-
-
 void
 Clef_change_req::do_print() const
 {
@@ -125,20 +85,12 @@ Clef_change_req::Clef_change_req (String s)
   clef_str_ = s;
 }
 
-
-
-
-
-
 void
 Partial_measure_req::do_print() const
 {
-  DOUT << duration_;
+  DOUT << length_mom_;
 }
 
-
-
-
 void
 Time_signature_change_req::do_print() const
 {
@@ -150,7 +102,8 @@ Time_signature_change_req::do_print() const
 bool
 Time_signature_change_req::do_equal_b (Request * r) const
 {
-  Time_signature_change_req * m = dynamic_cast <Time_signature_change_req *> (r);
+  Time_signature_change_req * m
+    = dynamic_cast <Time_signature_change_req *> (r);
 
   return m && m->beats_i_ == beats_i_
     && one_beat_i_ == m->one_beat_i_;
@@ -181,14 +134,9 @@ 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_;
 }
 
-
-
-
-
-
 void
 Measure_grouping_req::do_print() const
 {
@@ -333,13 +281,6 @@ Break_req::Break_req ()
   penalty_i_ = 0;
 }
 
-void
-Break_req::do_print () const
-{
-}
-
-
-
 Mark_req::Mark_req (String s)
 {
   str_ = s;