Imported Upstream version 2.16.0

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

diff --git a/Documentation/music-glossary.tely b/Documentation/music-glossary.tely
index d822de1dfe2cb7d0fa54c59ea2357e51601507ca..a57dffbe63beb09c0693e1e0675754c9f6930832 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
 
 @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
 @end macro
 
 @set FDL


@@ -254,6 +254,7 @@ Languages in this order.
 * just intonation::
 * key::
 * key signature::
 * just intonation::
 * key::
 * key signature::

+* kievan notation::

 * laissez vibrer::
 * largo::
 * leading note::
 * laissez vibrer::
 * largo::
 * leading note::


@@ -539,7 +540,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
 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
 
 
 @node accidental


@@ -1998,7 +1999,7 @@ Another name for @ref{common time}.
 ES: ?,
 I: ?,
 F: ?,
 ES: ?,
 I: ?,
 F: ?,

-D: ?,
+D: Kunstmusik,

 NL: ?,
 DK: ?,
 S: ?,
 NL: ?,
 DK: ?,
 S: ?,


@@ -2102,29 +2103,16 @@ A meter that includes a triplet subdivision within the beat: see
 @ref{compound meter}.
 
 @item
 @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
 
 
 @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
 \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 "||"
   c8 d e f4 d8 c bes
   c4 g'8 e c f4.
   \bar "||"


@@ -2132,7 +2120,9 @@ A time signature that additively combines two or more unequal meters, e.g.,
 @end lilypond
 
 @seealso
 @end lilypond
 
 @seealso

-@ref{compound meter}, @ref{meter}, @ref{polymetric time signature}.
+@ref{compound meter},
+@ref{meter},
+@ref{polymetric time signature}.

 
 
 @node concert pitch
 
 
 @node concert pitch


@@ -4001,8 +3991,7 @@ Notes printed in small types to indicate that their time values are not
 counted in the rhythm of the bar.
 
 @seealso
 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
 
 
 @node grand staff


@@ -4542,6 +4531,14 @@ key of the music.
 @seealso
 @ref{accidental}.
 
 @seealso
 @ref{accidental}.
 

+@node kievan notation
+@section kievan notation
+
+A form of medieval music notation used predominantly in the chantbooks
+of the Russian Orthodox Church as well as Carpatho-Russian and Ukrainian
+jurisdictions of Orthodoxy and Byzantine-rite Catholicism.  It is
+characterized by the square shape of its noteheads.
+

 
 @node laissez vibrer
 @section laissez vibrer
 
 @node laissez vibrer
 @section laissez vibrer


@@ -5544,6 +5541,7 @@ S: mordent,
 FI: mordent, korukuvio.
 
 @seealso
 FI: mordent, korukuvio.
 
 @seealso

+@ref{acciaccatura}, @ref{appoggiatura}, @ref{grace notes},

 @ref{ornament}.
 
 
 @ref{ornament}.
 
 


@@ -5674,7 +5672,7 @@ FI: ?.
 
 @seealso
 @ref{acciaccatura}, @ref{appoggiatura}, @ref{grace notes},
 
 @seealso
 @ref{acciaccatura}, @ref{appoggiatura}, @ref{grace notes},

-@ref{ornament}.
+@ref{mordent}, @ref{ornament}.

 
 
 @node ninth
 
 
 @node ninth


@@ -5893,7 +5891,7 @@ or bracket) to indicate that the music is to be played in a different octave:
 For longer passages, it may be more practical to mark the octave change at the
 beginning with a phrase (see the list below for examples), but without a bracket
 or extender line.  Then, when the music returns to the written pitch, the octave
 For longer passages, it may be more practical to mark the octave change at the
 beginning with a phrase (see the list below for examples), but without a bracket
 or extender line.  Then, when the music returns to the written pitch, the octave

-change is cancelled with the word @notation{loco} (q.v.).
+change is canceled with the word @notation{loco} (q.v.).

 
 To parallel the list above:
 
 
 To parallel the list above:
 


@@ -6002,7 +6000,8 @@ the @emph{prall} (inverted mordent).
 @end lilypond
 
 @seealso
 @end lilypond
 
 @seealso

-@ref{acciaccatura}, @ref{appoggiatura}, @ref{grace notes}.
+@ref{acciaccatura}, @ref{appoggiatura}, @ref{grace notes},
+@ref{mordent}.

 
 
 @node ossia
 
 
 @node ossia


@@ -6654,7 +6653,10 @@ DK: rallentando,
 S: rallentando,
 FI: rallerdando, hidastuen.
 
 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}.
 
 @seealso
 @ref{ritardando}.


@@ -6780,11 +6782,13 @@ DK: ritardando,
 S: ritardando,
 FI: ritardando, hidastuen,
 
 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
 
 @seealso

-No cross-references.
+@ref{rallentando}.

 
 
 @node ritenuto
 
 
 @node ritenuto


@@ -6842,10 +6846,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
 }
 \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
 
 >>
 @end lilypond