Merge master into nested-bookparts

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

diff --git a/Documentation/user/world.itely b/Documentation/user/world.itely
index 1c90f0fdd9cca98fe5a14cdc5b1e6fab0372a920..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
@@ -73,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
@@ -238,12 +242,9 @@ key signatures:
 
 @snippets
 
-
-
 @lilypondfile[verbatim,lilyquote,texidoc,doctitle]
 {non-traditional-key-signatures.ly}
 
-
 @seealso
 
 Notation Reference:     
@@ -275,32 +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.
+adjust the beaming behaviour and/or use compound time signatures.
 
 @snippets
 
 @lilypondfile[verbatim,lilyquote,texidoc,doctitle]
 {compound-time-signatures.ly}
 
-@c FIXME: move to arabic-improvisation.ly
-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.  Here is an example of what could be the start of a
-@notation{hijaz} improvisation:
-
-@lilypond[quote,verbatim]    
-\include "arabic.ly"
-\relative sol' {
-  \key re \kurd 
-  #(set-accidental-style 'forget)
-  \cadenzaOn  
-  sol4 sol sol sol fad mib sol1 fad8 mib re4. r8 mib1 fad sol
-} 
-@end lilypond
-
+@lilypondfile[verbatim,lilyquote,texidoc,doctitle]
+{arabic-improvisation.ly}
 
 @seealso