Merge branch 'master' of /home/jcharles/GIT/Lily/. into translation

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

diff --git a/Documentation/music-glossary.tely b/Documentation/music-glossary.tely
index 115e75784a10c330e7ac1733c1a15728bcfc8db1..f772b3df2317bbef9e95de3b5eefafbed3ae94be 100644 (file)
--- a/Documentation/music-glossary.tely
+++ b/Documentation/music-glossary.tely
@@ -12,9 +12,14 @@ terms used in the documentation manuals for LilyPond version
 @version{}.
 @end macro
 
-@c `Music Glossary' was born 1999-10-04 with git commit 280a0bb...
+@c `Music Glossary' was born 1999-10-04 with this commit:
+@c lilypond-1.2.12
+@c author: fred
+@c commit: be4e46f61b1a8dec0922e0fd849c626beb6ab9be
+@c   file: Documentation/user/glossary.texi
+
 @macro copyrightDeclare
-Copyright @copyright{} 1999--2012 by the authors
+Copyright @copyright{} 1999--2014 by the authors
 @end macro
 
 @set FDL
@@ -598,7 +603,7 @@ An accidental alters a note by:
     \context {
       \Score
       \override SpacingSpanner
-        #'base-shortest-duration = #(ly:make-moment 1 32)
+        #'base-shortest-duration = #(ly:make-moment 1/32)
     }
   }
 }
@@ -683,7 +688,7 @@ Since one does not crescendo @emph{to} nothing, it is not correct to use
 @section alla breve
 
 ES: alla breve,
-I: ?,
+I: alla breve,
 F: alla breve, à la brève,
 D: Allabreve, alla breve
 NL: ?,
