Issue 4209: Change notename csharp et al. to c-sharp et al.

diff --git a/Documentation/notation/pitches.itely b/Documentation/notation/pitches.itely
index 60fb0cc443d1763bedcaefd13ad1aaa08a56cf8a..3cfd1f7577d0d8bb0192970747fc62c7f0f0d208 100644 (file)
--- a/Documentation/notation/pitches.itely
+++ b/Documentation/notation/pitches.itely
@@ -510,7 +510,7 @@ In addition to note names, accidental suffixes may
 also vary depending on the language:
 
 @quotation
-@multitable {@code{nederlands}} {-s/-sharp} {-ess/-es} {-ss/-x/-sharpsharp} {-essess/-eses}
+@multitable {@code{nederlands}} {-s/--sharp} {-ess/-es} {-ss/-x/--sharpsharp} {-essess/-eses}
 @headitem Language
   @tab sharp @tab flat @tab double sharp @tab double flat
 @item @code{nederlands}
@@ -520,8 +520,8 @@ also vary depending on the language:
 @item @code{deutsch}
   @tab -is @tab -es @tab -isis @tab -eses
 @item @code{english}
-  @tab -s/-sharp @tab -f/-flat @tab -ss/-x/-sharpsharp
-    @tab -ff/-flatflat
+  @tab -s/--sharp @tab -f/--flat @tab -ss/-x/--sharpsharp
+    @tab -ff/--flatflat
 @item @code{espanol} or @code{español}
   @tab -s @tab -b @tab -ss/-x @tab -bb
 @item @code{italiano} or @code{français}

diff --git a/python/convertrules.py b/python/convertrules.py
index 8ecce6f877478a88ce2cff8c26f465af6b6b73c4..02f41a23663632ee0fa543968bde74102f3f9bb1 100644 (file)
--- a/python/convertrules.py
+++ b/python/convertrules.py
@@ -3723,9 +3723,11 @@ def conv(str):
     str = re.sub (r'\bthin-kern\b', 'segno-kern', str)
     return str
 
-@rule ((2, 19, 16), "implicitTimeSignatureVisibility -> initialTimeSignatureVisibility")
+@rule ((2, 19, 16), """implicitTimeSignatureVisibility -> initialTimeSignatureVisibility
+csharp -> c-sharp""")
 def conv(str):
     str = re.sub (r'\bimplicitTimeSignatureVisibility\b', 'initialTimeSignatureVisibility', str)
+    str = re.sub (r'\b([a-g])((?:sharp){1,2}|(?:flat){1,2})\b',r'\1-\2', str)
     return str
 
 # Guidelines to write rules (please keep this at the end of this file)

diff --git a/scm/define-note-names.scm b/scm/define-note-names.scm
index 52a9d969fa709ffd067ec2a45b1f1eb9f0bea4e1..104632e3b0109eab40ab0bf60df0a863d71fb07a 100644 (file)
--- a/scm/define-note-names.scm
+++ b/scm/define-note-names.scm
@@ -310,41 +310,41 @@
     ;;  tqs = three-quarter[-tones] sharp
 
     (english . (
-                (cflatflat . ,(ly:make-pitch -1 0 DOUBLE-FLAT))
-                (cflat . ,(ly:make-pitch -1 0 FLAT))
+                (c-flatflat . ,(ly:make-pitch -1 0 DOUBLE-FLAT))
+                (c-flat . ,(ly:make-pitch -1 0 FLAT))
                 (c . ,(ly:make-pitch -1 0 NATURAL))
-                (csharp . ,(ly:make-pitch -1 0 SHARP))
-                (csharpsharp . ,(ly:make-pitch -1 0 DOUBLE-SHARP))
-                (dflatflat . ,(ly:make-pitch -1 1 DOUBLE-FLAT))
-                (dflat . ,(ly:make-pitch -1 1 FLAT))
+                (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))
-                (dsharp . ,(ly:make-pitch -1 1 SHARP))
-                (dsharpsharp . ,(ly:make-pitch -1 1 DOUBLE-SHARP))
-                (eflatflat . ,(ly:make-pitch -1 2 DOUBLE-FLAT))
-                (eflat . ,(ly:make-pitch -1 2 FLAT))
+                (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))
-                (esharp . ,(ly:make-pitch -1 2 SHARP))
-                (esharpsharp . ,(ly:make-pitch -1 2 DOUBLE-SHARP))
-                (fflatflat . ,(ly:make-pitch -1 3 DOUBLE-FLAT))
-                (fflat . ,(ly:make-pitch -1 3 FLAT))
+                (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))
-                (fsharp . ,(ly:make-pitch -1 3 SHARP))
-                (fsharpsharp . ,(ly:make-pitch -1 3 DOUBLE-SHARP))
-                (gflatflat . ,(ly:make-pitch -1 4 DOUBLE-FLAT))
-                (gflat . ,(ly:make-pitch -1 4 FLAT))
+                (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))
-                (gsharp . ,(ly:make-pitch -1 4 SHARP))
-                (gsharpsharp . ,(ly:make-pitch -1 4 DOUBLE-SHARP))
-                (aflatflat . ,(ly:make-pitch -1 5 DOUBLE-FLAT))
-                (aflat . ,(ly:make-pitch -1 5 FLAT))
+                (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))
-                (asharp . ,(ly:make-pitch -1 5 SHARP))
-                (asharpsharp . ,(ly:make-pitch -1 5 DOUBLE-SHARP))
-                (bflatflat . ,(ly:make-pitch -1 6 DOUBLE-FLAT))
-                (bflat . ,(ly:make-pitch -1 6 FLAT))
+                (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))
-                (bsharp . ,(ly:make-pitch -1 6 SHARP))
-                (bsharpsharp . ,(ly:make-pitch -1 6 DOUBLE-SHARP))
+                (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))