Francisco's latest Spanish glossary fixes and Werner's UTF-8 texinfo

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

diff --git a/Documentation/user/music-glossary.tely b/Documentation/user/music-glossary.tely
index 08f03e9c142feec82d23c150bbb21cb6044ce668..55ac317db99ff17826cd98cc6e55e0c4d9b6375d 100644 (file)
--- a/Documentation/user/music-glossary.tely
+++ b/Documentation/user/music-glossary.tely
@@ -11,7 +11,8 @@
 @end direntry
 
 @ifhtml
 @end direntry
 
 @ifhtml

-This document is also available in @uref{source/Documentation/user/music-glossary.pdf,PDF}
+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}.
 @end ifhtml
 
 and as @uref{source/Documentation/user/music-glossary.html,one big page}.
 @end ifhtml
 


@@ -23,7 +24,7 @@ and as @uref{source/Documentation/user/music-glossary.html,one big page}.
 @c                             French glossary
 @author Han-Wen Nienhuys    @c Dutch glossary
 @author Jan Nieuwenhuizen   @c Dutch glossary
 @c                             French glossary
 @author Han-Wen Nienhuys    @c Dutch glossary
 @author Jan Nieuwenhuizen   @c Dutch glossary

-@author Dadiv Gonzalez      @c Spanish glossary
+@author David González      @c Spanish glossary

 @author Bjoern Jacke        @c German glossary
 @author Neil Jerram         @c English glossary translations
 @author Mats Bengtsson      @c Swedish glossary
 @author Bjoern Jacke        @c German glossary
 @author Neil Jerram         @c English glossary translations
 @author Mats Bengtsson      @c Swedish glossary


@@ -39,7 +40,7 @@ Copyright @copyright{} 1999--2006 by the authors
   under the terms of the GNU Free Documentation License, Version 1.1
   or any later version published by the Free Software Foundation,
   without Invariant Sections.
   under the terms of the GNU Free Documentation License, Version 1.1
   or any later version published by the Free Software Foundation,
   without Invariant Sections.

-  
+

 @end titlepage
 
 
 @end titlepage
 
 


@@ -67,7 +68,7 @@ Italian glossary,
 German glossary,
 @item Christian Mondrup
 Original author of LilyPond glossary, Danish glossary,
 German glossary,
 @item Christian Mondrup
 Original author of LilyPond glossary, Danish glossary,

-@item Dadiv Gonzalez
+@item David González

 Spanish glossary,
 @item Fran@,{c}ois Pinard
 Original glossary of GNU music project, French glossary,
 Spanish glossary,
 @item Fran@,{c}ois Pinard
 Original glossary of GNU music project, French glossary,


@@ -434,7 +435,7 @@ The stress of one tone over others.
 @node accidental
 @section accidental
 
 @node accidental
 @section accidental
 

-ES: alteración accidentelle,
+ES: alteración accidental,

 I: accidento,
 F: altération accidentelle,
 D: Vorzeichen, Versetzungszeichen, Akzidenz,
 I: accidento,
 F: altération accidentelle,
 D: Vorzeichen, Versetzungszeichen, Akzidenz,


@@ -451,21 +452,21 @@ accidental.
 
 @lilypond[fragment,notime,line-width=13.0\cm]
 \set Score.automaticBars = ##f
 
 @lilypond[fragment,notime,line-width=13.0\cm]
 \set Score.automaticBars = ##f

-%\override TextScript #'font-style = #'large
-\oldaddlyrics
-\context Staff \relative c'' {
-  gis1 gisis ges geses g!
-}
-\context Lyrics \lyrics {
-  \override Lyrics .LyricText #'self-alignment-X = #-1
-  sharp "db. sharp" flat "db. flat" natural
-}
+<< 
+  \context Staff \relative c'' {
+    gis1 gisis ges geses g!
+  }
+  \lyrics {
+    \override Lyrics .LyricText #'self-alignment-X = #-1
+    sharp "db. sharp" flat "db. flat" natural
+  }
+>>

 @end lilypond
 
 @node accelerando
 @section accelerando
 
 @end lilypond
 
 @node accelerando
 @section accelerando
 

-ES: acelerando,
+ES: accelerando,

 I: accelerando,
 F: accelerando, en accélérant,
 D: accelerando, schneller werden,
 I: accelerando,
 F: accelerando, en accélérant,
 D: accelerando, schneller werden,


@@ -515,7 +516,7 @@ tempo, especially the first and last movements of a @aref{sonata}.
 ES: alteración,
 I: alterazione
 F: altération
 ES: alteración,
 I: alterazione
 F: altération

-D: 
+D:

 NL: verhoging of verlaging,
 DK:
 S:
 NL: verhoging of verlaging,
 DK:
 S:


@@ -559,7 +560,7 @@ C clef setting middle C on the middle line of the staff
 @node ambit
 @section ambit
 
 @node ambit
 @section ambit
 

-ES: ambitus,
+ES: ámbito,

 I: ambitus,
 F: ambitus,
 D: ambitus,
 I: ambitus,
 F: ambitus,
 D: ambitus,


@@ -575,6 +576,7 @@ the pitch range that a musical instrument is capable of playing.
 @node ancient minor scale
 @section ancient minor scale
 
 @node ancient minor scale
 @section ancient minor scale
 

+ES: escala menor antigua,

 I: scala minore naturale,
 F: forme du mode mineur ancien, troisème mode, mode hellénique
 D: reines Moll,
 I: scala minore naturale,
 F: forme du mode mineur ancien, troisème mode, mode hellénique
 D: reines Moll,


@@ -699,7 +701,7 @@ FI: arpeggio, murtosointu.
 @node ascending interval
 @section ascending interval
 
 @node ascending interval
 @section ascending interval
 

-ES: Intervalo ascendente,
+ES: intervalo ascendente,

 I: intervallo ascendente,
 F: intervalle ascendant,
 D: steigendes Intervall,
 I: intervallo ascendente,
 F: intervalle ascendant,
 D: steigendes Intervall,


@@ -727,6 +729,7 @@ FI: ylinouseva intervalli.
 @node autograph
 @section autograph
 
 @node autograph
 @section autograph
 

+ES: manuscrito,

 I: autografo,
 F: manuscrit,
 D: Autograph, Handschrift,
 I: autografo,
 F: manuscrit,
 D: Autograph, Handschrift,


@@ -761,12 +764,12 @@ FI: H, h.
 @node bar
 @section bar
 
 @node bar
 @section bar
 

-ES: compás, @aref{measure}.
+@aref{measure}.

 
 @node bar line
 @section bar line
 
 
 @node bar line
 @section bar line
 

-ES: ?,
+ES: barra, línea divisoria,

 I: stanghetta, barra (di divisione),
 F: barre (de mesure),
 D: Taktstrich,
 I: stanghetta, barra (di divisione),
 F: barre (de mesure),
 D: Taktstrich,


@@ -825,6 +828,7 @@ A clef setting with middle C on the first top ledger line.
 @node bass
 @section bass
 
 @node bass
 @section bass
 

+ES: bajo,

 I: basso,
 F: basse,
 D: Bass,
 I: basso,
 F: basse,
 D: Bass,


@@ -841,6 +845,7 @@ an abbreviation for double bass.
 @node beam
 @section beam
 
 @node beam
 @section beam
 

+ES: barra

 I: coda,
 F: barre,
 D: Balken,
 I: coda,
 F: barre,
 D: Balken,


@@ -865,7 +870,7 @@ The number of beams determines the note value of the connected notes.
 @node beat
 @section beat
 
 @node beat
 @section beat
 

-ES: tiempo,
+ES: tiempo, parte (de compás)

 I: tempi,
 F: temps,
 D: Takt, Taktschlag, Zeit (im Takt),
 I: tempi,
 F: temps,
 D: Takt, Taktschlag, Zeit (im Takt),


@@ -939,6 +944,7 @@ trumpet, trombone, french horn, and tube.
 @node breath mark
 @section breath mark
 
 @node breath mark
 @section breath mark
 

+ES: respiración,

 I: respiro,
 F: respiration,
 D: Atemzeichen, Trennungszeichen,
 I: respiro,
 F: respiration,
 D: Atemzeichen, Trennungszeichen,


@@ -951,7 +957,7 @@ Indication of where to breathe in vocal and wind instrument parts.
 @node breve
 @section breve
 
 @node breve
 @section breve
 

-ES: breve,
+ES: cuadrada, breve,

 I: breve,
 F: brève,
 D: Brevis,
 I: breve,
 F: brève,
 D: Brevis,


@@ -983,7 +989,7 @@ FI: C, c.
 @node C clef
 @section C clef
 
 @node C clef
 @section C clef
 

