Update from Trevor.

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

diff --git a/Documentation/user/pitches.itely b/Documentation/user/pitches.itely
index f7f5af7a603ef4adb9892822f71bd8d1ba7fd418..687463a2e78ff75a5dc8769b887bc8612be0b925 100644 (file)
--- a/Documentation/user/pitches.itely
+++ b/Documentation/user/pitches.itely
@@ -313,26 +313,20 @@ 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 canceled.  To change this behavior, use
-
-@lilypond[verbatim,quote,ragged-right,fragment,relative=2]
-ceses4 ces cis c
-\set Staff.extraNatural = ##f
-ceses4 ces cis c
-@end lilypond
-
+Snippets: @lsrdir{pitches},
+@lsr{pitches,preventing-extra-naturals-from-being-automatically-added.ly}.
 
 @seealso
 
 Music Glossary: @rglos{sharp}, @rglos{flat}, @rglos{double sharp},
 @rglos{double flat}.
 
+Learning Manual: @rlearning{Accidentals and key signatures}.
+
 Notation Reference: @ref{Automatic accidentals},
-@ref{Musica ficta accidentals}.
+@ref{Musica ficta accidentals},
+@ref{Note names in other languages}.
 
-Snippets: @lsrdir{pitches}.
 
 
 @refbugs
@@ -915,57 +909,15 @@ fis
 
 @commonprop
 
-A natural sign is printed to cancel any previous accidentals.
-This may be altered:
-
-@lilypond[verbatim,quote,ragged-right,fragment,relative=2]
-\key d \major
-a b cis d
-\key g \minor
-a bes c d
-\set Staff.printKeyCancellation = ##f
-\key d \major
-a b cis d
-\key g \minor
-a bes c d
-@end lilypond
-
-The @code{\key} command sets the context property
-@code{Staff.keySignature}.  Non-standard key signatures can be
-specified by setting this property directly.  The format of this
-command is a list:
-
-@example
-\set Staff.keySignature =
-  #'((@var{octave} . @var{step}) . @var{alter})
-@end example
-
-@noindent
-where, for each element in the list, @var{octave} specifies the
-octave (0 being the octave from middle C to the B above),
-@var{step} specifies the note within the octave (0 means C and 6
-means B), and @var{alter} is @code{,SHARP} @code{,FLAT}
-@code{,DOUBLE-SHARP} etc.  (Note the leading comma.)  Here is an
-example of a possible key signature for generating a whole-tone
-scale:
-
-@lilypond[verbatim,quote,ragged-right]
-\relative c' {
-  \new Staff {
-    \set Staff.keySignature =
-      #`(((0 .  3) . ,SHARP) ((0 . 5) . ,FLAT) ((0 . 6) . ,FLAT))
-    c d e fis aes bes c
-  }
-}
-@end lilypond
+Snippets: @lsrdir{pitches}, @lsr{pitches,
+preventing-natural-signs-from-being-printed-when-the-key-signature-changes.ly},
+@lsr{pitches, non-traditional-key-signatures.ly}
 
 @seealso
 
 Music Glossary: @rglos{church mode}, @rglos{scordatura}.
 
-Snippets: @lsrdir{pitches},
-FIXME link to snippet 248,
-FIXME link to a snippet about scordatura.
+Learning Manual: @rlearning{Accidentals and key signatures}.
 
 Internals reference: @internalsref{KeyCancellation},
 @internalsref{KeySignature}, @internalsref{Key_engraver}.
@@ -1011,6 +963,8 @@ Internally the function sets the properties @code{ottavation}
 
 @seealso
 
+Music Glossary: @c FIXME add link once it's in the glossary @c @rgloss{ottava}.
+
 Snippets: @lsrdir{pitches}.
 
 Internals reference: @internalsref{OttavaBracket}.
@@ -1108,6 +1062,8 @@ to serve as a reminder that these parts are written in C.
 
 @seealso
 
+Music Glossary: @c FIXME add link once it's in the glossary @c @rgloss{instrument transposition}.
+
 Notation Reference: @ref{Quoting other voices}, @ref{Transpose}.
 
 Snippets: @lsrdir{pitches}.
@@ -1781,7 +1737,7 @@ Snippets: @lsrdir{pitches}.
 Internals reference: @internalsref{Accidental_engraver},
 @internalsref{Accidental}, @internalsref{AccidentalSuggestion},
 @internalsref{AccidentalPlacement}, @internalsref{GrandStaff} and
-@internalsref{PianoStaff}.
+@internalsref{PianoStaff}, @internalsref{Staff}.
 
 
 @refbugs
@@ -1804,7 +1760,7 @@ The term @notation{ambitus} or @notation{ambit} 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 if it meets their capabilities.
+determine if it matches 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
@@ -1865,8 +1821,9 @@ formatting system would not reserve space for the moved object.
 
 @seealso
 
-Snippets: @lsrdir{pitches},
-@lsr{vocal,ambitus@/.ly}.
+Snippets: @lsrdir{pitches}.
+@c FIXME: lsr stuff.
+@c @lsr{vocal,ambitus@/.ly}.
 
 Internals reference: @internalsref{Ambitus},
 @internalsref{AmbitusLine}, @internalsref{AmbitusNoteHead},
@@ -1919,6 +1876,8 @@ font, see @ref{Setting the staff size}.
 
 @seealso
 
+Notation Reference: @ref{Setting the staff size}.
+
 Snippets: @lsrdir{pitches},
 
 Internals reference: @internalsref{NoteHead}.
@@ -2035,4 +1994,6 @@ To see all notehead styles, please see @ref{Note head styles}.
 
 Snippets: @lsrdir{pitches}.
 
+Notation Reference: @ref{Note head styles}.
+
 Internals reference: @internalsref{NoteHead}.