Merge master into nested-bookparts

[lilypond.git] / Documentation / user / world.itely

diff --git a/Documentation/user/world.itely b/Documentation/user/world.itely
index 713cca94ae9c60d2e984ee9283fbd8ac9eb2c043..b1e387a80658a82ea2a2b7084353630f0749a0de 100644 (file)
--- a/Documentation/user/world.itely
+++ b/Documentation/user/world.itely
@@ -6,7 +6,7 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.11.51"
+@c \version "2.11.61"
 
 @node World music
 @section World music
@@ -28,8 +28,9 @@ music.
 * References for Arabic music::  
 * Arabic note names ::          
 * Arabic key signatures::       
-* Arabic time signatures:: 
-* Further reading::  
+* Arabic time signatures::      
+* Arabic music example::        
+* Further reading::             
 @end menu
 
  
@@ -72,6 +73,10 @@ in @ref{Key signature}.
 @item Complex time signatures may require that notes be grouped
 manually as described in @ref{Manual beams}. 
 
+@item @notation{Takasim} which are rhythmically free 
+improvisations may be written down omitting bar lines as 
+described in @ref{Unmetered music}. 
+
 @end itemize 
 
 @seealso
@@ -109,6 +114,26 @@ notated:
 @end lilypond
 
 
+@cindex Arabic semi-flat symbol 
+@cindex Semi-flat symbol appearance
+
+The symbol for semi-flat does not match the symbol which is used
+in Arabic notation.  The @code{\dwn} symbol defined in
+@code{arabic.ly} may be used preceding a flat symbol as a work
+around if it is important to use the specific Arabic semi-flat
+symbol.  The appearance of the semi-flat symbol in the key
+signature cannot be altered by using this method. 
+
+
+@lilypond[quote,verbatim]    
+\include "arabic.ly"
+\relative do' { 
+  \set Staff.extraNatural = ##f 
+  dod dob dosd \dwn dob dobsb dodsd do do
+}
+@end lilypond
+
+
 @seealso 
 
 Notation Reference:     
@@ -217,11 +242,9 @@ key signatures:
 
 @snippets
 
-
 @lilypondfile[verbatim,lilyquote,texidoc,doctitle]
 {non-traditional-key-signatures.ly}
 
-
 @seealso
 
 Notation Reference:     
@@ -253,25 +276,15 @@ beat, but in a manner that is difficult to match by adjusting
 automatic beaming.  You can override this by switching off
 automatic beaming and beaming the notes manually.  Where matching
 existing typeset music is not an issue, you may still want to
-adjust the beaming behaviour and/or using compound time
-signatures.
-
-@c FIXME: move to snippet?  -gp note for gp
-For improvisations or @notation{taqasim} which are temporarily
-free, the time signature can be omitted and @code{\cadenzaOn} can
-be used.  You might need to adjust the accidental style, since the
-absence of bar lines will cause the accidental to be marked only
-once:
-
-@example  
-#(set-accidental-style 'forget)
-@end example 
+adjust the beaming behaviour and/or use compound time signatures.
 
 @snippets
 
 @lilypondfile[verbatim,lilyquote,texidoc,doctitle]
 {compound-time-signatures.ly}
 
+@lilypondfile[verbatim,lilyquote,texidoc,doctitle]
+{arabic-improvisation.ly}
 
 @seealso 
 
@@ -286,6 +299,47 @@ Notation Reference:
 Snippets:
 @rlsr{World music}.
 
+
+@node Arabic music example
+@unnumberedsubsubsec Arabic music example 
+
+@cindex Arabic music example 
+@cindex Arabic music template
+@cindex Template Arabic music 
+
+Here is a template that also uses the start of a Turkish Semai
+that is familiar in Arabic music education in order to illustrate
+some of the peculiarities of Arabic music notation, such as medium
+intervals and unusual modes that are discussed in this section. 
+
+@lilypond[quote,verbatim]  
+\include "arabic.ly"
+\score {
+  \relative re' {
+    \set Staff.extraNatural = ##f
+    \set Staff.autoBeaming = ##f
+    \key re \bayati 
+    \time 10/8
+          
+    re4 re'8 re16 [misb re do] sisb [la sisb do] re4 r8                
+    re16 [misb do re] sisb [do] la [sisb sol8] la [sisb] do [re] misb 
+    fa4 fa16 [misb] misb8. [re16] re8 [misb] re  [do] sisb             
+    do4 sisb8 misb16 [re do sisb] la [do sisb la] la4 r8                
+  }
+  \header {
+    title = "Semai Muhayer"
+    composer = "Jamil Bek"
+  }
+}
+@end lilypond
+
+@seealso
+
+Snippets:
+@rlsr{World music} 
+
+
+
 @node Further reading
 @unnumberedsubsubsec Further reading