-ES: Clave de do,
+ES: clave de do,

 I: chiave di do,
 F: clé d'ut,
 D: C-Schlüssel,
 I: chiave di do,
 F: clé d'ut,
 D: C-Schlüssel,


@@ -998,19 +1004,19 @@ lines.
 @lilypond[fragment,notime,line-width=13.0\cm]
 \set Score.automaticBars = ##f
 \override Score.Clef #'full-size-change = ##t
 @lilypond[fragment,notime,line-width=13.0\cm]
 \set Score.automaticBars = ##f
 \override Score.Clef #'full-size-change = ##t

-%\override Score.LyricText #'font-style = #'large
-\oldaddlyrics
-\context Staff \relative c' {
-  \clef soprano c1 s s
-  \clef mezzosoprano c s s
-  \clef alto c s s
-  \clef tenor c s s
-  \clef baritone c s s
-}
-\context Lyrics \lyrics {
-  \override Lyrics .LyricText #'self-alignment-X = #-1
-  "Soprano  " "Mezzosoprano  " "Alto  " "Tenor  " Baritone
-}
+<<
+  \context Staff \relative c' {
+    \clef soprano c1 
+    \clef mezzosoprano c 
+    \clef alto c 
+    \clef tenor c 
+    \clef baritone c 
+  }
+  \context Lyrics \lyrics {
+    \override Lyrics .LyricText #'self-alignment-X = #-1
+    "Soprano  " "Mezzosoprano  " "Alto  " "Tenor  " Baritone
+  }
+>>

 @end lilypond
 
 @node cadence
 @end lilypond
 
 @node cadence


@@ -1069,7 +1075,8 @@ D: Cent,
 NL: cent,
 DK: cent,
 S: cent,
 NL: cent,
 DK: cent,
 S: cent,

-FI: sentti, puolisävelaskeleen sadasosa tasavireisessä viritysjärjestelmässä.
+FI: sentti, puolisävelaskeleen sadasosa tasavireisessä
+viritysjärjestelmässä.

 
 Logarithmic unit of measurement.  1@tie{}cent is 1/1200 of an octave (1/100
 of an equally tempered @aref{semitone}).
 
 Logarithmic unit of measurement.  1@tie{}cent is 1/1200 of an octave (1/100
 of an equally tempered @aref{semitone}).


@@ -1092,8 +1099,10 @@ DK: akkord,
 S: ackord,
 FI: sointu.
 
 S: ackord,
 FI: sointu.
 

-Three or more tones sounding simultaneously.  In traditional European music the
-base chord is a @emph{triad} consisting of 2@w{ }thirds.  @emph{Major} (major +
+Three or more tones sounding simultaneously.  In traditional European music
+the
+base chord is a @emph{triad} consisting of 2@w{ }thirds.  @emph{Major} (major
++

 minor @aref{third}) as well as @emph{minor} (minor + major third)
 chords may be extended with more thirds.  Four-tone @emph{seventh chords}
 and five-tone @emph{ninth} major chords are most often used as dominants
 minor @aref{third}) as well as @emph{minor} (minor + major third)
 chords may be extended with more thirds.  Four-tone @emph{seventh chords}
 and five-tone @emph{ninth} major chords are most often used as dominants


@@ -1104,16 +1113,16 @@ chords are denoted open chords
 @lilypond[fragment,notime,line-width=13.0\cm]
 \set Score.automaticBars = ##f
 %\override TextScript #'font-style = #'large
 @lilypond[fragment,notime,line-width=13.0\cm]
 \set Score.automaticBars = ##f
 %\override TextScript #'font-style = #'large

-\oldaddlyrics
+<<

 \context Staff \relative c'' {
 \context Staff \relative c'' {

-  <g b d>1 s s
-  <g bes d> s s
-  <g bes des> s s
-  <g b dis> s s
-  <g b d f> s s
-  <g b d f a> s s
+  <g b d>1 
+  <g bes d>
+  <g bes des>
+  <g b dis> 
+  <g b d f> 
+  <g b d f a> 

 }
 }

-\context Lyrics \lyrics{
+\lyrics{

   "major  "
   "minor  "
   "diminished  "
   "major  "
   "minor  "
   "diminished  "


@@ -1121,6 +1130,7 @@ chords are denoted open chords
   "seventh-chord  "
   ninth-chord
 }
   "seventh-chord  "
   ninth-chord
 }

+>>

 @end lilypond
 
 @node chromatic scale
 @end lilypond
 
 @node chromatic scale


@@ -1187,6 +1197,8 @@ FI: avain, nuottiavain.
 @node cluster
 @section cluster
 
 @node cluster
 @section cluster
 

+ES: racimo.
+

 A @emph{cluster} is a range of simultaneously sounding pitches that
 may change over time.  The set of available pitches to apply usually
 depends on the acoustic source.  Thus, in piano music, a cluster
 A @emph{cluster} is a range of simultaneously sounding pitches that
 may change over time.  The set of available pitches to apply usually
 depends on the acoustic source.  Thus, in piano music, a cluster


@@ -1216,6 +1228,7 @@ pitch contained in the cluster would be notated as an ordinary note.
 @node comma
 @section comma
 
 @node comma
 @section comma
 

+ES: coma, comma,

 I: comma,
 F: comma,
 D: Komma,
 I: comma,
 F: comma,
 D: Komma,


@@ -1251,6 +1264,7 @@ Intervals larger than an octave.
 @node complement
 @section complement
 
 @node complement
 @section complement
 

+ES: intervalo invertido,

 I: rivolto,
 F: intervalle complémentaire,
 D: Komplementärintervall,
 I: rivolto,
 F: intervalle complémentaire,
 D: Komplementärintervall,


@@ -1412,7 +1426,7 @@ abbreviation ``cresc.''.
 @node cue-notes
 @section cue-notes
 
 @node cue-notes
 @section cue-notes
 

-ES: notas guia,
+ES: notas guía,

 I: notine,
 F: petites notes précédent l'entrée d'in instrument, réplique,
 D: Stichnoten,
 I: notine,
 F: petites notes précédent l'entrée d'in instrument, réplique,
 D: Stichnoten,


@@ -1458,11 +1472,11 @@ of the 20th century
   }
 }
 @end lilypond
   }
 }
 @end lilypond

-  
+

 @node D
 @section D
 
 @node D
 @section D
 

-ES: Re,
+ES: re,

 I: re,
 F: ré,
 D: D, d,
 I: re,
 F: ré,
 D: D, d,


@@ -1572,7 +1586,7 @@ music but also to some extent in newer jazz music.
 \set Score.automaticBars = ##f
 %\override Score.LyricText #'font-style = #'large
 %\override Score.TextScript #'font-style = #'large
 \set Score.automaticBars = ##f
 %\override Score.LyricText #'font-style = #'large
 %\override Score.TextScript #'font-style = #'large

-\oldaddlyrics
+<<

   \context Staff \relative c' {
     c1 d
     \override TextScript #'padding = #-4
   \context Staff \relative c' {
     c1 d
     \override TextScript #'padding = #-4


@@ -1581,79 +1595,77 @@ music but also to some extent in newer jazz music.
   \context Lyrics \lyrics {
     Ionian
   }
   \context Lyrics \lyrics {
     Ionian
   }

+>>

 @end lilypond
 
 @lilypond[fragment,notime,ragged-right]
 \set Score.automaticBars = ##f
 @end lilypond
 
 @lilypond[fragment,notime,ragged-right]
 \set Score.automaticBars = ##f

-%\override Score.LyricText #'font-style = #'large
-%\override Score.TextScript #'font-style = #'large
-\oldaddlyrics
+<<

   \context Staff \relative c' {
     d1
     \override TextScript #'padding = #-4
     e^"~~ S" f g a b^"~~ S" c d
   }
   \context Staff \relative c' {
     d1
     \override TextScript #'padding = #-4
     e^"~~ S" f g a b^"~~ S" c d
   }

-  \context Lyrics \lyrics {
+  \lyrics {

     Dorian
   }
     Dorian
   }

+>>

 @end lilypond
 
 @lilypond[fragment,notime,ragged-right]
 \set Score.automaticBars = ##f
 @end lilypond
 
 @lilypond[fragment,notime,ragged-right]
 \set Score.automaticBars = ##f

-%\override Score.LyricText #'font-style = #'large
-%\override Score.TextScript #'font-style = #'large
-\oldaddlyrics
+<<

   \relative c' {
     \override TextScript #'padding = #-4
     e1^"~~ S" f g a b^"~~ S" c d e
   }
   \relative c' {
     \override TextScript #'padding = #-4
     e1^"~~ S" f g a b^"~~ S" c d e
   }

-  \context Lyrics \lyrics {
+  \lyrics {

     Phrygian
   }
     Phrygian
   }

