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 3fa3fa5fa32e9e0f125b4ec15bf39b941eb527b7..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--2010 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
@@ -2102,29 +2102,16 @@ A meter that includes a triplet subdivision within the beat: see
 @ref{compound meter}.
 
 @item
-A time signature that additively combines two or more unequal meters, e.g.,
-@q{3/8 + 2/8} instead of @q{5/8}.  Sometimes called additive time signatures.
+A time signature that additively combines two or more unequal meters,
+e.g., @q{3/8 + 2/8} instead of @q{5/8}.  Sometimes called additive time
+signatures.
 
 @end enumerate
 
-@lilypond[quote,line-width=13.0\cm]
-#(define ((compound-time one two three num) grob)
-  (grob-interpret-markup grob
-    (markup
-      #:override '(baseline-skip . 0)
-      #:number
-      #:line (
-        #:left-column (one num)
-        #:vcenter "+"
-        #:left-column (two num)
-        #:vcenter "+"
-        #:left-column (three num)))))
-
+@lilypond[quote,verbatim]
 \relative c' {
   \key f \major
-  #(set-time-signature 8 8 '(3 2 3))
-  \override Staff.TimeSignature #'stencil =
-    #(compound-time "3" "2" "3" "8")
+  \compoundMeter #'((3 8) (2 8) (3 8))
   c8 d e f4 d8 c bes
   c4 g'8 e c f4.
   \bar "||"
@@ -2132,7 +2119,9 @@ A time signature that additively combines two or more unequal meters, e.g.,
 @end lilypond
 
 @seealso
-@ref{compound meter}, @ref{meter}, @ref{polymetric time signature}.
+@ref{compound meter},
+@ref{meter},
+@ref{polymetric time signature}.
 
 
 @node concert pitch
@@ -4001,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
@@ -5544,6 +5532,7 @@ S: mordent,
 FI: mordent, korukuvio.
 
 @seealso
+@ref{acciaccatura}, @ref{appoggiatura}, @ref{grace notes},
 @ref{ornament}.
 
 
@@ -5674,7 +5663,7 @@ FI: ?.
 
 @seealso
 @ref{acciaccatura}, @ref{appoggiatura}, @ref{grace notes},
-@ref{ornament}.
+@ref{mordent}, @ref{ornament}.
 
 
 @node ninth
@@ -6002,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
@@ -6654,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}.
@@ -6780,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
@@ -6842,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