X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=ly%2Fsuomi.ly;h=a53b1411e41ea53762778a774263736a8e3f2219;hb=269d2bdca89eb06f0f22a3af3b47a615399f4cbf;hp=2dcb32e1a510f974bd22987dcb8d2f5fb0277bb4;hpb=10f0e1d58eda7e8d5f3e7d5613ca2d976620e434;p=lilypond.git

diff --git a/ly/suomi.ly b/ly/suomi.ly
index 2dcb32e1a5..a53b1411e4 100644
--- a/ly/suomi.ly
+++ b/ly/suomi.ly
@@ -1,12 +1,39 @@
-% common finnish names for notes. "es" means flat, "is" means sharp
-%
-% by Heikki Junes <<heikki.junes@hut.fi>>
-% based on svenska.ly by Mats Bengtsson.
+%%%% 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>
+%%%%
+%%%% LilyPond is free software: you can redistribute it and/or modify
+%%%% it under the terms of the GNU General Public License as published by
+%%%% the Free Software Foundation, either version 3 of the License, or
+%%%% (at your option) any later version.
+%%%%
+%%%% LilyPond is distributed in the hope that it will be useful,
+%%%% but WITHOUT ANY WARRANTY; without even the implied warranty of
+%%%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+%%%% GNU General Public License for more details.
+%%%%
+%%%% You should have received a copy of the GNU General Public License
+%%%% along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 
-% 2001/08/28 Heikki Junes <<heikki.junes@hut.fi>>
-%            added bb and marked heses as `unusual'
+\version "2.12.0"
 
-\pitchnames #`(
+%{
+
+  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))
@@ -38,11 +65,15 @@
 	(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))
+	(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))
 )
-\version "1.9.7"
+
+pitchnames = \pitchnamesSuomi
+
+#(ly:parser-set-note-names parser pitchnames)