X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=ly%2Fsvenska.ly;h=85ca0f8919351e13c3689807558de774ddbb1ff4;hb=abf0f7e73103716d60c235fa61d938754d9f3a06;hp=2476e46022b6d32cdd786e1fd33999d8fcedb7cd;hpb=54685cedab8c7e6ce9cfc754dc6b6c646e8421ff;p=lilypond.git

diff --git a/ly/svenska.ly b/ly/svenska.ly
index 2476e46022..85ca0f8919 100644
--- a/ly/svenska.ly
+++ b/ly/svenska.ly
@@ -1,43 +1,74 @@
-%
-% common Swedish names for notes. "ess" means flat, "iss" means sharp
-%
-% by Mats Bengtsson.
-
-\pitchnames #`(
-	(cessess . ,(make-pitch -1 0 -2 ))
-	(cess . ,(make-pitch -1 0 -1 ))
-	(c . ,(make-pitch -1 0 0 ))
-	(ciss . ,(make-pitch -1 0 1 ))
-	(cississ . ,(make-pitch -1 0 2 ))
-	(dessess . ,(make-pitch -1 1 -2 ))
-	(dess . ,(make-pitch -1 1 -1 ))
-	(d . ,(make-pitch -1 1 0 ))
-	(diss . ,(make-pitch -1 1 1 ))
-	(dississ . ,(make-pitch -1 1 2 ))
-	(essess . ,(make-pitch -1 2 -2 ))
-	(ess . ,(make-pitch -1 2 -1 ))
-	(e . ,(make-pitch -1 2 0 ))
-	(eiss . ,(make-pitch -1 2 1 ))
-	(eississ . ,(make-pitch -1 2 2 ))
-	(fessess . ,(make-pitch -1 3 -2 ))
-	(fess . ,(make-pitch -1 3 -1 ))
-	(f . ,(make-pitch -1 3 0 ))
-	(fiss . ,(make-pitch -1 3 1 ))
-	(fississ . ,(make-pitch -1 3 2 ))
-	(gessess . ,(make-pitch -1 4 -2 ))
-	(gess . ,(make-pitch -1 4 -1 ))
-	(g . ,(make-pitch -1 4 0 ))
-	(giss . ,(make-pitch -1 4 1 ))
-	(gississ . ,(make-pitch -1 4 2 ))
-	(assess . ,(make-pitch -1 5 -2 ))
-	(ass . ,(make-pitch -1 5 -1 ))
-	(a . ,(make-pitch -1 5 0 ))
-	(aiss . ,(make-pitch -1 5 1 ))
-	(aississ . ,(make-pitch -1 5 2 ))
-	(hessess . ,(make-pitch -1 6 -2 ))
-	(b . ,(make-pitch -1 6 -1 ))
-	(h . ,(make-pitch -1 6 0 ))
-	(hiss . ,(make-pitch -1 6 1 ))
-	(hississ . ,(make-pitch -1 6 2 ))
+%%%% common Swedish names for notes
+%%%% This file is part of LilyPond, the GNU music typesetter.
+%%%%
+%%%% Copyright (C) 1997--2010 Mats Bengtsson <mabe@violin.s3.kth.se>
+%%%%
+%%%% 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/>.
+
+\version "2.12.0"
+
+%{
+
+  ess    = flat
+  essess = double-flat
+
+  iss    = sharp
+  ississ = double-sharp
+
+  English: c  d  e  f  g  a  bf b
+  Swedish: c  d  e  f  g  a  b  h
+
+%}
+
+pitchnamesSvenska = #`(
+	(cessess . ,(ly:make-pitch -1 0 DOUBLE-FLAT))
+	(cess . ,(ly:make-pitch -1 0 FLAT))
+	(c . ,(ly:make-pitch -1 0 NATURAL))
+	(ciss . ,(ly:make-pitch -1 0 SHARP))
+	(cississ . ,(ly:make-pitch -1 0 DOUBLE-SHARP))
+	(dessess . ,(ly:make-pitch -1 1 DOUBLE-FLAT))
+	(dess . ,(ly:make-pitch -1 1 FLAT))
+	(d . ,(ly:make-pitch -1 1 NATURAL))
+	(diss . ,(ly:make-pitch -1 1 SHARP))
+	(dississ . ,(ly:make-pitch -1 1 DOUBLE-SHARP))
+	(essess . ,(ly:make-pitch -1 2 DOUBLE-FLAT))
+	(ess . ,(ly:make-pitch -1 2 FLAT))
+	(e . ,(ly:make-pitch -1 2 NATURAL))
+	(eiss . ,(ly:make-pitch -1 2 SHARP))
+	(eississ . ,(ly:make-pitch -1 2 DOUBLE-SHARP))
+	(fessess . ,(ly:make-pitch -1 3 DOUBLE-FLAT))
+	(fess . ,(ly:make-pitch -1 3 FLAT))
+	(f . ,(ly:make-pitch -1 3 NATURAL))
+	(fiss . ,(ly:make-pitch -1 3 SHARP))
+	(fississ . ,(ly:make-pitch -1 3 DOUBLE-SHARP))
+	(gessess . ,(ly:make-pitch -1 4 DOUBLE-FLAT))
+	(gess . ,(ly:make-pitch -1 4 FLAT))
+	(g . ,(ly:make-pitch -1 4 NATURAL))
+	(giss . ,(ly:make-pitch -1 4 SHARP))
+	(gississ . ,(ly:make-pitch -1 4 DOUBLE-SHARP))
+	(assess . ,(ly:make-pitch -1 5 DOUBLE-FLAT))
+	(ass . ,(ly:make-pitch -1 5 FLAT))
+	(a . ,(ly:make-pitch -1 5 NATURAL))
+	(aiss . ,(ly:make-pitch -1 5 SHARP))
+	(aississ . ,(ly:make-pitch -1 5 DOUBLE-SHARP))
+	(hessess . ,(ly:make-pitch -1 6 DOUBLE-FLAT))
+	(b . ,(ly:make-pitch -1 6 FLAT))
+	(h . ,(ly:make-pitch -1 6 NATURAL))
+	(hiss . ,(ly:make-pitch -1 6 SHARP))
+	(hississ . ,(ly:make-pitch -1 6 DOUBLE-SHARP))
 )
-\version "1.5.68"
+
+pitchnames = \pitchnamesSvenska
+
+#(ly:parser-set-note-names parser pitchnames)