From f818ffe1795cbd337a143cd133b7c6ded700e5f5 Mon Sep 17 00:00:00 2001
From: Valentin Villenave <valentin@villenave.net>
Date: Wed, 27 Oct 2010 00:07:01 +0200
Subject: [PATCH] Doc: NR 1.1.1.4 Note names, remove arabic.ly from common
 languages

---
 Documentation/notation/pitches.itely | 43 +++++++++++++++++++++-------
 Documentation/notation/world.itely   |  4 +++
 2 files changed, 36 insertions(+), 11 deletions(-)

diff --git a/Documentation/notation/pitches.itely b/Documentation/notation/pitches.itely
index 0451385176..fd9c04fdc2 100644
--- a/Documentation/notation/pitches.itely
+++ b/Documentation/notation/pitches.itely
@@ -441,7 +441,7 @@ any standard.
 There are predefined sets of note and accidental names for various
 other languages.  To use them, include the language-specific init
 file listed below.  For example, to use English note names, add
-@code{@w{\include "english.ly"}} to the input file.
+@code{@w{@bs{}include "english.ly"}} to the input file.
 
 @warning{Because some other include files (such as @code{@w{predefined-fretboards.ly}})
 use default (Nederlands) note names, the @code{@bs{}include}
@@ -456,8 +456,6 @@ The available language files and the note names they define are:
   @tab Note Names
 @item @file{nederlands.ly}
   @tab c d e f g a bes b
-@item @file{arabic.ly}
-  @tab do re mi fa sol la sib si
 @item @file{catalan.ly}
   @tab do re mi fa sol la sib si
 @item @file{deutsch.ly}
@@ -489,8 +487,6 @@ and the accidental suffixes they define are:
 @headitem Language File
   @tab sharp @tab flat @tab double sharp @tab double flat
 @item @file{nederlands.ly}
-  @tab -is @tab -es @tab -isis @tab -eses
-@item @file{arabic.ly}
   @tab -d @tab -b @tab -dd @tab -bb
 @item @file{catalan.ly}
   @tab -d/-s @tab -b @tab -dd/-ss @tab -bb
@@ -549,8 +545,6 @@ languages, no special names have been defined yet.
 
 @item @file{nederlands.ly}
   @tab -ih @tab -eh @tab -isih @tab -eseh
-@item @file{arabic.ly}
-  @tab -sd @tab -sb @tab -dsd @tab -bsb
 @item @file{deutsch.ly}
   @tab -ih @tab -eh @tab -isih @tab -eseh
 @item @file{english.ly}
@@ -565,7 +559,23 @@ languages, no special names have been defined yet.
 @end quotation
 
 
+@cindex Arabic music
+
+Other languages and types of music may be supported by extending
+these predefined sets of note names.  For example, Arabic music
+may be typeset using @code{@w{@bs{}include "arabic.ly"}} which
+actually includes, in turn, the standard Italian note names as
+defined in @file{italiano.ly}, and adds extra macros and definitions.
+For details about non-Western music support, see
+@ref{Non-Western note names and accidentals} and
+@ref{World music}.
+
+
 @seealso
+Notation Reference:
+@ref{Non-Western note names and accidentals},
+@ref{World music}.
+
 Music Glossary:
 @rglos{Pitch names}.
 
@@ -582,12 +592,16 @@ 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
+pitch differences being implicit.  For example,
+@notation{Arabic music} is typically notated in
+standard @q{Italian} notation, with standard semitone and quarter-tone
 accidentals, with the precise pitch alterations being
-determined by context.  Others require extended or unique
-notations.
+determined by context.
+Italian note names and Arabic-specific tweaks are explained in
+@ref{Note names in other languages}; Arabic notation is discussed
+more extensively in @ref{Arabic music}.
 
+Other types of music require extended or unique notations:
 @notation{Turkish classical music}, or Ottoman music,
 employs melodic forms known as @notation{makamlar}, whose
 intervals are based on 1/9 divisions of the whole tone.
@@ -636,6 +650,13 @@ makamlar, see @ref{Turkish classical music}.
 @lilypondfile[verbatim,lilyquote,texidoc,doctitle]
 {makam-example.ly}
 
+@seealso
+Notation Reference:
+@ref{Note names in other languages},
+@ref{World music},
+@ref{Arabic music},
+@ref{Turkish classical music}.
+
 
 @node Changing multiple pitches
 @subsection Changing multiple pitches
diff --git a/Documentation/notation/world.itely b/Documentation/notation/world.itely
index d50839acfa..d6481c2a5d 100644
--- a/Documentation/notation/world.itely
+++ b/Documentation/notation/world.itely
@@ -20,6 +20,10 @@ that are relevant to traditions outside the Western tradition.
 * Turkish classical music::
 @end menu
 
+@c update Music Glossary for makam, makamlar, maqam,... -vv
+@c and add @rglos entries to pitches.itely "Non-Western note names"
+
+
 @node Arabic music
 @subsection Arabic music
 
-- 
2.39.2