patch::: 1.1.27.jcn3: geen genade

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

diff --git a/lily/include/musical-request.hh b/lily/include/musical-request.hh
index d280d158acab436876ceee114b4b70db9a8280b8..eea7e90b167678c71a2c520623e1e4c6f4cf2cd6 100644 (file)
--- a/lily/include/musical-request.hh
+++ b/lily/include/musical-request.hh
@@ -37,8 +37,7 @@ public:
     
   bool do_equal_b (Request*) const;
   void compress (Moment);
-  virtual Moment duration() const;
-  Rhythmic_req();
+  virtual Moment length_mom () const;
   static int compare (Rhythmic_req const&,Rhythmic_req const&);
   REQUESTMETHODS(Rhythmic_req);
 };
@@ -67,21 +66,6 @@ public:
   REQUESTMETHODS(Spacing_req);
 };
 
-/// Put a text above or below (?) this staff.
-class Text_req  : public virtual Musical_req  {
-public:
-  /// preferred position (above/below)
-  Direction dir_;
-  /// the characteristics of the text
-  Text_def *tdef_p_;
-
-  Text_req (int d, Text_def*);
-  ~Text_req();
-  Text_req (Text_req const&);
-
-  REQUESTMETHODS(Text_req);
-};
-
 /** a syllable  or lyric is a string with rhythm.
   */
 class Lyric_req  : public  Rhythmic_req  {
@@ -104,12 +88,21 @@ struct Melodic_req :virtual Musical_req
   REQUESTMETHODS(Melodic_req);
 };
 
+/// specify tonic of a chord
+struct Tonic_req : public Melodic_req
+{
+  Tonic_req ();
+  REQUESTMETHODS(Tonic_req);
+};
+
 /// Put a note of specified type, height, and with accidental on the staff.
 class Note_req  : public Rhythmic_req, virtual public Melodic_req  {
 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;
   REQUESTMETHODS(Note_req);
@@ -140,13 +133,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. 
@@ -160,13 +146,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  {
@@ -175,13 +155,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 {
@@ -199,8 +177,7 @@ public:
     for FP, SF, SFZ (FP is *not* louder than FFF)
    */
   enum Loudness {
-    FFF, FF, F, MF, MP, P, PP, PPP, FP, SF, SFZ
-  };
+    FFFFFF, FFFFF, FFFF, FFF, FF, F, MF, MP, P, PP, PPP, PPPP, PPPPP, PPPPPP, FP, SF, SFF, SFZ, SP, SPP, RFZ };
   static String loudness_static_str (Loudness);
   REQUESTMETHODS(Dynamic_req);
 };