(all-grob-descriptions): fix order of

key-cancellation.

This fixes: morgenlied.ly and input/regression/beam-concave.ly

diff --git a/ChangeLog b/ChangeLog
index 45be1a4b75680f309ec891304b57a956823ec6d5..c4056bc0f8fa284797a5d52bb259a6a84c8b15b9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2004-09-12  Han-Wen Nienhuys   <hanwen@xs4all.nl>
 
+       * scm/define-grobs.scm (all-grob-descriptions): fix order of
+       key-cancellation.
+
        * input/regression/beam-concave-damped.ly: new file.
 
        * lily/beam-concave.cc: new file, with new routines for concave

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index f1c93fe2a3cfc7ccf811c45a140aab6562195be7..7fda58b9a3ebfbbb4cacfca145b76e8d6e9c5c2d 100644 (file)
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -222,12 +222,12 @@
        (break-align-orders . #(; end-of-line:
                                (instrument-name
                                 left-edge ambitus breathing-sign
-                                clef key-cancellation staff-bar key-signature
+                                clef staff-bar key-cancellation key-signature
                                 time-signature custos)
 
                                ; unbroken
                                (instrument-name left-edge ambitus breathing-sign
-                                                clef key-cancellation staff-bar key-signature
+                                                clef staff-bar key-cancellation key-signature
                                                 staff
                                                 time-signature custos)
                                ; begin of line