X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Documentation%2Fmusic-glossary.tely;h=4b80b3cc1f6da919560828ef1289fc4310ec3166;hb=HEAD;hp=a58b49971ba2a011a8dfab4e5d458edab486fa0a;hpb=40aac0ae57ee113faa860ba221d83d9e6312173e;p=lilypond.git

diff --git a/Documentation/music-glossary.tely b/Documentation/music-glossary.tely
index a58b49971b..4b80b3cc1f 100644
--- 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--2014 by the authors
+Copyright @copyright{} 1999--2015 by the authors
 @end macro
 
 @set FDL
@@ -245,6 +250,7 @@ Languages in this order.
 * harmonics::
 * harmony::
 * hemiola::
+* high bass clef::
 * homophony::
 * hook::
 * hymn meter::
@@ -529,7 +535,7 @@ No cross-references.
 
 ES: mordente de una nota,
 I: acciaccatura,
-F: acciaccatura, appoggiature brève,
+F: acciaccature, appoggiature brève,
 D: Zusammenschlag,
 NL: samenslag,
 DK: ?,
@@ -1073,7 +1079,7 @@ FI: ylinouseva intervalli.
 
 ES: manuscrito,
 I: autografo,
-F: manuscrit, autographe
+F: manuscrit, autographe,
 D: Autograph, Handschrift,
 NL: manuscript,
 DK: håndskrift, autograf,
@@ -1225,7 +1231,8 @@ FI: bassoavain.
 A clef setting with middle C on the first top ledger line.
 
 @seealso
-@ref{F clef}.
+@ref{F clef},
+@ref{high bass clef}.
 
 
 @node beam
@@ -1259,7 +1266,7 @@ g64-"1/64"[ s32 g64 s32 g64 s32 g64] s32
 
 ES: tiempo, parte (de compás)
 I: tempi,
-F: temps,
+F: temps, battue
 D: Takt, Taktschlag, Zeit (im Takt),
 NL: tel,
 DK: (takt)slag,
@@ -1999,7 +2006,7 @@ Another name for @ref{common time}.
 
 ES: ?,
 I: Periodo di pratica comune,
-F: ?,
+F: musique classique moderne,
 D: Kunstmusik,
 NL: ?,
 DK: ?,
@@ -2219,7 +2226,7 @@ g4 g g a | b2 a | g4 b a a | g1 \bar "||"
 
 ES: consonancia,
 I: consonanza,
-F: consonance,
+F: consonance, consonnance,
 D: Konsonanz,
 NL: consonant,
 DK: konsonans,
@@ -2367,7 +2374,7 @@ g4\< a b c | d1\! \bar "|."
 
 ES: notas guía,
 I: notine,
-F: petites notes précédant l'entrée d'un instrument, réplique, @q{à défaut},
+F: petites notes précédant l'entrée d'un instrument, réplique, « à défaut »,
 D: Stichnoten,
 NL: stichnoten,
 DK: stiknoder,
@@ -2797,7 +2804,7 @@ This is a stub for diminution (@emph{wrt} mensural notation).
 
 ES: directo,
 I: ?,
-F: ?,
+F: direct,
 D: Weiser, Zeiger,
 NL: ?,
 DK: ?,
@@ -2866,7 +2873,7 @@ FI: dissonanssi, dissonoiva intervalli, riitasointi.
 
 ES: división,
 I: divisio,
-F: ?,
+F: division,
 D: Divisio,
 NL: ?,
 DK: ?,
@@ -3023,7 +3030,7 @@ D: doppelter Vorschlag,
 NL: dubbele voorslag,
 DK: dobbelt forslag,
 S: dubbelslag,
-FI: kaksoisappogiatura, kaksoisetuhele.
+FI: kaksoisappoggiatura, kaksoisetuhele.
 
 @seealso
 @ref{appoggiatura}.
@@ -3100,7 +3107,7 @@ FI: kaksoisylennysmerkki.
 
 ES: compás polimétrico,
 I: indicazione di tempo doppia/polimetrica,
-F: ?,
+F: mesure composée, métrique composée,
 D: zusammengesetzte Taktart,
 NL: ?,
 DK: ?,
@@ -3618,8 +3625,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
@@ -3796,7 +3802,7 @@ FI: kvartti.
 
 ES: partitura a la francesa,
 I: partitura senza i righi vuoti,
-F: ?,
+F: partition à la française,
 D: Orchesterpartitur ohne leere Systeme,
 NL: ?,
 DK: ?,
@@ -3821,7 +3827,7 @@ you may wish to procure a copy of their style manual.
 
 ES: pentagrama a la francesa,
 I: rigo temporaneo,
-F: ?,
+F: portée à la française,
 D: zeitweiliges Notensystem,
 NL: ?,
 DK: ?,
