Re: [PATCH] Extended documentation on Turkish classical music and makam

[Joseph Wakeling]

Hi Trevor,

> This is more serious, as I can't fix this at this end.  It may well
> be due to creating the patch from an earlier revision.  If you know
> the SHA1 ID of the revision you used to make the patch you
> could simply mail it to me.  I can then apply the patch against that
> revision at this end and cherry-pick it forwards.

I think the attached patches should work.  They should lack trailing
whitespace and I've used git format-patch origin which I hope will
generate the patch against the head of the master branch.  (Still
getting the hang of git; I'm a bzr user generally:-)

I pulled a clean copy of the latest master branch to a new directory and
was able to apply these patches successfully.  In the event they don't
apply correctly, the parent commit was
eaf4fd311686c1aa22e529328cf5a08b63cd19f3

Best wishes,

    -- Joe

>From e3e8a3916a3ffc33836aee04722ac9cb3b3aed85 Mon Sep 17 00:00:00 2001
From: Joseph Wakeling <address@hidden>
Date: Tue, 1 Sep 2009 21:33:41 +0200
Subject: [PATCH 1/2] Extended documentation on Turkish classical music and 
Makam.

 * New section on 'Non-Western note names and accidentals'
   in the Pitches section of the Notation Reference.
   Contains table of accidentals for makam.ly.

 * New section on Turkish classical music in the World
   Music section of the Notation Reference.
---
 Documentation/notation/pitches.itely |   68 ++++++++++++++++++++++++++++++++-
 Documentation/notation/world.itely   |   62 +++++++++++++++++++++++++++++++
 2 files changed, 127 insertions(+), 3 deletions(-)

diff --git a/Documentation/notation/pitches.itely 
b/Documentation/notation/pitches.itely
index b02e6da..7951310 100644
--- a/Documentation/notation/pitches.itely
+++ b/Documentation/notation/pitches.itely
@@ -37,6 +37,7 @@ mode.  In most cases, relative mode will be more convenient.
 * Relative octave entry::
 * Accidentals::
 * Note names in other languages::
+* Non-Western note names and accidentals::
 @end menu
 
 
@@ -388,9 +389,6 @@ cis
 @lilypondfile[verbatim,lilyquote,texidoc,doctitle]
 {preventing-extra-naturals-from-being-automatically-added.ly}
 
address@hidden,lilyquote,texidoc,doctitle]
-{makam-example.ly}
-
 
 @seealso
 Music Glossary:
@@ -573,6 +571,70 @@ Snippets:
 @rlsr{Pitches}.
 
 
