Merge commit 'origin' into includes

[lilypond.git] / ly / catalan.ly

diff --git a/ly/catalan.ly b/ly/catalan.ly
index 37452f06e61a7d62df3c22296d9d4b8d31635c20..aab7edf923390688d2a5724ebaaf3295f6084010 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.
 
@@ -73,4 +74,6 @@ pitchnamesCatalan = #`(
 
 pitchnames = \pitchnamesCatalan
 
-\version "2.1.30"
+\version "2.12.0"
+
+#(ly:parser-set-note-names parser pitchnames)