lilypond-0.1.15

diff --git a/lily/include/musical-request.hh b/lily/include/musical-request.hh
index 4531ff82cfb39fb5315163963691d892e4fba1ce..5ebe4cb3a382b390e7073c5e83ec32dada0ef803 100644 (file)
--- a/lily/include/musical-request.hh
+++ b/lily/include/musical-request.hh
@@ -221,17 +221,23 @@ public:
 
 class Dynamic_req  : public virtual Musical_req  {
 public:
-  /// for absolute dynamics
+  /**
+    for absolute dynamics
+
+    This sux. We'd want increasing numbers for FFF till PPP, but not 
+    for FP, SF, SFZ (FP is *not* louder than FFF)
+   */
   enum Loudness {
-    FFF, FF, F, MF, MP, P, PP, PPP
+    FFF, FF, F, MF, MP, P, PP, PPP, FP, SF, SFZ
   };
-  static String loudness_str (Loudness);
+  static String loudness_static_str (Loudness);
   REQUESTMETHODS(Dynamic_req, dynamic);
 };
 
 class Absolute_dynamic_req  : public Dynamic_req  {
 public:
   Loudness loudness_;
+  String loudness_str () const;
   Absolute_dynamic_req();
   REQUESTMETHODS(Absolute_dynamic_req, absdynamic);
 };