X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=ly%2Fmakam.ly;h=7f5f8cc78382400bbb8ddda827b93176ddde12fc;hb=97a0169312a260933246ab224e4f8b0969871dd5;hp=37b66298bdd2886a3ae80849efca5e9ec3be37fa;hpb=2055f35c47a045a50a01ff4dba8524322cfc3b48;p=lilypond.git

diff --git a/ly/makam.ly b/ly/makam.ly
index 37b66298bd..7f5f8cc783 100644
--- a/ly/makam.ly
+++ b/ly/makam.ly
@@ -1,4 +1,4 @@
-\version "2.14.0"
+\version "2.19.22"
 
 %{
 
@@ -6,7 +6,7 @@ Define 1/9 alterations.
 
 %}
 
- 
+
 #(define-public EKSIK-IKI 5/18)
 #(define-public EKSIK-UC 6/18)
 
@@ -29,7 +29,7 @@ makamPitchNames = #`(
   (g . ,(ly:make-pitch -1 4 NATURAL))
   (a . ,(ly:make-pitch -1 5 NATURAL))
   (b . ,(ly:make-pitch -1 6 NATURAL))
-  
+
   (cc . ,(ly:make-pitch -1 0 KOMA))
   (dc . ,(ly:make-pitch -1 1 KOMA))
   (ec . ,(ly:make-pitch -1 2 KOMA))
@@ -70,7 +70,7 @@ makamPitchNames = #`(
   (gfc . ,(ly:make-pitch -1 4 (- KOMA)))
   (afc . ,(ly:make-pitch -1 5 (- KOMA)))
   (bfc . ,(ly:make-pitch -1 6 (- KOMA)))
-  
+
   (cfb . ,(ly:make-pitch -1 0 (- BAKIYE)))
   (dfb . ,(ly:make-pitch -1 1 (- BAKIYE)))
   (efb . ,(ly:make-pitch -1 2 (- BAKIYE)))
@@ -86,7 +86,7 @@ makamPitchNames = #`(
   (gfk . ,(ly:make-pitch -1 4 (- KUCUK)))
   (afk . ,(ly:make-pitch -1 5 (- KUCUK)))
   (bfk . ,(ly:make-pitch -1 6 (- KUCUK)))
-  
+
   (cfi . ,(ly:make-pitch -1 0 (- EKSIK-IKI)))
   (dfi . ,(ly:make-pitch -1 1 (- EKSIK-IKI)))
   (efi . ,(ly:make-pitch -1 2 (- EKSIK-IKI)))
@@ -102,8 +102,8 @@ makamPitchNames = #`(
   (gfu . ,(ly:make-pitch -1 4 (- EKSIK-UC)))
   (afu . ,(ly:make-pitch -1 5 (- EKSIK-UC)))
   (bfu . ,(ly:make-pitch -1 6 (- EKSIK-UC)))
-  
-  
+
+
   (cfbm . ,(ly:make-pitch -1 0 (- BUYUKMUCENNEB)))
   (dfbm . ,(ly:make-pitch -1 1 (- BUYUKMUCENNEB)))
   (efbm . ,(ly:make-pitch -1 2 (- BUYUKMUCENNEB)))
@@ -116,8 +116,8 @@ makamPitchNames = #`(
 
 
 %% set pitch names.
-pitchnames = \makamPitchNames 
-#(ly:parser-set-note-names parser makamPitchNames)
+pitchnames = \makamPitchNames
+#(ly:parser-set-note-names makamPitchNames)
 
 #(define eksikMirroredSlashedFlat
   (if (defined? 'eksikMirroredSlashedFlat)
@@ -131,11 +131,11 @@ makamGlyphs = #`((1 . "accidentals.doublesharp")
        (0 . "accidentals.natural")
        (-1/9 . "accidentals.mirroredflat")
        (-5/18 . ,(if eksikMirroredSlashedFlat
-		 "accidentals.mirroredflat.backslash"
-		 "accidentals.mirroredflat"))
+                 "accidentals.mirroredflat.backslash"
+                 "accidentals.mirroredflat"))
        (-6/18 . ,(if eksikMirroredSlashedFlat
-		 "accidentals.mirroredflat.backslash"
-		 "accidentals.mirroredflat"))
+                 "accidentals.mirroredflat.backslash"
+                 "accidentals.mirroredflat"))
        (-4/9 . "accidentals.flat.slash")
        (-5/9 . "accidentals.flat")
        (-8/9 . "accidentals.flat.slashslash")
@@ -144,11 +144,10 @@ makamGlyphs = #`((1 . "accidentals.doublesharp")
 \layout {
   \context {
     \Score
-    \override KeySignature #'glyph-name-alist = \makamGlyphs
-    \override Accidental #'glyph-name-alist = \makamGlyphs
-    \override AccidentalCautionary #'glyph-name-alist = \makamGlyphs
-    \override TrillPitchAccidental #'glyph-name-alist = \makamGlyphs
-    \override AmbitusAccidental #'glyph-name-alist = \makamGlyphs
+    \override KeySignature.glyph-name-alist = \makamGlyphs
+    \override Accidental.glyph-name-alist = \makamGlyphs
+    \override AccidentalCautionary.glyph-name-alist = \makamGlyphs
+    \override TrillPitchAccidental.glyph-name-alist = \makamGlyphs
+    \override AmbitusAccidental.glyph-name-alist = \makamGlyphs
   }
 }
-