Merge branch 'master' of git://git.sv.gnu.org/lilypond

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

diff --git a/Documentation/user/music-glossary.tely b/Documentation/user/music-glossary.tely
index dab6c0d1abab85cd7f5c6393f970dd70767de71a..0b43f03ffa0677b801fe66772a276b2cf2aa57a9 100644 (file)
--- a/Documentation/user/music-glossary.tely
+++ b/Documentation/user/music-glossary.tely
@@ -153,7 +153,7 @@ Languages in this order.
 * alteration::                  
 * alto::                        
 * alto clef::                   
-* ambit::                       
+* ambitus::                     
 * anacrusis::                   
 * ancient minor scale::         
 * andante::                     
@@ -189,7 +189,6 @@ Languages in this order.
 * chromatic scale::             
 * chromaticism::                
 * church mode::                 
-* church rest::                 
 * clef::                        
 * cluster::                     
 * comma::                       
@@ -311,7 +310,7 @@ Languages in this order.
 * motif::                       
 * motive::                      
 * movement::                    
-* multibar rest::               
+* multi-measure rest::          
 * mixolydian mode::             
 * natural sign::                
 * neighbour tones::             
@@ -600,8 +599,8 @@ C clef setting middle C on the middle line of the staff.
 @ref{C clef}.
 
 
-@node ambit
-@section ambit
+@node ambitus
+@section ambitus
 
 ES: ámbito,
 I: ambitus,
@@ -1347,25 +1346,6 @@ FI: moodi, kirkkosävellaji.
 @ref{diatonic scale}.
 
 
-@node church rest
-@section church rest
-
-ES: compases de espera (estilo de la iglesia),
-I: pausa multipla (della cappella),
-F: pause multiple (style de l'église),
-NL: meermaats rust (?),
-D: Kirchenpause,
-DK: flertaktspause (?),
-S: flertaktspaus (?),
-FI: usean tahdin mittainen tauko (?).
-
-LilyPond-specific term for an older style of multibar rests.  Instead of a long bar with a number, @q{church rest}s use a combination of longa, breve and whole rests to indicate the duration (in measures) of a rest.
-
-@seealso
-
-@ref{multibar rest}.
-
-
 @node clef
 @section clef
 
@@ -2902,7 +2882,7 @@ of the piece.
 
 @seealso
 
-Program reference: @ruser{Manual beams}
+Internals Reference: @ruser{Manual beams}
 
 
 @node fermata
@@ -4161,27 +4141,36 @@ Greater musical works like @ref{symphony} and
 independant pieces called movements.
 
 
-@node multibar rest
-@section multibar rest
+@node multi-measure rest
+@section multi-measure rest
 
 ES: compases de espera,
 I: pausa multipla,
 F: pause multiple,
 NL: meermaats rust,
-D: mehrtaktige Pause,
+D: mehrtaktige Pause, Kirchenpause,
 DK: flertaktspause,
 S: flertaktspaus,
 FI: usean tahdin mittainen tauko.
 
+Multi-measure rests are conventionally typeset with a combination of longa,
+breve and whole rests for shorter and a long horizontal bar for longer
+spans of rest, with a number above to indicate the duration (in measures)
+of the rest. The former style is called @q{Kirchenpausen} in German, as a
+reminiscence of its use in Renaissance vocal polyphony. 
+
 @lilypond[fragment,ragged-right]
 \relative c'' {
   a1
   \set Score.skipBars = ##t R1*3
   a1
+  \set Score.skipBars = ##t R1*122
+  a1
 }
 @end lilypond
 
 
+
 @node mixolydian mode
 @section mixolydian mode