X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=ly%2Fnorsk.ly;h=36a5aa0ba87c9b0ab972ee6ac2bbf14d9379c095;hb=579274a935b22567ac15b3651a9d651474f88ec4;hp=5b02889ab43a9b66abbc9be80061fb784c9e5d7f;hpb=33fee1aae93af367e6d2f0a80bef3e1b38eda9eb;p=lilypond.git

diff --git a/ly/norsk.ly b/ly/norsk.ly
index 5b02889ab4..36a5aa0ba8 100644
--- a/ly/norsk.ly
+++ b/ly/norsk.ly
@@ -1,29 +1,37 @@
+%%%% 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>
+%%%%
+%%%% 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/>.
 
-% 	Idx norsk.ly,v 1.1 1998/03/25 11:38:28 arvidg Exp arvidg $	
+\version "2.12.0"
 
 %{
 
- Common norwegian names for notes, including versions without the
- double s-es to save typing, as well as the traditional names with
- them not to confuse musicians.  "es" or "ess" means flat, "is" or
- "iss" means sharp.
-
- Otherwise, the main difference from the dutch names is the that the
- "b" is called "h" in norwegian, while the dutch "bes" is a norwegian
- "b".
-
- Staying within the (proud?) naming convention for norwegian language
- setup used in LaTeX, this file is called "norsk.ly" instead of
- "norwegian.ly", even if all other languages' files use the english
- name.
+  es     = flat
+  ess    = flat
+  eses   = double-flat
+  essess = double-flat
 
- This file is based on "dutch.ly".  Basically, I copied "dutch.ly",
- duplicated all lines containing at least one "is" or "es", changed
- every other "is" into an "iss" and every other "es" into an "ess",
- 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.
+  is     = sharp
+  iss    = sharp
+  isis   = double-sharp
+  ississ = double-sharp
 
-                                  Arvid Gr=F8tting <<arvidg@ifi.uio.no>>
+    English: c  d  e  f  g  a  bf b
+  Norwegian: c  d  e  f  g  a  b  h
 
 %}
 
@@ -102,9 +110,6 @@ pitchnamesNorsk = #`(
 	(hississ . ,(ly:make-pitch -1 6 DOUBLE-SHARP))
 )
 
-
-pitchnames =\pitchnamesNorsk
-
-\version "2.12.0"
+pitchnames = \pitchnamesNorsk
 
 #(ly:parser-set-note-names parser pitchnames)