lilypond-0.1.54

diff --git a/.dstreamrc b/.dstreamrc
index d016c2b727255f80aac394da9f184d1be23b052a..da36d7d722d57b1b168fa72587f6a83b64317efd 100644 (file)
--- a/.dstreamrc
+++ b/.dstreamrc
@@ -57,7 +57,7 @@ Paper_score                   1
 Paper_def              1
 Performer              1
 Performer_group_performer      1
-Request                        1
+Request                        0
 Request_iterator       1
 Rest_collision         1
 Rest_collision_engraver 1

diff --git a/lily/include/key.hh b/lily/include/key.hh
index 4a68fa8148733814511429fc0385986bc9ef2ca8..da0379919334f6e61da77075bceb71c53350ac7e 100644 (file)
--- a/lily/include/key.hh
+++ b/lily/include/key.hh
@@ -14,26 +14,29 @@
 class Octave_key {
 
 public:
-    Array<int> accidental_i_arr_;
- 
-    Octave_key();
-    void set (int i, int acc);
-    int acc (int i) const { return accidental_i_arr_[i]; }
+  Array<int> accidental_i_arr_;
+  void clear ();
+  Octave_key();
+  void set (int i, int acc);
+  int acc (int i) const { return accidental_i_arr_[i]; }
+  void print () const;
 };
 
 /// administration of accidentals
 class Key
 {
-    /** for each octave a key. Has to be private since octave 0 isn't member 0.
-     */
-    Array<Octave_key> octaves;
+  /** for each octave a key. Has to be private since octave 0 isn't member 0.
+   */
+  Array<Octave_key> octaves;
 public:
-    bool multi_octave_b_;
-    
-    Octave_key&oct (int);
-    void set (int name, int acc);
-    void set (int oct, int name, int acc);
-    Key();
+  bool multi_octave_b_;
+  
+  void clear ();
+  Octave_key&oct (int);
+  void set (int name, int acc);
+  void set (int oct, int name, int acc);
+  Key();
+  void print () const;  
 };
 
 #endif // KEY_HH

diff --git a/lily/key.cc b/lily/key.cc
index 1a7892d4b13a67c2388c7ce415f860c5eddb143e..56a6278cfa118bf7655d777727b6fa3ac2750317 100644 (file)
--- a/lily/key.cc
+++ b/lily/key.cc
@@ -10,15 +10,32 @@
 */
 
 #include "key.hh"
+#include "debug.hh"
 
 const int OCTAVES=14;          // ugh..
 const int ZEROOCTAVE=7;
 
+
+void
+Octave_key::print () const
+{
+  for (int i= 0; i < 7 ; i++)
+    DOUT << "note " << i << " acc: " << accidental_i_arr_[i] << "\n";
+}
+
+
+
 Octave_key::Octave_key()
 {
   accidental_i_arr_.set_size (7);
+  clear ();
+}
+
+void
+Octave_key::clear ()
+{
   for (int i= 0; i < 7 ; i++)
-       accidental_i_arr_[i] = 0;
+    accidental_i_arr_[i] = 0;
 }
 
 Key::Key()
@@ -51,5 +68,21 @@ void
 Key::set (int n, int a)
 {
   for (int i= 0; i < OCTAVES ; i++)
-       octaves[i].set (n,a);
+    octaves[i].set (n,a);
+}
+void
+Key::clear ()
+{
+  for (int i= 0; i < OCTAVES ; i++)
+    octaves[i].clear ();
+}
+void
+Key::print () const
+{
+  for (int i= 0; i < OCTAVES ; i++)
+    {
+      DOUT << "octave " << i - ZEROOCTAVE << " Octave_key { ";
+      octaves[i].print ();
+      DOUT << "}\n";
+    }
 }