Move Ambitus from educational into pitches.

diff --git a/Documentation/user/educational.itely b/Documentation/user/educational.itely
index d3504b0b0e809b1475c41d3a3249167c740df5e8..94ba066688d0d736cac82372ac4556f1540077a8 100644 (file)
--- a/Documentation/user/educational.itely
+++ b/Documentation/user/educational.itely
@@ -164,7 +164,6 @@ Internals Reference: @internalsref{NoteHead}.
 * Hidden notes::                
 * Coloring objects::            
 * Parentheses::                 
-* Ambitus::                     
 * Stems::                       
 @end menu
 
@@ -426,100 +425,6 @@ This only functions inside chords, even for single notes
 @end example
 
 
-@node Ambitus
-@unnumberedsubsubsec Ambitus
-@cindex ambitus
-
-The term @emph{ambitus} denotes a range of pitches for a given
-voice in a part of music.  It may also denote the pitch range that
-a musical instrument is capable of playing.  Ambits are printed on
-vocal parts, so performers can easily determine it meets their
-capabilities.
-
-Ambits are denoted at the beginning of a piece near the initial
-clef.  The range is graphically specified by two note heads that
-represent the minimum and maximum pitch.  To print such ambits,
-add the @internalsref{Ambitus_engraver} to the
-@internalsref{Voice} context, for example,
-
-@example
-\layout @{
-  \context @{
-    \Voice
-    \consists Ambitus_engraver
-  @}
-@}
-@end example
-
-This results in the following output
-
-@lilypond[quote,ragged-right]
-\layout {
-  \context {
-    \Staff
-    \consists Ambitus_engraver
-  }
-}
-
-\relative \new Staff {
-  as'' c e2 cis,2
-}
-@end lilypond
-
-If you have multiple voices in a single staff and you want a
-single ambitus per staff rather than per each voice, add the
-@internalsref{Ambitus_engraver} to the @internalsref{Staff}
-context rather than to the @internalsref{Voice} context.  Here is
-an example,
-
-@lilypond[verbatim,ragged-right,quote]
-\new Staff \with {
-  \consists "Ambitus_engraver"
-}
-<<
-  \new Voice \with {
-    \remove "Ambitus_engraver"
-  } \relative c'' {
-    \override Ambitus #'X-offset = #-1.0
-    \voiceOne
-    c4 a d e f2
-  }
-  \new Voice \with {
-    \remove "Ambitus_engraver"
-  } \relative c' {
-    \voiceTwo
-    es4 f g as b2
-  }
->>
-@end lilypond
-
-@noindent
-This example uses one advanced feature,
-
-@example
-\override Ambitus #'X-offset = #-1.0
-@end example
-
-@noindent
-This code moves the ambitus to the left.  The same effect could
-have been achieved with @code{extra-offset}, but then the
-formatting system would not reserve space for the moved object.
-
-@seealso
-
-Internals Reference: @internalsref{Ambitus},
-@internalsref{AmbitusLine}, @internalsref{AmbitusNoteHead},
-@internalsref{AmbitusAccidental}.
-
-Examples:
-@lsr{vocal,ambitus@/.ly}.
-
-@refbugs
-
-There is no collision handling in the case of multiple per-voice
-ambitus.
-
-
 @node Stems
 @unnumberedsubsubsec Stems
 

diff --git a/Documentation/user/pitches.itely b/Documentation/user/pitches.itely
index 2e3fcf1b014693b754bcff01049997932e74b0b3..9ab341c38b3184294aa8e19b525df69d8ab6d489 100644 (file)
--- a/Documentation/user/pitches.itely
+++ b/Documentation/user/pitches.itely
@@ -635,6 +635,7 @@ This section discusses how to alter the output of pitches.
 * Ottava brackets::             
 * Instrument transpositions::   
 * Automatic accidentals::       
+* Ambitus::                     
 @end menu
 
 @node Clef
@@ -1441,4 +1442,99 @@ can be solved by manually inserting @code{!} and @code{?} for the
 problematic notes.
 
 
+@node Ambitus
+@unnumberedsubsubsec Ambitus
+@cindex ambitus
+
+The term @emph{ambitus} denotes a range of pitches for a given
+voice in a part of music.  It may also denote the pitch range that
+a musical instrument is capable of playing.  Ambits are printed on
+vocal parts, so performers can easily determine it meets their
+capabilities.
+
+Ambits are denoted at the beginning of a piece near the initial
+clef.  The range is graphically specified by two note heads that
+represent the minimum and maximum pitch.  To print such ambits,
+add the @internalsref{Ambitus_engraver} to the
+@internalsref{Voice} context, for example,
+
+@example
+\layout @{
+  \context @{
+    \Voice
+    \consists Ambitus_engraver
+  @}
+@}
+@end example
+
+This results in the following output
+
+@lilypond[quote,ragged-right]
+\layout {
+  \context {
+    \Staff
+    \consists Ambitus_engraver
+  }
+}
+
+\relative \new Staff {
+  as'' c e2 cis,2
+}
+@end lilypond
+
+If you have multiple voices in a single staff and you want a
+single ambitus per staff rather than per each voice, add the
+@internalsref{Ambitus_engraver} to the @internalsref{Staff}
+context rather than to the @internalsref{Voice} context.  Here is
+an example,
+
+@lilypond[verbatim,ragged-right,quote]
+\new Staff \with {
+  \consists "Ambitus_engraver"
+}
+<<
+  \new Voice \with {
+    \remove "Ambitus_engraver"
+  } \relative c'' {
+    \override Ambitus #'X-offset = #-1.0
+    \voiceOne
+    c4 a d e f2
+  }
+  \new Voice \with {
+    \remove "Ambitus_engraver"
+  } \relative c' {
+    \voiceTwo
+    es4 f g as b2
+  }
+>>
+@end lilypond
+
+@noindent
+This example uses one advanced feature,
+
+@example
+\override Ambitus #'X-offset = #-1.0
+@end example
+
+@noindent
+This code moves the ambitus to the left.  The same effect could
+have been achieved with @code{extra-offset}, but then the
+formatting system would not reserve space for the moved object.
+
+@seealso
+
+Internals Reference: @internalsref{Ambitus},
+@internalsref{AmbitusLine}, @internalsref{AmbitusNoteHead},
+@internalsref{AmbitusAccidental}.
+
+Examples:
+@lsr{vocal,ambitus@/.ly}.
+
+@refbugs
+
+There is no collision handling in the case of multiple per-voice
+ambitus.
+
+
+