X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=ly%2Fdeutsch.ly;h=08596816c8e71441289d3aed47f70ad094ba4358;hb=14573cf22c37fb61eac8e3d3ea37dfa2a13f8542;hp=9c0902ba0003d7580c8d5d249a53595fd55190d6;hpb=c7205110d9cf8c4acb6149047f1674e2aa1a348b;p=lilypond.git

diff --git a/ly/deutsch.ly b/ly/deutsch.ly
index 9c0902ba00..08596816c8 100644
--- a/ly/deutsch.ly
+++ b/ly/deutsch.ly
@@ -1,52 +1,68 @@
 % common german names for notes. "es" means flat, "is" means sharp
 %
-% by Roland Meier <meier@informatik.th-darmstadt.de>
+% by Roland Meier <<meier@informatik.th-darmstadt.de>>
 % based on swedish.ly by Mats Bengtsson.
 
-% 1999/06/09 Bjoern Jacke <bjoern.jacke@gmx.de>
+% 1999/06/09 Bjoern Jacke <<bjoern.jacke@gmx.de>>
 %            added asas and marked ases as `unusual'
 
 
-\notenames  #'(
-	(ceses . ( -1 0 -2 ))
-	(ces . ( -1 0 -1 ))
-	(c . ( -1 0 0 ))
-	(cis . ( -1 0 1 ))
-	(cisis . ( -1 0 2 ))
-	(deses . ( -1 1 -2 ))
-	(des . ( -1 1 -1 ))
-	(d . ( -1 1 0 ))
-	(dis . ( -1 1 1 ))
-	(disis . ( -1 1 2 ))
-	(eses . ( -1 2 -2 ))
-	(es . ( -1 2 -1 ))
-	(e . ( -1 2 0 ))
-	(eis . ( -1 2 1 ))
-	(eisis . ( -1 2 2 ))
-	(feses . ( -1 3 -2 ))
-	(fes . ( -1 3 -1 ))
-	(f . ( -1 3 0 ))
-	(fis . ( -1 3 1 ))
-	(fisis . ( -1 3 2 ))
-	(geses . ( -1 4 -2 ))
-	(ges . ( -1 4 -1 ))
-	(g . ( -1 4 0 ))
-	(gis . ( -1 4 1 ))
-	(gisis . ( -1 4 2 ))
-	(asas . ( -1 5 -2 ))
-	(ases . ( -1 5 -2 ))  ; non-standard name for asas
-	(as . ( -1 5 -1 ))
-	(a . ( -1 5 0 ))
-	(ais . ( -1 5 1 ))
-	(aisis . ( -1 5 2 ))
-	(heses . ( -1 6 -2 ))
-	(b . ( -1 6 -1 ))
-	(h . ( -1 6 0 ))
-	(his . ( -1 6 1 ))
-	(hisis . ( -1 6 2 ))
+pitchnamesDeutsch = #`(
+	(ceses . ,(ly:make-pitch -1 0 DOUBLE-FLAT))
+	(ces . ,(ly:make-pitch -1 0 FLAT))
+	(ceh . ,(ly:make-pitch -1 0 SEMI-FLAT))
+	(c . ,(ly:make-pitch -1 0 NATURAL))
+	(cis . ,(ly:make-pitch -1 0 SHARP))
+	(cih . ,(ly:make-pitch -1 0 SEMI-SHARP))
+	(cisis . ,(ly:make-pitch -1 0 DOUBLE-SHARP))
+	(deses . ,(ly:make-pitch -1 1 DOUBLE-FLAT))
+	(des . ,(ly:make-pitch -1 1 FLAT))
+	(deh . ,(ly:make-pitch -1 1 SEMI-FLAT))
+	(d . ,(ly:make-pitch -1 1 NATURAL))
+	(dis . ,(ly:make-pitch -1 1 SHARP))
+	(dih . ,(ly:make-pitch -1 1 SEMI-SHARP))
+	(disis . ,(ly:make-pitch -1 1 DOUBLE-SHARP))
+	(eses . ,(ly:make-pitch -1 2 DOUBLE-FLAT))
+	(es . ,(ly:make-pitch -1 2 FLAT))
+	(eeh . ,(ly:make-pitch -1 2 SEMI-FLAT))
+	(e . ,(ly:make-pitch -1 2 NATURAL))
+	(eis . ,(ly:make-pitch -1 2 SHARP))
+	(eih . ,(ly:make-pitch -1 2 SEMI-SHARP))
+	(eisis . ,(ly:make-pitch -1 2 DOUBLE-SHARP))
+	(feses . ,(ly:make-pitch -1 3 DOUBLE-FLAT))
+	(fes . ,(ly:make-pitch -1 3 FLAT))
+	(feh . ,(ly:make-pitch -1 3 SEMI-FLAT))
+	(f . ,(ly:make-pitch -1 3 NATURAL))
+	(fis . ,(ly:make-pitch -1 3 SHARP))
+	(fih . ,(ly:make-pitch -1 3 SEMI-SHARP))
+	(fisis . ,(ly:make-pitch -1 3 DOUBLE-SHARP))
+	(geses . ,(ly:make-pitch -1 4 DOUBLE-FLAT))
+	(ges . ,(ly:make-pitch -1 4 FLAT))
+	(geh . ,(ly:make-pitch -1 4 SEMI-FLAT))
+	(g . ,(ly:make-pitch -1 4 NATURAL))
+	(gis . ,(ly:make-pitch -1 4 SHARP))
+	(gih . ,(ly:make-pitch -1 4 SEMI-SHARP))
+	(gisis . ,(ly:make-pitch -1 4 DOUBLE-SHARP))
+	(asas . ,(ly:make-pitch -1 5 DOUBLE-FLAT))
+	(ases . ,(ly:make-pitch -1 5 DOUBLE-FLAT))   ;;non-standard name for asas
+	(as . ,(ly:make-pitch -1 5 FLAT))
+	(aeh . ,(ly:make-pitch -1 5 SEMI-FLAT))
+	(a . ,(ly:make-pitch -1 5 NATURAL))
+	(ais . ,(ly:make-pitch -1 5 SHARP))
+	(aih . ,(ly:make-pitch -1 5 SEMI-SHARP))
+	(aisis . ,(ly:make-pitch -1 5 DOUBLE-SHARP))
+	(heses . ,(ly:make-pitch -1 6 DOUBLE-FLAT))
+	(b . ,(ly:make-pitch -1 6 FLAT))
+	(beh . ,(ly:make-pitch -1 6 SEMI-FLAT))
+	(h . ,(ly:make-pitch -1 6 NATURAL))
+	(his . ,(ly:make-pitch -1 6 SHARP))
+	(hih . ,(ly:make-pitch -1 6 SEMI-SHARP))
+	(hisis . ,(ly:make-pitch -1 6 DOUBLE-SHARP))
 )
 
 
-}
+pitchnames = \pitchnamesDeutsch
 
-\version "1.3.38";
+\version "2.10.0"
+
+#(ly:parser-set-note-names parser pitchnames)