Merge branch 'master' into jneeman

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

diff --git a/Documentation/user/music-glossary.tely b/Documentation/user/music-glossary.tely
index 1c596303d74afaf03b41c91639bffd5f80315af0..edc9e653479feed88007c66407d091aa93866be1 100644 (file)
--- a/Documentation/user/music-glossary.tely
+++ b/Documentation/user/music-glossary.tely
@@ -1,8 +1,8 @@
-\input texinfo @c -*- coding: utf8; mode: texinfo; -*-
+\input texinfo @c -*- coding: utf-8; mode: texinfo; -*-
 @setfilename music-glosssary.info
 @settitle Music Glossary
 
-@documentencoding utf-8
+@documentencoding UTF-8
 @documentlanguage en
 
 @c see lilypond.tely for info installation note
@@ -14,7 +14,7 @@
 @ifhtml
 This document is also available in
 @uref{source/Documentation/user/music-glossary.pdf,PDF}
-and as @uref{source/Documentation/user/music-glossary.html,one big page}.
+and as @uref{source/Documentation/user/music-glossary-big-page.html,one big page}.
 @end ifhtml
 
 @titlepage
@@ -73,7 +73,7 @@ German glossary,
 Original author of LilyPond glossary, Danish glossary,
 @item David González
 Spanish glossary,
-@item Fran@,{c}ois Pinard
+@item François Pinard
 Original glossary of GNU music project, French glossary,
 @item Han-Wen Nienhuys
 Dutch glossary,
@@ -312,6 +312,7 @@ Languages in this order.
 * ornament::                    
 * ossia::                       
 * part::                        
+* pause::                       
 * pennant::                     
 * percussion::                  
 * perfect interval::            
@@ -583,6 +584,7 @@ the pitch range that a musical instrument is capable of playing.
 @section anacrusis
 
 @c  TODO: add more languages for anacrusis
+ES: anacrusa
 F: anacrouse
 
 An anacrusis (also known as pickup or upbeat) is an incomplete measure
@@ -2243,7 +2245,7 @@ symbol indicates playing an octave lower (for example on double bass
 
 ES: calderón,
 I: corona,
-F: point d'orgue, point d'arr@^et,
+F: point d'orgue, point d'arrêt,
 D: Fermate,
 NL: fermate,
 DK: fermat,
@@ -3414,7 +3416,7 @@ and hears a tone.
 
 ES: cabeza,
 I: testa, testina, capocchia,
-F: t@^ete de la note,
+F: tête de la note,
 D: Notenkopf,
 NL: nootballetje,
 DK: nodehovede,
@@ -3610,6 +3612,11 @@ FI: stemma, instrumenttiosuus.
 or voice.  2.@tie{}in contrapuntal music @aref{counterpoint} the single
 melodic line of the contrapunctal web.
 
+@node pause
+@section pause
+
+@ref{fermata}.
+
 @node pennant
 @section pennant
 
@@ -3817,7 +3824,7 @@ FI: neljännesosatauko.
 @node quintuplet
 @section quintuplet
 
-ES: cinquillo,
+ES: cinquillo, quintillo.
 I: quintina,
 F: quintolet,
 D: Quintole,