Makam-init.ly -> makam.ly

diff --git a/Documentation/topdocs/NEWS.tely b/Documentation/topdocs/NEWS.tely
index c69e4571f0413a60c94150dcfd00fb94dac76ea5..d4a84594b9f4a522174c48dd43fdf58f06da4a24 100644 (file)
--- a/Documentation/topdocs/NEWS.tely
+++ b/Documentation/topdocs/NEWS.tely
@@ -373,7 +373,7 @@ Alterations (such as a sharp or flat) may now be arbitrary
 fractions.  This allows some forms of microtonal music.  For example,
 Turkish makam music uses 1/9th tone alterations.
 
-@lilypondfile{makam.ly}
+@lilypondfile{makam-example.ly}
 
 @item
 Tie directions may be set with @code{^~} and @code{_~}.

diff --git a/input/new/makam-example.ly b/input/new/makam-example.ly
new file mode 100644 (file)
index 0000000..d884252
--- /dev/null
+++ b/input/new/makam-example.ly
@@ -0,0 +1,20 @@
+\version "2.11.61"
+\header {
+  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.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 example"
+}
+
+% Initialize makam settings
+\include "makam.ly"
+
+\relative c' {
+  \set Staff.keySignature = #`((3 . ,BAKIYE) (6 . ,(- KOMA)))
+  c4 cc db fk
+  gbm4 gfc gfb efk
+  fk4 db cc c
+}

diff --git a/input/new/makam.ly b/input/new/makam.ly
deleted file mode 100644 (file)
index 502a431..0000000
--- a/input/new/makam.ly
+++ /dev/null
@@ -1,20 +0,0 @@
-\version "2.11.61"
-\header {
-  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} (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"
-}
-
-% Initialize makam settings
-\include "makam-init.ly"
-
-\relative c' {
-  \set Staff.keySignature = #`((3 . ,BAKIYE) (6 . ,(- KOMA)))
-  c4 cc db fk
-  gbm4 gfc gfb efk
-  fk4 db cc c
-}

diff --git a/input/texidocs/makam-example.texidoc b/input/texidocs/makam-example.texidoc
new file mode 100644 (file)
index 0000000..5ee9cb4
--- /dev/null
+++ b/input/texidocs/makam-example.texidoc
@@ -0,0 +1,10 @@
+  texidoces = "
+El «Makam» es un tipo de melodía de Turquía que
+utiliza intervalos microtonales de 1/9 de tono.  Consulte el
+archivo de inicio @code{makam.ly} (véase el 'Manual de
+aprendizaje @version{}, 4.6.3 Otras fuentes de información' para
+averiguar la situación de este archivo) para ver detalles de los
+nombres de las notas y las alteraciones.
+
+"
+  doctitlees = "El «Makam»"

diff --git a/input/texidocs/makam.texidoc b/input/texidocs/makam.texidoc
deleted file mode 100644 (file)
index 9409f6e..0000000
--- a/input/texidocs/makam.texidoc
+++ /dev/null
@@ -1,10 +0,0 @@
-  texidoces = "
-El «Makam» es un tipo de melodía de Turquía que
-utiliza intervalos microtonales de 1/9 de tono.  Consulte el
-archivo de inicio @code{makam-init.ly} (véase el 'Manual de
-aprendizaje @version{}, 4.6.3 Otras fuentes de información' para
-averiguar la situación de este archivo) para ver detalles de los
-nombres de las notas y las alteraciones.
-
-"
-  doctitlees = "El «Makam»"

