Merge branch 'master' into nested-bookparts

[lilypond.git] / input / new / makam.ly

diff --git a/input/new/makam.ly b/input/new/makam.ly
index b62e93fd64f6ac3cca86d3b792a443b1d6a5b977..c4150ae30c9dd57577b80a4e1c80c877fa1ba43e 100644 (file)
--- a/input/new/makam.ly
+++ b/input/new/makam.ly
@@ -1,11 +1,11 @@
 \version "2.11.6"
 \header {
-  lsrtags = "pitches"
+  lsrtags = "pitches,world-music"
   texidoc = "Makam is a type of melody from Turkey using 1/9th-tone
-  microtonal alterations.  Consult the initialization file
-  @code{makam-init.ly} (in @code{/usr/share/lilypond/current/ly})
-  for details of pitch names and alterations.
-  "
+microtonal alterations.  Consult the initialization file
+@code{makam-init.ly} (see the `Learning Manual @version{},
+4.6.3 Other sources of information' for the location of this file)
+for details of pitch names and alterations."
   doctitle = "Makam"
 }
 
@@ -13,8 +13,8 @@
 \include "makam-init.ly"
 
 \relative c' {
-  \set Staff.keySignature =  #`((3 . ,BAKIYE) (6 . ,(- KOMA)))  
-  c cc db fk
-  gbm gfc gfb efk
-  fk db cc c
+  \set Staff.keySignature = #`((3 . ,BAKIYE) (6 . ,(- KOMA)))
+  c4 cc db fk
+  gbm4 gfc gfb efk
+  fk4 db cc c
 }