Merge master into nested-bookparts

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

diff --git a/Documentation/user/ancient.itely b/Documentation/user/ancient.itely
index c28ea69fa021ec2690d4a1a869ee7635a1b433f9..4929daf38e4dcb5148fa3f6b156ba0ad06a3ab43 100644 (file)
--- a/Documentation/user/ancient.itely
+++ b/Documentation/user/ancient.itely
@@ -43,7 +43,7 @@ notation. See
 
 @itemize
 @item @ref{Mensural note heads},
-@item @ref{Mensural accidentals},
+@item @ref{Mensural accidentals and key signatures},
 @item @ref{Mensural rests},
 @item @ref{Mensural clefs},
 @item @ref{Gregorian clefs},
@@ -233,7 +233,7 @@ postfix style @code{note\[ ... note\]}.
 @c with the same effect and is believed to be stable.
 
 @c TODO: this does not seem to work at the moment.
- @c -- eo
+@c -- eo
 
 
 
@@ -261,28 +261,19 @@ For typesetting custodes, just put a @rinternals{Custos_engraver} into the
 and change the style of the custos with an @code{\override} if
 desired, as shown in the following example:
 
-@example
-\layout @{
-  \context @{
-    \Staff
-    \consists Custos_engraver
-    Custos \override #'style = #'mensural
-  @}
-@}
-@end example
-
-The result looks like this
-
 @lilypond[quote,ragged-right]
 \score {
-{
-  a'1
-  \override Staff.Custos #'style = #'mensural
-  \break
-  g'
-}
-\layout {
-  \context { \Staff \consists Custos_engraver }
+  \relative c'' {
+    a1
+    \break
+    g
+  }
+  \layout {
+    \context {
+      \Staff
+      \consists Custos_engraver
+      \override Custos #'style = #'mensural
+    }
   }
 }
 @end lilypond
@@ -317,7 +308,7 @@ supported are @code{vaticana}, @code{medicaea}, @code{hufnagel}, and
 Internals Reference: @rinternals{Custos}.
 
 Examples:
-@rlsr{Ancient}.
+@rlsr{Ancient notation}.
 
 @c {{{2 Figured bass support
 @node Figured bass support
@@ -338,8 +329,8 @@ Baroque period; see @ref{Figured bass}.
 * Mensural note heads::
 * Mensural flags::
 * Mensural rests::
-* Mensural accidentals::
-* Annotational accidentals (@emph{musica ficta})::
+* Mensural accidentals and key signatures::
+* Annotational accidentals (musica ficta)::
 * White mensural ligatures::
 @end menu
 
@@ -797,7 +788,7 @@ the use of key signatures.
 Internals Reference: @rinternals{KeySignature}.
 
 @c {{{2 Annotational accidentals (musica ficta)
-@node Annotational accidentals (@emph{musica ficta})
+@node Annotational accidentals (musica ficta)
 @unnumberedsubsubsec Annotational accidentals (@emph{musica ficta})
 
 In European music from before about 1600, singers were expected to
@@ -1314,7 +1305,7 @@ Notation Reference: @ref{Breath marks}.
 
 Internals Reference: @rinternals{BreathingSign}.
 
-Examples: @rlsr{Ancient}.
+Examples: @rlsr{Ancient notation}.