Docs: run convert-ly for 2.14.0.

[lilypond.git] / Documentation / learning / common-notation.itely

diff --git a/Documentation/learning/common-notation.itely b/Documentation/learning/common-notation.itely
index a483362b90bc3b9de416d29a77ae0dd3c10e87f8..43189255966ce7f7129a2d5ea7e0be7e1e4b8c40 100644 (file)
--- a/Documentation/learning/common-notation.itely
+++ b/Documentation/learning/common-notation.itely
@@ -8,7 +8,7 @@
     Guide, node Updating translation committishes..
 @end ignore
 
-@c \version "2.12.0"
+@c \version "2.14.0"
 
 @ignore
 Tutorial guidelines:  (different from policy.txt!)
@@ -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
@@ -163,7 +163,7 @@ signature only affects the @emph{printed} accidentals, not the
 note's @notation{pitch}!  This is a feature that often causes
 confusion to newcomers, so let us explain it in more detail.
 
-LilyPond makes a sharp distinction between musical content and
+LilyPond makes a clear distinction between musical content and
 layout.  The alteration (@notation{flat}, @notation{natural sign} or
 @notation{sharp}) of a note is part of the pitch, and is therefore
 musical content.  Whether an accidental (a @emph{printed} flat,
@@ -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
@@ -779,7 +776,10 @@ than polyrhythmic scores.
 @funindex GrandStaff
 @funindex ChoirStaff
 
-Music Glossary: @rglos{brace}.
+Music Glossary:
+@rglos{brace},
+@rglos{staff},
+@rglos{system}.
 
 Piano music is typeset in two staves connected by a
 @notation{brace}.
@@ -821,6 +821,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 +830,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 +848,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
@@ -870,7 +875,7 @@ r4 <c e g>8( <c e g>\> <c e g>4 <c f a>\!) |
 
 Polyphonic music in lilypond, while not difficult, uses concepts
 that we haven't discussed yet, so we're not going to introduce
-them here. Instead, the following sections introduce these concepts
+them here.  Instead, the following sections introduce these concepts
 and explain them thoroughly.
 
 @seealso
@@ -931,13 +936,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.
 
@@ -973,12 +977,25 @@ shine as bright as day}.  Let's extend it:
 >>
 @end lilypond
 
-We see the extra lyrics do not align properly with the notes.  The
-word @notation{shine} should be sung on two notes, not one.  This
-is called a @notation{melisma}, a single syllable sung to more
-than one note.  There are several ways to spread a syllable over
-multiple notes, the simplest being to add a slur across them, for
-details, see @ref{Ties and slurs}:
+If you compile the code in the example above, you should see some
+warnings in the console output:
+
+@example
+song.ly:12:29: warning: barcheck failed at: 5/8
+    The | moon doth shine as
+                             | bright as day; |
+song.ly:12:46: warning: barcheck failed at: 3/8
+    The | moon doth shine as | bright as day;
+                                              |
+@end example
+
+This is a good example of the usefulness of bar checks.  Now,
+looking at the music, we see that the extra lyrics do not align
+properly with the notes.  The word @notation{shine} should be sung
+on two notes, not one.  This is called a @notation{melisma}, a
+single syllable sung to more than one note.  There are several
+ways to spread a syllable over multiple notes, the simplest being
+to add a slur across them, for details, see @ref{Ties and slurs}:
 
 @lilypond[verbatim,quote]
 <<