diff --git a/ly/makam-init.ly b/ly/makam-init.ly
deleted file mode 100644 (file)
index d4fdc78..0000000
--- a/ly/makam-init.ly
+++ /dev/null
@@ -1,154 +0,0 @@
-\version "2.11.6"
-
-%{
-
-Define 1/9 alterations.
-
-%}
-
- 
-#(define-public EKSIK-IKI 5/18)
-#(define-public EKSIK-UC 6/18)
-
-#(define-public KOMA 1/9)
-#(define-public BAKIYE 4/9)
-#(define-public KUCUK 5/9)
-#(define-public BUYUKMUCENNEB 8/9)
-
-%{
-
-Define pitch names
-
-%}
-
-makamPitchNames = #`(
-  (c . ,(ly:make-pitch -1 0 NATURAL))
-  (d . ,(ly:make-pitch -1 1 NATURAL))
-  (e . ,(ly:make-pitch -1 2 NATURAL))
-  (f . ,(ly:make-pitch -1 3 NATURAL))
-  (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))
-  (fc . ,(ly:make-pitch -1 3 KOMA))
-  (gc . ,(ly:make-pitch -1 4 KOMA))
-  (ac . ,(ly:make-pitch -1 5 KOMA))
-  (bc . ,(ly:make-pitch -1 6 KOMA))
-
-  (cb . ,(ly:make-pitch -1 0 BAKIYE))
-  (db . ,(ly:make-pitch -1 1 BAKIYE))
-  (eb . ,(ly:make-pitch -1 2 BAKIYE))
-  (fb . ,(ly:make-pitch -1 3 BAKIYE))
-  (gb . ,(ly:make-pitch -1 4 BAKIYE))
-  (ab . ,(ly:make-pitch -1 5 BAKIYE))
-  (bb . ,(ly:make-pitch -1 6 BAKIYE))
-
-  (ck . ,(ly:make-pitch -1 0 KUCUK))
-  (dk . ,(ly:make-pitch -1 1 KUCUK))
-  (ek . ,(ly:make-pitch -1 2 KUCUK))
-  (fk . ,(ly:make-pitch -1 3 KUCUK))
-  (gk . ,(ly:make-pitch -1 4 KUCUK))
-  (ak . ,(ly:make-pitch -1 5 KUCUK))
-  (bk . ,(ly:make-pitch -1 6 KUCUK))
-
-  (cbm . ,(ly:make-pitch -1 0 BUYUKMUCENNEB))
-  (dbm . ,(ly:make-pitch -1 1 BUYUKMUCENNEB))
-  (ebm . ,(ly:make-pitch -1 2 BUYUKMUCENNEB))
-  (fbm . ,(ly:make-pitch -1 3 BUYUKMUCENNEB))
-  (gbm . ,(ly:make-pitch -1 4 BUYUKMUCENNEB))
-  (abm . ,(ly:make-pitch -1 5 BUYUKMUCENNEB))
-  (bbm . ,(ly:make-pitch -1 6 BUYUKMUCENNEB))
-
-  ;; f for flat.
-  (cfc . ,(ly:make-pitch -1 0 (- KOMA)))
-  (dfc . ,(ly:make-pitch -1 1 (- KOMA)))
-  (efc . ,(ly:make-pitch -1 2 (- KOMA)))
-  (ffc . ,(ly:make-pitch -1 3 (- KOMA)))
-  (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)))
-  (ffb . ,(ly:make-pitch -1 3 (- BAKIYE)))
-  (gfb . ,(ly:make-pitch -1 4 (- BAKIYE)))
-  (afb . ,(ly:make-pitch -1 5 (- BAKIYE)))
-  (bfb . ,(ly:make-pitch -1 6 (- BAKIYE)))
-
-  (cfk . ,(ly:make-pitch -1 0 (- KUCUK)))
-  (dfk . ,(ly:make-pitch -1 1 (- KUCUK)))
-  (efk . ,(ly:make-pitch -1 2 (- KUCUK)))
-  (ffk . ,(ly:make-pitch -1 3 (- KUCUK)))
-  (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)))
-  (ffi . ,(ly:make-pitch -1 3 (- EKSIK-IKI)))
-  (gfi . ,(ly:make-pitch -1 4 (- EKSIK-IKI)))
-  (afi . ,(ly:make-pitch -1 5 (- EKSIK-IKI)))
-  (bfi . ,(ly:make-pitch -1 6 (- EKSIK-IKI)))
-
-  (cfu . ,(ly:make-pitch -1 0 (- EKSIK-UC)))
-  (dfu . ,(ly:make-pitch -1 1 (- EKSIK-UC)))
-  (efu . ,(ly:make-pitch -1 2 (- EKSIK-UC)))
-  (ffu . ,(ly:make-pitch -1 3 (- EKSIK-UC)))
-  (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)))
-  (ffbm . ,(ly:make-pitch -1 3 (- BUYUKMUCENNEB)))
-  (gfbm . ,(ly:make-pitch -1 4 (- BUYUKMUCENNEB)))
-  (afbm . ,(ly:make-pitch -1 5 (- BUYUKMUCENNEB)))
-  (bfbm . ,(ly:make-pitch -1 6 (- BUYUKMUCENNEB)))
-
-)
-
-
-%% set pitch names.
-pitchnames = \makamPitchNames 
-#(ly:parser-set-note-names parser makamPitchNames)
-
-#(define eksikMirroredSlashedFlat
-  (if (defined? 'eksikMirroredSlashedFlat)
-       eksikMirroredSlashedFlat #f))
-
-makamGlyphs = #`((1 . "accidentals.doublesharp")
-       (8/9 . "accidentals.sharp.slashslashslash.stemstem")
-       (5/9 . "accidentals.sharp.slashslashslash.stem")
-       (4/9 . "accidentals.sharp")
-       (1/9 . "accidentals.sharp.slashslash.stem")
-       (0 . "accidentals.natural")
-       (-1/9 . "accidentals.mirroredflat")
-       (-5/18 . ,(if eksikMirroredSlashedFlat
-                "accidentals.mirroredflat.backslash"
-                "accidentals.mirroredflat"))
-       (-6/18 . ,(if eksikMirroredSlashedFlat
-                "accidentals.mirroredflat.backslash"
-                "accidentals.mirroredflat"))
-       (-4/9 . "accidentals.flat.slash")
-       (-5/9 . "accidentals.flat")
-       (-8/9 . "accidentals.flat.slashslash")
-       (-1 . "accidentals.flatflat"))
-
-\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
-  }
-}
-

