From 4268b63145907f404cd77ed48f901877d00680a3 Mon Sep 17 00:00:00 2001
From: James Lowe <james.lowe@datacore.com>
Date: Tue, 29 Jun 2010 17:41:49 +0100
Subject: [PATCH] Doc: LM 2.2.4 Combining Notes into Chords

Updated example
Added @warning
Moved one @seealso rglos{} to correct place for LM
---
 Documentation/learning/common-notation.itely | 27 ++++++++++----------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/Documentation/learning/common-notation.itely b/Documentation/learning/common-notation.itely
index fd2be002f0..0c374e4df0 100644
--- a/Documentation/learning/common-notation.itely
+++ b/Documentation/learning/common-notation.itely
@@ -155,7 +155,7 @@ a1 |
 
 Music Glossary: @rglos{accidental}, @rglos{key signature},
 @rglos{pitch}, @rglos{flat}, @rglos{natural}, @rglos{sharp},
-@rglos{transposition}.
+@rglos{transposition}, @rglos{Pitch names}.
 
 To determine whether to print an @notation{accidental}, LilyPond
 examines the pitches and the @notation{key signature}.  The key
@@ -215,9 +215,6 @@ Notation Reference:
 @ruser{Automatic accidentals},
 @ruser{Key signature}.
 
-Music Glossary:
-@rglos{Pitch names}.
-
 
 @node Ties and slurs
 @subsection Ties and slurs
@@ -821,6 +818,8 @@ Notation Reference:
 @node Combining notes into chords
 @subsection Combining notes into chords
 
+Music Glossary: @rglos{chord}
+
 @cindex chords
 @cindex note durations in chords
 
@@ -828,8 +827,6 @@ Notation Reference:
 @funindex >
 @funindex < ... >
 
-Music Glossary: @rglos{chord}.
-
 We saw earlier how notes can be combined into @notation{chords} by
 indicating they are simultaneous by enclosing them in double angle
 brackets.  However, the normal way of indicating a chord is to
@@ -848,10 +845,15 @@ brackets.  For example, you can combine markings like beams and
 ties with chords.  They must be placed outside the angle brackets.
 
 @lilypond[verbatim,quote,relative=2]
-r4 <c e g>8[ <c f a>]~ <c f a>2 |
-r4 <c e g>8( <c e g>\> <c e g>4 <c f a>\!) |
+r4 <c e g>~ <c f a>2 |
+<c e g>8[ <c f a> <c e g> <c f a>] <c e g>\>[ <c f a> <c f a> <c e g>]\! |
+r4 <c e g>8.\p <c f a>16( <c e g>4-. <c f a>) |
 @end lilypond
 
+@seealso
+Notation Reference:
+@ruser{Chorded notes}.
+
 
 @node Single staff polyphony
 @subsection Single staff polyphony
@@ -931,13 +933,12 @@ separating each syllable with a space.
 >>
 @end lilypond
 
-Note the curly brackets delimiting both the music and the lyrics.
-It is essential that the final syllable is separated from the
-terminating curly bracket by a space or a newline, or it will be
+@warning{It is essential that the final syllable is separated from
+the terminating curly bracket by a space or a newline, or it will be
 assumed to be part of the syllable, giving rise to an obscure
-error, see @rprogram{Apparent error in ../ly/init.ly}.
+error, see @rprogram{Apparent error in ../ly/init.ly}.}
 
-Note also the double angle brackets @w{@code{<< ... >>}} around the
+Note the double angle brackets @w{@code{<< ... >>}} around the
 whole piece to show that the music and lyrics are to occur at the
 same time.
 
-- 
2.39.5