X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=ly%2Fnorsk.ly;h=4ede332e65f2b56f5eb9c9c1d57f2fffa135d2df;hb=402045837e7134cdf90d1fcf31768c62227a4936;hp=c2a13eead27335128d02bd565764dc027ba45c56;hpb=ea8506894a420e3393858a3ee284ab6b2f12c6d6;p=lilypond.git

diff --git a/ly/norsk.ly b/ly/norsk.ly
index c2a13eead2..4ede332e65 100644
--- a/ly/norsk.ly
+++ b/ly/norsk.ly
@@ -23,85 +23,86 @@
  added "ass" et al, and made some b->h-related changes.  There may be
  bugs in here please tell me (or send patches) if you find any.
 
-                                  Arvid Gr=F8tting <arvidg@ifi.uio.no>
+                                  Arvid Gr=F8tting <<arvidg@ifi.uio.no>>
 
 %}
 
-\pitchnames #`(
-	(ceses . ,(ly:make-pitch -1 0 -2 ))
-	(cessess . ,(ly:make-pitch -1 0 -2 ))
-	(ces . ,(ly:make-pitch -1 0 -1 ))
-	(cess . ,(ly:make-pitch -1 0 -1 ))
-	(c . ,(ly:make-pitch -1 0 0 ))
-	(cis . ,(ly:make-pitch -1 0 1 ))
-	(ciss . ,(ly:make-pitch -1 0 1 ))
-	(cisis . ,(ly:make-pitch -1 0 2 ))
-	(cississ . ,(ly:make-pitch -1 0 2 ))
-	(deses . ,(ly:make-pitch -1 1 -2 ))
-	(dessess . ,(ly:make-pitch -1 1 -2 ))
-	(des . ,(ly:make-pitch -1 1 -1 ))
-	(dess . ,(ly:make-pitch -1 1 -1 ))
-	(d . ,(ly:make-pitch -1 1 0 ))
-	(dis . ,(ly:make-pitch -1 1 1 ))
-	(diss . ,(ly:make-pitch -1 1 1 ))
-	(disis . ,(ly:make-pitch -1 1 2 ))
-	(dississ . ,(ly:make-pitch -1 1 2 ))
-	(eeses . ,(ly:make-pitch -1 2 -2 ))
-	(eessess . ,(ly:make-pitch -1 2 -2 ))
-	(eses . ,(ly:make-pitch -1 2 -2 ))
-	(essess . ,(ly:make-pitch -1 2 -2 ))
-	(ees . ,(ly:make-pitch -1 2 -1 ))
-	(eess . ,(ly:make-pitch -1 2 -1 ))
-	(es . ,(ly:make-pitch -1 2 -1 ))
-	(ess . ,(ly:make-pitch -1 2 -1 ))
-	(e . ,(ly:make-pitch -1 2 0 ))
-	(eis . ,(ly:make-pitch -1 2 1 ))
-	(eiss . ,(ly:make-pitch -1 2 1 ))
-	(eisis . ,(ly:make-pitch -1 2 2 ))
-	(eississ . ,(ly:make-pitch -1 2 2 ))
-	(feses . ,(ly:make-pitch -1 3 -2 ))
-	(fessess . ,(ly:make-pitch -1 3 -2 ))
-	(fes . ,(ly:make-pitch -1 3 -1 ))
-	(fess . ,(ly:make-pitch -1 3 -1 ))
-	(f . ,(ly:make-pitch -1 3 0 ))
-	(fis . ,(ly:make-pitch -1 3 1 ))
-	(fiss . ,(ly:make-pitch -1 3 1 ))
-	(fisis . ,(ly:make-pitch -1 3 2 ))
-	(fississ . ,(ly:make-pitch -1 3 2 ))
-	(geses . ,(ly:make-pitch -1 4 -2 ))
-	(gessess . ,(ly:make-pitch -1 4 -2 ))
-	(ges . ,(ly:make-pitch -1 4 -1 ))
-	(gess . ,(ly:make-pitch -1 4 -1 ))
-	(g . ,(ly:make-pitch -1 4 0 ))
-	(g . ,(ly:make-pitch -1 4 0 ))
-	(gis . ,(ly:make-pitch -1 4 1 ))
-	(giss . ,(ly:make-pitch -1 4 1 ))
-	(gisis . ,(ly:make-pitch -1 4 2 ))
-	(gississ . ,(ly:make-pitch -1 4 2 ))
-	(aeses . ,(ly:make-pitch -1 5 -2 ))
-	(aessess . ,(ly:make-pitch -1 5 -2 ))
-	(ases . ,(ly:make-pitch -1 5 -2 ))
-	(assess . ,(ly:make-pitch -1 5 -2 ))
-	(aes . ,(ly:make-pitch -1 5 -1 ))
-	(aess . ,(ly:make-pitch -1 5 -1 ))
-	(as . ,(ly:make-pitch -1 5 -1 ))
-	(ass . ,(ly:make-pitch -1 5 -1 ))
-	(a . ,(ly:make-pitch -1 5 0 ))
-	(ais . ,(ly:make-pitch -1 5 1 ))
-	(aiss . ,(ly:make-pitch -1 5 1 ))
-	(aisis . ,(ly:make-pitch -1 5 2 ))
-	(aississ . ,(ly:make-pitch -1 5 2 ))
-	(bes . ,(ly:make-pitch -1 6 -2 ))
-	(bess . ,(ly:make-pitch -1 6 -2 ))
-	(b . ,(ly:make-pitch -1 6 -1 ))
-	(b . ,(ly:make-pitch -1 6 -1 ))
-	(h . ,(ly:make-pitch -1 6 0 ))
-	(his . ,(ly:make-pitch -1 6 1 ))
-	(hiss . ,(ly:make-pitch -1 6 1 ))
-	(hisis . ,(ly:make-pitch -1 6 2 ))
-	(hississ . ,(ly:make-pitch -1 6 2 ))
+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
 
-\version "1.7.18"
+\version "2.1.22"