Fix use of relative in docs and restore UTF-8 strings

* replace bare \relative with "\relative c'" -- I didn't check
systematically, there must remain some occurences of bare
\relative.

* fix misuse of relative lilypond-book fragment option -- cases of
misuse were probably not fixed because relative without fragment used
to have no effect on ly snippets.

* also restore mangled UTF-8 strings and add misssing accent in "Chéri".

diff --git a/Documentation/de/user/simultaneous.itely b/Documentation/de/user/simultaneous.itely
index c444bbafe522defadd6aaaa3afa2be9d86af7503..5dc94d016e29754b482dfc99526aabcc5651fab9 100644 (file)
--- a/Documentation/de/user/simultaneous.itely
+++ b/Documentation/de/user/simultaneous.itely
@@ -265,7 +265,7 @@ mehr Stimmen benötigt werden, um Zusammenstöße zwischen Noten zu
 vermeiden. Zusätzliche Stimmen werden durch einen neuen Bezeichner 
 erstellt, wie das nächste Beispiel zeigt.
 
-@lilypond[quote,verbatim,ragged-right,relative=2]
+@lilypond[quote,verbatim,ragged-right]
 voiceFive = #(context-spec-music (make-voice-props-set 4) 'Voice)
 
 \relative c''' <<

diff --git a/Documentation/es/user/editorial.itely b/Documentation/es/user/editorial.itely
index 9dd00e441d227c67ee79433e62f3ef6bb766dc98..ea3c74b523fff41782be1530f732ad979c2919c1 100644 (file)
--- a/Documentation/es/user/editorial.itely
+++ b/Documentation/es/user/editorial.itely
@@ -500,7 +500,7 @@ sincronizadas con las notas.
 @snippets
 
 @lilypondfile[verbatim,lilyquote,ragged-right,texidoc]
-{grid-lines-changing-their-appearance.ly}
+{grid-lines--changing-their-appearance.ly}
 
 
 @seealso

diff --git a/Documentation/es/user/fundamental.itely b/Documentation/es/user/fundamental.itely
index e7f3b05ca9cd1548ed304542e660a6407ac83a51..bea56c9c9b7a535de8a07e9fad19170b92dc7a86 100644 (file)
--- a/Documentation/es/user/fundamental.itely
+++ b/Documentation/es/user/fundamental.itely
@@ -1894,8 +1894,7 @@ Esto parece un poco enrevesado; los márgenes están descuadrados.  Esto
 tiene fácil solución.  Presentamos aquí la plantilla completa para
 soprano y cello.
 
-@lilypond[quote,verbatim,ragged-right]
-\version "2.11.38"
+@lilypond[quote,verbatim,ragged-right,addversion]
 sopranoMusic = \relative c' {
   \clef treble
   \key c \major
@@ -2115,8 +2114,7 @@ Los grupos ChoirStaff y PianoStaff se deben combinar utilizando
 Al combinar todo esto junto y escribir la música de los tres compases
 del ejemplo anterior, obtenemos:
 
-@lilypond[quote,verbatim,ragged-right]
-\version "2.11.38"
+@lilypond[quote,verbatim,ragged-right,addversion]
 global = { \key d \major \time 4/4 }
 sopMusic = \relative c'' {
   \clef "treble"
@@ -2320,8 +2318,7 @@ pentagramas tendrá una estructura similar, aunque el número de voces
 puede variar.  Todo lo que nos queda es añadir la música, y combinar
 todas las partes.
 
-@lilypond[quote,verbatim,ragged-right]
-\version "2.11.38"
+@lilypond[quote,verbatim,ragged-right,addversion]
 \header {
   title = "Jesu, meine Freude"
   composer = "J S Bach"

diff --git a/Documentation/es/user/simultaneous.itely b/Documentation/es/user/simultaneous.itely
index 30933bc736997018f944bed9d15ced3356fdc269..86c7d659ab42089f7c4945a038726639bb58c7e5 100644 (file)
--- a/Documentation/es/user/simultaneous.itely
+++ b/Documentation/es/user/simultaneous.itely
@@ -183,7 +183,7 @@ adicionales para evitar colisiones entre las notas.  Las voces
 adicionales se añaden definiendo una variable, como se muestra a
 continuación:
 
-@lilypond[quote,verbatim,ragged-right,relative=2]
+@lilypond[quote,verbatim,ragged-right]
 voiceFive = #(context-spec-music (make-voice-props-set 4) 'Voice)
 
 \relative c''' <<
