Merge branch 'original' into HEAD

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

diff --git a/Documentation/user/pitches.itely b/Documentation/user/pitches.itely
index e38bc880863b2c99646a3ce8cce4cc19eae67490..05b71b88db4a3859da8d9fa1707fa56ceb6caab0 100644 (file)
--- a/Documentation/user/pitches.itely
+++ b/Documentation/user/pitches.itely
@@ -207,7 +207,7 @@ Snippets: @lsrdir{Pitches,Pitches}.
 @funindex \chordmode
 @funindex \relative
 
-@refbugs
+@knownissues
 
 The relative conversion will not affect @code{\transpose},
 @code{\chordmode} or @code{\relative} sections in its argument.
@@ -244,6 +244,7 @@ see @rlearning{Accidentals and key signatures}.}
 @cindex sharp, double
 @cindex double flat
 @cindex flat, double
+@cindex natural sign
 
 A @notation{sharp} pitch is made by adding @code{is} to the note name,
 and a @notation{flat} pitch by adding @code{es}.  As you might expect,
@@ -308,7 +309,7 @@ cis
 @end lilypond
 
 
-@commonprop
+@snippets
 
 @lilypondfile[verbatim,lilyquote,ragged-right,texidoc]
 {preventing-extra-naturals-from-being-automatically-added.ly}
@@ -327,7 +328,7 @@ Notation Reference: @ref{Automatic accidentals},
 Snippets: @lsrdir{Pitches,Pitches}.
 
 
-@refbugs
+@knownissues
 
 There are no generally accepted standards for denoting
 quarter-tone accidentals, so LilyPond's symbol does not conform to
@@ -614,7 +615,7 @@ For more information about transposing instruments,
 see @ref{Instrument transpositions}.
 
 
-@commonprop
+@snippets
 
 @lilypondfile[verbatim,lilyquote,ragged-right,texidoc]
 {transposing-pitches-with-minimum-accidentals-smart-transpose.ly}
@@ -632,7 +633,7 @@ Internals Reference: @internalsref{TransposedMusic}.
 @funindex \chordmode
 @funindex \relative
 
-@refbugs
+@knownissues
 
 
 The relative conversion will not affect @code{\transpose},
@@ -751,7 +752,7 @@ c2 c
 @end lilypond
 
 
-@commonprop
+@snippets
 
 @lilypondfile[verbatim,lilyquote,ragged-right,texidoc]
 {clefs-commonly-tweaked-properties.ly}
@@ -815,7 +816,7 @@ fis
 @end lilypond
 
 
-@commonprop
+@snippets
 
 @lilypondfile[verbatim,lilyquote,ragged-right,texidoc]
 {preventing-natural-signs-from-being-printed-when-the-key-signature-changes.ly}
@@ -860,7 +861,7 @@ The @code{set-octavation} function also takes -1 (for 8va bassa),
 2@tie{}(for 15ma), and -2 (for 15ma bassa) as arguments.
 
 
-@commonprop
+@snippets
 
 @lilypondfile[verbatim,lilyquote,ragged-right,texidoc]
 {ottava-text.ly}
