X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=ly%2Fnorsk.ly;h=ab2367b1c9240111df58fe8262344f0d8e2b7150;hb=368ad44455b251754e273a8392fe220f3c64d61f;hp=36a5aa0ba87c9b0ab972ee6ac2bbf14d9379c095;hpb=bc95f4434f760d41191341ab4508b2064eb19025;p=lilypond.git

diff --git a/ly/norsk.ly b/ly/norsk.ly
index 36a5aa0ba8..ab2367b1c9 100644
--- a/ly/norsk.ly
+++ b/ly/norsk.ly
@@ -1,7 +1,7 @@
 %%%% common Norwegian names for notes
 %%%% This file is part of LilyPond, the GNU music typesetter.
 %%%%
-%%%% Copyright (C) 1998--2010 Arvid Grøtting <arvidg@ifi.uio.no>
+%%%% 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,100 +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
-  ess    = flat
-  eses   = double-flat
-  essess = double-flat
-
-  is     = sharp
-  iss    = sharp
-  isis   = double-sharp
-  ississ = double-sharp
-
-    English: c  d  e  f  g  a  bf b
-  Norwegian: c  d  e  f  g  a  b  h
-
-%}
-
-pitchnamesNorsk = #`(
-	(ceses . ,(ly:make-pitch -1 0 DOUBLE-FLAT))
-	(cessess . ,(ly:make-pitch -1 0 DOUBLE-FLAT))
-	(ces . ,(ly:make-pitch -1 0 FLAT))
-	(cess . ,(ly:make-pitch -1 0 FLAT))
-	(c . ,(ly:make-pitch -1 0 NATURAL))
-	(cis . ,(ly:make-pitch -1 0 SHARP))
-	(ciss . ,(ly:make-pitch -1 0 SHARP))
-	(cisis . ,(ly:make-pitch -1 0 DOUBLE-SHARP))
-	(cississ . ,(ly:make-pitch -1 0 DOUBLE-SHARP))
-	(deses . ,(ly:make-pitch -1 1 DOUBLE-FLAT))
-	(dessess . ,(ly:make-pitch -1 1 DOUBLE-FLAT))
-	(des . ,(ly:make-pitch -1 1 FLAT))
-	(dess . ,(ly:make-pitch -1 1 FLAT))
-	(d . ,(ly:make-pitch -1 1 NATURAL))
-	(dis . ,(ly:make-pitch -1 1 SHARP))
-	(diss . ,(ly:make-pitch -1 1 SHARP))
-	(disis . ,(ly:make-pitch -1 1 DOUBLE-SHARP))
-	(dississ . ,(ly:make-pitch -1 1 DOUBLE-SHARP))
-	(eeses . ,(ly:make-pitch -1 2 DOUBLE-FLAT))
-	(eessess . ,(ly:make-pitch -1 2 DOUBLE-FLAT))
-	(eses . ,(ly:make-pitch -1 2 DOUBLE-FLAT))
-	(essess . ,(ly:make-pitch -1 2 DOUBLE-FLAT))
-	(ees . ,(ly:make-pitch -1 2 FLAT))
-	(eess . ,(ly:make-pitch -1 2 FLAT))
-	(es . ,(ly:make-pitch -1 2 FLAT))
-	(ess . ,(ly:make-pitch -1 2 FLAT))
-	(e . ,(ly:make-pitch -1 2 NATURAL))
-	(eis . ,(ly:make-pitch -1 2 SHARP))
-	(eiss . ,(ly:make-pitch -1 2 SHARP))
-	(eisis . ,(ly:make-pitch -1 2 DOUBLE-SHARP))
-	(eississ . ,(ly:make-pitch -1 2 DOUBLE-SHARP))
-	(feses . ,(ly:make-pitch -1 3 DOUBLE-FLAT))
-	(fessess . ,(ly:make-pitch -1 3 DOUBLE-FLAT))
-	(fes . ,(ly:make-pitch -1 3 FLAT))
-	(fess . ,(ly:make-pitch -1 3 FLAT))
-	(f . ,(ly:make-pitch -1 3 NATURAL))
-	(fis . ,(ly:make-pitch -1 3 SHARP))
-	(fiss . ,(ly:make-pitch -1 3 SHARP))
-	(fisis . ,(ly:make-pitch -1 3 DOUBLE-SHARP))
-	(fississ . ,(ly:make-pitch -1 3 DOUBLE-SHARP))
-	(geses . ,(ly:make-pitch -1 4 DOUBLE-FLAT))
-	(gessess . ,(ly:make-pitch -1 4 DOUBLE-FLAT))
-	(ges . ,(ly:make-pitch -1 4 FLAT))
-	(gess . ,(ly:make-pitch -1 4 FLAT))
-	(g . ,(ly:make-pitch -1 4 NATURAL))
-	(g . ,(ly:make-pitch -1 4 NATURAL))
-	(gis . ,(ly:make-pitch -1 4 SHARP))
-	(giss . ,(ly:make-pitch -1 4 SHARP))
-	(gisis . ,(ly:make-pitch -1 4 DOUBLE-SHARP))
-	(gississ . ,(ly:make-pitch -1 4 DOUBLE-SHARP))
-	(aeses . ,(ly:make-pitch -1 5 DOUBLE-FLAT))
-	(aessess . ,(ly:make-pitch -1 5 DOUBLE-FLAT))
-	(ases . ,(ly:make-pitch -1 5 DOUBLE-FLAT))
-	(assess . ,(ly:make-pitch -1 5 DOUBLE-FLAT))
-	(aes . ,(ly:make-pitch -1 5 FLAT))
-	(aess . ,(ly:make-pitch -1 5 FLAT))
-	(as . ,(ly:make-pitch -1 5 FLAT))
-	(ass . ,(ly:make-pitch -1 5 FLAT))
-	(a . ,(ly:make-pitch -1 5 NATURAL))
-	(ais . ,(ly:make-pitch -1 5 SHARP))
-	(aiss . ,(ly:make-pitch -1 5 SHARP))
-	(aisis . ,(ly:make-pitch -1 5 DOUBLE-SHARP))
-	(aississ . ,(ly:make-pitch -1 5 DOUBLE-SHARP))
-	(bes . ,(ly:make-pitch -1 6 DOUBLE-FLAT))
-	(bess . ,(ly:make-pitch -1 6 DOUBLE-FLAT))
-	(b . ,(ly:make-pitch -1 6 FLAT))
-	(b . ,(ly:make-pitch -1 6 FLAT))
-	(h . ,(ly:make-pitch -1 6 NATURAL))
-	(his . ,(ly:make-pitch -1 6 SHARP))
-	(hiss . ,(ly:make-pitch -1 6 SHARP))
-	(hisis . ,(ly:make-pitch -1 6 DOUBLE-SHARP))
-	(hississ . ,(ly:make-pitch -1 6 DOUBLE-SHARP))
-)
-
-pitchnames = \pitchnamesNorsk
-
-#(ly:parser-set-note-names parser pitchnames)
+\language "norsk"