+>>

 @end lilypond
 
 @lilypond[fragment,notime,ragged-right]
 \set Score.automaticBars = ##f
 @end lilypond
 
 @lilypond[fragment,notime,ragged-right]
 \set Score.automaticBars = ##f

-%\override Score.LyricText #'font-style = #'large
-%\override Score.TextScript #'font-style = #'large
-\oldaddlyrics
+<<

   \relative c' {
     f1 g a
     \override TextScript #'padding = #-4
     b^"~~ S" c d e^"~~ S" f
   }
   \relative c' {
     f1 g a
     \override TextScript #'padding = #-4
     b^"~~ S" c d e^"~~ S" f
   }

-  \context Lyrics \lyrics {
+  \lyrics {

     Lydian
   }
     Lydian
   }

+>>

 @end lilypond
 
 @lilypond[fragment,notime,ragged-right]
 \set Score.automaticBars = ##f
 @end lilypond
 
 @lilypond[fragment,notime,ragged-right]
 \set Score.automaticBars = ##f

-%\override Score.LyricText #'font-style = #'large
-%\override Score.TextScript #'font-style = #'large
-\oldaddlyrics
+<<

   \relative c'' {
     g1 a
     \override TextScript #'padding = #-4
     b^"~~ S" c d e^"~~ S" f g }
   \relative c'' {
     g1 a
     \override TextScript #'padding = #-4
     b^"~~ S" c d e^"~~ S" f g }

-  \context Lyrics \lyrics {
+  \lyrics {

     Mixolydian
   }
     Mixolydian
   }

+>>

 @end lilypond
 
 @lilypond[fragment,notime,ragged-right]
 \set Score.automaticBars = ##f
 %\override Score.LyricText #'font-style = #'large
 %\override Score.TextScript #'font-style = #'large
 @end lilypond
 
 @lilypond[fragment,notime,ragged-right]
 \set Score.automaticBars = ##f
 %\override Score.LyricText #'font-style = #'large
 %\override Score.TextScript #'font-style = #'large

-\oldaddlyrics
+<<

   \relative c'' {
     a1
     \override TextScript #'padding = #-4
     b^"~~ S" c d e^"~~ S" f g a
   }
   \relative c'' {
     a1
     \override TextScript #'padding = #-4
     b^"~~ S" c d e^"~~ S" f g a
   }

-  \context Lyrics \lyrics {
+  \lyrics {

     Aeolian
   }
     Aeolian
   }

+>>

 @end lilypond
 
 From the beginning of the 17th century the scales used in European
 @end lilypond
 
 From the beginning of the 17th century the scales used in European


@@ -1663,39 +1675,35 @@ harmonic minor scale type an augmented second (A) occurs between the 6th and
 
 @lilypond[fragment,notime,ragged-right]
 \set Score.automaticBars = ##f
 
 @lilypond[fragment,notime,ragged-right]
 \set Score.automaticBars = ##f

-%\override Score.LyricText #'font-style = #'large
-%\override Score.TextScript #'font-style = #'large
-\oldaddlyrics
+<<

   \relative c' {
     c1 d
     \override TextScript #'padding = #-4
     e^"~~ S" f g a b^"~~ S" c
   }
   \relative c' {
     c1 d
     \override TextScript #'padding = #-4
     e^"~~ S" f g a b^"~~ S" c
   }

-  \context Lyrics \lyrics {
+ \lyrics {

     Major
   }
     Major
   }

+>>

 @end lilypond
 
 @lilypond[fragment,notime,ragged-right]
 \set Score.automaticBars = ##f
 @end lilypond
 
 @lilypond[fragment,notime,ragged-right]
 \set Score.automaticBars = ##f

-%\override Score.LyricText #'font-style = #'large
-%\override Score.TextScript #'font-style = #'large
-\oldaddlyrics
+<<

   \relative c'' {
     a1
     \override TextScript #'padding = #-4
     b^"~~ S" c d e^"~~ S" f g a
   }
   \relative c'' {
     a1
     \override TextScript #'padding = #-4
     b^"~~ S" c d e^"~~ S" f g a
   }

-  \context Lyrics \lyrics {
+ \lyrics {

     "ancient minor"
   }
     "ancient minor"
   }

+>>

 @end lilypond
 
 @lilypond[fragment,notime,ragged-right]
 \set Score.automaticBars = ##f
 @end lilypond
 
 @lilypond[fragment,notime,ragged-right]
 \set Score.automaticBars = ##f