@@ -322,7 +322,7 @@ Si queremos sólo las partes mezcladas y no las marcas textuales,
 podemos establecer la propiedad @code{printPartCombineTexts} al valor
 false.
 
-@lilypond[quote,verbatim,ragged-right,fragment,relative=2]
+@lilypond[quote,verbatim,ragged-right,fragment]
 \new Staff <<
   \set Staff.printPartCombineTexts = ##f
   \partcombine
@@ -335,7 +335,7 @@ Para cambiar el texto que se imprime para los solos o la fusión,
 podemos establecer las propiedades @code{soloText}, @code{soloIIText}
 y @code{aDueText}.
 
-@lilypond[quote,verbatim,ragged-right,fragment,relative=2]
+@lilypond[quote,verbatim,ragged-right,fragment]
 \new Staff <<
   \set Score.soloText = #"ichi"
   \set Score.soloIIText = #"ni"

diff --git a/Documentation/es/user/vocal.itely b/Documentation/es/user/vocal.itely
index 4dfc56bdd5892a005108de25a59c2bff63372410..f61af06b7e1b2b6fc601e680f73a9cc7737e4085 100644 (file)
--- a/Documentation/es/user/vocal.itely
+++ b/Documentation/es/user/vocal.itely
@@ -100,7 +100,7 @@ a la melodía.  He aquí un ejemplo:
 
 @lilypond[ragged-right,verbatim,fragment,quote]
 \time 3/4
-\relative { c2 e4 g2. }
+\relative c' { c2 e4 g2. }
 \addlyrics { play the game }
 @end lilypond
 
@@ -109,7 +109,7 @@ Se pueden añadir más versos mediante la adición de más secciones
 
 @lilypond[ragged-right,verbatim,fragment,quote]
 \time 3/4
-\relative { c2 e4 g2. }
+\relative c' { c2 e4 g2. }
 \addlyrics { play the game }
 \addlyrics { speel het spel }
 \addlyrics { joue le jeu }
@@ -198,9 +198,9 @@ comillas o usar un carácter @code{_} (guión bajo), para obtener
 espacios entre las sílabas, o usar el símbolo de tilde curva
 (@code{~}) para obtener una ligadura entre sílabas de la letra.
 
-@lilypond[quote,relative=2,ragged-right,fragment,verbatim]
+@lilypond[quote,ragged-right,fragment,verbatim]
 \time 3/4
-\relative { c2 e4 g2 e4 }
+\relative c' { c2 e4 g2 e4 }
 \addlyrics { gran- de_a- mi- go }
 \addlyrics { pu- "ro y ho-" nes- to }
 \addlyrics { pu- ro~y~ho- nes- to }
@@ -220,7 +220,7 @@ utf-8.  Consulte @ref{Text encoding}, para ver más información.
 @c FIXME: quotes.
 
 @lilypond[quote,ragged-right,fragment,verbatim]
-\relative { e4 f e d e f e2 }
+\relative c' { e4 f e d e f e2 }
 \addlyrics { He said: “Let my peo ple go”. }
 @end lilypond
 
@@ -481,9 +481,9 @@ ligaduras de texto están hechas con el carácter de Unicode U+203F, por
 tanto debe asegurarse de tener instalada una tipografía (como
 DejaVuLGC) que incluya este glifo.}.
 
-@lilypond[quote,relative=2,ragged-right,fragment,verbatim]
+@lilypond[quote,ragged-right,fragment,verbatim]
 \time 3/4
-\relative { c2 e4 g2 e4 }
+\relative c' { c2 e4 g2 e4 }
 \addlyrics { gran- de_a- mi- go }
 \addlyrics { pu- "ro y ho-" nes- to }
 \addlyrics { pu- ro~y~ho- nes- to }
