Merge branch 'master' into lilypond/translation

[lilypond.git] / Documentation / music-glossary.tely

diff --git a/Documentation/music-glossary.tely b/Documentation/music-glossary.tely
index fff26f135edf880cfd280ef88df25751bb89c237..b2df038dc722d5ec91047f054db0d7c9e0ccfe1f 100644 (file)
--- a/Documentation/music-glossary.tely
+++ b/Documentation/music-glossary.tely
@@ -14,7 +14,7 @@ terms used in the documentation manuals for LilyPond version
 
 @c `Music Glossary' was born 1999-10-04 with git commit 280a0bb...
 @macro copyrightDeclare
-Copyright @copyright{} 1999--2011 by the authors
+Copyright @copyright{} 1999--2012 by the authors
 @end macro
 
 @set FDL
@@ -539,7 +539,7 @@ principal note to which it is attached.  The acciaccatura is drawn as a
 small eighth note (quaver) with a line drawn through the flag and stem.
 
 @seealso
-@ref{appoggiatura}, @ref{grace notes}, @ref{ornament}.
+@ref{appoggiatura}, @ref{grace notes}, @ref{mordent}, @ref{ornament}.
 
 
 @node accidental
@@ -3990,8 +3990,7 @@ Notes printed in small types to indicate that their time values are not
 counted in the rhythm of the bar.
 
 @seealso
-@ref{acciaccatura}, @ref{appoggiatura}, @ref{grace notes},
-@ref{ornament}.
+@ref{acciaccatura}, @ref{appoggiatura}, @ref{mordent}, @ref{ornament}.
 
 
 @node grand staff
@@ -5533,6 +5532,7 @@ S: mordent,
 FI: mordent, korukuvio.
 
 @seealso
+@ref{acciaccatura}, @ref{appoggiatura}, @ref{grace notes},
 @ref{ornament}.
 
 
@@ -5663,7 +5663,7 @@ FI: ?.
 
 @seealso
 @ref{acciaccatura}, @ref{appoggiatura}, @ref{grace notes},
-@ref{ornament}.
+@ref{mordent}, @ref{ornament}.
 
 
 @node ninth
@@ -5991,7 +5991,8 @@ the @emph{prall} (inverted mordent).
 @end lilypond
 
 @seealso
-@ref{acciaccatura}, @ref{appoggiatura}, @ref{grace notes}.
+@ref{acciaccatura}, @ref{appoggiatura}, @ref{grace notes},
+@ref{mordent}.
 
 
 @node ossia
@@ -6643,7 +6644,10 @@ DK: rallentando,
 S: rallentando,
 FI: rallerdando, hidastuen.
 
-[Italian] A performance indication, abbreviated @notation{rall.}
+[Italian: @q{slowing down}]
+
+Slackening in speed, more gradual than @ref{ritardando}.  Abbreviated
+to @notation{rall.}
 
 @seealso
 @ref{ritardando}.
@@ -6769,11 +6773,13 @@ DK: ritardando,
 S: ritardando,
 FI: ritardando, hidastuen,
 
-Gradually slackening in speed.  Mostly abbreviated to @notation{rit.} or
-@notation{ritard}.
+[Italian: @q{lagging}]
+
+Gradual slowing down, more pronounced than @ref{rallentando}.  Mostly
+abbreviated to @notation{rit.} or @notation{ritard}.
 
 @seealso
-No cross-references.
+@ref{rallentando}.
 
 
 @node ritenuto
@@ -6831,10 +6837,8 @@ scale as roots of chords.  The most important are degrees I = tonic
 \new Staff \relative c' {
   c1 d e f g a b c
 }
- \lyrics {
-  << { I II III IV V VI VII I }
-     { T "" ""  S  D } >>
-}
+ \lyrics { I II III IV V VI VII I }
+ \lyrics { T "" ""  S  D }
 >>
 @end lilypond