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 b7879061a4657878719c51616abaceced0b8b54a..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},
@@ -966,21 +968,23 @@ 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