@@ -3889,17 +3895,17 @@ the parallel minor scale, or the incomplete dominant seventh chord.
    ((thick (* (magstep font-size)
       (ly:output-def-lookup layout 'line-thickness)))
     (underline-thick (* thickness thick))
-    (markup (interpret-markup layout props arg))
-    (x1 (car (ly:stencil-extent markup X)))
-    (x2 (cdr (ly:stencil-extent markup X)))
-    (y1 (car (ly:stencil-extent markup Y)))
-    (y2 (cdr (ly:stencil-extent markup Y)))
+    (m (interpret-markup layout props arg))
+    (x1 (car (ly:stencil-extent m X)))
+    (x2 (cdr (ly:stencil-extent m X)))
+    (y1 (car (ly:stencil-extent m Y)))
+    (y2 (cdr (ly:stencil-extent m Y)))
     (dx (* extension (- x2 x1)))
     (dy (* extension (- y2 y1)))
     (line (make-line-stencil underline-thick
       (- x1 dx) (- y1 dy)
       (+ x2 dx) (+ y2 dy))))
-   (ly:stencil-add markup line)))
+   (ly:stencil-add m line)))
 <<
   {
     <g e c>1 <a f d> <b g e>
@@ -4288,6 +4294,42 @@ and is therefore a polymeter (second definition) of considerable antiquity.
 @seealso
 @ref{mensural notation}, @ref{meter}, @ref{polymeter}, @ref{proportion}.
 
+@node high bass clef
+@section high bass clef
+
+ES: ?,
+I: ?,
+F: clef de basse haute,
+D: hoher Bassschlüssel,
+NL: ?,
+DK: ?,
+S: ?,
+FI: ?.
+
+Beginning in 18th century the high bass clef used in French Horn parts
+for the lowest pitches.  This usage of the F clef was then passed down
+from the French Horn to the Basset Horn and then to the Bass Clarinet.
+It looks identical to the standard bass clef, but is pitched an octave
+higher -- octavation indicators on clefs appeared at the beginning of
+the 20th Century.
+
+In LilyPond, the most straightforward way to make a high bass clef is to
+print the modern version @code{\clef "bass^8"} but without the @code{8};
+
+@lilypond[quote,verbatim]
+<<
+  \new Staff {
+    \clef treble { g4 b d' g' }
+  }
+  \new Staff \with { \omit ClefModifier }
+  { \clef "bass^8" { g4 b d' g' } }
+>>
+@end lilypond
+
+
+@seealso
+@ref{F clef}, @ref{bass clef}.
+
 
 @node homophony
 @section homophony
@@ -4361,7 +4403,7 @@ No cross-references.
 
 ES: ?,
 I: accordo di settima dominante incompleto,
-F: ?,
+F: accord de septième de dominante incomplet,
 D: verkürzter Dominantseptakkord,
 NL: ?,
 DK: ?,
@@ -4777,7 +4819,7 @@ FI: viiva, nuottiviiva.
 
 ES: en su lugar,
 I: loco,
-F: ?,
+F: loco,
 D: loco,
 NL: ?,
 DK: ?,
@@ -5004,7 +5046,7 @@ mediant (variant tonic).
 
 ES: melisma,
 I: melisma,
-F: mélisme, tenue,
+F: mélisme, vocalise,
 D: Melisma,
 NL: melisma,
 DK: ?,
@@ -5474,8 +5516,8 @@ The female voice between soprano and contralto.
 
 ES: do central,
 I: do centrale,
-F: do central, do 3
-D: zweigestrichenes@w{ }c,
+F: do central, do 3,
+D: eingestrichenes@w{ }c,
 NL: centrale@w{ }c,
 DK: enstreget@w{ }c,
 S: ettstruket@w{ }c,
@@ -5610,7 +5652,7 @@ theme or subject.
 @lilypond[quote,line-width=13.0\cm]
 \score{
 \relative c'' {
-  \set Score.implicitTimeSignatureVisibility = #all-invisible
+  \set Score.initialTimeSignatureVisibility = #all-invisible
   \override Score.TimeSignature #'break-visibility = #all-invisible
   \time 4/4
   \key g \major
@@ -6341,7 +6383,7 @@ simultaneously or in alternation.
 
 ES: indicación de compás polimétrico,
 I: tempo polimetrico,
-F: ?,
+F: métrique polymétrique,
 D: zusammengesetzte Taktart,
 NL: ?,
 DK: ?,
@@ -6565,7 +6607,7 @@ FI: kvartoli.
 
 ES: variante [de acorde o intervalo],
 I: qualità (?),
-F: qualité (?),
+F: qualité [d'accord ou d'intervalle],
 D: Modus (Dur oder Moll),
 NL: ?,
 DK: ?,
@@ -6940,7 +6982,7 @@ No cross-references.
 
 ES: partitura,
 I: partitura,
-F: partition, conducteur (full score),
+F: partition, conducteur @emph{(full score)},
 D: Partitur (full score), Klavierauszug (vocal score),
 NL: partituur,
 DK: partitur,
@@ -7091,7 +7133,7 @@ FI: korotusmerkki.
 
 ES: simile, similar,
 I: simile,
-F: simile,
+F: simile, de façon identique,
 D: simile, gleichartig,
 NL: ?,
 DK: ?,
@@ -7543,7 +7585,7 @@ The seventh @ref{scale degree}.
 
 ES: sobre la cuerda de Sol,
 I: sul Sol,
-F: sur la G,
+F: sur la corde de sol,
 D: auf G, auf der G-Saite,
 NL: ?,
 DK: ?,
@@ -8170,7 +8212,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: ?,