-%\override Score.LyricText #'font-style = #'large
-%\override Score.TextScript #'font-style = #'large
-\oldaddlyrics
+<<

   \relative c'' {
     a1
     \override TextScript #'padding = #-4
   \relative c'' {
     a1
     \override TextScript #'padding = #-4


@@ -1704,28 +1712,30 @@ harmonic minor scale type an augmented second (A) occurs between the 6th and
   \context Lyrics \lyrics {
     "Harmonic minor"
   }
   \context Lyrics \lyrics {
     "Harmonic minor"
   }

+>>

 @end lilypond
 
 @lilypond[fragment,notime,line-width=13.0\cm]
 \set Score.automaticBars = ##f
 %\override Score.LyricText #'font-style = #'large
 %\override Score.TextScript #'font-style = #'large
 @end lilypond
 
 @lilypond[fragment,notime,line-width=13.0\cm]
 \set Score.automaticBars = ##f
 %\override Score.LyricText #'font-style = #'large
 %\override Score.TextScript #'font-style = #'large

-\oldaddlyrics
+<<

   \relative c'' {
     a1
     \override TextScript #'padding = #-4
     b^"~~ S" c d e fis gis^"~~ S"
     a g! f!^"~~ S" e d c^"~~ S" b a
   }
   \relative c'' {
     a1
     \override TextScript #'padding = #-4
     b^"~~ S" c d e fis gis^"~~ S"
     a g! f!^"~~ S" e d c^"~~ S" b a
   }

-  \context Lyrics \lyrics {
+   \lyrics {

     "Melodic minor"
   }
     "Melodic minor"
   }

+>>

 @end lilypond
 
 @node diminished interval
 @section diminished interval
 
 @end lilypond
 
 @node diminished interval
 @section diminished interval
 

-ES: intervalo disminuído,
+ES: intervalo disminuido,

 I: intervallo diminuito,
 F: intervalle diminué,
 D: vermindertes Intervall,
 I: intervallo diminuito,
 F: intervalle diminué,
 D: vermindertes Intervall,


@@ -1762,7 +1772,7 @@ DK: springende bevægelse,
 S: hoppande rörelse,
 FI: melodian hyppivä liike.
 
 S: hoppande rörelse,
 FI: melodian hyppivä liike.
 

-Progressing melodically by intervals larger than a major second.  
+Progressing melodically by intervals larger than a major second.

 Opposite of @aref{conjunct movement}.
 
 @lilypond[fragment,ragged-right]
 Opposite of @aref{conjunct movement}.
 
 @lilypond[fragment,ragged-right]


@@ -1782,7 +1792,7 @@ Opposite of @aref{conjunct movement}.
 @node dissonant interval
 @section dissonant interval
 
 @node dissonant interval
 @section dissonant interval
 

-ES: intervalo disonante, disonancias,
+ES: intervalo disonante, disonancia,

 I: intervallo dissonante, dissonanza,
 F: dissonance,
 D: Dissonanz,
 I: intervallo dissonante, dissonanza,
 F: dissonance,
 D: Dissonanz,


@@ -1796,6 +1806,7 @@ FI: dissonanssi, dissonoiva intervalli, riitasointi.
 @node dominant ninth chord
 @section dominant ninth chord
 
 @node dominant ninth chord
 @section dominant ninth chord
 

+ES: acorde de novena de dominante,

 I: accordo di nona di dominante,
 F: accord de neuvième dominante,
 D: Domi@-nant@-nonen@-akkord,
 I: accordo di nona di dominante,
 F: accord de neuvième dominante,
 D: Domi@-nant@-nonen@-akkord,


@@ -1894,6 +1905,7 @@ FI: kaksoisappogiatura, kaksoisetuhele.
 @node double bar line
 @section double bar line
 
 @node double bar line
 @section double bar line
 

+ES: doble barra,

 I: doppia barra,
 F: double barre,
 D: Doppelstrich,
 I: doppia barra,
 F: double barre,
 D: Doppelstrich,


@@ -1907,7 +1919,7 @@ Indicates the end of a section within a movement.
 @node double dotted note
 @section double dotted note
 
 @node double dotted note
 @section double dotted note
 

-ES: nota con dos puntillos,
+ES: nota con doble puntillo,

 I: nota doppiamente puntata,
 F: note doublement pointée,
 D: doppelt punktierte Note,
 I: nota doppiamente puntata,
 F: note doublement pointée,
 D: doppelt punktierte Note,


@@ -2063,7 +2075,7 @@ FI: kahdeksasosatauko.
 @node engraving
 @section engraving
 
 @node engraving
 @section engraving
 

-ES: Grabar
+ES: grabar,

 I: incisione,
 F: gravure,
 D: Notenstechen, Notendruck
 I: incisione,
 F: gravure,
 D: Notenstechen, Notendruck


@@ -2082,7 +2094,7 @@ plate of metal.  Now also the term for the art of music typesetting.
 @node enharmonic
 @section enharmonic
 
 @node enharmonic
 @section enharmonic
 

-ES: enharmónico,
+ES: enarmónico,

 I: enarmonico,
 F: enharmonique,
 D: enharmonisch,
 I: enarmonico,
 F: enharmonique,
 D: enharmonisch,


@@ -2096,21 +2108,21 @@ but equal pitch.
 
 @lilypond[fragment,notime,line-width=13.0\cm]
 \set Score.automaticBars = ##f
 
 @lilypond[fragment,notime,line-width=13.0\cm]
 \set Score.automaticBars = ##f

-%\override Score.TextScript #'font-style = #'large
-\oldaddlyrics
+<<

 \context Staff \relative c'' {
 \context Staff \relative c'' {

-  gis1 s s as s s <des g,!> s s <cis g!> s s
+  gis1  as <des g,!>  <cis g!> 

 }
 \context Lyrics \lyrics {
   \override Lyrics .LyricText #'self-alignment-X = #-1
   "g sharp  " "a flat  " "dim fifth  " "augm fourth"
 }
 }
 \context Lyrics \lyrics {
   \override Lyrics .LyricText #'self-alignment-X = #-1
   "g sharp  " "a flat  " "dim fifth  " "augm fourth"
 }

+>>

 @end lilypond
 
 @node equal temperament
 @section equal temperament
 
 @end lilypond
 
 @node equal temperament
 @section equal temperament
 

-ES: ?,
+ES: temperamento igual,

 I: temperamento equabile,
 F: tempérament égal,
 D: gleichschwebende Stimmung,
 I: temperamento equabile,
 F: tempérament égal,
 D: gleichschwebende Stimmung,


@@ -2125,7 +2137,7 @@ Tuning system dividing the octave into 12 equal @aref{semitone}s
 @node expression mark
 @section expression mark
 
 @node expression mark
 @section expression mark
 

-ES: ?,
+ES: expresión,

 I: segno d'espressione,
 F: signe d'expression, indication de nuance,
 D: Vortragszeichen,
 I: segno d'espressione,
 F: signe d'expression, indication de nuance,
 D: Vortragszeichen,


@@ -2153,7 +2165,7 @@ FI: F, f.
 @node F clef
 @section F clef
 
 @node F clef
 @section F clef
 

-ES: Clave de Fa,
+ES: clave de fa,

 I: chiave di fa,
 F: clé de fa,
 D: F-Schlüssel,
 I: chiave di fa,
 F: clé de fa,
 D: F-Schlüssel,


@@ -2172,8 +2184,7 @@ symbol indicates playing an octave lower (for example on double bass
 @lilypond[fragment,notime,line-width=13.0\cm]
 \set Score.automaticBars = ##f
 \override Staff.Clef #'full-size-change = ##t
 @lilypond[fragment,notime,line-width=13.0\cm]
 \set Score.automaticBars = ##f
 \override Staff.Clef #'full-size-change = ##t

-%\override Score.LyricText #'font-style = #'large
-\oldaddlyrics
+<<

 \relative c {
   \clef varbaritone
   f1
 \relative c {
   \clef varbaritone
   f1


@@ -2186,14 +2197,14 @@ symbol indicates playing an octave lower (for example on double bass
   \clef "F_8"
   f1
 }
   \clef "F_8"
   f1
 }

-\context Lyrics \lyrics {
-%  \override Lyrics .LyricText #'self-alignment-X = #-1
+ \lyrics {

   "baritone  "
   "bass  "
   "sub-bass  "
   "octaved up  "
   "octaved down"
 }
   "baritone  "
   "bass  "
   "sub-bass  "
   "octaved up  "
   "octaved down"
 }

+>>

 @end lilypond
 
 @c F:  'point d'orgue' on a note, 'point d'arret' on a rest.
 @end lilypond
 
 @c F:  'point d'orgue' on a note, 'point d'arret' on a rest.


@@ -2201,7 +2212,7 @@ symbol indicates playing an octave lower (for example on double bass
 @node fermata
 @section fermata
 
 @node fermata
 @section fermata
 

-ES: Calderón,
+ES: calderón,

 I: corona,
 F: point d'orgue, point d'arr@^et,
 D: Fermate,
 I: corona,
 F: point d'orgue, point d'arr@^et,
 D: Fermate,


@@ -2236,7 +2247,7 @@ FI: kvintti.
 @node figured bass
 @section figured bass
 
 @node figured bass
 @section figured bass
 

-ES: bajo cifrado, @aref{thorough bass}.
+@aref{thorough bass}.

 
 @node fingering
 @section fingering
 
 @node fingering
 @section fingering


@@ -2361,13 +2372,13 @@ variants of the base chords.
 
 @lilypond[fragment,notime,line-width=13.0\cm]
 \set Score.automaticBars = ##f
 
 @lilypond[fragment,notime,line-width=13.0\cm]
 \set Score.automaticBars = ##f

-%\override Score.LyricText #'font-style = #'large
-%\override Score.TextScript #'font-style = #'large
-\oldaddlyrics
+<<

 \context Voice \relative c'' {
   <g e c >1 < a f d > < b g e >
   <c a f > < d b g > < e c a > < f d b > }
 \context Voice \relative c'' {
   <g e c >1 < a f d > < b g e >
   <c a f > < d b g > < e c a > < f d b > }

-\context Lyrics \lyrics { T Sp Dp S D Tp \markup{ D\translate #(cons -2 0) {"|"}  } }
+\context Lyrics \lyrics {
+  T Sp Dp S D Tp \markup{ D\translate #(cons -2 0) {"|"}  } }
+>>

 @end lilypond
 
 @node G
 @end lilypond
 
 @node G


@@ -2385,7 +2396,7 @@ FI: G, g.
 @node G clef
 @section G clef
 
 @node G clef
 @section G clef
 

-ES: Clave de sol,
+ES: clave de sol,

 I: chiave di sol,
 F: clé de sol,
 D: G-Schlüssel, Violinschlüssel,
 I: chiave di sol,
 F: clé de sol,
 D: G-Schlüssel, Violinschlüssel,


@@ -2443,7 +2454,7 @@ Letting the pitch slide fluently from one note to the other.
 @node grace notes
 @section grace notes
 
 @node grace notes
 @section grace notes
 

-ES: ?,
+ES: notas de adorno,

 I: abbellimenti,
 F: fioriture,
 D: Verzierungen, Vorschläge, Vor@-schlags@-noten,
 I: abbellimenti,
 F: fioriture,
 D: Verzierungen, Vorschläge, Vor@-schlags@-noten,


@@ -2458,6 +2469,7 @@ counted in the rhythm of the bar.  @aref{appoggiatura}.
 @node grand staff
 @section grand staff
 
 @node grand staff
 @section grand staff
 

+ES: sistema de piano,

 I: accolatura,
 F: accolade,
 D: Akkolade,
 I: accolatura,
 F: accolade,
 D: Akkolade,


@@ -2507,7 +2519,7 @@ FI: puolinuotti.
 @node half rest
 @section half rest
 
 @node half rest
 @section half rest
 

-ES: ?,
+ES: silencio de blanca,

 I: pausa di minima,
 F: demi-pause,
 UK: minim rest,
 I: pausa di minima,
 F: demi-pause,
 UK: minim rest,


@@ -2543,17 +2555,18 @@ section.  @aref{functional harmony}.
     \partial 4 < c g e >4 |
     < c a f > < b g d > < c g e >2
   }
     \partial 4 < c g e >4 |
     < c a f > < b g d > < c g e >2
   }

-%  %\override Score.LyricText #'font-style = #'large
-  \oldaddlyrics
-  \context Staff = SB \relative c {
-    \clef bass
-    \partial 4 c4 | f, g c2
-    \bar "|."
-  }
-  \context Lyrics \lyrics {
-    T S D T
-  }
+  <<
+    \context Staff = SB \relative c {
+      \clef bass
+      \partial 4 c4 | f, g c2
+      \bar "|."
+    }
+    \lyrics {
+      T4 S D T
+    }
+  >>

 >>
 >>

+

 @end lilypond
 
 @node harmony
 @end lilypond
 
 @node harmony


@@ -2628,7 +2641,8 @@ DK: interval,
 S: intervall,
 FI: intervalli, kahden sävelen korkeusero.
 
 S: intervall,
 FI: intervalli, kahden sävelen korkeusero.
 

-Difference in pitch between two notes.  Intervals may be perfect, minor, major,
+Difference in pitch between two notes.  Intervals may be perfect, minor,
+major,

 diminished, or augmented.  The augmented fourth and the diminished fifth are
 identical (@aref{enharmonic}) and are called @emph{tritonus}
 because they consist of three @aref{whole tone}s.  The addition
 diminished, or augmented.  The augmented fourth and the diminished fifth are
 identical (@aref{enharmonic}) and are called @emph{tritonus}
 because they consist of three @aref{whole tone}s.  The addition


@@ -2636,65 +2650,62 @@ of such two intervals forms an octave.
 
 @lilypond[fragment,notime,line-width=13.0\cm]
 \set Score.automaticBars = ##f
 
 @lilypond[fragment,notime,line-width=13.0\cm]
 \set Score.automaticBars = ##f

-%\override Score.LyricText #'font-style = #'large
-%\override Score.TextScript #'font-style = #'large
-\oldaddlyrics
+<<

 \context Voice \relative c'' {
 \context Voice \relative c'' {

-  < g g >1 s
-  < g as >^"minor" s
-  < g a! > s
-  < g ais >^"augm" s
-  < gis bes >^"dimin" s
-  < g! bes >^"minor" s
-  < g b! >^"major" s
-  < g bis >^"augm" s
+  < g g >1 
+  < g as >^"minor" 
+  < g a! > 
+  < g ais >^"augm" 
+  < gis bes >^"dimin" 
+  < g! bes >^"minor" 
+  < g b! >^"major" 
+  < g bis >^"augm" 

 }
 \context Lyrics \lyrics {
   "unisone " "second " "second " "second "
   "third  " "third " "third " "third"
 }
 }
 \context Lyrics \lyrics {
   "unisone " "second " "second " "second "
   "third  " "third " "third " "third"
 }

+>>

 @end lilypond
 
 @lilypond[fragment,notime,line-width=13.0\cm]
 \set Score.automaticBars = ##f
 @end lilypond
 
 @lilypond[fragment,notime,line-width=13.0\cm]
 \set Score.automaticBars = ##f

-%\override Score.LyricText #'font-style = #'large
-%\override Score.TextScript #'font-style = #'large
-\oldaddlyrics
+<<

 \context Staff \relative c'' {
 \context Staff \relative c'' {

-  < g c >1^"perfect" s
-  < g cis >^"augm" s
-  < g d' >^"perfect" s
-  < g des' > ^"dimin" s
-  < gis es' >^"dimin" s
-  < g! es' >^"minor" s
-  < g e'! >^"major" s
-  < g eis' >^"augm" s
+  < g c >1^"perfect" 
+  < g cis >^"augm" 
+  < g d' >^"perfect" 
+  < g des' > ^"dimin" 
+  < gis es' >^"dimin" 
+  < g! es' >^"minor" 
+  < g e'! >^"major" 
+  < g eis' >^"augm" 

 }
 }

-\context Lyrics \lyrics {
+ \lyrics {

   "fourth  " "fourth  " "fifth  " "fifth  "
   "sixth  " "sixth  " "sixth  " "sixth"
 }
   "fourth  " "fourth  " "fifth  " "fifth  "
   "sixth  " "sixth  " "sixth  " "sixth"
 }

+>>

 @end lilypond
 
 @lilypond[fragment,notime,line-width=13.0\cm]
 \set Score.automaticBars = ##f
 @end lilypond
 
 @lilypond[fragment,notime,line-width=13.0\cm]
 \set Score.automaticBars = ##f

-%\override Score.LyricText #'font-style = #'large
-%\override Score.TextScript #'font-style = #'large
-\oldaddlyrics
+<<

 \context Staff \relative c'' {
 \context Staff \relative c'' {

-  < gis f'! >1^"dimin" s
-  < g! f'! >^"minor" s
-  < g fis' >^"major" s
-  < g g' > s
-  < g as' >^"minor" s
-  < g a'! >^"major" s
-  < g bes' >^"minor" s
-  < g b'! >^"major" s
+  < gis f'! >1^"dimin" 
+  < g! f'! >^"minor" 
+  < g fis' >^"major" 
+  < g g' > 
+  < g as' >^"minor" 
+  < g a'! >^"major" 
+  < g bes' >^"minor" 
+  < g b'! >^"major" 

 }
 \context Lyrics \lyrics {
   "seventh " "seventh " "seventh " "octave "
   "none " "none " "decime " "decime"
 }
 }
 \context Lyrics \lyrics {
   "seventh " "seventh " "seventh " "octave "
   "none " "none " "decime " "decime"
 }

+>>

 @end lilypond
 
 @node inverted interval
 @end lilypond
 
 @node inverted interval


@@ -2724,6 +2735,7 @@ The difference between an interval and an octave.
 @node just intonation
 @section just intonation
 
 @node just intonation
 @section just intonation
 

+ES: entonación justa,

 I: intonazione giusta,
 F: intonation juste,
 D: reine Stimmung,
 I: intonazione giusta,
 F: intonation juste,
 D: reine Stimmung,


@@ -2754,7 +2766,7 @@ there are 12@w{ }keys, one on@w{ }c, one on c-sharp, etc.
 @node key signature
 @section key signature
 
 @node key signature
 @section key signature
 

-ES: armadura de clave,
+ES: armadura (de la clave),

 I: armatura di chiave,
 F: armure, armature [de la clé],
 D: Vorzeichen, Tonart,
 I: armatura di chiave,
 F: armure, armature [de la clé],
 D: Vorzeichen, Tonart,


@@ -2800,7 +2812,7 @@ upwards) to the tonic scale degree.
 @node ledger line
 @section ledger line
 
 @node ledger line
 @section ledger line
 

-ES: líneas adicionales,
+ES: línea adicional,

 I: tagli addizionali,
 F: ligne supplémentaire,
 D: Hilfslinie,
 I: tagli addizionali,
 F: ligne supplémentaire,
 D: Hilfslinie,


@@ -2819,7 +2831,7 @@ A ledger line is an extension of the staff.
 @node legato
 @section legato
 
 @node legato
 @section legato
 

-ES: ligado,
+ES: legato,

 I: legato,
 F: legato, lié,
 D: legato,
 I: legato,
 F: legato, lié,
 D: legato,


@@ -2828,26 +2840,26 @@ DK: legato,
 S: legato,
 FI: legato, sitoen.
 
 S: legato,
 FI: legato, sitoen.
 

-To be performed (a) without any perceptible interruption between the notes, 
+To be performed (a) without any perceptible interruption between the notes,

 unlike (b) @emph{leggiero} or @emph{non-legato}, (c) @emph{portato}, and
 (d) @aref{staccato}.
 
 @lilypond[fragment,notime,line-width=13.0\cm]
 \set Score.automaticBars = ##f
 unlike (b) @emph{leggiero} or @emph{non-legato}, (c) @emph{portato}, and
 (d) @aref{staccato}.
 
 @lilypond[fragment,notime,line-width=13.0\cm]
 \set Score.automaticBars = ##f

-\oldaddlyrics
-\context Staff \relative c'' {
-  c4-( d e-) \bar "||"
-  c4-- d-- e-- \bar "||"
-  c4-.-( d-. e-.-) \bar "||"
-  c4-. d-. e-. \bar "||"
-}
-\context Lyrics \lyrics {
-%  \override Lyrics .LyricText #'font-style = #'large
-  a
-  b "" ""
-  c
-  d
-}
+<<
+  \context Staff \relative c'' {
+    c4-( d e-) \bar "||"
+    c4-- d-- e-- \bar "||"
+    c4-.-( d-. e-.-) \bar "||"
+    c4-. d-. e-. \bar "||"
+  }
+  \lyrics {
+    a1
+    b
+    c
+    d
+  }
+>>

 @end lilypond
 
 @node legato curve
 @end lilypond
 
 @node legato curve


@@ -2863,7 +2875,7 @@ unlike (b) @emph{leggiero} or @emph{non-legato}, (c) @emph{portato}, and
 @node lilypond
 @section lilypond
 
 @node lilypond
 @section lilypond
 

-ES: estanque de lilas,
+ES: estanque de nenúfares,

 I: stagno del giglio,
 F: étang de lis,
 UK: lily pond,
 I: stagno del giglio,
 F: étang de lis,
 UK: lily pond,


@@ -2878,6 +2890,8 @@ A pond with lilies floating in it, also the name of a music typesetter.
 @node ligature
 @section ligature
 
 @node ligature
 @section ligature
 

+ES: ligadura
+

 A ligature is a coherent graphical symbol that represents at least two
 distinct notes.  Ligatures originally appeared in the manuscripts of
 Gregorian chant notation roughly since the 9th century to denote
 A ligature is a coherent graphical symbol that represents at least two
 distinct notes.  Ligatures originally appeared in the manuscripts of
 Gregorian chant notation roughly since the 9th century to denote


@@ -2941,7 +2955,7 @@ Note value: double length of @aref{breve}.
 @node lyrics
 @section lyrics
 
 @node lyrics
 @section lyrics
 

-ES: .,
+ES: letra (de la canción),

 I: .,
 F: .,
 D: Liedtext,
 I: .,
 F: .,
 D: Liedtext,


@@ -2981,6 +2995,7 @@ FI: duuri.
 @node meantone temperament
 @section meantone temperament
 
 @node meantone temperament
 @section meantone temperament
 

+ES: afinación mesotónica,

 I: accordatura mesotonica,
 F: tempérament mésotonique,
 D: mitteltönige Stimmung,
 I: accordatura mesotonica,
 F: tempérament mésotonique,
 D: mitteltönige Stimmung,


@@ -3032,7 +3047,8 @@ harmony}, @aref{relative key}.
 @node melisma
 @section melisma
 
 @node melisma
 @section melisma
 

-NL: melisma, 
+ES: melisma,
+NL: melisma,

 FI: melisma, laulettavan tavun sävelkuvio.
 
 A melisma (plural: melismata) is a group of notes or tones sung on one
 FI: melisma, laulettavan tavun sävelkuvio.
 
 A melisma (plural: melismata) is a group of notes or tones sung on one


@@ -3120,7 +3136,7 @@ M.M.@: (Mälzels Metronom).
 @node mezzo-soprano
 @section mezzo-soprano
 
 @node mezzo-soprano
 @section mezzo-soprano
 

-ES: mezzo soprano,
+ES: mezzosoprano,

 I: mezzo-soprano,
 F: mezzo-soprano,
 D: Mezzosopran,
 I: mezzo-soprano,
 F: mezzo-soprano,
 D: Mezzosopran,


@@ -3173,7 +3189,7 @@ FI: molli.
 @node minor interval
 @section minor interval
 
 @node minor interval
 @section minor interval
 

-ES: intervalo mayor,
+ES: intervalo menor,

 I: intervallo minore,
 F: intervalle mineur,
 D: kleines Intervall,
 I: intervallo minore,
 F: intervalle mineur,
 D: kleines Intervall,


@@ -3236,7 +3252,7 @@ FI: mordent, korukuvio.
 @node motive
 @section motive
 
 @node motive
 @section motive
 

-ES: tema,
+ES: motivo,

 I: inciso,
 F: incise,
 D: Motiv,
 I: inciso,
 F: incise,
 D: Motiv,


@@ -3360,7 +3376,7 @@ and hears a tone.
 @node note head
 @section note head
 
 @node note head
 @section note head
 

-ES: oval,
+ES: cabeza,

 I: testa, testina, capocchia,
 F: t@^ete de la note,
 D: Notenkopf,
 I: testa, testina, capocchia,
 F: t@^ete de la note,
 D: Notenkopf,


@@ -3379,7 +3395,7 @@ instrument.
 @node note value
 @section note value
 
 @node note value
 @section note value
 

-ES: valor,
+ES: valor (duración),

 I: valore, durata,
 F: durée, valeur (d'une note),
 D: Notenwert,
 I: valore, durata,
 F: durée, valeur (d'une note),
 D: Notenwert,


@@ -3389,7 +3405,8 @@ S: notvärde,
 FI: nuotin aika-arvo.
 
 Note values (durations) are measured as fractions, normally 1/2, of the next
 FI: nuotin aika-arvo.
 
 Note values (durations) are measured as fractions, normally 1/2, of the next

-higher note value.  The longest duration normally used is called @emph{brevis},
+higher note value.  The longest duration normally used is called
+@emph{brevis},

 but sometimes (mostly in pre-baroque music) the double length note value
 @emph{longa} is used.
 
 but sometimes (mostly in pre-baroque music) the double length note value
 @emph{longa} is used.
 


@@ -3501,7 +3518,8 @@ the upper note is played first.
 >>
 @end lilypond
 
 >>
 @end lilypond
 

-Other frequently used ornaments are the @emph{turn}, the @emph{mordent}, and the
+Other frequently used ornaments are the @emph{turn}, the @emph{mordent}, and
+the

 @emph{prall} (inverted mordent).
 
 @lilypond[fragment,line-width=13.0\cm]
 @emph{prall} (inverted mordent).
 
 @lilypond[fragment,line-width=13.0\cm]


@@ -3701,7 +3719,7 @@ denotes the highest possible degree of speed.
 @node Pythagorean comma
 @section Pythagorean comma
 
 @node Pythagorean comma
 @section Pythagorean comma
 

-ES: coma pitagórico,
+ES: coma pitagórica,

 I: comma pitagorico,
 F: comma pythagoricien,
 D: Pythagoräisches Komma,
 I: comma pitagorico,
 F: comma pythagoricien,
 D: Pythagoräisches Komma,


@@ -3763,7 +3781,7 @@ FI: neljännesosatauko.
 @node quintuplet
 @section quintuplet
 
 @node quintuplet
 @section quintuplet
 

-ES: quintillo,
+ES: cinquillo,

 I: quintina,
 F: quintolet,
 D: Quintole,
 I: quintina,
 F: quintolet,
 D: Quintole,


@@ -3791,7 +3809,7 @@ Abbreviation "rall.".  @aref{ritardando}.
 @node relative key
 @section relative key
 
 @node relative key
 @section relative key
 

-ES: relativa,
+ES: relativo,

 I: tonalità relativa,
 F: tonalité relative,
 D: Paralleltonart,
 I: tonalità relativa,
 F: tonalité relative,
 D: Paralleltonart,


@@ -3825,7 +3843,7 @@ with the same @aref{key signature}.
 @node repeat
 @section repeat
 
 @node repeat
 @section repeat
 

-ES: barra de repetición,
+ES: repetición,

 I: ritornello,
 F: barre de reprise,
 D: Wiederholung,
 I: ritornello,
 F: barre de reprise,
 D: Wiederholung,


@@ -3883,7 +3901,7 @@ no common metrical unit (beat).
 @node ritardando
 @section ritardando
 
 @node ritardando
 @section ritardando
 

-ES: retardando,
+ES: ritardando,

 I: ritardando,
 F: ritardando,
 D: Ritardando, langsamer werden,
 I: ritardando,
 F: ritardando,
 D: Ritardando, langsamer werden,


@@ -3925,7 +3943,7 @@ FI: asteikko, sävelasteikko.
 @node scale degree
 @section scale degree
 
 @node scale degree
 @section scale degree
 

-ES: grados de la escala,
+ES: grado (de la escala),

 I: grado della scala,
 F: degré [de la gamme],
 D: Tonleiterstufe,
 I: grado della scala,
 F: degré [de la gamme],
 D: Tonleiterstufe,


@@ -3940,16 +3958,15 @@ sub@-do@-mi@-nant (S) and V = dominant (D).
 
 @lilypond[fragment,notime,line-width=13.0\cm]
 \set Score.automaticBars = ##f
 
 @lilypond[fragment,notime,line-width=13.0\cm]
 \set Score.automaticBars = ##f

-%\override Score.LyricText #'font-style = #'large
-%\set minVerticalAlign = #8
-\oldaddlyrics
+<<

 \context Staff \relative c' {
   c1 d e f g a b c
 }
 \context Staff \relative c' {
   c1 d e f g a b c
 }

-\context Lyrics \lyrics {
+ \lyrics {

   << { I II III IV V VI VII I }
   << { I II III IV V VI VII I }

-    { T "" "" S D } >>
+     { T "" ""  S  D } >>

 }
 }

+>>

 @end lilypond
 
 @aref{functional harmony}.
 @end lilypond
 
 @aref{functional harmony}.


@@ -4032,6 +4049,7 @@ FI: septimi.
 @node sextuplet
 @section sextuplet
 
 @node sextuplet
 @section sextuplet
 

+ES: seisillo,

 I: sestina,
 F: sextolet,
 D: Sextole,
 I: sestina,
 F: sextolet,
 D: Sextole,


@@ -4084,7 +4102,7 @@ FI: kuudestoistaosanuotti.
 @node sixteenth rest
 @section sixteenth rest
 
 @node sixteenth rest
 @section sixteenth rest
 

-ES: silencia de semicorchea,
+ES: silencio de semicorchea,

 I: pausa di semicroma,
 F: quart de soupir,
 UK: semiquaver rest,
 I: pausa di semicroma,
 F: quart de soupir,
 UK: semiquaver rest,


@@ -4128,7 +4146,7 @@ FI: kuudeskymmenesneljäsosanuotti.
 @node sixty-fourth rest
 @section sixty-fourth rest
 
 @node sixty-fourth rest
 @section sixty-fourth rest
 

-ES: silencia de semifusa,
+ES: silencio de semifusa,

 I: pausa di semibiscroma,
 F: seizième de soupir,
 UK: hemidemisemiquaver rest,
 I: pausa di semibiscroma,
 F: seizième de soupir,
 UK: hemidemisemiquaver rest,


@@ -4143,7 +4161,7 @@ FI: kuudeskymmenesneljäsosatauko.
 @node slur
 @section slur
 
 @node slur
 @section slur
 

-ES: ligadura,
+ES: ligadura (de expresión),

 I: legatura (di portamento or espressiva),
 F: liaison, coulé,
 D: Bogen, Legatobogen, Phrasierungsbogen,
 I: legatura (di portamento or espressiva),
 F: liaison, coulé,
 D: Bogen, Legatobogen, Phrasierungsbogen,


@@ -4159,6 +4177,7 @@ breath in singing.
 @node solmization
 @section solmization
 
 @node solmization
 @section solmization
 

+ES: solmisación,

 I: solmisazione,
 F: solmisation,
 D: Solmisation,
 I: solmisazione,
 F: solmisation,
 D: Solmisation,


@@ -4235,7 +4254,7 @@ The highest female voice.
 @node staccato
 @section staccato
 
 @node staccato
 @section staccato
 

-ES: staccato,
+ES: picado,

 I: staccato,
 F: staccato, piqué, détaché,
 D: Staccato,
 I: staccato,
 F: staccato, piqué, détaché,
 D: Staccato,


@@ -4353,7 +4372,7 @@ The fourth @aref{scale degree}.  @aref{functional harmony}.
 @node submediant
 @section submediant
 
 @node submediant
 @section submediant
 

-ES: superdominante,
+ES: submediante,

 I: sopratonica,
 F: sous-médiante,
 D: Submediante,
 I: sopratonica,
 F: sous-médiante,
 D: Submediante,


@@ -4367,7 +4386,7 @@ The sixth @aref{scale degree}.
 @node subtonic
 @section subtonic
 
 @node subtonic
 @section subtonic
 

-ES: sensible,
+ES: subtónica,

 I: sottotonica,
 F: sous-tonique,
 D: Subtonika,
 I: sottotonica,
 F: sous-tonique,
 D: Subtonika,


@@ -4423,7 +4442,7 @@ A symphony may be defined as a @aref{sonata} for orchestra.
 @node syncopation
 @section syncopation
 
 @node syncopation
 @section syncopation
 

-ES: sincopado,
+ES: síncopa,

 I: sincope,
 F: syncope,
 D: Synkope,
 I: sincope,
 F: syncope,
 D: Synkope,


@@ -4451,13 +4470,15 @@ the underlaying (normal) pulse and the actual (abnormal) rhythm.
 @node syntonic comma
 @section syntonic comma
 
 @node syntonic comma
 @section syntonic comma
 

+ES: coma sintónica,

 I: comma sintonico (o didimico),
 F: comma syntonique,
 D: syntonisches Komma,
 NL: syntonische komma,
 DK: syntonisk komma,
 S: syntoniskt komma,
 I: comma sintonico (o didimico),
 F: comma syntonique,
 D: syntonisches Komma,
 NL: syntonische komma,
 DK: syntonisk komma,
 S: syntoniskt komma,

-FI: syntoninen komma, terssien taajuusero luonnollisessa ja Pytagorisessa viritysjärjestelmässä.
+FI: syntoninen komma, terssien taajuusero luonnollisessa ja Pytagorisessa
+viritysjärjestelmässä.

 
 Difference between the natural third and the third obtained by Pythagorean
 tuning (@aref{Pythagorean comma}), equal to 22@w{ }cents.
 
 Difference between the natural third and the third obtained by Pythagorean
 tuning (@aref{Pythagorean comma}), equal to 22@w{ }cents.


@@ -4465,6 +4486,7 @@ tuning (@aref{Pythagorean comma}), equal to 22@w{ }cents.
 @node system
 @section system
 
 @node system
 @section system
 

+ES: sistema,

 I: accollatura,
 F: système,
 D: Notensystem,
 I: accollatura,
 F: système,
 D: Notensystem,


@@ -4539,7 +4561,7 @@ FI: desimi.
 @node tenuto
 @section tenuto
 
 @node tenuto
 @section tenuto
 

-ES: tenuto,
+ES: subrayado (tenuto),

 I: tenuto,
 F: tenue, tenuto,
 D: gehalten, tenuo,
 I: tenuto,
 F: tenue, tenuto,
 D: gehalten, tenuo,


@@ -4625,17 +4647,14 @@ with figures designating the chief @aref{interval}s and
         < bes g >8 as < as f > g < g es > f < d f > es | < g es >4 }
     >>
   }
         < bes g >8 as < as f > g < g es > f < d f > es | < g es >4 }
     >>
   }

-  \oldaddlyrics
+  <<

     \context Staff = rh \relative c' {
     \clef bass
     \key es \major
     es8 c d bes c as bes16 as g f | es4
     \context Staff = rh \relative c' {
     \clef bass
     \key es \major
     es8 c d bes c as bes16 as g f | es4

-  }
-  \context Lyrics \lyrics {
-    \override Lyrics .VerticalAlign #'threshold = #'(6 . 12)
-    << { "" "6" "" "4" "" "6" "" "" "6" "4" }
-      { "" "" "" "2" "" "" "" "" "" "2" } >>
-  }
+    }
+    \figures { s8 <6> s <4 2> s <6> s16 s <6> <4 2>  }
+  >>

 >>
 @end lilypond
 
 >>
 @end lilypond
 


