Merge commit 'origin' into beamlets2

[lilypond.git] / ly / deutsch.ly

diff --git a/ly/deutsch.ly b/ly/deutsch.ly
index 4ac2fd4022523e0a72a494cc75b399c2523de378..0967f4cad22bed03d5e891d5b132b0d4f9c6b0ec 100644 (file)
--- a/ly/deutsch.ly
+++ b/ly/deutsch.ly
@@ -1,52 +1,89 @@
 % 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 . ,(make-pitch -1 0 -2 ))
-       (ces . ,(make-pitch -1 0 -1 ))
-       (c . ,(make-pitch -1 0 0 ))
-       (cis . ,(make-pitch -1 0 1 ))
-       (cisis . ,(make-pitch -1 0 2 ))
-       (deses . ,(make-pitch -1 1 -2 ))
-       (des . ,(make-pitch -1 1 -1 ))
-       (d . ,(make-pitch -1 1 0 ))
-       (dis . ,(make-pitch -1 1 1 ))
-       (disis . ,(make-pitch -1 1 2 ))
-       (eses . ,(make-pitch -1 2 -2 ))
-       (es . ,(make-pitch -1 2 -1 ))
-       (e . ,(make-pitch -1 2 0 ))
-       (eis . ,(make-pitch -1 2 1 ))
-       (eisis . ,(make-pitch -1 2 2 ))
-       (feses . ,(make-pitch -1 3 -2 ))
-       (fes . ,(make-pitch -1 3 -1 ))
-       (f . ,(make-pitch -1 3 0 ))
-       (fis . ,(make-pitch -1 3 1 ))
-       (fisis . ,(make-pitch -1 3 2 ))
-       (geses . ,(make-pitch -1 4 -2 ))
-       (ges . ,(make-pitch -1 4 -1 ))
-       (g . ,(make-pitch -1 4 0 ))
-       (gis . ,(make-pitch -1 4 1 ))
-       (gisis . ,(make-pitch -1 4 2 ))
-       (asas . ,(make-pitch -1 5 -2 ))
-       (ases . ,(make-pitch -1 5 -2 ))  ; non-standard name for asas
-       (as . ,(make-pitch -1 5 -1 ))
-       (a . ,(make-pitch -1 5 0 ))
-       (ais . ,(make-pitch -1 5 1 ))
-       (aisis . ,(make-pitch -1 5 2 ))
-       (heses . ,(make-pitch -1 6 -2 ))
-       (b . ,(make-pitch -1 6 -1 ))
-       (h . ,(make-pitch -1 6 0 ))
-       (his . ,(make-pitch -1 6 1 ))
-       (hisis . ,(make-pitch -1 6 2 ))
+pitchnamesDeutsch = #`(
+       (ceses . ,(ly:make-pitch -1 0 DOUBLE-FLAT))
+       (ceseh . ,(ly:make-pitch -1 0 THREE-Q-FLAT))
+       (ces . ,(ly:make-pitch -1 0 FLAT))
+       (ceh . ,(ly:make-pitch -1 0 SEMI-FLAT))
+       (c . ,(ly:make-pitch -1 0 NATURAL))
+       (cih . ,(ly:make-pitch -1 0 SEMI-SHARP))
+       (cis . ,(ly:make-pitch -1 0 SHARP))
+       (cisih . ,(ly:make-pitch -1 0 THREE-Q-SHARP))
+       (cisis . ,(ly:make-pitch -1 0 DOUBLE-SHARP))
+
+       (deses . ,(ly:make-pitch -1 1 DOUBLE-FLAT))
+       (deseh . ,(ly:make-pitch -1 1 THREE-Q-FLAT))
+       (des . ,(ly:make-pitch -1 1 FLAT))
+       (deh . ,(ly:make-pitch -1 1 SEMI-FLAT))
+       (d . ,(ly:make-pitch -1 1 NATURAL))
+       (dih . ,(ly:make-pitch -1 1 SEMI-SHARP))
+       (dis . ,(ly:make-pitch -1 1 SHARP))
+       (disih . ,(ly:make-pitch -1 1 THREE-Q-SHARP))
+       (disis . ,(ly:make-pitch -1 1 DOUBLE-SHARP))
+
+       (eses . ,(ly:make-pitch -1 2 DOUBLE-FLAT))
+       (eseh . ,(ly:make-pitch -1 2 THREE-Q-FLAT))
+       (es . ,(ly:make-pitch -1 2 FLAT))
+       (eeh . ,(ly:make-pitch -1 2 SEMI-FLAT))
+       (e . ,(ly:make-pitch -1 2 NATURAL))
+       (eih . ,(ly:make-pitch -1 2 SEMI-SHARP))
+       (eis . ,(ly:make-pitch -1 2 SHARP))
+       (eisih . ,(ly:make-pitch -1 2 THREE-Q-SHARP))
+       (eisis . ,(ly:make-pitch -1 2 DOUBLE-SHARP))
+
+       (feses . ,(ly:make-pitch -1 3 DOUBLE-FLAT))
+       (feseh . ,(ly:make-pitch -1 3 THREE-Q-FLAT))
+       (fes . ,(ly:make-pitch -1 3 FLAT))
+       (feh . ,(ly:make-pitch -1 3 SEMI-FLAT))
+       (f . ,(ly:make-pitch -1 3 NATURAL))
+       (fih . ,(ly:make-pitch -1 3 SEMI-SHARP))
+       (fis . ,(ly:make-pitch -1 3 SHARP))
+       (fisih . ,(ly:make-pitch -1 3 THREE-Q-SHARP))
+       (fisis . ,(ly:make-pitch -1 3 DOUBLE-SHARP))
+
+       (geses . ,(ly:make-pitch -1 4 DOUBLE-FLAT))
+       (geseh . ,(ly:make-pitch -1 4 THREE-Q-FLAT))
+       (ges . ,(ly:make-pitch -1 4 FLAT))
+       (geh . ,(ly:make-pitch -1 4 SEMI-FLAT))
+       (g . ,(ly:make-pitch -1 4 NATURAL))
+       (gih . ,(ly:make-pitch -1 4 SEMI-SHARP))
+       (gis . ,(ly:make-pitch -1 4 SHARP))
+       (gisih . ,(ly:make-pitch -1 4 THREE-Q-SHARP))
+       (gisis . ,(ly:make-pitch -1 4 DOUBLE-SHARP))
+
+       (asas . ,(ly:make-pitch -1 5 DOUBLE-FLAT))
+       (asah . ,(ly:make-pitch -1 5 THREE-Q-FLAT))
+       (ases . ,(ly:make-pitch -1 5 DOUBLE-FLAT))   ;;non-standard name for asas
+       (aseh . ,(ly:make-pitch -1 5 THREE-Q-FLAT))
+       (as . ,(ly:make-pitch -1 5 FLAT))
+       (aeh . ,(ly:make-pitch -1 5 SEMI-FLAT))
+       (a . ,(ly:make-pitch -1 5 NATURAL))
+       (aih . ,(ly:make-pitch -1 5 SEMI-SHARP))
+       (ais . ,(ly:make-pitch -1 5 SHARP))
+       (aisih . ,(ly:make-pitch -1 5 THREE-Q-SHARP))
+       (aisis . ,(ly:make-pitch -1 5 DOUBLE-SHARP))
+
+       (heses . ,(ly:make-pitch -1 6 DOUBLE-FLAT))
+       (heseh . ,(ly:make-pitch -1 6 THREE-Q-FLAT))
+       (b . ,(ly:make-pitch -1 6 FLAT))
+       (beh . ,(ly:make-pitch -1 6 SEMI-FLAT))
+       (h . ,(ly:make-pitch -1 6 NATURAL))
+       (hih . ,(ly:make-pitch -1 6 SEMI-SHARP))
+       (his . ,(ly:make-pitch -1 6 SHARP))
+       (hisih . ,(ly:make-pitch -1 6 THREE-Q-SHARP))
+       (hisis . ,(ly:make-pitch -1 6 DOUBLE-SHARP))
 )
 
 
+pitchnames = \pitchnamesDeutsch
 
+\version "2.12.0"
 
-\version "1.3.96";
+#(ly:parser-set-note-names parser pitchnames)