address@hidden Non-Western note names and accidentals
address@hidden Non-Western note names and accidentals
+
+Many non-Western musics (and some Western folk and
+traditional musics) employ alternative or extended tuning
+systems that do not fit readily into standard classical
+notation.
+
+In some cases standard notation is still used, with the
+pitch differences being implicit.  For example, Arabic
+music is notated with standard semitone and quarter-tone
+accidentals, with the precise pitch alterations being
+determined by context.  Others require extended or unique
+notations.
+
address@hidden classical music}, or Ottoman music,
+employs melodic forms known as @notation{makamlar}, whose
+intervals are based on 1/9 divisions of the whole tone.
+From a modern notational point of view, it is convenient
+to use the standard Western staff notes (c, d, e, ...)
+with special accidentals unique to Turkish music.  These
+accidentals are defined in @file{makam.ly} (see the
+Learning Manual 2.12.2, section 4.6.3,  `Other sources of
+information', for the location of this file).  The
+following table gives their names, the accidental suffix
+that must be added to notes, and their pitch alteration
+as a fraction of one whole tone.
+
address@hidden TODO: can we include the actual accidentals in this table?
address@hidden
address@hidden address@hidden mücenneb (sharp)}} address@hidden address@hidden 
alteration}}
address@hidden Accidental name
+  @tab suffix @tab pitch alteration
+
address@hidden büyük mücenneb (sharp)
+  @tab -bm @tab +8/9
address@hidden kücük mücenneb (sharp)
+  @tab -k @tab +5/9
address@hidden bakiye (sharp)
+  @tab -b @tab +4/9
address@hidden koma (sharp)
+  @tab -c @tab +1/9
+
address@hidden koma (flat)
+  @tab -fc @tab -1/9
address@hidden bakiye (flat)
+  @tab -fb @tab -4/9
address@hidden kücük mücenneb (flat)
+  @tab -fk @tab -5/9
address@hidden büyük mücenneb (flat)
+  @tab -fbm @tab -8/9
address@hidden multitable
address@hidden quotation
+
+For further information on Turkish classical music and
+makamlar, see @ref{Turkish classical music}.
+
+
address@hidden
+
address@hidden,lilyquote,texidoc,doctitle]
+{makam-example.ly}
+
+
 @node Changing multiple pitches
 @subsection Changing multiple pitches
 
diff --git a/Documentation/notation/world.itely 
b/Documentation/notation/world.itely
index 0d7d5a5..26b38fe 100644
--- a/Documentation/notation/world.itely
+++ b/Documentation/notation/world.itely
@@ -16,6 +16,7 @@ that are relevant to traditions outside the Western tradition.
 
 @menu
 * Arabic music::
+* Turkish classical music::
 @end menu
 
 @node Arabic music
@@ -381,3 +382,64 @@ George Farah
 Ibrahim Ali Darwish Al-masri
 @end itemize
 @end enumerate
+
+
address@hidden Turkish classical music
address@hidden Turkish classical music
+
+This section highlights issues that are relevant to notating Turkish
+classical music.
+
address@hidden
+* References for Turkish classical music::
+* Turkish note names::
address@hidden TODO * Turkish key signatures::
address@hidden TODO * Turkish time signatures::
address@hidden TODO * Turkish music example::
address@hidden TODO * Further reading::
address@hidden menu
+
+
address@hidden References for Turkish classical music
address@hidden References for Turkish classical music
+
address@hidden Turkish music
address@hidden Ottoman music
address@hidden comma intervals
address@hidden makam
address@hidden makamlar
+
+Turkish classical music developed in the Ottoman Empire in a
+period roughly contemporaneous with classical music in Europe,
+and has continued on into the 20th and 21st centuries as a
+vibrant and distinct tradition with its own compositional
+forms, theory and performance styles.  Among its striking
+features is the use of microtonal intervals based on `commas'
+of 1/9 of a tone, from which are constructed the melodic
+forms known as @notation{makam} (plural @notation{makamlar}).
+
+
address@hidden Turkish note names
address@hidden Turkish note names
+
address@hidden Turkish note names
address@hidden makam
address@hidden makamlar
+
+Pitches in Turkish classical music traditionally have unique
+names, and the basis of pitch on 1/9-tone divisions means
+makamlar employ a completely different set of intervals from
+Western scales and modes: @notation{koma} (1/9 of a tone),
address@hidden bakiye} (3/9), @notation{bakiye} (4/9),
address@hidden mücenneb} (5/9), @notation{büyük mücenneb}
+(8/9), @notation{tanîni} (a whole tone) and
address@hidden ikili} (12/9 or 13/9 of a tone).
+
+From a modern notational point of view it is convenient to
+use the standard Western staff notes (c, d, e, ...) with
+special accidentals that raise or lower notes by intervals
+of 1/9, 4/9, 5/9 and 8/9 of a tone.  These accidentals are
+defined in the file @file{makam.ly} (see the Learning Manual
+2.12.2, section 4.6.3,  `Other sources of information', for
+the location of this file) and are described in more detail
+in @ref{Non-Western note names and accidentals}.
-- 
1.6.3.3

>From 87559ec5464dac315a64eb7182a268d47802f6af Mon Sep 17 00:00:00 2001
From: Joseph Wakeling <address@hidden>
Date: Wed, 2 Sep 2009 20:29:13 +0200
Subject: [PATCH 2/2] Turkish classical music corrections.

---
 Documentation/notation/pitches.itely |   11 +++++------
 Documentation/notation/world.itely   |    8 ++++----
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/Documentation/notation/pitches.itely 
b/Documentation/notation/pitches.itely
index 7951310..ac79d18 100644
--- a/Documentation/notation/pitches.itely
+++ b/Documentation/notation/pitches.itely
@@ -592,12 +592,11 @@ intervals are based on 1/9 divisions of the whole tone.
 From a modern notational point of view, it is convenient
 to use the standard Western staff notes (c, d, e, ...)
 with special accidentals unique to Turkish music.  These
-accidentals are defined in @file{makam.ly} (see the
-Learning Manual 2.12.2, section 4.6.3,  `Other sources of
-information', for the location of this file).  The
-following table gives their names, the accidental suffix
-that must be added to notes, and their pitch alteration
-as a fraction of one whole tone.
+accidentals are defined in @file{makam.ly} (see
address@hidden sources of information} for the location
+of this file).  The following table gives their names,
+the accidental suffix that must be added to notes, and
+their pitch alteration as a fraction of one whole tone.
 
 @c TODO: can we include the actual accidentals in this table?
 @quotation
diff --git a/Documentation/notation/world.itely 
b/Documentation/notation/world.itely
index 26b38fe..44531df 100644
--- a/Documentation/notation/world.itely
+++ b/Documentation/notation/world.itely
@@ -439,7 +439,7 @@ From a modern notational point of view it is convenient to
 use the standard Western staff notes (c, d, e, ...) with
 special accidentals that raise or lower notes by intervals
 of 1/9, 4/9, 5/9 and 8/9 of a tone.  These accidentals are
-defined in the file @file{makam.ly} (see the Learning Manual
-2.12.2, section 4.6.3,  `Other sources of information', for
-the location of this file) and are described in more detail
-in @ref{Non-Western note names and accidentals}.
+defined in the file @file{makam.ly} (see
address@hidden sources of information} for the location
+of this file) and are described in more detail in
address@hidden note names and accidentals}.
-- 
1.6.3.3