From 904651acb0710f2deaca7c2bff436aa401f13eaf Mon Sep 17 00:00:00 2001 From: David Kastrup Date: Mon, 1 Dec 2014 13:05:53 +0100 Subject: [PATCH] Issue 4209: Change notename csharp et al. to c-sharp et al. --- Documentation/notation/pitches.itely | 6 +-- python/convertrules.py | 4 +- scm/define-note-names.scm | 56 ++++++++++++++-------------- 3 files changed, 34 insertions(+), 32 deletions(-) diff --git a/Documentation/notation/pitches.itely b/Documentation/notation/pitches.itely index 60fb0cc443..3cfd1f7577 100644 --- 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 8ecce6f877..02f41a2366 100644 --- 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 52a9d969fa..104632e3b0 100644 --- 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)) -- 2.39.5