@@ -4668,7 +4687,7 @@ uniting them into a single sound (tone) equal to the combined durations.
 @node time signature
 @section time signature
 
 @node time signature
 @section time signature
 

-ES: cifra indicadora de compás,
+ES: indicación de compás,

 I: segni di tempo,
 F: chiffrage (chiffres indicateurs), signe de valeur,
 D: Taktangabe, Angabe der Taktart,
 I: segni di tempo,
 F: chiffrage (chiffres indicateurs), signe de valeur,
 D: Taktangabe, Angabe der Taktart,


@@ -4682,7 +4701,7 @@ FI: tahtiosoitus.
 @node tone
 @section tone
 
 @node tone
 @section tone
 

-ES: sonido,
+ES: tono,

 I: suono,
 F: ton,
 D: Ton,
 I: suono,
 F: ton,
 D: Ton,


@@ -4698,7 +4717,7 @@ Music from the 20th century may be based on atonal sounds.
 @node tonic
 @section tonic
 
 @node tonic
 @section tonic
 

-ES: tonica,
+ES: tónica,

 I: tonica,
 F: tonique,
 D: Tonika,
 I: tonica,
 F: tonique,
 D: Tonika,


@@ -4713,7 +4732,7 @@ The first @aref{scale degree}.
 @node transposition
 @section transposition
 
 @node transposition
 @section transposition
 