@@ -758,7 +758,7 @@ la propiedad minimum-distance de LyricSpace.
 Para que este cambio sea válido para la letra de la partitura
 completa, establezca la propiedad dentro del @q{layout} o disposición.
 
-@lilypond[relative,verbatim,quote,ragged-right]
+@lilypond[verbatim,quote,ragged-right]
 \score {
   \relative c' {
   c c c c
@@ -873,7 +873,7 @@ versión abreviada como @code{shortVocalName}.
   Hi, my name is Bert.
 } \addlyrics {
   \set vocalName = "Ernie "
-  Oh, che -- ri, je t'aime
+  Oh, ché -- ri, je t'aime
 }
 @end lilypond
 
@@ -896,7 +896,7 @@ texto, tal y como se muestra a continuación:
 @lilypond[verbatim,ragged-right,quote]
 %{
 <<
-  \relative \new Voice = "lahlah" {
+  \relative c' \new Voice = "lahlah" {
     \set Staff.autoBeaming = ##f
     c4
     \slurDotted
@@ -926,7 +926,7 @@ lenta que la normal.  Esto se puede conseguir insertando @code{\skip}s
 texto se retrasará una nota más.  Por ejemplo,
 
 @lilypond[verbatim,ragged-right,quote]
-\relative { c c g' }
+\relative c' { c c g' }
 \addlyrics {
   twin -- \skip 4
   kle
@@ -942,7 +942,7 @@ texto.  Esto se hace estableciendo la propiedad
 
 @lilypond[ragged-right,quote]
 <<
-  \relative \new Voice = "lahlah" {
+  \relative c' \new Voice = "lahlah" {
     \set Staff.autoBeaming = ##f
     c4
     <<

diff --git a/Documentation/fr/user/fundamental.itely b/Documentation/fr/user/fundamental.itely
index d620bfc076d28f54daf1a64e215564d65f1f10be..7741a2d98da5cf8011c5672d295dc21d24fe1df5 100644 (file)
--- a/Documentation/fr/user/fundamental.itely
+++ b/Documentation/fr/user/fundamental.itely
@@ -430,7 +430,7 @@ amené à recourir à des voix supplémentaires afin d'éviter des collisions
 de notes.  Ces voix additionnelles s'ajoutent en définissant un
 identificateur, comme le montre l'exemple suivant :
 
-@lilypond[quote,verbatim,ragged-right,relative=2]
+@lilypond[quote,verbatim,ragged-right]
 voiceFive = #(context-spec-music (make-voice-props-set 4) 'Voice)
 
 \relative c''' <<
@@ -845,8 +845,7 @@ C'est un peu le bazar dans tout ça ; mais il vous sera facile de
 mettre un peu d'ordre dans l'indentation.  Voici le modèle pour
 soprano et violoncelle au complet :
 
-@lilypond[quote,verbatim,ragged-right]
-\version "2.11.38"
+@lilypond[quote,verbatim,ragged-right,addversion]
 sopranoMusic = \relative c' {
   \clef treble
   \key c \major

diff --git a/Documentation/fr/user/vocal.itely b/Documentation/fr/user/vocal.itely
index eb353dbdaee35febbabb0112bca84cc0ec8f2082..9ee15c039e35deb1e675872a9c229c3ff7a39e6c 100644 (file)
--- a/Documentation/fr/user/vocal.itely
+++ b/Documentation/fr/user/vocal.itely
@@ -193,9 +193,9 @@ ces syllabes entre guillemets, ou bien remplacer l'espace par un
 caractère souligné (@code{_}), ou encore utiliser un tilde (@code{~})
 pour obtenir une liaison entre les syllabes.
 
-@lilypond[quote,relative=2,ragged-right,fragment,verbatim]
+@lilypond[quote,ragged-right,fragment,verbatim]
 \time 3/4
-\relative { c2 e4 g2 e4 }
+\relative c' { c2 e4 g2 e4 }
 \addlyrics { gran- de_a- mi- go }
 \addlyrics { pu- "ro y ho-" nes- to }
 \addlyrics { pu- ro~y~ho- nes- to }
@@ -209,10 +209,10 @@ incluant ce symbole (par exemple DejaVuLGC) installée sur le système.
 Pour utiliser des lettres accentuées ou des caractères spéciaux 
 --- cœurs ou guillemets inversés par exemple --- il suffit de les insérer
 dans le fichier et de veiller à sauvegarder ce dernier avec le codage
-utf-8.  Voir à ce sujet @ref{Text encoding} pour plus de détails.
+UTF-8.  Voir à ce sujet @ref{Text encoding} pour plus de détails.
 
 @lilypond[quote,ragged-right,fragment,verbatim]
-\relative { e4 f e d e f e2 }
+\relative c' { e4 f e d e f e2 }
 \addlyrics { He said: “Let my peo ple go”. }
 @end lilypond
 
@@ -471,9 +471,9 @@ liaison adaptée aux paroles correspond au caractère Unicode U+203F, et
 n'apparaîtra dans la partition que si le système dispose d'une police
 installée qui contient ce symbole(par exemple DejaVuLGC).}.
 
-@lilypond[quote,relative=2,ragged-right,fragment,verbatim]
+@lilypond[quote,ragged-right,fragment,verbatim]
 \time 3/4
-\relative { c2 e4 g2 e4 }
+\relative c' { c2 e4 g2 e4 }
 \addlyrics { gran- de_a- mi- go }
 \addlyrics { pu- "ro y ho-" nes- to }
 \addlyrics { pu- ro~y~ho- nes- to }
@@ -742,7 +742,7 @@ d'accroître l'espacement des paroles.
 Pour que ce réglage s'applique à toute la partition, définissez-le
 dans le bloc @code{\layout}.
 
-@lilypond[relative,verbatim,quote,ragged-right]
+@lilypond[verbatim,quote,ragged-right]
 \score {
   \relative c' {
   c c c c
@@ -853,7 +853,7 @@ abrégée.
   Hi, my name is Bert.
 } \addlyrics {
   \set vocalName = "Ernie "
-  Oh, che -- ri, je t'aime
+  Oh, ché -- ri, je t'aime
 }
 @end lilypond
 
@@ -905,7 +905,7 @@ faire un mélisme.  Il faudra alors insérer des sauts invisibles
 suivant d'une note :
 
 @lilypond[verbatim,ragged-right,quote]
-\relative { c c g' }
+\relative c' { c c g' }
 \addlyrics {
   twin -- \skip 4
   kle
@@ -921,7 +921,7 @@ modifie la propriété @code{associatedVoice}.  Dans cet exemple,
 
 @lilypond[ragged-right,quote]
 <<
-  \relative \new Voice = "lahlah" {
+  \relative c' \new Voice = "lahlah" {
     \set Staff.autoBeaming = ##f
     c4
     <<

diff --git a/Documentation/user/simultaneous.itely b/Documentation/user/simultaneous.itely
index 0b9b14c57648869eecc48f0456b5ef4db6c89c29..0948c91b01a1be1df298b2552ea09d163c9e9218 100644 (file)
--- a/Documentation/user/simultaneous.itely
+++ b/Documentation/user/simultaneous.itely
@@ -199,7 +199,7 @@ In some instances of complex polyphonic music, you may need
 additional voices to avoid collisions between notes.  Additional
 voices are added by defining an variable, as shown below:
 
-@lilypond[quote,verbatim,ragged-right,relative=2]
+@lilypond[quote,verbatim,ragged-right]
 voiceFive = #(context-spec-music (make-voice-props-set 4) 'Voice)
 
 \relative c''' <<
@@ -332,7 +332,7 @@ down stems and @q{Solo II}.
 If you just want the merging parts, and not the textual markings,
 you may set the property @code{printPartCombineTexts} to false.
 
-@lilypond[quote,verbatim,ragged-right,fragment,relative=2]
+@lilypond[quote,verbatim,ragged-right]
 \new Staff <<
   \set Staff.printPartCombineTexts = ##f
   \partcombine
@@ -345,7 +345,7 @@ To change the text that is printed for solos or merging, you may
 set the @code{soloText}, @code{soloIIText}, and @code{aDueText}
 properties.
 
-@lilypond[quote,verbatim,ragged-right,fragment,relative=2]
+@lilypond[quote,verbatim,ragged-right]
 \new Staff <<
   \set Score.soloText = #"ichi"
   \set Score.soloIIText = #"ni"

diff --git a/Documentation/user/spacing.itely b/Documentation/user/spacing.itely
index 439ce43d4f4b615fe4e6383e8bc2af9ad90c620b..5cf5c8d370f448fc22cf4bef0b3631947ceab350 100644 (file)
--- a/Documentation/user/spacing.itely
+++ b/Documentation/user/spacing.itely
@@ -1597,7 +1597,7 @@ music.  Note that @code{ly:make-moment} constructs
 a duration, so @code{1 4} is a longer duration
 than @code{1 16}.
 
-@lilypond[relative,verbatim,line-width=12\cm]
+@lilypond[verbatim,line-width=12\cm]
 \score {
   \relative c'' {
     g4 e e2 | f4 d d2 | c4 d e f | g4 g g2 |
@@ -1608,7 +1608,7 @@ than @code{1 16}.
 }
 @end lilypond
 
-@lilypond[relative,verbatim,line-width=12\cm]
+@lilypond[verbatim,line-width=12\cm]
 \score {
   \relative c'' {
     g4 e e2 | f4 d d2 | c4 d e f | g4 g g2 |

diff --git a/Documentation/user/staff.itely b/Documentation/user/staff.itely
index 8b8c72705c4ccf9b67a94cd19982a1ef90d4eb85..ea933dd957b4fb974b5dbd576f20ab34b2969647 100644 (file)
--- a/Documentation/user/staff.itely
+++ b/Documentation/user/staff.itely
@@ -597,7 +597,7 @@ to the main staff with @code{<<} and @code{>>} brackets.  The @emph{ossia}
 staff is stopped and started explicitely and white space is inserted 
 with the @code{\skip} command.
 
-@lilypond[verbatim,relative=2,quote]
+@lilypond[verbatim,quote]
 <<
   \new Staff \with
   {
@@ -696,7 +696,7 @@ You can make the staff lines invisible by removing the
 
 @lilypond[quote,ragged-right,verbatim]
 \score {
-  \context Staff \relative c'' { c8 c c16 c c c }
+  \new Staff \relative c'' { c8 c c16 c c c }
   \layout{
     \context {
       \Staff
@@ -719,7 +719,7 @@ The lower staff of the second staff group is not removed,
 because the setting applies only to the specific staff inside 
 of which it is written.
 
-@lilypond[quote,ragged-right,verbatim,relative=2]
+@lilypond[quote,ragged-right,verbatim]
 \layout {
   \context { 
     \RemoveEmptyStaffContext 
@@ -1174,8 +1174,8 @@ cbsn = \relative c, {
 }
 
 <<
-  \context Staff = "picc" \picc
-  \context Staff = "cbsn" \cbsn
+  \new Staff = "picc" \picc
+  \new Staff = "cbsn" \cbsn
 >>
 @end lilypond
 

diff --git a/Documentation/user/vocal.itely b/Documentation/user/vocal.itely
index aaa0e8674f0b7a8fd8e5d1f2fe995d8d2e0288c4..76d7be98c51a18690d6c4ce67025125f0a6a31b6 100644 (file)
--- a/Documentation/user/vocal.itely
+++ b/Documentation/user/vocal.itely
@@ -119,7 +119,7 @@ to a melody.  Here is an example,
 
 @lilypond[ragged-right,verbatim,fragment,quote]
 \time 3/4
-\relative { c2 e4 g2. }
+\relative c' { c2 e4 g2. }
 \addlyrics { play the game }
 @end lilypond
 
@@ -128,7 +128,7 @@ More stanzas can be added by adding more
 
 @lilypond[ragged-right,verbatim,fragment,quote]
 \time 3/4
-\relative { c2 e4 g2. }
+\relative c' { c2 e4 g2. }
 \addlyrics { play the game }
 \addlyrics { speel het spel }
 \addlyrics { joue le jeu }
@@ -213,9 +213,9 @@ In order to assign more than one syllable to a single note, you can
 surround them with quotes or use a @code{_} character, to get spaces
 between syllables, or use tilde  symbol (@code{~}) to get a lyric tie.
 
-@lilypond[quote,relative=2,ragged-right,fragment,verbatim]
+@lilypond[quote,ragged-right,fragment,verbatim]
 \time 3/4
-\relative { c2 e4 g2 e4 }
+\relative c' { c2 e4 g2 e4 }
 \addlyrics { gran- de_a- mi- go }
 \addlyrics { pu- "ro y ho-" nes- to }
 \addlyrics { pu- ro~y~ho- nes- to }
@@ -229,15 +229,12 @@ glyph.
 To enter lyrics with characters from non-English languages, or with
 accented and special characters (such as the heart symbol or slanted quotes),
 simply insert the characters directly into the input file and save
-it with utf-8 encoding.  See @ref{Text encoding}, for more info.
-
-FIXME: quotes.
+it with UTF-8 encoding.  See @ref{Text encoding}, for more info.
 
 @lilypond[quote,ragged-right,fragment,verbatim]
-\relative { e4 f e d e f e2 }
-\addlyrics { He said: there is a bug here }
+\relative c' { e4 f e d e f e2 }
+\addlyrics { He said: “Let my peo ple go”. }
 @end lilypond
-@c \addlyrics { He said: “Let my peo ple goâ€\9d. }
 
 To use normal quotes in lyrics, add a backslash before the
 quotes.  For example,
@@ -495,9 +492,9 @@ U+203F, so be
 sure to have a font (Like DejaVuLGC) installed that includes this
 glyph.}.
 
-@lilypond[quote,relative=2,ragged-right,fragment,verbatim]
+@lilypond[quote,ragged-right,fragment,verbatim]
 \time 3/4
-\relative { c2 e4 g2 e4 }
+\relative c' { c2 e4 g2 e4 }
 \addlyrics { gran- de_a- mi- go }
 \addlyrics { pu- "ro y ho-" nes- to }
 \addlyrics { pu- ro~y~ho- nes- to }
@@ -602,7 +599,7 @@ the text will be delayed another note.
 For example,
 
 @lilypond[verbatim,ragged-right,quote]
-\relative { c c g' }
+\relative c' { c c g' }
 \addlyrics {
   twin -- \skip 4
   kle
@@ -768,7 +765,7 @@ LyricSpace.
 To make this change for all lyrics in the score, set the property in the
 layout.
 
-@lilypond[relative,verbatim,quote,ragged-right]
+@lilypond[verbatim,quote,ragged-right]
 \score {
   \relative c' {
   c c c c
@@ -836,10 +833,10 @@ Stanza numbers can be added by setting @code{stanza}, e.g.,
   Hi, my name is Bert.
 } \addlyrics {
   \set stanza = "2. "
-  Oh, there is a bug here
+  Oh, ché -- ri, je t'aime
 }
 @end lilypond
-  @c Oh, ché -- ri, je t'aime
+
 
 @noindent
 These numbers are put just before the start of the first syllable.
@@ -913,7 +910,7 @@ the line, just like instrument names.  They are created by setting
   Hi, my name is Bert.
 } \addlyrics {
   \set vocalName = "Ernie "
-  Oh, che -- ri, je t'aime
+  Oh, ché -- ri, je t'aime
 }
 @end lilypond
 
@@ -935,7 +932,7 @@ in the text, as shown here,
 @lilypond[verbatim,ragged-right,quote]
 %{
 <<
-  \relative \new Voice = "lahlah" {
+  \relative c' \new Voice = "lahlah" {
     \set Staff.autoBeaming = ##f
     c4
     \slurDotted
@@ -968,7 +965,7 @@ done by setting the @code{associatedVoice} property.  In the example
 
 @lilypond[ragged-right,quote]
 <<
-  \relative \new Voice = "lahlah" {
+  \relative c' \new Voice = "lahlah" {
     \set Staff.autoBeaming = ##f
     c4
     <<