X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=ly%2Fdeutsch.ly;h=427b8abb1ea2a463437e10be6b8a5cc6123625ab;hb=a447227710cb9b6c9fe61342a90e8cc85c022136;hp=6978b17e1c0c4f20ed1dcd962ba9a4ba0a591c1c;hpb=e18531db1f79fb685fbd16d6a2a67bf4b6c09915;p=lilypond.git

diff --git a/ly/deutsch.ly b/ly/deutsch.ly
index 6978b17e1c..427b8abb1e 100644
--- a/ly/deutsch.ly
+++ b/ly/deutsch.ly
@@ -1,9 +1,7 @@
 %%%% common German names for notes
 %%%% This file is part of LilyPond, the GNU music typesetter.
 %%%%
-%%%% Copyright (C) 1997--2010 Roland Meier <meier@informatik.th-darmstadt.de>
-%%%%                Bjoern Jacke <bjoern.jacke@gmx.de>
-%%%%                  (added asas; added comment to ases)
+%%%% Copyright (C) 2010--2015 Valentin Villenave <valentin@villenave.net>
 %%%%
 %%%% LilyPond is free software: you can redistribute it and/or modify
 %%%% it under the terms of the GNU General Public License as published by
@@ -18,102 +16,8 @@
 %%%% You should have received a copy of the GNU General Public License
 %%%% along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 
-\version "2.12.0"
+%%%% Legacy file. (see scm/define-note-names.scm)
 
-%{
+\version "2.16.0"
 
-  es   = flat
-  eses = double-flat
-  eh   = quarter-tone flat
-  eseh = three-quarter-tones flat
-
-  is   = sharp
-  isis = double-sharp
-  ih   = quarter-tone sharp
-  isih = three-quarter-tones sharp
-
-  English: c  d  e  f  g  a  bf b
-   German: c  d  e  f  g  a  b  h
-
-  Adapted from svenska.ly
-
-%}
-
-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
-
-#(ly:parser-set-note-names parser pitchnames)
+\language "deutsch"