diff options
| author | Neil Puttock <n.puttock@gmail.com> | 2008-10-01 20:14:04 +0100 |
|---|---|---|
| committer | Neil Puttock <n.puttock@gmail.com> | 2008-10-01 22:05:46 +0100 |
| commit | e1c0b59e4e9c32150ad21c144dd9e76a705a3a10 (patch) | |
| tree | abd8848dbd0e0740152ac6fa0b110bcf9f8dea4b | |
| parent | 33da8a7ea4971d226b13337de0e7ba2f3d539474 (diff) | |
Makam-init.ly -> makam.ly
| -rw-r--r-- | Documentation/topdocs/NEWS.tely | 2 | ||||
| -rw-r--r-- | input/new/makam-example.ly (renamed from input/new/makam.ly) | 6 | ||||
| -rw-r--r-- | input/texidocs/makam-example.texidoc (renamed from input/texidocs/makam.texidoc) | 2 | ||||
| -rw-r--r-- | ly/makam.ly (renamed from ly/makam-init.ly) | 2 | ||||
| -rw-r--r-- | python/convertrules.py | 5 |
5 files changed, 11 insertions, 6 deletions
diff --git a/Documentation/topdocs/NEWS.tely b/Documentation/topdocs/NEWS.tely index c69e4571f0..d4a84594b9 100644 --- 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.ly b/input/new/makam-example.ly index 502a43132d..d8842521f8 100644 --- a/input/new/makam.ly +++ b/input/new/makam-example.ly @@ -3,14 +3,14 @@ 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{}, +@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" + doctitle = "Makam example" } % Initialize makam settings -\include "makam-init.ly" +\include "makam.ly" \relative c' { \set Staff.keySignature = #`((3 . ,BAKIYE) (6 . ,(- KOMA))) diff --git a/input/texidocs/makam.texidoc b/input/texidocs/makam-example.texidoc index 9409f6e477..5ee9cb431d 100644 --- a/input/texidocs/makam.texidoc +++ b/input/texidocs/makam-example.texidoc @@ -1,7 +1,7 @@ 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 +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. diff --git a/ly/makam-init.ly b/ly/makam.ly index d4fdc78315..68cd7d7bc9 100644 --- a/ly/makam-init.ly +++ b/ly/makam.ly @@ -1,4 +1,4 @@ -\version "2.11.6" +\version "2.11.61" %{ diff --git a/python/convertrules.py b/python/convertrules.py index 0373f10915..cb48266a28 100644 --- 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, |