note-collison.cc: Scale shifts by width of note at left; issue 1713

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

diff --git a/Documentation/music-glossary.tely b/Documentation/music-glossary.tely
index 94c1c42e39aeacfda83b5a9fda272880550872f9..1983f83dc717d68bf9ce04762a4d43befabedf91 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--2010 by the authors
+Copyright @copyright{} 1999--2012 by the authors

 @end macro
 
 @set FDL
 @end macro
 
 @set FDL


@@ -57,6 +57,7 @@ Copyright @copyright{} 1999--2010 by the authors
 * Musical terms A-Z::
 * Duration names notes and rests::
 * Pitch names::
 * Musical terms A-Z::
 * Duration names notes and rests::
 * Pitch names::

+* Non-Western terms A-Z::

 
 Appendices
 
 
 Appendices
 


@@ -148,6 +149,7 @@ Languages in this order.
 * cluster::
 * comma::
 * common meter::
 * cluster::
 * comma::
 * common meter::

+* Common Practice Period::

 * common time::
 * complement::
 * compound interval::
 * common time::
 * complement::
 * compound interval::


@@ -537,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
 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


@@ -1990,6 +1992,25 @@ Another name for @ref{common time}.
 @ref{common time}, @ref{meter}.
 
 
 @ref{common time}, @ref{meter}.
 
 

+@node Common Practice Period
+@section Common Practice Period
+
+ES: ?,
+I: ?,
+F: ?,
+D: Kunstmusik,
+NL: ?,
+DK: ?,
+S: ?,
+FI: ?.
+
+@c TODO:
+This is a stub for Common Practice Period (CPP).
+
+@seealso
+@ruser{Note names in other languages}.
+
+

 @node common time
 @section common time
 
 @node common time
 @section common time
 


@@ -2081,29 +2102,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 "||"


@@ -2111,7 +2119,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


@@ -3980,8 +3990,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


@@ -5523,6 +5532,7 @@ S: mordent,
 FI: mordent, korukuvio.
 
 @seealso
 FI: mordent, korukuvio.
 
 @seealso

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

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


@@ -5653,7 +5663,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


@@ -5872,7 +5882,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:
 


@@ -5981,7 +5991,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


@@ -6633,7 +6644,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}.


@@ -6759,11 +6773,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


@@ -6821,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
 }
 \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
 


@@ -8741,6 +8755,134 @@ send it to me, care of the lilypond-user discussion list.
 @end multitable
 
 
 @end multitable
 
 

+@node Non-Western terms A-Z
+@chapter Non-Western terms A-Z
+
+@menu
+* bayati::
+* iraq::
+* kurd::
+* makam::
+* makamlar::
+* maqam::
+* rast::
+* semai::
+* sikah::
+* taqasim::
+@end menu
+
+
+@node bayati
+@section bayati
+
+@c TODO
+This is a stub for @code{bayati}.
+
+@seealso
+Notation Reference:
+@ruser{Arabic key signatures}.
+
+
+@node iraq
+@section iraq
+
+@c TODO
+This is a stub for @code{iraq}.
+
+@seealso
+Notation Reference:
+@ruser{Arabic key signatures}.
+
+
+@node kurd
+@section kurd
+
+@c TODO
+This is a stub for @code{kurd}.
+
+@seealso
+Notation Reference:
+@ruser{Arabic key signatures}.
+
+
+@node makam
+@section makam
+
+@c TODO
+This is a stub for @code{makam}.
+
+@seealso
+Notation Reference:
+@ruser{Turkish classical music}.
+
+
+@node makamlar
+@section makamlar
+
+@c TODO
+This is a stub for @code{makamlar}.
+
+@seealso
+Notation Reference:
+@ruser{Turkish classical music}.
+
+
+@node maqam
+@section maqam
+
+@c TODO
+This is a stub for @code{maqam}.
+
+@seealso
+Notation Reference:
+@ruser{Arabic music},
+@ruser{Arabic key signatures}.
+
+
+@node rast
+@section rast
+
+@c TODO
+This is a stub for @code{rast}.
+
+@seealso
+Notation Reference:
+@ruser{Arabic key signatures}.
+
+
+@node semai
+@section semai
+
+@c TODO
+This is a stub for @code{semai}.
+
+@seealso
+Notation Reference:
+@ruser{Arabic key signatures}.
+
+
+@node sikah
+@section sikah
+
+@c TODO
+This is a stub for @code{sikah}.
+
+@seealso
+Notation Reference:
+@ruser{Arabic key signatures}.
+
+
+@node taqasim
+@section taqasim
+
+@c TODO
+This is a stub for @code{taqasim}.
+
+@seealso
+Notation Reference:
+@ruser{Arabic key signatures}.
+
+

 @node Literature used
 @appendix Literature used
 
 @node Literature used
 @appendix Literature used