Rearrange pitches (Accidentals += cautionary, micro)

diff --git a/Documentation/user/ancient.itely b/Documentation/user/ancient.itely
index c75162e9d4d5dec1f74885fea3ae1a8ab79923c0..5122887757b5ebe86dac780e53334e831d8d79c5 100644 (file)
--- a/Documentation/user/ancient.itely
+++ b/Documentation/user/ancient.itely
@@ -216,7 +216,7 @@ controlled by the @code{glyph-name-alist} property of the
 
 @seealso
 
-In this manual: @ref{Pitches}, @ref{Cautionary accidentals}, and
+In this manual: @ref{Pitches}, @ref{Accidentals}, and
 @ref{Automatic accidentals}, give a general introduction of the use of
 accidentals.  @ref{Key signature}, gives a general introduction of
 the use of key signatures.

diff --git a/Documentation/user/pitches.itely b/Documentation/user/pitches.itely
index 92fa5d41d48c8ae6a913eff1c0a9c904b2a57115..faae41a6f6d2ad1cb1eae3077f51bc0404cf4a2d 100644 (file)
--- a/Documentation/user/pitches.itely
+++ b/Documentation/user/pitches.itely
@@ -30,8 +30,6 @@ Into text.
 @menu
 * Normal pitches::              
 * Accidentals::                 
-* Cautionary accidentals::      
-* Micro tones::                 
 * Note names in other languages::  
 @end menu
 
@@ -133,28 +131,6 @@ d e fis g
 @end lilypond
 
 
-@commonprop
-
-In accordance with standard typesetting rules, a natural sign is
-printed before a sharp or flat if a previous accidental needs to
-be cancelled.  To change this behavior, use @code{\set
-Staff.extraNatural = ##f}
-
-@lilypond[fragment,quote,ragged-right,verbatim,relative=2]
-ceses4 ces cis c
-\set Staff.extraNatural = ##f
-ceses4 ces cis c
-@end lilypond
-
-
-@seealso
-
-Program reference: @internalsref{LedgerLineSpanner},
-@internalsref{NoteHead}.
-
-
-@node Cautionary accidentals
-@unnumberedsubsubsec Cautionary accidentals
 
 @cindex accidental, reminder
 @cindex accidental, cautionary
@@ -177,15 +153,6 @@ cis cis cis! cis? c c? c! c
 @end lilypond
 
 
-@seealso
-
-The automatic production of accidentals can be tuned in many ways.
-For more information, see @ref{Automatic accidentals}.
-
-
-@node Micro tones
-@unnumberedsubsubsec Micro tones
-
 @cindex quarter tones
 @cindex semi-flats, semi-sharps
 
@@ -201,6 +168,29 @@ ceseh ceh cih cisih
 Micro tones are also exported to the MIDI file.
 
 
+@commonprop
+
+In accordance with standard typesetting rules, a natural sign is
+printed before a sharp or flat if a previous accidental needs to
+be cancelled.  To change this behavior, use @code{\set
+Staff.extraNatural = ##f}
+
+@lilypond[fragment,quote,ragged-right,verbatim,relative=2]
+ceses4 ces cis c
+\set Staff.extraNatural = ##f
+ceses4 ces cis c
+@end lilypond
+
+
+@seealso
+
+The automatic production of accidentals can be tuned in many ways.
+For more information, see @ref{Automatic accidentals}.
+
+Program reference: @internalsref{LedgerLineSpanner},
+@internalsref{NoteHead}.
+
+
 @refbugs
 
 There are no generally accepted standards for denoting
@@ -208,6 +198,7 @@ three-quarter flats, so LilyPond's symbol does not conform to any
 standard.
 
 
+
 @node Note names in other languages
 @unnumberedsubsubsec Note names in other languages
 
@@ -654,6 +645,8 @@ when setting properties manually.
 
 Program reference: @internalsref{Clef}.
 
+This manual: @ref{Ancient clefs}.
+
 
 @node Key signature
 @unnumberedsubsubsec Key signature