release: 1.1.18

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

diff --git a/lily/include/musical-request.hh b/lily/include/musical-request.hh
index 2f3c3f599c57f2f6ca630fc0df26fb60b30adb7c..b3b5b2959b162d77f4c4578bf87ad59eea0a3597 100644 (file)
--- a/lily/include/musical-request.hh
+++ b/lily/include/musical-request.hh
@@ -22,26 +22,7 @@
 class Musical_req  : public virtual Request  {
 public:
 
-  DEFAULTACCESSOR(Lyric_req)
-  DEFAULTACCESSOR(Note_req )
-  DEFAULTACCESSOR(Stem_req )
-  DEFAULTACCESSOR(Melodic_req )
-  DEFAULTACCESSOR(Slur_req )
-  DEFAULTACCESSOR(Beam_req )
-  DEFAULTACCESSOR(Abbreviation_beam_req)
-  DEFAULTACCESSOR(Rhythmic_req)
-  DEFAULTACCESSOR(Musical_script_req)
-  DEFAULTACCESSOR(Text_req)
-  DEFAULTACCESSOR(Rest_req )
-  DEFAULTACCESSOR(Skip_req)
-  DEFAULTACCESSOR(Dynamic_req)
-  DEFAULTACCESSOR(Absolute_dynamic_req )
-  DEFAULTACCESSOR(Tie_req)
-  DEFAULTACCESSOR(Musical_span_req)
-  DEFAULTACCESSOR(Plet_req)
-  DEFAULTACCESSOR(Span_dynamic_req )
-  DEFAULTACCESSOR(Abbreviation_req)
-  DEFAULTACCESSOR(Multi_measure_rest_req)
+
   REQUESTMETHODS(Musical_req);
 };
 
@@ -57,7 +38,6 @@ public:
   bool do_equal_b (Request*) const;
   void compress (Moment);
   virtual Moment duration() const;
-  Rhythmic_req();
   static int compare (Rhythmic_req const&,Rhythmic_req const&);
   REQUESTMETHODS(Rhythmic_req);
 };
@@ -129,9 +109,10 @@ public:
     
   /// force/supress printing of accidental.
   bool forceacc_b_;
+  /// Cautionary, i.e. parenthesized accidental.
+  bool cautionary_b_;
   Note_req();
   bool do_equal_b (Request*) const;
-  Rhythmic_req* access_Rhythmic_req () { return Rhythmic_req::access_Rhythmic_req (); }
   REQUESTMETHODS(Note_req);
 };
 
@@ -160,13 +141,6 @@ public:
   
 };
 
-/** Start / stop a beam at this note */
-class Beam_req  : public Musical_span_req  {
-public:
-  REQUESTMETHODS(Beam_req);
-
-  Beam_req();
-};
 
 /** 
  Start / stop an abbreviation beam at this note. 
@@ -180,13 +154,7 @@ public:
   int type_i_;
 };
 
-/**
-  Start a tie at this note, end it at the next
- */
-class Tie_req : public Musical_req {
-public:
-  REQUESTMETHODS(Tie_req);
-};
+
 
 /// a slur
 class Slur_req  : public Musical_span_req  {
@@ -195,13 +163,11 @@ public:
 
 };
 
-/// a plet (bracket with) number
-class Plet_req : public Musical_span_req  {
+/// an extender line
+class Extender_req : public Musical_span_req  {
 public:
-  int plet_i_;
-
-  REQUESTMETHODS(Plet_req);
-  Plet_req ();
+  REQUESTMETHODS(Extender_req);
+  Extender_req ();
 };
 
 class Musical_script_req : public Musical_req,  public Script_req {