X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=ly%2Fsuomi.ly;h=be787cf9e879e89f724a483f895e512a23e14989;hb=b872748c6aa8bb721ced458691b38ac2fac5dfc8;hp=a53b1411e41ea53762778a774263736a8e3f2219;hpb=e18531db1f79fb685fbd16d6a2a67bf4b6c09915;p=lilypond.git

diff --git a/ly/suomi.ly b/ly/suomi.ly
index a53b1411e4..be787cf9e8 100644
--- a/ly/suomi.ly
+++ b/ly/suomi.ly
@@ -1,7 +1,7 @@
 %%%% common Finnish names for notes
 %%%% This file is part of LilyPond, the GNU music typesetter.
 %%%%
-%%%% Copyright (C) 2001--2010 Heikki Junes <heikki.junes@hut.fi>
+%%%% 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
@@ -16,64 +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
-
-  is   = sharp
-  isis = double-sharp
-
-  English: c  d  e  f  g  a  bf b
-  Finnish: c  d  e  f  g  a  b  h
-
-  Adapted from svenska.ly
-
-%}
-
-pitchnamesSuomi = #`(
-	(ceses . ,(ly:make-pitch -1 0 DOUBLE-FLAT))
-	(ces . ,(ly:make-pitch -1 0 FLAT))
-	(c . ,(ly:make-pitch -1 0 NATURAL))
-	(cis . ,(ly:make-pitch -1 0 SHARP))
-	(cisis . ,(ly:make-pitch -1 0 DOUBLE-SHARP))
-	(deses . ,(ly:make-pitch -1 1 DOUBLE-FLAT))
-	(des . ,(ly:make-pitch -1 1 FLAT))
-	(d . ,(ly:make-pitch -1 1 NATURAL))
-	(dis . ,(ly:make-pitch -1 1 SHARP))
-	(disis . ,(ly:make-pitch -1 1 DOUBLE-SHARP))
-	(eses . ,(ly:make-pitch -1 2 DOUBLE-FLAT))
-	(es . ,(ly:make-pitch -1 2 FLAT))
-	(e . ,(ly:make-pitch -1 2 NATURAL))
-	(eis . ,(ly:make-pitch -1 2 SHARP))
-	(eisis . ,(ly:make-pitch -1 2 DOUBLE-SHARP))
-	(feses . ,(ly:make-pitch -1 3 DOUBLE-FLAT))
-	(fes . ,(ly:make-pitch -1 3 FLAT))
-	(f . ,(ly:make-pitch -1 3 NATURAL))
-	(fis . ,(ly:make-pitch -1 3 SHARP))
-	(fisis . ,(ly:make-pitch -1 3 DOUBLE-SHARP))
-	(geses . ,(ly:make-pitch -1 4 DOUBLE-FLAT))
-	(ges . ,(ly:make-pitch -1 4 FLAT))
-	(g . ,(ly:make-pitch -1 4 NATURAL))
-	(gis . ,(ly:make-pitch -1 4 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))
-	(a . ,(ly:make-pitch -1 5 NATURAL))
-	(ais . ,(ly:make-pitch -1 5 SHARP))
-	(aisis . ,(ly:make-pitch -1 5 DOUBLE-SHARP))
-	(bb . ,(ly:make-pitch -1 6 DOUBLE-FLAT)) ;; should be bes. Kept for downwards compatibility
-	(bes . ,(ly:make-pitch -1 6 DOUBLE-FLAT))
-	(heses . ,(ly:make-pitch -1 6 DOUBLE-FLAT))  ;;non-standard name for bb
-	(b . ,(ly:make-pitch -1 6 FLAT))
-	(h . ,(ly:make-pitch -1 6 NATURAL))
-	(his . ,(ly:make-pitch -1 6 SHARP))
-	(hisis . ,(ly:make-pitch -1 6 DOUBLE-SHARP))
-)
-
-pitchnames = \pitchnamesSuomi
-
-#(ly:parser-set-note-names parser pitchnames)
+\language "suomi"