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 840ac2ccb9ceef47551b63ea317c8c1f776e4ccf..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,
@@ -150,10 +150,12 @@ Languages in this order.
 * alto::                        
 * alto clef::                   
 * ambit::                       
+* anacrusis::                   
 * ancient minor scale::         
 * andante::                     
 * appoggiatura::                
 * arpeggio::                    
+* articulation::                
 * ascending interval::          
 * augmented interval::          
 * autograph::                   
@@ -310,6 +312,7 @@ Languages in this order.
 * ornament::                    
 * ossia::                       
 * part::                        
+* pause::                       
 * pennant::                     
 * percussion::                  
 * perfect interval::            
@@ -457,6 +460,7 @@ accidental.
 \set Score.automaticBars = ##f
 << 
   \context Staff \relative c'' {
+    \set Staff.extraNatural = ##f
     gis1 gisis ges geses g!
   }
   \lyrics {
@@ -576,6 +580,16 @@ The term ambit (from latin: ambitus, plural: ambitus) denotes a range
 of pitches for a given voice in a part of music.  It may also denote
 the pitch range that a musical instrument is capable of playing.
 
+@node anacrusis
+@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
+of music before a section of music.
+
 @node ancient minor scale
 @section ancient minor scale
 
@@ -615,7 +629,7 @@ Walking tempo/character.
 
 ES: apoyatura,
 I: appoggiatura,
-F: appogiature, (port de voix),
+F: appoggiature, (port de voix),
 D: Vorschlag,
 NL: voorslag,
 DK: forslag,
@@ -701,6 +715,15 @@ FI: arpeggio, murtosointu.
 >>
 @end lilypond
 
+@node articulation
+@section articulation
+
+@c TODO: add languages for articulation.
+Articulation refers to notation which indicates how a note or notes should
+be played.  Slurs, accents, staccato, and legato are all examples of
+articulartion.
+
+
 @node ascending interval
 @section ascending interval
 
@@ -734,7 +757,7 @@ FI: ylinouseva intervalli.
 
 ES: manuscrito,
 I: autografo,
-F: manuscrit,
+F: manuscrit, autographe
 D: Autograph, Handschrift,
 NL: manuscript,
 DK: håndskrift, autograf,
@@ -1118,6 +1141,7 @@ chords are denoted open chords
 %\override TextScript #'font-style = #'large
 <<
 \context Staff \relative c'' {
+  \set Staff.extraNatural = ##f
   <g b d>1 
   <g bes d>
   <g bes des>
@@ -1445,6 +1469,9 @@ when to start playing.  Usually printed in a smaller type.
 @node custos
 @section custos
 
+F: guidon,
+D: Notenzeiger.
+
 A custos is a staff symbol that appears at the end of a staff line
 with monophonic musical contents (i.e., with a single voice).  It
 anticipates the pitch of the first note of the following line and thus
@@ -2218,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,
@@ -2961,7 +2988,7 @@ Note value: double length of @aref{breve}.
 
 ES: letra (de la canción),
 I: .,
-F: .,
+F: paroles,
 D: Liedtext,
 NL: liedtekst,
 DK: .,
@@ -3052,6 +3079,7 @@ harmony}, @aref{relative key}.
 @section melisma
 
 ES: melisma,
+F: mélisme,
 NL: melisma,
 FI: melisma, laulettavan tavun sävelkuvio.
 
@@ -3068,7 +3096,7 @@ syllable in plainsong
 
 ES: compás,
 I: tempo, metro,
-F: indication de mésure,
+F: indication de mesure, mesure,
 D: Taktart, Metrum,
 NL: maatsoort,
 DK: taktart,
@@ -3388,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,
@@ -3584,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
 
@@ -3791,7 +3824,7 @@ FI: neljännesosatauko.
 @node quintuplet
 @section quintuplet
 
-ES: cinquillo,
+ES: cinquillo, quintillo.
 I: quintina,
 F: quintolet,
 D: Quintole,
@@ -4528,7 +4561,7 @@ intervals.  @aref{meantone temperament}, @aref{equal temperament}.
 
 ES: indicación de tempo,
 I: indicazione di tempo,
-F: indication de temps,
+F: indication de tempo,
 D: Zeitmaß, Tempobezeichnung,
 NL: tempo aanduiding,
 DK: tempobetegelse,
@@ -4632,7 +4665,7 @@ FI: kolmanneskymmeneskahdesosatauko.
 
 ES: bajo cifrado,
 I: basso continuo, basso numerato,
-F: basse chiffrée,
+F: basse chiffrée, basse continue,
 D: Generalbass, bezifferter Bass,
 NL: basso continuo, becijferde bas
 DK: generalbas,
@@ -4699,7 +4732,7 @@ uniting them into a single sound (tone) equal to the combined durations.
 
 ES: indicación de compás,
 I: segni di tempo,
-F: chiffrage (chiffres indicateurs), signe de valeur,
+F: chiffrage (chiffres indicateurs), signe de valeur, indication de mesure,
 D: Taktangabe, Angabe der Taktart,
 NL: maatsoort,
 DK: taktangivelse,