@@ -1782,7 +1787,7 @@ the top line high F:
     \context {
       \Score
       \override SpacingSpanner
-        #'base-shortest-duration = #(ly:make-moment 1 1)
+        #'base-shortest-duration = #(ly:make-moment 1/1)
       \override  NonMusicalPaperColumn
         #'line-break-system-details = #'((alignment-distances . (3 3)))
       \override BarLine #'stencil = ##f
@@ -1843,7 +1848,7 @@ have been selected:
     \context {
       \Score
       \override SpacingSpanner
-        #'base-shortest-duration = #(ly:make-moment 2 1)
+        #'base-shortest-duration = #(ly:make-moment 2/1)
       \override  NonMusicalPaperColumn
         #'line-break-system-details = #'((alignment-distances . (3 3)))
       \override BarLine #'stencil = ##f
@@ -1906,7 +1911,7 @@ shown below, where the notes show an arpeggio on a C major chord.
     \context {
       \Score
       \override SpacingSpanner #'base-shortest-duration =
-        #(ly:make-moment 2 1)
+        #(ly:make-moment 2/1)
       \override  NonMusicalPaperColumn
         #'line-break-system-details = #'((alignment-distances . (3 3)))
       \override BarLine #'stencil = ##f
@@ -1998,7 +2003,7 @@ Another name for @ref{common time}.
 @section Common Practice Period
 
 ES: ?,
-I: ?,
+I: Periodo di pratica comune,
 F: ?,
 D: Kunstmusik,
 NL: ?,
@@ -2089,7 +2094,7 @@ A meter that includes a triplet subdivision within the beat, such as
 @section compound time
 
 ES: compás compuesto, compás de amalgama (def. 2),
-I: ?,
+I: tempo misto,
 F: temps composé,
 D: zusammengesetzte Taktart,
 NL: ?,
@@ -2865,7 +2870,7 @@ FI: dissonanssi, dissonoiva intervalli, riitasointi.
 @section divisio
 
 ES: división,
-I: ?,
+I: divisio,
 F: ?,
 D: Divisio,
 NL: ?,
@@ -2900,7 +2905,7 @@ No cross-references.
 @section doit
 
 ES: elevación [de tono],
-I: ?,
+I: portamento indeterminato verso l'alto/l'acuto,
 F: saut,
 D: Glissando zu unbestimmter Tonhöhe,
 NL: ?,
@@ -2908,7 +2913,7 @@ DK: ?,
 S: ?,
 FI: nousu.
 
-Indicator for a indeterminately rising pitch bend.  Compare with
+Indicator for an indeterminately rising pitch bend.  Compare with
 @emph{glissando}, which has determinate starting and ending pitches.
 
 @seealso
@@ -3099,7 +3104,7 @@ FI: kaksoisylennysmerkki.
 @section double time signature
 
 ES: compás polimétrico,
-I: ?,
+I: indicazione di tempo doppia/polimetrica,
 F: ?,
 D: zusammengesetzte Taktart,
 NL: ?,
@@ -3519,7 +3524,7 @@ Double Bass).
 @section fall
 
 ES: caída [de tono],
-I: ?,
+I: portamento indeterminato verso il basso/il grave,
 F: chute,
 D: Glissando zu unbestimmter Tonhöhe nach unten,
 NL: ?,
@@ -3527,7 +3532,7 @@ DK: ?,
 S: ?,
 FI: lasku.
 
-Indicator for a indeterminately falling pitch bend.  Compare with
+Indicator for an indeterminately falling pitch bend.  Compare with
 @emph{glissando}, which has determinate starting and ending pitches.
 
 @seealso
@@ -3538,7 +3543,7 @@ Indicator for a indeterminately falling pitch bend.  Compare with
 @section feathered beam
 
 ES: barra progresiva,
-I: ?,
+I: travatura convergente/divergente,
 F: ligature en soufflet, lien de croches en soufflet,
 D: gespreizter Balken,
 NL: ?,
@@ -3618,8 +3623,7 @@ played above the bass notes.
 @lilypond[quote,line-width=13.0\cm]
 \new GrandStaff <<
   \new Staff = "rh" \with {
-    fontSize = #-3
-    \override StaffSymbol #'staff-space = #(magstep -3)
+    \magnifyStaff #2/3
   } \relative c'' {
     \clef treble
     \key es \major
@@ -3702,7 +3706,7 @@ g64-"64th" s8
 @section flageolet
 
 ES: armónico,
-I: ?,
+I: armonico,
 F: flageolet,
 D: Flageolett,
 NL: ?,
@@ -3795,7 +3799,7 @@ FI: kvartti.
 @section Frenched score
 
 ES: partitura a la francesa,
-I: ?,
+I: partitura senza i righi vuoti,
 F: ?,
 D: Orchesterpartitur ohne leere Systeme,
 NL: ?,
@@ -3820,7 +3824,7 @@ you may wish to procure a copy of their style manual.
 @section Frenched staff
 
 ES: pentagrama a la francesa,
-I: ?,
+I: rigo temporaneo,
 F: ?,
 D: zeitweiliges Notensystem,
 NL: ?,
@@ -3956,7 +3960,7 @@ part in modern choral scores).
 @lilypond[quote,notime]
 \relative c'' {
   \override Staff.Clef #'full-size-change = ##t
-    \set Score.proportionalNotationDuration = #(ly:make-moment 1 8)
+    \set Score.proportionalNotationDuration = #(ly:make-moment 1/8)
     \clef french
     g1
     \clef treble
@@ -4319,7 +4323,7 @@ the same rhythm (more or less).  In contrast to @emph{polyphony}.
 @section hymn meter
 
 ES: ?,
-I: ?,
+I: metrica dell'inno,
 F: ?,
 D: Silbenanzahl,
 NL: ?,
@@ -4360,7 +4364,7 @@ No cross-references.
 @section incomplete dominant seventh chord
 
 ES: ?,
-I: ?,
+I: accordo di settima dominante incompleto,
 F: ?,
 D: verkürzter Dominantseptakkord,
 NL: ?,
@@ -4416,7 +4420,7 @@ The addition of such two intervals forms an octave.
 % Fifth
   < g des' >^"dim"
   < g d' >^"per"
-  < g dis >^"aug"
+  < g dis' >^"aug"
 % Sixth
   < gis es' >^"dim"
   < g! es' >^"min"
@@ -4714,7 +4718,7 @@ notes, unlike (b) @notation{leggiero} or @notation{non-legato}, (c)
 @section ligature
 
 ES: ligadura,
-I: ?,
+I: ligatura,
 F: ligature,
 DE: Ligatur,
 NL: ?,
@@ -4837,7 +4841,7 @@ g\longa g\breve
 @section lyric tie
 
 ES: ligadura de letra,
-I: ?,
+I: legatura del testo,
 F: ligature de mots,
 D: Textbindung,
 NL: ?,
@@ -5096,7 +5100,7 @@ TODO: add to definition (including summary info on proportional notation)
 @c TODO: add languages
 
 ES: signo de mensuración,
-I: ?,
+I: indicazione mensurale,
 F: signe de mensuration,
 D: Mensurzeichen,
 NL: ?,
@@ -5702,7 +5706,7 @@ FI: palautusmerkki.
 @c TODO: add definition.
 
 ES: tonos vecinos,
-I: ?,
+I: nota di volta,
 F: tons voisins,
 D: ?,
 NL: ?,
@@ -5853,17 +5857,17 @@ dotted notes are also frequently used.
 @lilypond[quote,line-width=13.0\cm]
 \relative c'' {
   \time 4/4
-  \times 2/3 {g8_"triplets" g g} g4 g8 g g4 \bar "||"
-  \times 2/5 {g8_"quintuplets" g g g g} g4 g8 g g4 \bar "||"
+  \tuplet 3/2 {g8_"triplets" g g} g4 g8 g g4 \bar "||"
+  \tuplet 5/2 {g8_"quintuplets" g g g g} g4 g8 g g4 \bar "||"
 }
 @end lilypond
 
 @lilypond[quote,line-width=13.0\cm]
 \relative c'' {
   \time 3/4
-  \times 3/2 {g4_"duplets" g} |
+  \tuplet 2/3 {g4_"duplets" g} |
   g4 g g \bar "||"
-  \times 6/4 {g8_"quadruplets" g g g} |
+  \tuplet 4/6 {g8_"quadruplets" g g g} |
   g8 g g g g4 \bar "||"
 }
 @end lilypond
@@ -6014,7 +6018,7 @@ the upper note is played first.
   }
   \relative c'' {
     c2. c32 b c b c b c b | c1
-    c2. b32 c b c \times 4/5 { b c b c b } | c1
+    c2. b32 c b c \tuplet 5/4 { b c b c b } | c1
   }
 >>
 @end lilypond
@@ -7110,7 +7114,7 @@ TODO: Where else could I refer the reader?
 @section simple meter
 
 ES: compás simple, compás de subdivisión binaria,
-I: ?,
+I: tempo semplice,
 F: mesure binaire,
 D: grader Takt,
 NL: ?,
@@ -8170,7 +8174,7 @@ standard.  Tuning forks for other pitches are available.
 
 ES: grupo de valoración especial,
 I: gruppi irregolari,
-F: ?,
+F: N-olet,
 D: N-tole,
 NL: Antimetrische figuur,
 DK: ?,