patch::: 1.4.1.jcn4

1.4.1.jcn4
==========

* Glossary fixes (Thanks Jean-Pierre Coulon).

diff --git a/CHANGES b/CHANGES
index 584d0f45cf8df4f0879a9cf09f6d1d5bf433fb81..6a684de42aad7daf864b94175e0f8fc11e1626ab 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,8 @@
+1.4.1.jcn4
+==========
+
+* Glossary fixes (Thanks Jean-Pierre Coulon).
+
 1.4.1.jcn3
 ==========
 

diff --git a/Documentation/user/glossary.tely b/Documentation/user/glossary.tely
index f043ecf4b579cae584838c3e467c915b9c91cfba..bae4fb573c5c4e65a6d9e31bf0e18763fdf8da8b 100644 (file)
--- a/Documentation/user/glossary.tely
+++ b/Documentation/user/glossary.tely
@@ -55,7 +55,7 @@ ES: acento, I: accento, F: accent, D: Akzent, NL: accent, DK: accent, S: accent,
 The stress of one tone over others.
 
 @item accidental
-ES: alteración, I: alterazione, accidente, F: alt@'eration accidentelle, D: Vorzeichen,
+ES: alteración, I: alterazione, accidente, F: alt@'eration, D: Vorzeichen,
 Versetzungszeichen, NL: voorteken, DK: l@o{}st fortegn, S: tillf@"alligt 
 f@"ortecken, N:
 
@@ -178,8 +178,8 @@ An appoggiatura may have more notes preceding the main note.
   \grace { [as16 ( bes] } < ) c4 as > 
   \grace { [as16 ( bes] } < ) c4 as > \bar "||"
   \grace { bes16 } as8_"performance" as16 bes as8 g |
-  < \context Voice = va { \stemUp as32 bes c8. as32 bes c8. }
-    \context Voice = vb { \stemDown as16 ~ as8. as16 ~ as8. } >
+  < \context Voice = va { \stemUp\tieUp as32 bes c8. as32 bes c8. }
+    \context Voice = vb { \stemDown\tieDown as16 ~ as8. as16 ~ as8. } >
   \bar "||"
 }
 @end lilypond
@@ -252,10 +252,11 @@ baryton.
 The male voice intermediate between the @w{@ar{}@strong{bass}} and the
 @w{@ar{}@strong{tenor}}.
 
+@c  F: clef de troisi@`eme ligne dropped
+
 @item baritone clef
 ES:  clave de fa en tercera
-I: chiave di baritono, F: clef de ut cinqui@`eme ligne, clef de troisi@`eme
-ligne, D: Barytonschl@"ussel, NL: baritonsleutel, DK: barytonn@o{}gle, S:
+I: chiave di baritono, F: clef d' Ut cinqui@`eme ligne, clef de Fa troisi@`eme, D: Barytonschl@"ussel, NL: baritonsleutel, DK: barytonn@o{}gle, S:
 barytonklav, N: .
 
 C or F clef setting central C on the upper staff line. @w{@ar{}@strong{c clef}}
@@ -1062,8 +1063,10 @@ octave lower (for example on double bass @w{@ar{}@strong{strings}}).
 }
 @end lilypond
 
+@c F:  'point d'orgue' on a note, 'point d'arret' on a rest.
+
 @item fermata
-ES: Calderón, I: corona, F: pause, D: Fermate, NL: fermate, DK: fermat, S: fermat, N: .
+ES: Calderón, I: corona, F: point d'orgue, point d'arr@^et, UK: pause, corona, D: Fermate, NL: fermate, DK: fermat, S: fermat, N: .
 
 Prolonged note or rest of indefinite duration.
 
@@ -1550,7 +1553,7 @@ harmony}} @w{@ar{}@strong{relative key}}.
 @w{@ar{}@strong{cadenza}}
 
 @item meter, time
-ES: compás, I: tempo, metro, F: m@`etre, D: Taktart, Metrum, NL: maatsoort, DK: taktart,
+ES: compás, I: tempo, metro, F: indication de m@'esure, D: Taktart, Metrum, NL: maatsoort, DK: taktart,
 S: taktart, N: .
 
 The basic scheme of @ar{}@w{}@strong{note value}s and @ar{}@w{}@strong{accent}s
@@ -1969,7 +1972,7 @@ kwart rust, DK:@w{ }fjerdedelspause, S: fj@"ardedelspaus, N: .
 @w{@ar{}@strong{note value}}
 
 @item quintuplet
-ES: quintillo, I: quintina, F: quintuplet, D: Quintole, NL: kwintool, DK: kvintol, S:
+ES: quintillo, I: quintina, F: quintolet, D: Quintole, NL: kwintool, DK: kvintol, S:
 kvintol, N: .
 
 @w{@ar{}@strong{note value}}
@@ -2015,6 +2018,8 @@ gen@-ta@-gel@-se, S: repris, N: .
 }
 @end lilypond
 
+@c F: 'pause' if you mean a whole rest, 'silence' if you do not want to
+@c     specify the rest's value.
 @item rest
 ES: silencio, I: pausa, F: silence, D: Pause, NL: rust, DK: pause, S: paus, N: .
 
@@ -2573,7 +2578,7 @@ or by the whole orchestra (choir), either at exactly the same pitch or in a
 different octave.
 
 @item upbeat
-ES: entrada anacrúsica, I: anacrusi, F: anacrouse, D: Auftakt, NL: opmaat, DK: optakt, S:
+ES: entrada anacrúsica, I: anacrusi, F: anacrouse, lev@'ee, D: Auftakt, NL: opmaat, DK: optakt, S:
 upptakt, N:
 
 Initial note(s) of a melody occurring before the first bar
@@ -2624,7 +2629,7 @@ tones on the piano keyboard with exactly one key between them - including
 black and white keys - is a whole tone.
 
 @item woodwind
-ES: maderas, I: legni, F: le bois, D: Holzbl@"aser, NL: houtblazers, DK tr@ae{}bl@ae{}sere,
+ES: maderas, I: legni, F: les bois, D: Holzbl@"aser, NL: houtblazers, DK tr@ae{}bl@ae{}sere,
 S: tr@"abl@aa{}sare, N: .
 
 A family of blown wooden musical instruments. Today some of these instruments

diff --git a/VERSION b/VERSION
index 100eb9ff68b39c09a14c0c1453c4a84506f8255e..970bb5b64479feaa73bf4f56425dca106049e812 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=4
 PATCH_LEVEL=1
-MY_PATCH_LEVEL=jcn3
+MY_PATCH_LEVEL=jcn4
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.

diff --git a/scripts/ly2dvi.py b/scripts/ly2dvi.py
index d81879fa64e8efee378d0cd5d42cffd2892129b5..d6a634499527120a14664121c120abf7a994bf4a 100644 (file)
--- a/scripts/ly2dvi.py
+++ b/scripts/ly2dvi.py
@@ -148,9 +148,9 @@ verbose_p = 0
 # feta16.{afm,mf,tex,tfm}, and only set env upon failure.
 #
 environment = {
-       'MFINPUTS' : ':' + datadir + '/mf',
-       'TEXINPUTS': ':' + datadir + '/tex:' + datadir + '/ps',
-       'TFMFONTS' : ':' + datadir + '/tfm',
+       'MFINPUTS' : datadir + '/mf' + ':',
+       'TEXINPUTS': datadir + '/tex:' + datadir + '/ps' + ':',
+       'TFMFONTS' : datadir + '/tfm' + ':',
        'GS_FONTPATH' : datadir + '/afm:' + datadir + '/pfa',
        'GS_LIB' : datadir + '/ps',
 }