@@ -1313,6 +1314,8 @@ musicB = {
 @cindex accidentals, modern
 @cindex modern accidentals
 @cindex multivoice accidentals
+@cindex accidental style, modern
+@cindex modern accidental style
 @funindex modern-voice
 
 This rule is used for multivoice accidentals to be read both by
@@ -1371,6 +1374,9 @@ musicB = {
 }
 @end lilypond
 
+@cindex accidental style, modern voice cautionary
+@cindex accidental style, cautionary, modern voice
+@cindex accidental style, voice, modern cautionary
 @funindex modern-voice-cautionary
 @item modern-voice-cautionary
 
@@ -1427,7 +1433,11 @@ musicB = {
 @end lilypond
 
 @item piano
-@funindex piano accidentals
+@cindex piano accidentals
+@cindex piano accidentals
+@cindex accidentals, piano
+@cindex piano accidental style
+@cindex accidental style, piano
 
 This rule reflects twentieth-century practice for piano notation.
 Its behavior is very similar to @code{modern} style, but here
@@ -1485,6 +1495,12 @@ musicB = {
 
 @item piano-cautionary
 @funindex #(set-accidental-style 'piano-cautionary)
+@cindex accidentals, piano cautionary
+@cindex cautionary accidentals, piano
+@cindex piano cautionary accidentals
+@cindex accidental style, piano cautionary
+@cindex cautionary accidental style, piano
+@cindex piano cautionary accidental style
 
 Same as @code{#(set-accidental-style 'piano)} but with the extra
 accidentals typeset as cautionaries.
@@ -1536,6 +1552,8 @@ musicB = {
 
 @item no-reset
 @funindex no-reset accidental style
+@cindex accidental style, no reset
+@cindex no reset accidental style
 
 This is the same as @code{default} but with accidentals lasting
 @q{forever} and not only within the same measure:
@@ -1588,6 +1606,8 @@ musicB = {
 
 @item forget
 @funindex forget accidental style
+@cindex forget accidental style
+@cindex accidental style, forget
 
 This is the opposite of @code{no-reset}: Accidentals are not
 remembered at all -- and hence all accidentals are typeset
@@ -1641,7 +1661,7 @@ musicB = {
 @end lilypond
 @end table
 
-@commonprop
+@snippets
 
 @lilypondfile[verbatim,lilyquote,ragged-right,texidoc]
 {dodecaphonic-style-accidentals-for-each-note-including-naturals.ly}
@@ -1657,7 +1677,12 @@ Internals Reference: @internalsref{Accidental_engraver},
 @internalsref{PianoStaff}, @internalsref{Staff}.
 
 
-@refbugs
+@cindex accidentals and simultaneous notes
+@cindex simultaneous notes and accidentals
+@cindex accidentals in chords
+@cindex chords, accidentals in
+
+@knownissues
 
 Simultaneous notes are considered to be entered in sequential
 mode.  This means that in a chord the accidentals are typeset as
@@ -1671,15 +1696,18 @@ problematic notes.
 
 @node Ambitus
 @subsubsection Ambitus
+
 @cindex ambitus
+@cindex range of pitches
+@cindex pitch range
 
-The term @notation{ambitus} or @notation{ambit} denotes a range of
+The term @notation{ambitus} (pl. 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 that performers can easily
+Ambitus are printed on vocal parts so that performers can easily
 determine if it matches their capabilities.
 
-Ambits are denoted at the beginning of a piece near the initial
+Ambitus are denoted at the beginning of a piece near the initial
 clef.  The range is graphically specified by two note heads that
 represent the lowest and highest pitches.  Accidentals are only
 printed if they are not part of the key signature.
@@ -1698,7 +1726,7 @@ printed if they are not part of the key signature.
 @end lilypond
 
 
-@commonprop
+@snippets
 
 @lilypondfile[verbatim,lilyquote,ragged-right,texidoc]
 {adding-ambiti-per-voice.ly}
@@ -1709,6 +1737,8 @@ printed if they are not part of the key signature.
 
 @seealso
 
+Music Glossary: @rglos{ambitus}.
+
 Snippets: @lsrdir{Pitches,Pitches}.
 
 Internals Reference: @internalsref{Ambitus},
@@ -1717,7 +1747,7 @@ Internals Reference: @internalsref{Ambitus},
 @internalsref{Staff}, @internalsref{Voice}.
 
 
-@refbugs
+@knownissues
 
 There is no collision handling in the case of multiple per-voice
 ambitus.
@@ -1726,6 +1756,8 @@ ambitus.
 @node Note heads
 @subsection Note heads
 
+This section suggests ways of altering note heads.
+
 @menu
 * Special note heads::          
 * Easy notation note heads::    
@@ -1737,6 +1769,17 @@ ambitus.
 @subsubsection Special note heads
 
 @cindex note heads, special
+@cindex note heads, cross
+@cindex note heads, diamond
+@cindex note heads, parlato
+@cindex note heads, harmonic
+@cindex note heads, guitar
+@cindex special note heads
+@cindex cross note heads
+@cindex diamond note heads
+@cindex parlato note heads
+@cindex harmonic note heads
+@cindex guitar note heads
 
 Different note heads are used by various instruments for various
 meanings -- crosses are used for @q{parlato} with vocalists,
@@ -1774,6 +1817,10 @@ Internals Reference: @internalsref{NoteHead},
 @cindex note heads, easy notation
 @cindex easy notation
 @cindex Hal Leonard
+@cindex beginners' music
+@cindex music, beginners'
+@cindex easy play note heads
+@cindex note heads, easy play
 
 The @q{easy play} note head includes a note name inside the head.
 It is used in music for beginners.
@@ -1795,7 +1842,7 @@ The command @code{\easyHeadsOn} overrides settings for the
 in a large font size.  To print with a larger font, see @ref{Setting the
 staff size}.
 
-@refcommands
+@predefined
 
 @funindex \easyHeadsOn
 @funindex \easyHeadsOff
@@ -1814,6 +1861,11 @@ Internals Reference: @internalsref{NoteHead}.
 @subsubsection Shape note heads
 
 @cindex note heads, shape
+@cindex note heads, Aiken
+@cindex note heads, sacred harp
+@cindex shape notes
+@cindex Aiken shape note heads
+@cindex sacred harp note heads
 @funindex \key
 @funindex shapeNoteStyles
 @funindex \aikenHeads
@@ -1836,16 +1888,20 @@ c,8 d4 e8 a2 g1
 Shapes are typeset according to the step in the scale, where
 the base of the scale is determined by the @code{\key} command.
 
-@commonprop
+@snippets
 
 @lilypondfile[verbatim,lilyquote,ragged-right,texidoc]
 {applying-noteheads-styles-depending-on-the-step-of-the-scale.ly}
 
+@noindent
+To see all note head styles, see @ref{Note head styles}.
 
 @seealso
 
 Snippets: @lsrdir{Pitches,Pitches}.
 
+Notation Reference: @ref{Note head styles}.
+
 
 @node Improvisation
 @subsubsection Improvisation
@@ -1874,7 +1930,7 @@ rhythm.  Such note heads can be created:
 @end lilypond
 
 
-@refcommands
+@predefined
 
 @funindex \improvisationOn
 @funindex \improvisationOff