release: 1.3.19

[lilypond.git] / lily / include / key.hh

diff --git a/lily/include/key.hh b/lily/include/key.hh
index b00b1723c12a8c6e0d47fbc764c6fa71ce7e8ca0..5c24db2f08e4b22113e76a87a45add99760026d1 100644 (file)
--- a/lily/include/key.hh
+++ b/lily/include/key.hh
@@ -1,14 +1,13 @@
 /*
   key.hh -- declare Key, Octave_key
 
-  (c) 1996--1998 Han-Wen Nienhuys
+  (c) 1996--2000 Han-Wen Nienhuys
 */
 
 #ifndef KEY_HH
 #define KEY_HH
 
 #include "array.hh"
-#include "scalar.hh"
 #include "lily-proto.hh"
 
 /// administration of current key in one octave.
@@ -16,6 +15,7 @@ class Octave_key {
 
 public:
   Array<int> accidental_i_arr_;
+  Array<bool> internal_forceacc_b_arr_;
   void clear ();
   Octave_key();
   void set (int i, int acc);
@@ -37,8 +37,12 @@ public:
   Octave_key const& oct (int) const;
   void set (int name, int acc);
   void set (Musical_pitch);
+  void set_internal_forceacc (Musical_pitch);
+  void clear_internal_forceacc (Musical_pitch);
 
   bool different_acc (Musical_pitch) const;
+  bool internal_forceacc (Musical_pitch) const;
+  bool double_to_single_acc (Musical_pitch) const;
   
   Key();
   void print () const;