diff --git a/ly/makam.ly b/ly/makam.ly
new file mode 100644 (file)
index 0000000..68cd7d7
--- /dev/null
+++ b/ly/makam.ly
@@ -0,0 +1,154 @@
+\version "2.11.61"
+
+%{
+
+Define 1/9 alterations.
+
+%}
+
+ 
+#(define-public EKSIK-IKI 5/18)
+#(define-public EKSIK-UC 6/18)
+
+#(define-public KOMA 1/9)
+#(define-public BAKIYE 4/9)
+#(define-public KUCUK 5/9)
+#(define-public BUYUKMUCENNEB 8/9)
+
+%{
+
+Define pitch names
+
+%}
+
+makamPitchNames = #`(
+  (c . ,(ly:make-pitch -1 0 NATURAL))
+  (d . ,(ly:make-pitch -1 1 NATURAL))
+  (e . ,(ly:make-pitch -1 2 NATURAL))
+  (f . ,(ly:make-pitch -1 3 NATURAL))
+  (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))
+  (fc . ,(ly:make-pitch -1 3 KOMA))
+  (gc . ,(ly:make-pitch -1 4 KOMA))
+  (ac . ,(ly:make-pitch -1 5 KOMA))
+  (bc . ,(ly:make-pitch -1 6 KOMA))
+
+  (cb . ,(ly:make-pitch -1 0 BAKIYE))
+  (db . ,(ly:make-pitch -1 1 BAKIYE))
+  (eb . ,(ly:make-pitch -1 2 BAKIYE))
+  (fb . ,(ly:make-pitch -1 3 BAKIYE))
+  (gb . ,(ly:make-pitch -1 4 BAKIYE))
+  (ab . ,(ly:make-pitch -1 5 BAKIYE))
+  (bb . ,(ly:make-pitch -1 6 BAKIYE))
+
+  (ck . ,(ly:make-pitch -1 0 KUCUK))
+  (dk . ,(ly:make-pitch -1 1 KUCUK))
+  (ek . ,(ly:make-pitch -1 2 KUCUK))
+  (fk . ,(ly:make-pitch -1 3 KUCUK))
+  (gk . ,(ly:make-pitch -1 4 KUCUK))
+  (ak . ,(ly:make-pitch -1 5 KUCUK))
+  (bk . ,(ly:make-pitch -1 6 KUCUK))
+
+  (cbm . ,(ly:make-pitch -1 0 BUYUKMUCENNEB))
+  (dbm . ,(ly:make-pitch -1 1 BUYUKMUCENNEB))
+  (ebm . ,(ly:make-pitch -1 2 BUYUKMUCENNEB))
+  (fbm . ,(ly:make-pitch -1 3 BUYUKMUCENNEB))
+  (gbm . ,(ly:make-pitch -1 4 BUYUKMUCENNEB))
+  (abm . ,(ly:make-pitch -1 5 BUYUKMUCENNEB))
+  (bbm . ,(ly:make-pitch -1 6 BUYUKMUCENNEB))
+
+  ;; f for flat.
+  (cfc . ,(ly:make-pitch -1 0 (- KOMA)))
+  (dfc . ,(ly:make-pitch -1 1 (- KOMA)))
+  (efc . ,(ly:make-pitch -1 2 (- KOMA)))
+  (ffc . ,(ly:make-pitch -1 3 (- KOMA)))
+  (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)))
+  (ffb . ,(ly:make-pitch -1 3 (- BAKIYE)))
+  (gfb . ,(ly:make-pitch -1 4 (- BAKIYE)))
+  (afb . ,(ly:make-pitch -1 5 (- BAKIYE)))
+  (bfb . ,(ly:make-pitch -1 6 (- BAKIYE)))
+
+  (cfk . ,(ly:make-pitch -1 0 (- KUCUK)))
+  (dfk . ,(ly:make-pitch -1 1 (- KUCUK)))
+  (efk . ,(ly:make-pitch -1 2 (- KUCUK)))
+  (ffk . ,(ly:make-pitch -1 3 (- KUCUK)))
+  (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)))
+  (ffi . ,(ly:make-pitch -1 3 (- EKSIK-IKI)))
+  (gfi . ,(ly:make-pitch -1 4 (- EKSIK-IKI)))
+  (afi . ,(ly:make-pitch -1 5 (- EKSIK-IKI)))
+  (bfi . ,(ly:make-pitch -1 6 (- EKSIK-IKI)))
+
+  (cfu . ,(ly:make-pitch -1 0 (- EKSIK-UC)))
+  (dfu . ,(ly:make-pitch -1 1 (- EKSIK-UC)))
+  (efu . ,(ly:make-pitch -1 2 (- EKSIK-UC)))
+  (ffu . ,(ly:make-pitch -1 3 (- EKSIK-UC)))
+  (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)))
+  (ffbm . ,(ly:make-pitch -1 3 (- BUYUKMUCENNEB)))
+  (gfbm . ,(ly:make-pitch -1 4 (- BUYUKMUCENNEB)))
+  (afbm . ,(ly:make-pitch -1 5 (- BUYUKMUCENNEB)))
+  (bfbm . ,(ly:make-pitch -1 6 (- BUYUKMUCENNEB)))
+
+)
+
+
+%% set pitch names.
+pitchnames = \makamPitchNames 
+#(ly:parser-set-note-names parser makamPitchNames)
+
+#(define eksikMirroredSlashedFlat
+  (if (defined? 'eksikMirroredSlashedFlat)
+       eksikMirroredSlashedFlat #f))
+
+makamGlyphs = #`((1 . "accidentals.doublesharp")
+       (8/9 . "accidentals.sharp.slashslashslash.stemstem")
+       (5/9 . "accidentals.sharp.slashslashslash.stem")
+       (4/9 . "accidentals.sharp")
+       (1/9 . "accidentals.sharp.slashslash.stem")
+       (0 . "accidentals.natural")
+       (-1/9 . "accidentals.mirroredflat")
+       (-5/18 . ,(if eksikMirroredSlashedFlat
+                "accidentals.mirroredflat.backslash"
+                "accidentals.mirroredflat"))
+       (-6/18 . ,(if eksikMirroredSlashedFlat
+                "accidentals.mirroredflat.backslash"
+                "accidentals.mirroredflat"))
+       (-4/9 . "accidentals.flat.slash")
+       (-5/9 . "accidentals.flat")
+       (-8/9 . "accidentals.flat.slashslash")
+       (-1 . "accidentals.flatflat"))
+
+\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
+  }
+}
+

diff --git a/python/convertrules.py b/python/convertrules.py
index 0373f109156a2ca0c9538a029bc05cb137d061de..cb48266a28361f8228227427734192ee47605f88 100644 (file)
--- a/python/convertrules.py
+++ b/python/convertrules.py
@@ -2817,6 +2817,11 @@ def conv (str):
     str = re.sub (r'\\include(\s+)"gregorian-init.ly"', r'\\include\1"gregorian.ly"', str)
     return str
 
+@rule ((2, 11, 62), "makam-init.ly -> makam.ly")
+def conv (str):
+    str = re.sub (r'\\include(\s+)"makam-init.ly"', r'\\include\1"makam.ly"', str)
+    return str
+
 # Guidelines to write rules (please keep this at the end of this file)
 #
 # - keep at most one rule per version; if several conversions should be done,