lilypond-0.0.49

diff --git a/lily/include/command-request.hh b/lily/include/command-request.hh
index 87139bd42788ccd51e81c8d7e89509502c3e70da..3c257b67f193684103fe4514a43d29cb40decc52 100644 (file)
--- a/lily/include/command-request.hh
+++ b/lily/include/command-request.hh
@@ -123,12 +123,16 @@ class Key_change_req  : public Command_req  {
 public:
     Array<Melodic_req*> melodic_p_arr_;
     bool minor_b_;
-  
+
+    /// don't ignore the  octaves in #melodic_p_arr_#?
+    bool multi_octave_b_;
     Key_change_req();
     Key_change_req(Key_change_req const&);
     ~Key_change_req();
     REQUESTMETHODS(Key_change_req, keychange);
 
+    /// squash the octaves to 1
+    void squash_octaves();
     /// return number of flats in key
     int flats_i();
 

diff --git a/lily/include/local-key-item.hh b/lily/include/local-key-item.hh
index 96bad9999e79352ff42dbdffb6ae30cc9e779514..dd4ae4b7367ac87127774be197fc29399ba075c8 100644 (file)
--- a/lily/include/local-key-item.hh
+++ b/lily/include/local-key-item.hh
@@ -14,8 +14,11 @@ struct Local_acc {
     static int compare(Local_acc&, Local_acc&);
 };
 
+/**
+  Accidentals which can be different for each octave.
+ */
 struct Local_key_item : Item {
-NAME_MEMBERS(Local_key_item);
+    NAME_MEMBERS(Local_key_item);
     Array<Local_acc> accs;
     Array<Item*> support_items_;
     int c0_position;

diff --git a/lily/include/local-key-reg.hh b/lily/include/local-key-reg.hh
index 628ccc7c421ea814e6b6e649698ebd0bb85ed7d6..2ab094b3b397613c7c3a142e0c637130a8d75066 100644 (file)
--- a/lily/include/local-key-reg.hh
+++ b/lily/include/local-key-reg.hh
@@ -11,7 +11,7 @@
 #include "key.hh"
 
 struct Local_key_register : Request_register {
-    Local_key local_key_;
+    Key local_key_;
     Local_key_item* key_item_p_;
     Key const *key_C_;
     /* *************** */