Merge commit 'origin' into release/unstable

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

diff --git a/Documentation/notation/pitches.itely b/Documentation/notation/pitches.itely
index e91d5a8f3d3f99ef438cc1fab98381dc1aeffba5..7fb1f89e48bd4b5fdc50df31a3c99f71050a1732 100644 (file)
--- a/Documentation/notation/pitches.itely
+++ b/Documentation/notation/pitches.itely
@@ -379,7 +379,7 @@ Accidentals on tied notes are only printed at the beginning of a
 new system:
 
 @lilypond[verbatim,quote,relative=2]
-cis1 ~ cis ~
+cis1~ cis~
 \break
 cis
 @end lilypond
@@ -387,10 +387,12 @@ cis
 
 @snippets
 
+@lilypondfile[verbatim,lilyquote,texidoc,doctitle,ragged-right]
+{hiding-accidentals-on-tied-notes-at-the-start-of-a-new-system.ly}
+
 @lilypondfile[verbatim,lilyquote,texidoc,doctitle]
 {preventing-extra-naturals-from-being-automatically-added.ly}
 
-
 @seealso
 Music Glossary:
 @rglos{sharp},
@@ -892,9 +894,6 @@ This section discusses how to alter the output of pitches.
 @cindex baritone clef
 @cindex varbaritone clef
 @cindex subbass clef
-@cindex tab clef
-@cindex moderntab clef
-@cindex percussion clef
 @cindex clef
 @cindex ancient clef
 @cindex clef, ancient
@@ -951,8 +950,6 @@ c2 c
 c2 c
 \clef percussion
 c2 c
-\clef tab
-c2 c
 
 \break
 
@@ -960,7 +957,7 @@ c2 c
 c2 c
 \clef F   % synonym for bass
 c2 c
-\clef C   % synonym for tenor
+\clef C   % synonym for alto
 c2 c
 @end lilypond
 
@@ -971,27 +968,29 @@ c2 c
 @cindex tenor clef, choral
 
 By adding@tie{}@code{_8} or@tie{}@code{^8} to the clef name, the
-clef is transposed one octave down or up, respectively,
+clef is transposed one octave down or up respectively,
 and@tie{}@code{_15} and@tie{}@code{^15} transpose by two octaves.
-Clef names containing non-alphabetic characters must be enclosed
-in quotes.
+Other integers can be used if required.  Clef names containing
+non-alphabetic characters must be enclosed in quotes
 
 @lilypond[verbatim,quote,relative=1]
 \clef treble
 c2 c
 \clef "treble_8"
 c2 c
-\clef "G_8"
-c2 c
 \clef "bass^15"
 c2 c
-\clef "F^15"
+\clef "alto_2"
+c2 c
+\clef "G_8"
+c2 c
+\clef "F^5"
 c2 c
 @end lilypond
 
-Further supported clefs are described under
-@ref{Mensural clefs}, @ref{Gregorian clefs},
-and @ref{Custom tablatures}.
+Some special purpose clefs are described in @ref{Mensural clefs},
+@ref{Gregorian clefs}, @ref{Default tablatures}, and @ref{Custom
+tablatures}.
 
 @snippets
 
@@ -1003,6 +1002,7 @@ and @ref{Custom tablatures}.
 Notation Reference:
 @ref{Mensural clefs},
 @ref{Gregorian clefs},
+@ref{Default tablatures},
 @ref{Custom tablatures}.
 
 Snippets:
@@ -1133,17 +1133,19 @@ Internals Reference:
 octave for the staff:
 
 @lilypond[verbatim,quote,relative=2]
-a'2 b
-\ottava #1
-a b
+a2 b
+\ottava #-2
+a2 b
+\ottava #-1
+a2 b
 \ottava #0
-a b
+a2 b
+\ottava #1
+a2 b
+\ottava #2
+a2 b
 @end lilypond
 
-The @code{ottava} function also takes -1 (for 8va bassa),
-2@tie{}(for 15ma), and -2 (for 15ma bassa) as arguments.
-
-
 @snippets
 
 @lilypondfile[verbatim,lilyquote,texidoc,doctitle]
@@ -2576,6 +2578,10 @@ c4 b
 c b < g \xNote c f > b
 @end lilypond
 
+As synonyms for @code{\xNote}, @code{\xNotesOn} and @code{\xNotesOff},
+@code{\deadNote}, @code{\deadNotesOn} and @code{\deadNotesOff} can
+be used.  The term @notation{dead note} is commonly used by guitarists.
+
 There is also a shorthand for diamond shapes which can be used
 only inside chords:
 
@@ -2596,7 +2602,8 @@ Snippets:
 
 Notation Reference:
 @ref{Note head styles},
-@ref{Chorded notes}.
+@ref{Chorded notes},
+@ref{Indicating harmonics and dampened notes}.
 
 Internals Reference:
 @rinternals{note-event},
@@ -2678,33 +2685,65 @@ Internals Reference:
 @cindex shape notes
 @cindex Aiken shape note heads
 @cindex sacred harp note heads
+@cindex note heads, Southern Harmony
+@cindex Southern Harmony note heads
 
-@funindex \key
-@funindex key
 @funindex \aikenHeads
 @funindex aikenHeads
 @funindex \sacredHarpHeads
 @funindex sacredHarpHeads
+@funindex \southernHarmonyHeads
+@funindex southernHarmonyHeads
 
 In shape note head notation, the shape of the note head
 corresponds to the harmonic function of a note in the scale.  This
 notation was popular in nineteenth-century American song books.
-Shape note heads can be produced:
+Shape note heads can be produced in Sacred Harp, Southern Harmony,
+and Aiken (Christian Harmony) styles:
 
 @lilypond[verbatim,quote,relative=2]
 \aikenHeads
-c, d e f g a b c
+c, d e f g2 a b1 c \break
 \sacredHarpHeads
-c, d e f g a b c
+c,4 d e f g2 a b1 c \break
+\southernHarmonyHeads
+c,4 d e f g2 a b1 c \break
 @end lilypond
 
-Shapes are typeset according to the step in the scale, where the
-base of the scale is determined by the @code{\key} command.
+@funindex \key
+@funindex key
+@funindex \aikenHeadsMinor
+@funindex aikenHeadsMinor
+@funindex \sacredHarpHeadsMinor
+@funindex sacredHarpHeadsMinor
+@funindex \southernHarmonyHeadsMinor
+@funindex southernHarmonyHeadsMinor
+
+Shapes are typeset according to the step in the scale, where the base
+of the scale is determined by the @code{\key} command.  When writing
+in a minor key, the scale step can be determined from the relative
+major:
+
+@lilypond[verbatim,quote,relative=2]
+\key a \minor
+\aikenHeads
+a b c d e2 f g1 a \break
+\aikenHeadsMinor
+a,4 b c d e2 f g1 a \break
+\sacredHarpHeadsMinor
+a,2 b c d \break
+\southernHarmonyHeadsMinor
+a2 b c d \break
+@end lilypond
 
 
 @predefined
 @code{\aikenHeads},
-@code{\sacredHarpHeads}.
+@code{\aikenHeadsMinor},
+@code{\sacredHarpHeads},
+@code{\sacredHarpHeadsMinor},
+@code{\southernHarmonyHeads},
+@code{\southernHarmonyHeadsMinor}.
 @endpredefined