-ES: transposición,
+ES: transporte,

 I: trasposizione,
 F: transposition,
 D: Transposition,
 I: trasposizione,
 F: transposition,
 D: Transposition,


@@ -4762,7 +4781,7 @@ FI: diskanttiavain.
 @node tremolo
 @section tremolo
 
 @node tremolo
 @section tremolo
 

-ES: tremolo,
+ES: trémolo,

 I: tremolo,
 F: trémolo,
 D: Tremolo,
 I: tremolo,
 F: trémolo,
 D: Tremolo,


@@ -4818,7 +4837,7 @@ FI: trilli.
 @node triple meter
 @section triple meter
 
 @node triple meter
 @section triple meter
 

-ES: compás compuesto,
+ES: compás ternario,

 I: tempo ternario,
 F: mesure ternaire,
 D: in drei,
 I: tempo ternario,
 F: mesure ternaire,
 D: in drei,


@@ -4846,7 +4865,7 @@ FI: trioli.
 @node tritone
 @section tritone
 
 @node tritone
 @section tritone
 

-ES: trítono,
+ES: tritono,

 I: tritono,
 F: triton,
 D: Tritonus,
 I: tritono,
 F: triton,
 D: Tritonus,


@@ -4870,12 +4889,13 @@ S: stämgaffel,
 FI: viritysavain.
 
 A two-pronged piece of steel used to indicate absolute pitch.  Tuning forks
 FI: viritysavain.
 
 A two-pronged piece of steel used to indicate absolute pitch.  Tuning forks

