Issue 4210: Reorder \language "english" to prefer abbreviations

This changes the output of

    \language "english"

    \displayLilyMusic \transpose c cs { c d e f g a b }

from

    {
      csharp dsharp esharp fsharp gsharp asharp bsharp
    }

to

    {
      cs ds es fs gs as bs
    }

diff --git a/scm/define-note-names.scm b/scm/define-note-names.scm
index 104632e3b0109eab40ab0bf60df0a863d71fb07a..9d214819e60362a34e7112a3c73206f171d6e21d 100644 (file)
--- a/scm/define-note-names.scm
+++ b/scm/define-note-names.scm
@@ -310,42 +310,6 @@
     ;;  tqs = three-quarter[-tones] sharp
 
     (english . (
-                (c-flatflat . ,(ly:make-pitch -1 0 DOUBLE-FLAT))
-                (c-flat . ,(ly:make-pitch -1 0 FLAT))
-                (c . ,(ly:make-pitch -1 0 NATURAL))
-                (c-sharp . ,(ly:make-pitch -1 0 SHARP))
-                (c-sharpsharp . ,(ly:make-pitch -1 0 DOUBLE-SHARP))
-                (d-flatflat . ,(ly:make-pitch -1 1 DOUBLE-FLAT))
-                (d-flat . ,(ly:make-pitch -1 1 FLAT))
-                (d . ,(ly:make-pitch -1 1 NATURAL))
-                (d-sharp . ,(ly:make-pitch -1 1 SHARP))
-                (d-sharpsharp . ,(ly:make-pitch -1 1 DOUBLE-SHARP))
-                (e-flatflat . ,(ly:make-pitch -1 2 DOUBLE-FLAT))
-                (e-flat . ,(ly:make-pitch -1 2 FLAT))
-                (e . ,(ly:make-pitch -1 2 NATURAL))
-                (e-sharp . ,(ly:make-pitch -1 2 SHARP))
-                (e-sharpsharp . ,(ly:make-pitch -1 2 DOUBLE-SHARP))
-                (f-flatflat . ,(ly:make-pitch -1 3 DOUBLE-FLAT))
-                (f-flat . ,(ly:make-pitch -1 3 FLAT))
-                (f . ,(ly:make-pitch -1 3 NATURAL))
-                (f-sharp . ,(ly:make-pitch -1 3 SHARP))
-                (f-sharpsharp . ,(ly:make-pitch -1 3 DOUBLE-SHARP))
-                (g-flatflat . ,(ly:make-pitch -1 4 DOUBLE-FLAT))
-                (g-flat . ,(ly:make-pitch -1 4 FLAT))
-                (g . ,(ly:make-pitch -1 4 NATURAL))
-                (g-sharp . ,(ly:make-pitch -1 4 SHARP))
-                (g-sharpsharp . ,(ly:make-pitch -1 4 DOUBLE-SHARP))
-                (a-flatflat . ,(ly:make-pitch -1 5 DOUBLE-FLAT))
-                (a-flat . ,(ly:make-pitch -1 5 FLAT))
-                (a . ,(ly:make-pitch -1 5 NATURAL))
-                (a-sharp . ,(ly:make-pitch -1 5 SHARP))
-                (a-sharpsharp . ,(ly:make-pitch -1 5 DOUBLE-SHARP))
-                (b-flatflat . ,(ly:make-pitch -1 6 DOUBLE-FLAT))
-                (b-flat . ,(ly:make-pitch -1 6 FLAT))
-                (b . ,(ly:make-pitch -1 6 NATURAL))
-                (b-sharp . ,(ly:make-pitch -1 6 SHARP))
-                (b-sharpsharp . ,(ly:make-pitch -1 6 DOUBLE-SHARP))
-
                 (cff . ,(ly:make-pitch -1 0 DOUBLE-FLAT))
                 (ctqf . ,(ly:make-pitch -1 0 THREE-Q-FLAT))
                 (cf . ,(ly:make-pitch -1 0 FLAT))
@@ -422,6 +386,42 @@
                 (btqs . ,(ly:make-pitch -1 6 THREE-Q-SHARP))
                 (bss . ,(ly:make-pitch -1 6 DOUBLE-SHARP))
                 (bx . ,(ly:make-pitch -1 6 DOUBLE-SHARP))
+
+                (c-flatflat . ,(ly:make-pitch -1 0 DOUBLE-FLAT))
+                (c-flat . ,(ly:make-pitch -1 0 FLAT))
+                (c . ,(ly:make-pitch -1 0 NATURAL))
+                (c-sharp . ,(ly:make-pitch -1 0 SHARP))
+                (c-sharpsharp . ,(ly:make-pitch -1 0 DOUBLE-SHARP))
+                (d-flatflat . ,(ly:make-pitch -1 1 DOUBLE-FLAT))
+                (d-flat . ,(ly:make-pitch -1 1 FLAT))
+                (d . ,(ly:make-pitch -1 1 NATURAL))
+                (d-sharp . ,(ly:make-pitch -1 1 SHARP))
+                (d-sharpsharp . ,(ly:make-pitch -1 1 DOUBLE-SHARP))
+                (e-flatflat . ,(ly:make-pitch -1 2 DOUBLE-FLAT))
+                (e-flat . ,(ly:make-pitch -1 2 FLAT))
+                (e . ,(ly:make-pitch -1 2 NATURAL))
+                (e-sharp . ,(ly:make-pitch -1 2 SHARP))
+                (e-sharpsharp . ,(ly:make-pitch -1 2 DOUBLE-SHARP))
+                (f-flatflat . ,(ly:make-pitch -1 3 DOUBLE-FLAT))
+                (f-flat . ,(ly:make-pitch -1 3 FLAT))
+                (f . ,(ly:make-pitch -1 3 NATURAL))
+                (f-sharp . ,(ly:make-pitch -1 3 SHARP))
+                (f-sharpsharp . ,(ly:make-pitch -1 3 DOUBLE-SHARP))
+                (g-flatflat . ,(ly:make-pitch -1 4 DOUBLE-FLAT))
+                (g-flat . ,(ly:make-pitch -1 4 FLAT))
+                (g . ,(ly:make-pitch -1 4 NATURAL))
+                (g-sharp . ,(ly:make-pitch -1 4 SHARP))
+                (g-sharpsharp . ,(ly:make-pitch -1 4 DOUBLE-SHARP))
+                (a-flatflat . ,(ly:make-pitch -1 5 DOUBLE-FLAT))
+                (a-flat . ,(ly:make-pitch -1 5 FLAT))
+                (a . ,(ly:make-pitch -1 5 NATURAL))
+                (a-sharp . ,(ly:make-pitch -1 5 SHARP))
+                (a-sharpsharp . ,(ly:make-pitch -1 5 DOUBLE-SHARP))
+                (b-flatflat . ,(ly:make-pitch -1 6 DOUBLE-FLAT))
+                (b-flat . ,(ly:make-pitch -1 6 FLAT))
+                (b . ,(ly:make-pitch -1 6 NATURAL))
+                (b-sharp . ,(ly:make-pitch -1 6 SHARP))
+                (b-sharpsharp . ,(ly:make-pitch -1 6 DOUBLE-SHARP))
                 ))