Merge branch 'master' into nested-bookparts

[lilypond.git] / ly / makam-init.ly

diff --git a/ly/makam-init.ly b/ly/makam-init.ly
index e9bd509b732faa373770f8a4d22c9dd70be66a95..d4fdc78315f28d5c7e68808da4cc362ebb69acdf 100644 (file)
--- a/ly/makam-init.ly
+++ b/ly/makam-init.ly
@@ -1,11 +1,3 @@
-\header {
-
-  texidoc = "Makam is Turkish type of melody that uses 1/9 tone
-  microtonal alterations."
-
-}
-
-
 \version "2.11.6"
 
 %{
@@ -127,12 +119,9 @@ makamPitchNames = #`(
 pitchnames = \makamPitchNames 
 #(ly:parser-set-note-names parser makamPitchNames)
 
-\paper
-{
-  ragged-right = ##t
-}
-
-eksikMirroredSlashedFlat = ##f
+#(define eksikMirroredSlashedFlat
+  (if (defined? 'eksikMirroredSlashedFlat)
+       eksikMirroredSlashedFlat #f))
 
 makamGlyphs = #`((1 . "accidentals.doublesharp")
        (8/9 . "accidentals.sharp.slashslashslash.stemstem")
@@ -152,33 +141,14 @@ makamGlyphs = #`((1 . "accidentals.doublesharp")
        (-8/9 . "accidentals.flat.slashslash")
        (-1 . "accidentals.flatflat"))
 
-\relative {
-
-  %{ define alteration <-> symbol mapping. The following glyphs are available.
-
-  accidentals.sharp 
-  accidentals.sharp.slashslash.stem 
-  accidentals.sharp.slashslashslash.stemstem 
-  accidentals.sharp.slashslashslash.stem 
-  accidentals.sharp.slashslash.stemstemstem 
-  accidentals.natural 
-  accidentals.flat 
-  accidentals.flat.slash 
-  accidentals.flat.slashslash 
-  accidentals.mirroredflat.flat 
-  accidentals.mirroredflat 
-  accidentals.flatflat 
-  accidentals.flatflat.slash 
-  accidentals.doublesharp 
-
-  %}
-
-  \override Accidental #'glyph-name-alist =  \makamGlyphs
-  
-  \override Staff.KeySignature #'glyph-name-alist = \makamGlyphs
-  \set Staff.keySignature =  #'(
-    (3 .  4/9)
-    (6 . -1/9))
-  
-  c cc db fk gbm gfc gfb efk dfbm
+\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
+  }
 }
+