-give the international pitch for the tone @emph{a} (440 vibrations per second).
+give the international pitch for the tone @emph{a} (440 vibrations per
+second).

 
 @node turn
 @section turn
 
 
 @node turn
 @section turn
 

-ES: grupo,
+ES: grupeto,

 I: gruppetto,
 F: grupetto,
 D: Doppelschlag,
 I: gruppetto,
 F: grupetto,
 D: Doppelschlag,


@@ -4905,7 +4925,7 @@ different octave.
 @node upbeat
 @section upbeat
 
 @node upbeat
 @section upbeat
 

-ES: entrada anacrúsica,
+ES: anacrusa,

 I: anacrusi,
 F: anacrouse, levée,
 D: Auftakt,
 I: anacrusi,
 F: anacrouse, levée,
 D: Auftakt,


@@ -4988,7 +5008,7 @@ FI: kokotauko.
 @node whole tone
 @section whole tone
 
 @node whole tone
 @section whole tone
 

-ES: tono,
+ES: tono (entero),

 I: tono intero,
 F: ton entier,
 D: Ganzton,
 I: tono intero,
 F: ton entier,
 D: Ganzton,


@@ -5029,7 +5049,7 @@ symphony orchestra are flute, oboe, clarinet, saxophone, and bassoon.
 @item
   @tab @strong{UK}
   @tab @strong{I}
 @item
   @tab @strong{UK}
   @tab @strong{I}

