lilypond-0.0.35

diff --git a/hdr/commandrequest.hh b/hdr/commandrequest.hh
index f9eef852fd5759a1d905580f1dbdb6f0b550d8a8..71b83316610e27e7d04191ed0c043c678de89b4d 100644 (file)
--- a/hdr/commandrequest.hh
+++ b/hdr/commandrequest.hh
@@ -13,11 +13,10 @@
 #include "request.hh"
 #include "varray.hh"
 
-/**
-  Request assumed to be "happening" before the musical requests
- */
-struct Nonmusical_req : virtual Request {
-    REQUESTMETHODS(Nonmusical_req, nonmus);
+/** Request which are  assumed to be "happening" before the
+  musical requests. */
+struct Command_req : virtual Request {
+    REQUESTMETHODS(Command_req, command);
 
     virtual Measure_grouping_req * measuregrouping() { return 0; }
     virtual Clef_change_req * clefchange() { return 0; }
@@ -32,7 +31,7 @@ struct Nonmusical_req : virtual Request {
 
 /** Baseclass for meter/partial req. It has to be handled by
   Staff_{walker,column} baseclass.  */
-struct Timing_req : Nonmusical_req {
+struct Timing_req : Command_req {
     REQUESTMETHODS(Timing_req, timing);
 };
 
@@ -58,7 +57,7 @@ struct Meter_change_req : Timing_req {
 /// toggle Cadenza mode
 struct Cadenza_req : Timing_req {
     /// turn on?
-    bool on_b;
+    bool on_b_;
     Cadenza_req(bool);
     REQUESTMETHODS(Cadenza_req,cadenza);
 };
@@ -76,31 +75,31 @@ struct Measure_grouping_req: Timing_req {
     REQUESTMETHODS(Measure_grouping_req, measuregrouping);
 };
 
-struct Group_change_req : Nonmusical_req {
+struct Group_change_req : Command_req {
     String newgroup_str_;
     REQUESTMETHODS(Group_change_req, groupchange);
 };
 
 /** draw a (repeat)-bar. This something different than #Barcheck_req#,
   the latter should only happen at the start of a measure.  */
-struct Bar_req : Nonmusical_req {
+struct Bar_req : Command_req {
     String type_str_;
     Bar_req(String);
     int compare(const Bar_req&)const;
     REQUESTMETHODS(Bar_req,bar);
 };
-struct Terminate_voice_req : Nonmusical_req {
+struct Terminate_voice_req : Command_req {
     REQUESTMETHODS(Terminate_voice_req,terminate);
 };
 
-struct Group_feature_req : Nonmusical_req {
+struct Group_feature_req : Command_req {
     int stemdir_i_;
     Group_feature_req();
     REQUESTMETHODS(Group_feature_req, groupfeature);
 };
 
 
-struct Key_change_req : Nonmusical_req {
+struct Key_change_req : Command_req {
     Array<Melodic_req*> melodic_p_arr_;
 
     Key_change_req();
@@ -109,7 +108,7 @@ struct Key_change_req : Nonmusical_req {
     REQUESTMETHODS(Key_change_req, keychange);
 };
 
-struct Clef_change_req : Nonmusical_req {
+struct Clef_change_req : Command_req {
     String clef_str_;
     Clef_change_req(String);
     REQUESTMETHODS(Clef_change_req, clefchange);

diff --git a/src/commandrequest.cc b/src/commandrequest.cc
index 9af17503f37f90407b36f56a48cfde453c34e56b..5cf0912417e154e601a0604a6d321375b0a4aa8d 100644 (file)
--- a/src/commandrequest.cc
+++ b/src/commandrequest.cc
@@ -14,9 +14,16 @@
 void
 Cadenza_req::do_print()const
 {
-    mtor << on_b;
+    mtor << on_b_;
 }
 
+Cadenza_req::Cadenza_req(bool b)
+{
+    on_b_ =b;
+}
+/* *************** */
+
+
 int
 Bar_req::compare(const Bar_req &c1)const
 {
@@ -39,12 +46,6 @@ Partial_measure_req::Partial_measure_req(Moment m)
     duration_ =m;
 }
 /* *************** */
-Cadenza_req::Cadenza_req(bool b)
-{
-    on_b =b;
-}
-/* *************** */
-
 Meter_change_req::Meter_change_req()
 {
     beats_i_ = 0;
@@ -61,7 +62,7 @@ void
 Timing_req::do_print()const{}
 
 void
-Nonmusical_req::do_print()const{}
+Command_req::do_print()const{}
 /* *************** */
 void
 Barcheck_req::do_print() const{}