Merge branch 'master' of ssh://kainhofer@git.sv.gnu.org/srv/git/lilypond

[lilypond.git] / ly / catalan.ly

diff --git a/ly/catalan.ly b/ly/catalan.ly
index 2fd33abd75628121711a62c9f1fe767dae365b62..7d5ae8164a8317048925d440c4402e310dc318ee 100644 (file)
--- a/ly/catalan.ly
+++ b/ly/catalan.ly
@@ -1,8 +1,9 @@
 %{
 
- Common catalan names for notes. "b" means flat (bemoll), "d" means sharp (diesi).
- Also "s" is included for sharp (sostingut).  Both "diesi" and "sostingut" are approved
- by "Diccionari de la Llengua Catalana" from "Institut d'Estudis Catalans".
+ Common catalan names for notes. "b" means flat (bemoll), "d" means sharp
+ (diesi).  Also "s" is included for sharp (sostingut).  Both "diesi" and
+ "sostingut" are approved by "Diccionari de la Llengua Catalana" from
+ "Institut d'Estudis Catalans".
 
  Adapted from italiano.ly.
 
@@ -17,7 +18,7 @@
 
 
 % For using "sostingut" notation, which is also correct
-\pitchnames #`(
+pitchnamesCatalan = #`(
        (dobb . ,(ly:make-pitch -1 0 DOUBLE-FLAT))
        (dob . ,(ly:make-pitch -1 0 FLAT))
        (do . ,(ly:make-pitch -1 0 NATURAL))
@@ -71,6 +72,8 @@
        (siss . ,(ly:make-pitch -1 6 DOUBLE-SHARP))
 )
 
+pitchnames = \pitchnamesCatalan
 
+\version "2.10.0"
 
-\version "1.9.8"
+#(ly:parser-set-note-names parser pitchnames)