* lily/key-signature-interface.cc: change property name to

alteration-alist

* lily/key-engraver.cc (read_event): read keyAlterationOrder, not
keyAccidentalOrder

* python/convertrules.py (conv): keyAccidentalOrder ->
keyAlterationOrder

* lily/key-engraver.cc (create_key): always print a cancellation
for going to C-major/A-minor, regardless of printKeyCancellation.
(create_key): remove typecheck for visibility. This fixes key
signature not being printed.

diff --git a/ChangeLog b/ChangeLog
index ac885b1399f6989da6a0004c132d05675e569ba1..b9b5f86a01607e1a222080c4c8e16da8a87a14f3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
 2005-08-05  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+       * lily/key-signature-interface.cc: change property name to
+       alteration-alist
+
+       * lily/key-engraver.cc (read_event): read keyAlterationOrder, not
+       keyAccidentalOrder
+
+       * python/convertrules.py (conv): keyAccidentalOrder ->
+       keyAlterationOrder
+
        * lily/key-engraver.cc (create_key): always print a cancellation
        for going to C-major/A-minor, regardless of printKeyCancellation.
        (create_key): remove typecheck for visibility. This fixes key

diff --git a/lily/key-engraver.cc b/lily/key-engraver.cc
index af402a8307720f25be2d82cff48e3c108101f8f2..17735e0d2b7d2f9832940fbf50b46d5179ffc11f 100644 (file)
--- a/lily/key-engraver.cc
+++ b/lily/key-engraver.cc
@@ -92,11 +92,11 @@ Key_engraver::create_key (bool is_default)
                }
            }
          
-         cancellation_->set_property ("accidentals", restore);
+         cancellation_->set_property ("alteration-alist", restore);
          cancellation_->set_property ("c0-position",
                                       get_property ("middleCPosition"));
        }
-      item_->set_property ("accidentals", key);
+      item_->set_property ("alteration-alist", key);
     }
 
   if (!is_default)
@@ -169,7 +169,7 @@ Key_engraver::read_event (Music const *r)
 
   SCM n = scm_list_copy (p);
   SCM accs = SCM_EOL;
-  for (SCM s = get_property ("keyAccidentalOrder");
+  for (SCM s = get_property ("keyAlterationOrder");
        scm_is_pair (s); s = scm_cdr (s))
     {
       if (scm_is_pair (scm_member (scm_car (s), n)))
@@ -208,5 +208,5 @@ ADD_TRANSLATOR (Key_engraver,
                /* accepts */ "key-change-event",
                /* reads */ "keySignature printKeyCancellation lastKeySignature "
                "explicitKeySignatureVisibility createKeyOnClefChange "
-               "keyAccidentalOrder keySignature",
+               "keyAlterationOrder keySignature",
                /* write */ "lastKeySignature tonic keySignature");

diff --git a/lily/key-signature-interface.cc b/lily/key-signature-interface.cc
index 6215e03fef46f3be4d681dbc1aa9189aaf69bde5..bcaa2594e71b343cb688269dc4a1d05d7cb17f8c 100644 (file)
--- a/lily/key-signature-interface.cc
+++ b/lily/key-signature-interface.cc
@@ -101,7 +101,7 @@ Key_signature_interface::print (SCM smob)
       style = "";
     }
 
-  SCM newas = me->get_property ("accidentals");
+  SCM newas = me->get_property ("alteration-alist");
   Stencil mol;
 
   SCM c0s = me->get_property ("c0-position");
@@ -157,4 +157,4 @@ Key_signature_interface::print (SCM smob)
 
 ADD_INTERFACE (Key_signature_interface, "key-signature-interface",
               "A group of accidentals, to be printed as signature sign.",
-              "style c0-position accidentals");
+              "style c0-position alteration-alist");

diff --git a/python/convertrules.py b/python/convertrules.py
index 746559d26ad1ce46fda9fe3dc9efaa0cbaf903d8..796cd0068c63098d85a2f7587565882d3ba66f84 100644 (file)
--- a/python/convertrules.py
+++ b/python/convertrules.py
@@ -2534,6 +2534,13 @@ conversions.append (((2, 7, 2), conv,
                     '''ly:X-moment -> ly:moment-X'''))
 
 
+def conv (str):
+       str = re.sub('keyAccidentalOrder', 'keyAlterationOrder', str)
+       return str
+
+conversions.append (((2, 7, 4), conv,
+                    '''keyAccidentalOrder->keyAlterationOrder'''))
+
 
 ################################################################
 

diff --git a/scm/define-grob-properties.scm b/scm/define-grob-properties.scm
index 2ca7f0007a1cc443e17ab3e187ba469b974547f4..5a285980b638e62330e60413bad4685286050651 100644 (file)
--- a/scm/define-grob-properties.scm
+++ b/scm/define-grob-properties.scm
@@ -35,7 +35,9 @@ called first.  The functions take a grob and axis argument. ")
      (Y-extent-callback ,procedure? "see @code{X-extent-callback}.")
      (Y-offset-callbacks ,list? "see @code{X-offset-callbacks}.")
 
-     (accidentals ,list? "List of alteration numbers.")
+     (accidentals ,list? "List of alteration numbers")
+     (alteration-alist ,list? "List of @code{(@var{pitch}
+. @var{accidental})} pairs for key signature.")
      (add-stem-support ,boolean? "If set, the Stem object is included in this script's support") 
     
      (align-dir ,ly:dir? "Which side to align? @code{-1}: left side,
@@ -336,8 +338,6 @@ center of the staff.")
      (neutral-position ,number? "Position (in half staff spaces) where
 to flip the direction of custos stem.")
 
-     (new-accidentals ,list? "List of @code{(@var{pitch}
-. @var{accidental})} pairs.")
      (next ,ly:grob? "Object that is next relation (eg. the lyric syllable following an extender.")
      (note-names ,vector? "Vector of strings containing names for
 easy-notation note heads.")
@@ -349,9 +349,6 @@ get stems extending to the middle staff line.")
      (number-type ,symbol? "Type of numbers to use in label.  Choices
 include @code{roman-lower}, @code{roman-upper}, and @code{arabic}.")
      
-     (old-accidentals ,list? "List of @code{(@var{pitch} . @var{accidental})
-pairs.}")
-
      (padding ,ly:dimension? "Add this much extra space between
 objects that are next to each other.")
      (page-penalty ,number? "Penalty for page break at