-  @tab @strong{F}
+  @tab @strong{F (note name / rest name)}

 @item
   @tab @strong{D}
   @tab @strong{NL}
 @item
   @tab @strong{D}
   @tab @strong{NL}


@@ -5059,7 +5079,7 @@ symphony orchestra are flute, oboe, clarinet, saxophone, and bassoon.
 @item @strong{breve}
   @tab breve
   @tab breve
 @item @strong{breve}
   @tab breve
   @tab breve

-  @tab brève
+  @tab brève / double-pause

 @item
   @tab Brevis
   @tab brevis
 @item
   @tab Brevis
   @tab brevis


@@ -5067,14 +5087,14 @@ symphony orchestra are flute, oboe, clarinet, saxophone, and bassoon.
 @item
   @tab brevis
   @tab brevis
 @item
   @tab brevis
   @tab brevis

-  @tab breve
+  @tab cuadrada

 
 @item
 
 @item @strong{whole}
   @tab semi@-breve
   @tab semi@-breve
 
 @item
 
 @item @strong{whole}
   @tab semi@-breve
   @tab semi@-breve

-  @tab ronde
+  @tab ronde / pause

 @item
   @tab Ganze
   @tab hele
 @item
   @tab Ganze
   @tab hele


@@ -5089,7 +5109,7 @@ symphony orchestra are flute, oboe, clarinet, saxophone, and bassoon.
 @item @strong{half}
   @tab minim
   @tab minima
 @item @strong{half}
   @tab minim
   @tab minima

-  @tab blanche
+  @tab blanche / demi-pause

 @item
   @tab Halbe
   @tab halve
 @item
   @tab Halbe
   @tab halve


@@ -5104,7 +5124,7 @@ symphony orchestra are flute, oboe, clarinet, saxophone, and bassoon.
 @item @strong{quarter}
   @tab crotchet
   @tab semiminima
 @item @strong{quarter}
   @tab crotchet
   @tab semiminima

-  @tab noire
+  @tab noire / soupir

 @item
   @tab Viertel
   @tab kwart
 @item
   @tab Viertel
   @tab kwart


@@ -5119,7 +5139,7 @@ symphony orchestra are flute, oboe, clarinet, saxophone, and bassoon.
 @item @strong{eighth}
   @tab quaver
   @tab croma
 @item @strong{eighth}
   @tab quaver
   @tab croma

-  @tab croche
+  @tab croche / demi-soupir

 @item
   @tab Achtel
   @tab achtste
 @item
   @tab Achtel
   @tab achtste


@@ -5134,7 +5154,7 @@ symphony orchestra are flute, oboe, clarinet, saxophone, and bassoon.
 @item @strong{sixteenth}
   @tab semiquaver
   @tab semicroma
 @item @strong{sixteenth}
   @tab semiquaver
   @tab semicroma

-  @tab double croche
+  @tab double croche / quart de soupir

 @item
   @tab Sechzehntel
   @tab zestiende
 @item
   @tab Sechzehntel
   @tab zestiende


@@ -5149,7 +5169,7 @@ symphony orchestra are flute, oboe, clarinet, saxophone, and bassoon.
 @item @strong{thirty-second}
   @tab demisemiquaver
   @tab biscroma
 @item @strong{thirty-second}
   @tab demisemiquaver
   @tab biscroma

-  @tab triple croche
+  @tab triple croche / huitième de soupir

 @item
   @tab Zweiunddreissigstel
   @tab tweeendertigste
 @item
   @tab Zweiunddreissigstel
   @tab tweeendertigste


@@ -5164,7 +5184,7 @@ symphony orchestra are flute, oboe, clarinet, saxophone, and bassoon.
 @item @strong{sixty-fourth}
   @tab hemidemisemiquaver
   @tab semibiscroma
 @item @strong{sixty-fourth}
   @tab hemidemisemiquaver
   @tab semibiscroma

-  @tab quadruple croche
+  @tab quadruple croche / seizième de soupir

 @item
   @tab Vierundsechzigstel
   @tab vierenzestigste
 @item
   @tab Vierundsechzigstel
   @tab vierenzestigste


@@ -5187,8 +5207,8 @@ symphony orchestra are flute, oboe, clarinet, saxophone, and bassoon.
 @c @multitable @columnfractions .105 .145 .125 .125 .125 .125 .125 .125
 @multitable @columnfractions .11 .14 .14 .11 .1 .1 .1 .1 .1
 
 @c @multitable @columnfractions .105 .145 .125 .125 .125 .125 .125 .125
 @multitable @columnfractions .11 .14 .14 .11 .1 .1 .1 .1 .1
 

-@item @tab @strong{ES} @tab @strong{I} @tab @strong{F} @tab @strong{D} 
-@tab @strong{NL} @tab @strong{DK} @tab @strong{S} @tab @strong{FI} 
+@item @tab @strong{ES} @tab @strong{I} @tab @strong{F} @tab @strong{D}
+@tab @strong{NL} @tab @strong{DK} @tab @strong{S} @tab @strong{FI}

 
 @item
 
 
 @item
 


@@ -5196,12 +5216,14 @@ symphony orchestra are flute, oboe, clarinet, saxophone, and bassoon.
 
 @item
 
 
 @item
 

-@item @strong{c-sharp} @tab do diesis  @tab do diesis  @tab ut dièse @tab Cis @tab cis @tab
+@item @strong{c-sharp} @tab do sostenido  @tab do diesis  @tab ut dièse @tab
+Cis @tab cis @tab

 cis @tab cis @tab cis
 
 @item
 
 cis @tab cis @tab cis
 
 @item
 

-@item @strong{d-flat} @tab re bemolle  @tab re bemolle  @tab ré bémol @tab Des @tab des @tab
+@item @strong{d-flat} @tab re bemol  @tab re bemolle  @tab ré bémol @tab
+Des @tab des @tab

 des @tab des @tab des
 
 @item
 des @tab des @tab des
 
 @item


@@ -5218,11 +5240,13 @@ des @tab des @tab des
 
 @item
 
 
 @item
 

-@item @strong{g} @tab sol  @tab sol  @tab sol @tab G @tab g @tab g @tab g @tab g
+@item @strong{g} @tab sol  @tab sol  @tab sol @tab G @tab g @tab g @tab g
+@tab g

 
 @item
 
 
 @item
 

-@item @strong{a-flat} @tab la bemol  @tab la bemolle  @tab la bémol @tab As @tab as @tab as
+@item @strong{a-flat} @tab la bemol  @tab la bemolle  @tab la bémol @tab As
+@tab as @tab as

 @tab as @tab as
 
 @item
 @tab as @tab as
 
 @item


@@ -5231,12 +5255,14 @@ des @tab des @tab des
 
 @item
 
 
 @item
 

-@item @strong{a-sharp} @tab la sostenido  @tab la diesis  @tab la dièse @tab Ais @tab ais @tab
+@item @strong{a-sharp} @tab la sostenido  @tab la diesis  @tab la dièse @tab
+Ais @tab ais @tab

 ais @tab ais @tab ais
 
 @item
 
 ais @tab ais @tab ais
 
 @item
 

-@item @strong{b-flat} @tab si bemol  @tab si bemolle  @tab si bémol @tab B @tab bes @tab b
+@item @strong{b-flat} @tab si bemol  @tab si bemolle  @tab si bémol @tab B
+@tab bes @tab b

 @tab b @tab b
 
 @item
 @tab b @tab b
 
 @item