X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Documentation%2Fnotation%2Fworld.itely;h=379b83246c4e46e352cbe8bc11e795c20519d191;hb=28add695953862ef4a87f9fbeadd1d02dc299244;hp=3c5a3d8188af82a6d3f1180ea012aef519bd66e5;hpb=05928a7b4a01bc68773ff5689a338394362e6cd5;p=lilypond.git

diff --git a/Documentation/notation/world.itely b/Documentation/notation/world.itely
index 3c5a3d8188..379b83246c 100644
--- a/Documentation/notation/world.itely
+++ b/Documentation/notation/world.itely
@@ -7,7 +7,7 @@
     Guide, node Updating translation committishes..
 @end ignore
 
-@c \version "2.13.36"
+@c \version "2.19.21"
 
 @node World music
 @section World music
@@ -73,13 +73,13 @@ accidentals unique to Turkish music, that are defined in the file
 music and makamlar, see
 @ref{Turkish classical music}.
 
-To locate init files such as @file{arabic.ly} or @file{makam.ly}
-on your system, see
+To locate init files such as @file{arabic.ly} or
+@file{makam.ly} on your system, see
 @rlearning{Other sources of information}.
 
 @snippets
 
-@lilypondfile[verbatim,lilyquote,texidoc,doctitle]
+@lilypondfile[verbatim,quote,texidoc,doctitle]
 {makam-example.ly}
 
 @seealso
@@ -190,8 +190,8 @@ notated:
 
 @lilypond[quote,verbatim]
 \include "arabic.ly"
-\relative do' {
-  do re misb fa sol la sisb do sisb la sol fa misb re do
+\relative {
+  do' re misb fa sol la sisb do sisb la sol fa misb re do
 }
 @end lilypond
 
@@ -201,7 +201,7 @@ notated:
 
 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
+@file{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.
@@ -209,9 +209,9 @@ signature cannot be altered by using this method.
 
 @lilypond[quote,verbatim]
 \include "arabic.ly"
-\relative do' {
+\relative {
   \set Staff.extraNatural = ##f
-  dod dob dosd \dwn dob dobsb dodsd do do
+  dod' dob dosd \dwn dob dobsb dodsd do do
 }
 @end lilypond
 
@@ -231,7 +231,7 @@ Snippets:
 @cindex Arabic key signatures
 
 In addition to the minor and major key signatures, the following
-key signatures are defined in @code{arabic.ly}: @notation{bayati},
+key signatures are defined in @file{arabic.ly}: @notation{bayati},
 @notation{rast}, @notation{sikah}, @notation{iraq}, and
 @notation{kurd}.  These key signatures define a small number of
 maqam groups rather than the large number of maqams that are in
@@ -280,7 +280,7 @@ maqam.
 Here is one suggested grouping that maps the more common maqams to
 key signatures:
 
-@multitable @columnfractions 0.1 0.1 0.1 0.6
+@multitable @columnfractions 0.15 0.1 0.1 0.6
 @headitem maqam group
   @tab key
   @tab finalis
@@ -325,7 +325,7 @@ key signatures:
 
 @snippets
 
-@lilypondfile[verbatim,lilyquote,texidoc,doctitle]
+@lilypondfile[verbatim,quote,texidoc,doctitle]
 {non-traditional-key-signatures.ly}
 
 
@@ -342,7 +342,7 @@ Notation Reference:
 @ref{Key signature}.
 
 Learning Manual:
-@rlearning{Accidentals and key signatures}.
+@rlearning{Pitches and key signatures}.
 
 Internals Reference:
 @rinternals{KeySignature}.
@@ -371,10 +371,7 @@ the automatic beaming behaviour and/or use compound time signatures.
 
 @snippets
 
-@lilypondfile[verbatim,lilyquote,texidoc,doctitle]
-{compound-time-signatures.ly}
-
-@lilypondfile[verbatim,lilyquote,texidoc,doctitle]
+@lilypondfile[verbatim,quote,texidoc,doctitle]
 {arabic-improvisation.ly}
 
 
@@ -410,13 +407,13 @@ intervals and unusual modes that are discussed in this section.
 @lilypond[quote,verbatim]
 \include "arabic.ly"
 \score {
-  \relative re' {
+  \relative {
     \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
+    re'4 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
@@ -535,7 +532,7 @@ Western scales and modes: @notation{koma} (1/9 of a tone),
 @notation{artık 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
+use the standard Western staff notes (c, d, e, @dots{}) 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}.