From 96f2ffad1d385fd338f430ffa7877ed2fdb17bbb Mon Sep 17 00:00:00 2001
From: John Mandereau <john.mandereau@gmail.com>
Date: Sat, 15 Nov 2008 18:57:23 +0100
Subject: [PATCH] Docs: automatically update ly snippets in translations

Done by running 'make snippet-update' and checking the changes.
---
 Documentation/de/user/cheatsheet.itely        | 10 +-
 Documentation/de/user/editorial.itely         | 16 ++--
 Documentation/de/user/introduction.itely      |  6 +-
 Documentation/de/user/pitches.itely           |  6 +-
 Documentation/de/user/repeats.itely           |  2 +-
 Documentation/de/user/text.itely              | 44 ++++-----
 Documentation/es/user/editorial.itely         |  2 +-
 Documentation/es/user/expressive.itely        |  4 +-
 Documentation/es/user/fretted-strings.itely   |  6 +-
 Documentation/es/user/fundamental.itely       | 28 +++---
 Documentation/es/user/input.itely             |  2 +-
 Documentation/es/user/introduction.itely      | 96 ++++++++++++++++---
 Documentation/es/user/percussion.itely        |  2 +-
 Documentation/es/user/pitches.itely           |  6 +-
 Documentation/es/user/rhythms.itely           |  8 +-
 Documentation/es/user/staff.itely             |  2 +-
 Documentation/es/user/text.itely              |  2 +-
 Documentation/es/user/tutorial.itely          |  2 +-
 Documentation/es/user/tweaks.itely            |  4 +-
 Documentation/es/user/unfretted-strings.itely |  4 +-
 Documentation/fr/user/cheatsheet.itely        | 10 +-
 Documentation/fr/user/fundamental.itely       |  6 +-
 Documentation/fr/user/introduction.itely      | 12 ++-
 23 files changed, 174 insertions(+), 106 deletions(-)

diff --git a/Documentation/de/user/cheatsheet.itely b/Documentation/de/user/cheatsheet.itely
index cc880cf8d1..97a3453a93 100644
--- a/Documentation/de/user/cheatsheet.itely
+++ b/Documentation/de/user/cheatsheet.itely
@@ -36,7 +36,7 @@ c1 c2 c8 c16
 @tab
 @lilypond[fragment,relative=2,notime]
 \override Staff.Clef #'break-visibility = #all-invisible
-c4. c4..  
+c4. c4..
 @end lilypond
 
 @item @code{c d e f g a b }
@@ -67,7 +67,7 @@ s4_" "
 @tab Taktangaben
 @tab
 @lilypond[fragment]
-\override Staff.Clef #'transparent = ##t 
+\override Staff.Clef #'transparent = ##t
 \time 3/4
 s4_" "
 \time 4/4
@@ -98,7 +98,7 @@ d ~ d
 @lilypond[notime,fragment]
 \clef treble
 \key es \major
-s4 
+s4
 @end lilypond
 
 @item @var{note}@code{'}
@@ -212,7 +212,7 @@ a\> a a\!
 @tab
 @lilypond[fragment,relative=2]
 \set Staff.implicitTimeSignatureVisibility = #all-invisible
-<c e> 
+<c e>
 @end lilypond
 
 
@@ -263,7 +263,7 @@ twinkle
 <<
    { g'1 g }
   \new Lyrics \lyricsto "" { twin -- kle }
->> 
+>>
 @end lilypond
 
 @item @code{\chordmode @{ c:dim f:maj7 @}}
diff --git a/Documentation/de/user/editorial.itely b/Documentation/de/user/editorial.itely
index 0a2b65caaf..5e0eab615b 100644
--- a/Documentation/de/user/editorial.itely
+++ b/Documentation/de/user/editorial.itely
@@ -242,7 +242,7 @@ c4 d
 e4 f
 \unHideNotes
 g a
-\hideNotes 
+\hideNotes
 b
 \unHideNotes
 c
@@ -340,12 +340,12 @@ definiert werden.
 \set Staff.instrumentName = \markup {
   \with-color #(x11-color 'navy) "Clarinet"
 }
-  
+
 \override Stem #'color = #(rgb-color 0 0 0)
 gis8 a
 \override Stem #'color = #(rgb-color 1 1 1)
 gis8 a
-\override Stem #'color = #(rgb-color 0 0 0.5) 
+\override Stem #'color = #(rgb-color 0 0 0.5)
 gis4 a
 @end lilypond
 
@@ -508,10 +508,10 @@ zu erklären.
 \new Voice \with { \consists "Balloon_engraver" }
 {
   \balloonGrobText #'Stem #'(3 . 4) \markup { "I'm a Stem" }
-  a8 
+  a8
   \balloonGrobText #'Rest #'(-4 . -4) \markup { "I'm a rest" }
   r
-  <c, g'-\balloonText #'(-2 . -2) \markup { "I'm a note head" } c>2. 
+  <c, g'-\balloonText #'(-2 . -2) \markup { "I'm a note head" } c>2.
 }
 @end lilypond
 
@@ -530,11 +530,11 @@ aber das kann geändert werden.
 {
   \balloonLengthOff
   \balloonGrobText #'Stem #'(3 . 4) \markup { "I'm a Stem" }
-  a8 
+  a8
   \balloonGrobText #'Rest #'(-4 . -4) \markup { "I'm a rest" }
   r
   \balloonLengthOn
-  <c, g'-\balloonText #'(-2 . -2) \markup { "I'm a note head" } c>2. 
+  <c, g'-\balloonText #'(-2 . -2) \markup { "I'm a note head" } c>2.
 }
 @end lilypond
 
@@ -585,7 +585,7 @@ den Linien festgesetzt.
 \layout {
   \context {
     \Staff
-    \consists "Grid_point_engraver" 
+    \consists "Grid_point_engraver"
     gridInterval = #(ly:make-moment 1 4)
   }
   \context {
diff --git a/Documentation/de/user/introduction.itely b/Documentation/de/user/introduction.itely
index 103f6fb09f..c1a50928ab 100644
--- a/Documentation/de/user/introduction.itely
+++ b/Documentation/de/user/introduction.itely
@@ -713,7 +713,7 @@ ein Lead Sheet.
      \time 2/4
      c4 c g' g a a g2
    }
-   \addlyrics { twin kle twin kle lit tle star }
+   \addlyrics { twin -- kle twin -- kle lit -- tle star }
 >>
 @end lilypond
 
@@ -735,7 +735,7 @@ nächste Beispiel zeigt einige etwas exotischere Konstruktionen:
       << {
         \revert Stem #'direction
         \change Staff = down
-        \set subdivideBeams = ##t	     
+        \set subdivideBeams = ##t
         g16.[
           \change Staff = up
           c'''32
@@ -766,7 +766,7 @@ nächste Beispiel zeigt einige etwas exotischere Konstruktionen:
       \override Beam  #'thickness = #0.3
       \override Stem  #'thickness = #4.0
       g'16[ b16 fis16 g16]
-      << \makeClusters { 
+      << \makeClusters {
         as16 <as b>
         <g b>
         <g cis>
diff --git a/Documentation/de/user/pitches.itely b/Documentation/de/user/pitches.itely
index 16b23d0e52..c15a11dea0 100644
--- a/Documentation/de/user/pitches.itely
+++ b/Documentation/de/user/pitches.itely
@@ -302,8 +302,8 @@ B, während his als @code{bis} geschrieben werden muss. Das kann
 aber auch verändert werden, siehe @ref{Note names in other languages}.
 
 
-@lilypond[fragment,quote,ragged-right,verbatim,relative=2]
-a2 as e es
+@lilypond[verbatim,quote,relative=2]
+a4 aes a2
 @end lilypond
 
 Ein Auflösungszeichen macht die Wirkung eines Kreuzes oder Bs
@@ -683,7 +683,7 @@ Vorzeichen angezeigt werden.
 die Musik einen Halbton nach oben.  Aber die erste Version gibt als 
 Versetzungszeichen Kreuze aus, die zweite dagegen B-Versetzungszeichen.
 
-@lilypond[quote,ragged-right,verbatim]
+@lilypond[verbatim,quote]
 music = \relative c' { c d e f }
 \new Staff {
   \transpose c cis { \music }
diff --git a/Documentation/de/user/repeats.itely b/Documentation/de/user/repeats.itely
index cd44af4442..cb31559c15 100644
--- a/Documentation/de/user/repeats.itely
+++ b/Documentation/de/user/repeats.itely
@@ -127,7 +127,7 @@ e |
 oder
 
 @lilypond[verbatim,quote,relative=2]
-\partial 4 
+\partial 4
 \repeat volta 4 { e4 | c2 d | e2 f | }
 \alternative {
   { \partial 4*3 g4 g g }
diff --git a/Documentation/de/user/text.itely b/Documentation/de/user/text.itely
index b0d05265f7..50b83ba665 100644
--- a/Documentation/de/user/text.itely
+++ b/Documentation/de/user/text.itely
@@ -62,7 +62,7 @@ zeigt.  Derartiger Text kann manuell über oder unter dem
 Notensystem platziert werden, die Syntax hierzu ist beschrieben
 in @ref{Direction and placement}.
 
-@lilypond[quote,verbatim,relative=1]
+@lilypond[quote,fragment,ragged-right,verbatim,relative=1]
 d8^"pizz." e f g a4-"scherz." f
 @end lilypond
 
@@ -72,8 +72,8 @@ explizit den @code{\markup}-Befehl mit darauf folgenden
 geschweiften Klammern einsetzt, wie beschrieben in
 @ref{Formatting text}.
 
-@lilypond[quote,verbatim,relative=1]
-d8^\markup { \italic pizz. } e f g 
+@lilypond[quote,fragment,ragged-right,verbatim,relative=1]
+d8^\markup { \italic pizz. } e f g
 a4_\markup { \tiny scherz. \bold molto } f
 @end lilypond
 
@@ -85,7 +85,7 @@ zweite die Note nach rechts verschiebt.  Das Verhalten wird mit
 dem Befehl @code{\textLengthOn} (Textlänge an) erreicht, rückgängig
 kann es mit dem Befehl @code{\textLengthOff} gemacht werden.
 
-@lilypond[quote,verbatim,relative=1]
+@lilypond[quote,fragment,ragged-right,verbatim,relative=1]
 d8^"pizz." e f g
 \textLengthOn
 a4_"scherzando" f
@@ -138,9 +138,9 @@ auswirkt.  Solche Objekte, @qq{Strecker} (engl. spanners) genannt,
 können von einer Note bis zu einer anderen mit folgender
 Anweisung erstellt werden:
 
-@lilypond[verbatim,quote,relative=2]
-\override TextSpanner #'bound-details #'left #'text = "rit." 
-b1\startTextSpan 
+@lilypond[verbatim,quote,ragged-right,fragment,relative=2]
+\override TextSpanner #'bound-details #'left #'text = "rit."
+b1\startTextSpan
 e,\stopTextSpan
 @end lilypond
 
@@ -150,9 +150,9 @@ Standardeinstellungen wird er kursiv ausgegeben, aber eine andere
 Formatierung kann erreicht werden, indem man @code{\markup}-Blöcke
 einsetzt, wie beschrieben in @ref{Formatting text}.
 
-@lilypond[quote,relative=2,verbatim]
+@lilypond[quote,ragged-right,fragment,relative=2,verbatim]
 \override TextSpanner #'bound-details #'left #'text =
-  \markup { \upright "rit." } 
+  \markup { \upright "rit." }
 b1\startTextSpan c
 e,\stopTextSpan
 @end lilypond
@@ -200,7 +200,7 @@ indem man die Syntax für Zeichen einsetzen, wie beschrieben in
 @c \mark needs to be placed on a separate line (it's not
 @c attached to an object like \markup is). -vv
 
-@lilypond[verbatim,quote,relative=2]
+@lilypond[verbatim,quote,ragged-right,fragment,relative=2]
 c4
 \mark "Allegro"
 c c c
@@ -211,7 +211,7 @@ zu platzieren, weitere Formatierungsmöglichkeiten sind mit dem
 @code{\markup}-Befehl gegeben, wie beschrieben in 
 @ref{Formatting text}:
 
-@lilypond[fragment,quote,relative=1]
+@lilypond[fragment,quote,ragged-right,verbatim,relative=1]
 <c e>1
 \mark \markup { \italic { colla parte } }
 <d f>2 <e g>
@@ -225,7 +225,7 @@ Symbol mit dem Befehl @code{\musicglyph} angegeben wird, wie
 beschrieben in
 @ref{Music notation inside markup}:
 
-@lilypond[quote,verbatim,relative=1]
+@lilypond[fragment,quote,ragged-right,verbatim,relative=1]
 <f bes>2 <d aes'>
 \mark \markup { \musicglyph #"scripts.ufermata" }
 <e g>1
@@ -238,7 +238,7 @@ Ende notiert werden, werden sie zwischen Noten oder über der
 Taktlinie gesetzt.  Wenn sie an einem Zeilenumbruch angegeben
 werden, wird das Zeichen zu Beginn der nächsten Zeile ausgegeben.
 
-@lilypond[quote,ragged-right,verbatim,relative=2]
+@lilypond[fragment,quote,ragged-right,verbatim,relative=2]
 \mark "Allegro"
 c1 c
 \mark "assai" \break
@@ -402,7 +402,7 @@ e1-\markup intenso
 a2^\markup { poco \italic più forte  }
 c e1
 d2_\markup { \italic "string. assai" }
-e 
+e
 b1^\markup { \bold { molto \italic  agitato } }
 c
 @end lilypond
@@ -489,9 +489,9 @@ Einfache Änderungen des Schriftartschnitts können im Textbeschriftungsmodus
 vorgenommen werden:
 
 @lilypond[quote,verbatim,relative=2]
-d1^\markup { 
-  \bold { Più mosso } 
-  \italic { non troppo \underline Vivo } 
+d1^\markup {
+  \bold { Più mosso }
+  \italic { non troppo \underline Vivo }
 }
 r2 r4 r8
 d,_\markup { \italic quasi \smallCaps Tromba }
@@ -532,7 +532,7 @@ a^\markup {
   \fontsize #2 da
   \fontsize #3 camera
 }
-bes^\markup { (con 
+bes^\markup { (con
   \larger grande
   \smaller emozione
   \magnify #0.6 { e sentimento } )
@@ -553,7 +553,7 @@ aber die normale Schriftgröße kann auch eingesetzt werden:
 \markup {
   \column {
     \line { 1 \super st movement }
-    \line { 1 \normal-size-super st movement 
+    \line { 1 \normal-size-super st movement
       \sub { (part two) }  }
   }
 }
@@ -720,7 +720,7 @@ unsichtbares Objekt sein kann (im Beispiel mit @code{\null} erstellt).
 Der letzte Text im Beispiel hat keinen Anker und wird deshalb auch nicht verschoben.
 
 @lilypond[quote,verbatim,fragment,relative=1]
-d2^\markup { 
+d2^\markup {
   Acte I
   \raise #2 { Scène 1 }
 }
@@ -814,7 +814,7 @@ beinhalten.
   }
 }
 \markup {
-  \fill-line { 1885 } 
+  \fill-line { 1885 }
 }
 @end lilypond
 
@@ -839,7 +839,7 @@ linksbündig oder im Blocksatz, wie das nächste Beispiel illustriert:
       gitanos en el Albaicín de Granada. Al fondo una
       puerta por la que se ve el negro interior de
       una Fragua, iluminado por los rojos resplandores
-      del fuego.) 
+      del fuego.)
     }
     \hspace #0
 
diff --git a/Documentation/es/user/editorial.itely b/Documentation/es/user/editorial.itely
index 1b392fa461..fee77aa988 100644
--- a/Documentation/es/user/editorial.itely
+++ b/Documentation/es/user/editorial.itely
@@ -174,7 +174,7 @@ Puede usar la articulación de pulgar para indicar que una nota se debe
 tocar con el pulgar (p.ej. en música de cello).
 
 @lilypond[verbatim,quote,relative=2]
-<a_\thumb a'-3>8 <b_\thumb b'-3>
+<a_\thumb a'-3>2 <b_\thumb b'-3>
 @end lilypond
 
 @cindex digitación de acordes
diff --git a/Documentation/es/user/expressive.itely b/Documentation/es/user/expressive.itely
index 28237a3115..111a648148 100644
--- a/Documentation/es/user/expressive.itely
+++ b/Documentation/es/user/expressive.itely
@@ -202,8 +202,8 @@ para ver más detalles, consulte @ref{Direction and placement}.
 
 @lilypond[verbatim,quote,relative=2]
 c2\ppp c\mp
-c\rfz c^\mf
-c_\spp c^\ff
+c2\rfz c^\mf
+c2_\spp c^\ff
 @end lilypond
 
 @cindex regulador
diff --git a/Documentation/es/user/fretted-strings.itely b/Documentation/es/user/fretted-strings.itely
index a267cb5bbf..27352323b8 100644
--- a/Documentation/es/user/fretted-strings.itely
+++ b/Documentation/es/user/fretted-strings.itely
@@ -1156,9 +1156,9 @@ antes del ángulo de cierre @code{>}.}
 
 @lilypond[quote,verbatim,relative=0]
 \clef "treble_8"
-<c-\rightHandFinger #1 >4 
-<e-\rightHandFinger #2 > 
-<g-\rightHandFinger #3 > 
+<c-\rightHandFinger #1 >4
+<e-\rightHandFinger #2 >
+<g-\rightHandFinger #3 >
 <c-\rightHandFinger #4 >
 <c,-\rightHandFinger #1 e-\rightHandFinger #2
   g-\rightHandFinger #3 c-\rightHandFinger #4 >1
diff --git a/Documentation/es/user/fundamental.itely b/Documentation/es/user/fundamental.itely
index beb30b964c..4db2b11310 100644
--- a/Documentation/es/user/fundamental.itely
+++ b/Documentation/es/user/fundamental.itely
@@ -1034,7 +1034,7 @@ las ligaduras de unión y de expresión y las indicaciones de dinámica:
 
 @lilypond[quote,ragged-right,verbatim]
 \relative c'{
-  % Default behaviour or behaviour after \oneVoice
+  % Default behavior or behavior after \oneVoice
   c d8 ~ d e4 ( f g a ) b-> c
 }
 @end lilypond
@@ -1471,7 +1471,7 @@ refrainwordsB = \lyricmode {
 \score {
   \new ChoirStaff {
     \new Staff <<
-      \context Voice = "verse" {
+      \new Voice = "verse" {
         \versenotes \break
         <<
           \refrainnotesA
@@ -2067,7 +2067,7 @@ d e
 % make note heads larger
 \set fontSize = #2.5
 f g
-% return to original size
+% return to default size
 \unset fontSize
 a b
 @end lilypond
@@ -2511,7 +2511,6 @@ sopranoMusic = \relative c' {
   \clef treble
   \key c \major
   \time 4/4
-
   a4 b c d
 }
 
@@ -2523,11 +2522,10 @@ celloMusic = \relative c {
   \clef bass
   \key c \major
   \time 4/4
-
   d4 g fis8 e d4
 }
 
-\score{
+\score {
   <<
     <<
       \new Voice = "one" {
@@ -2734,28 +2732,28 @@ del ejemplo anterior, obtenemos:
 
 @lilypond[quote,verbatim,ragged-right,addversion]
 global = { \key d \major \time 4/4 }
-sopMusic = \relative c'' {
+sopranoMusic = \relative c'' {
   \clef "treble"
   r4 d2 a4 | d4. d8 a2 | cis4 d cis2 |
 }
-sopWords = \lyricmode {
+sopranoWords = \lyricmode {
   Wor -- thy is the lamb that was slain
 }
 altoMusic = \relative a' {
   \clef "treble"
   r4 a2 a4 | fis4. fis8 a2 | g4 fis fis2 |
 }
-altoWords = \sopWords
+altoWords = \sopranoWords
 tenorMusic = \relative c' {
   \clef "G_8"
   r4 fis2 e4 | d4. d8 d2 | e4 a, cis2 |
 }
-tenorWords = \sopWords
+tenorWords = \sopranoWords
 bassMusic = \relative c' {
   \clef "bass"
   r4 d2 cis4 | b4. b8 fis2 | e4 d a'2 |
 }
-bassWords = \sopWords
+bassWords = \sopranoWords
 upper = \relative a' {
   \clef "treble"
   \global
@@ -2776,9 +2774,9 @@ lower = \relative c, {
     \new ChoirStaff <<
       \new Staff = "sopranos" <<
         \set Staff.instrumentName = "Soprano"
-        \new Voice = "sopranos" { \global \sopMusic }
+        \new Voice = "sopranos" { \global \sopranoMusic }
       >>
-      \new Lyrics \lyricsto "sopranos" { \sopWords }
+      \new Lyrics \lyricsto "sopranos" { \sopranoWords }
       \new Staff = "altos" <<
         \set Staff.instrumentName = "Alto"
         \new Voice = "altos" { \global \altoMusic }
@@ -2797,7 +2795,7 @@ lower = \relative c, {
     >>  % end ChoirStaff
 
     \new PianoStaff <<
-      \set PianoStaff.instrumentName = "Piano"
+      \set PianoStaff.instrumentName = "Piano  "
       \new Staff = "upper" \upper
       \new Staff = "lower" \lower
     >>
@@ -2956,7 +2954,7 @@ ManualOneVoiceOneMusic = \relative g' {
   g4 g f ees | d2 c2 |
 }
 ManualOneVoiceTwoMusic = \relative c' {
-  ees16 d ees8~ ees16 f ees s c8 d~ d c~ |
+  ees16 d ees8~ ees16 f ees d c8 d~ d c~ |
   c c4 b8 c8. g16 c b c d |
 }
 ManualTwoMusic = \relative c' {
diff --git a/Documentation/es/user/input.itely b/Documentation/es/user/input.itely
index ce10303d7d..f68b7c85c6 100644
--- a/Documentation/es/user/input.itely
+++ b/Documentation/es/user/input.itely
@@ -1656,7 +1656,7 @@ repetición esté presente en la salida MIDI.  Esto se consigue mediante
 la aplicación de la función musical @code{\unfoldRepeats}.  Esta
 función cambia todas las repeticiones a repeticiones desplegadas.
 
-@lilypond[quote,verbatim,fragment,line-width=8.0\cm]
+@lilypond[quote,verbatim]
 \unfoldRepeats {
   \repeat tremolo 8 {c'32 e' }
   \repeat percent 2 { c''8 d'' }
diff --git a/Documentation/es/user/introduction.itely b/Documentation/es/user/introduction.itely
index c5daea3cf1..4dbc64b515 100644
--- a/Documentation/es/user/introduction.itely
+++ b/Documentation/es/user/introduction.itely
@@ -325,7 +325,7 @@ direcciones hacia arriba (o hacia la derecha).
 \new Score \with {
    \override SpacingSpanner #'spacing-increment = #3
    \override TimeSignature #'transparent = ##t
-} \relative {
+} \relative c' {
    \stemDown <e g b>4_>-\arpeggio
    \override Arpeggio #'direction = #RIGHT
    \stemUp <e g b>4^>-\arpeggio
@@ -453,9 +453,9 @@ cabezas de las notas, el @code{Note_heads_engraver}.
 \include "engraver-example.ily"
 
 \score {
-   \topVoice
-   \layout {
-   \context {
+  \topVoice
+  \layout {
+    \context {
       \Voice
       \remove "Stem_engraver"
       \remove "Phrasing_slur_engraver"
@@ -463,8 +463,8 @@ cabezas de las notas, el @code{Note_heads_engraver}.
       \remove "Script_engraver"
       \remove "Beam_engraver"
       \remove "Auto_beam_engraver"
-   }
-   \context {
+    }
+    \context {
       \Staff
       \remove "Accidental_engraver"
       \remove "Key_engraver"
@@ -473,8 +473,8 @@ cabezas de las notas, el @code{Note_heads_engraver}.
       \remove "Time_signature_engraver"
       \remove "Staff_symbol_engraver"
       \consists "Pitch_squash_engraver"
-   }
-}
+    }
+  }
 }
 @end lilypond
 
@@ -666,7 +666,7 @@ mayores, se pueden expresar ideas musicales más complejas.  Por
 ejemplo
 
 @lilypond[quote,verbatim,fragment,relative=1]
-c4
+f4
 @end lilypond
 
 @noindent
@@ -741,8 +741,11 @@ grabado de música dentro de un programa de ordenador.  Gracias a todo
 este duro trabajo, el programa ahora se puede usar para hacer trabajos
 útiles.  La aplicación más sencilla es imprimir notas.
 
-@lilypond[quote,relative=1,fragment]
-\time 2/4 c4 c g'4 g a4 a g2
+@lilypond[quote,relative=1]
+{
+  \time 2/4
+  c4 c g'4 g a4 a g2
+}
 @end lilypond
 
 @noindent
@@ -765,7 +768,76 @@ de acordes (lead sheet).
 También se puede imprimir notación polifónica y música para piano.
 El ejemplo siguiente combina algunas otras construcciones exóticas.
 
-@lilypondfile[quote,ragged-right]{screech-boink.ly}
+@lilypond[quote]
+\header {
+  title = "Screech and boink"
+  subtitle = "Random complex notation"
+  composer = "Han-Wen Nienhuys"
+}
+
+\score {
+  \context PianoStaff <<
+    \new Staff = "up" {
+      \time 4/8
+      \key c \minor
+      << {
+        \revert Stem #'direction
+        \change Staff = down
+        \set subdivideBeams = ##t
+        g16.[
+          \change Staff = up
+          c'''32
+          \change Staff = down
+          g32
+          \change Staff = up
+          c'''32
+          \change Staff = down
+          g16]
+        \change Staff = up
+        \stemUp
+        \set followVoice = ##t
+        c'''32([ b''16 a''16 gis''16 g''32)]
+      } \\ {
+        s4 \times 2/3 { d'16[ f' g'] } as'32[ b''32 e'' d'']
+      } \\ {
+        s4 \autoBeamOff d''8.. f''32
+      } \\ {
+        s4 es''4
+      } >>
+    }
+
+    \new Staff = "down" {
+      \clef bass
+      \key c \minor
+      \set subdivideBeams = ##f
+      \override Stem  #'french-beaming = ##t
+      \override Beam  #'thickness = #0.3
+      \override Stem  #'thickness = #4.0
+      g'16[ b16 fis16 g16]
+      << \makeClusters {
+        as16 <as b>
+        <g b>
+        <g cis>
+      } \\ {
+        \override Staff.Arpeggio  #'arpeggio-direction =#down
+        <cis, e, gis, b, cis>4\arpeggio
+      }
+    >> }
+  >>
+  \midi {
+    \context {
+      \Score
+      tempoWholesPerMinute = #(ly:make-moment 60 8)
+    }
+  }
+  \layout {
+    \context {
+      \Staff
+      \consists Horizontal_bracket_engraver
+    }
+  }
+}
+@end lilypond
 
 Todos los fragmentos mostrados se han escrito a mano, pero esto no es
 necesariamente así.  Puesto que el motor de formateo es casi
diff --git a/Documentation/es/user/percussion.itely b/Documentation/es/user/percussion.itely
index 6fecefcd8e..6c24b95e22 100644
--- a/Documentation/es/user/percussion.itely
+++ b/Documentation/es/user/percussion.itely
@@ -412,7 +412,7 @@ woodstaff = {
   % It also defines the positions of the two lines.
   \override Staff.StaffSymbol #'line-positions = #'(-2 3)
 
-  % This is neccessary; if not entered, the barline wuld be too short!
+  % This is neccessary; if not entered, the barline would be too short!
   \override Staff.BarLine #'bar-size = #3
 }
 
diff --git a/Documentation/es/user/pitches.itely b/Documentation/es/user/pitches.itely
index a0ded73954..1adac14d2a 100644
--- a/Documentation/es/user/pitches.itely
+++ b/Documentation/es/user/pitches.itely
@@ -179,9 +179,7 @@ anterior.
 \relative c' {
   c
   <c e g>
-  % the C is now an octave higher
   <c' e g'>
-  % the C returns to the original pitch
   <c, e, g''>
 }
 @end lilypond
@@ -319,7 +317,7 @@ del nombre de la nota.  Estas alteraciones adicionales se pueden usar
 también para producir notas con becuadro.
 
 @lilypond[verbatim,quote,relative=2]
-cis cis cis! cis? c c? c! c
+cis cis cis! cis? c c c! c?
 @end lilypond
 
 @cindex alteración en nota ligada
@@ -1187,12 +1185,10 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      %%% change the next line as desired:
       #(set-accidental-style 'default)
       \musicA
     }
     \context Staff = "down" {
-      %%% change the next line as desired:
       #(set-accidental-style 'default)
       \musicB
     }
diff --git a/Documentation/es/user/rhythms.itely b/Documentation/es/user/rhythms.itely
index 9ad92c7173..e56081ac51 100644
--- a/Documentation/es/user/rhythms.itely
+++ b/Documentation/es/user/rhythms.itely
@@ -300,7 +300,7 @@ a4*2/3 gis4*2/3 a4*2/3
 a4 a4
 % Double the duration of chord
 <a d>4*2
-% Duration of quarter, appears like sixteeth
+% Duration of quarter, appears like sixteenth
 b16*4 c4
 @end lilypond
 
@@ -399,7 +399,7 @@ ningún par de cabezas, no se crea ninguna ligadura.  Los acordes se
 pueden ligar parcialmente colocando la ligadura dentro del acorde.
 
 @lilypond[quote,verbatim,relative=1]
- <c e g> ~ <c e g>
+<c e g> ~ <c e g>
 <c~ e g~ b> <c e g b>
 @end lilypond
 
@@ -1230,9 +1230,9 @@ ligadura.
 \new Voice \with {
   \remove "Note_heads_engraver"
   \consists "Completion_heads_engraver"
-} {
-  c2. c8 d4 e f g a b c8 c2 b4 a g16 f4 e d c8. c2
 }
+
+{ c2. c8 d4 e f g a b c8 c2 b4 a g16 f4 e d c8. c2 }
 @end lilypond
 
 Este grabador divide todas las notas largas en la barra de compás e
diff --git a/Documentation/es/user/staff.itely b/Documentation/es/user/staff.itely
index 1e55cfa736..a78dfc2cf3 100644
--- a/Documentation/es/user/staff.itely
+++ b/Documentation/es/user/staff.itely
@@ -1218,7 +1218,7 @@ estableciendo la propiedad @code{instrumentCueName} en el contexto
 oboe = \relative c''' {
   g4 r8 e16 f e4 d
 }
-\addQuote oboe { \oboe }
+\addQuote "oboe" { \oboe }
 
 \new Staff \relative c'' <<
   \new CueVoice \with {
diff --git a/Documentation/es/user/text.itely b/Documentation/es/user/text.itely
index 3cabc78a01..8817aa1571 100644
--- a/Documentation/es/user/text.itely
+++ b/Documentation/es/user/text.itely
@@ -827,7 +827,7 @@ la izquierda o justificados, como se muestra en el ejemplo siguiente.
       (Calle de Granada. Fachada de la casa de Carmela
       y su hermano Manuel con grandes ventanas abiertas
       a través de las que se ve el patio
-      donde se celebra una alegre fiesta.)
+      donde se celebra una alegre fiesta)
     }
   }
 }
diff --git a/Documentation/es/user/tutorial.itely b/Documentation/es/user/tutorial.itely
index cbc7e83f46..66710c647d 100644
--- a/Documentation/es/user/tutorial.itely
+++ b/Documentation/es/user/tutorial.itely
@@ -1795,7 +1795,7 @@ el aria de Fígaro @notation{Largo al factotum}:
     \clef bass
     \key c \major
     \time 6/8
-    c4.~ c8 d b c([ d)] b c d b c
+    c4.~ c8 d b c([ d]) b c d b c
   }
   \addlyrics {
     Lar -- go_al fac -- to -- tum del -- la cit -- tà
diff --git a/Documentation/es/user/tweaks.itely b/Documentation/es/user/tweaks.itely
index 7319306237..108bcd0836 100644
--- a/Documentation/es/user/tweaks.itely
+++ b/Documentation/es/user/tweaks.itely
@@ -2056,7 +2056,7 @@ R1
 % Turn off collision avoidance
 \once \override TextScript #'outside-staff-priority = ##f
 \textLengthOn  % and turn on textLengthOn
-c,,2^"Long Text   "  % Spaces at end are honoured
+c,,2^"Long Text   "  % Spaces at end are honored
 c''2
 @end lilypond
 
@@ -3607,7 +3607,7 @@ notas un color que depende de su posición dentro del pentagrama.
   g1 |
 }
 \addlyrics {
-  Some -- where o -- ver the Rain -- bow way up high,
+  Some -- where o -- ver the Rain -- bow, way up high,
 }
 @end lilypond
 
diff --git a/Documentation/es/user/unfretted-strings.itely b/Documentation/es/user/unfretted-strings.itely
index ba376e82e1..f1401a39ac 100644
--- a/Documentation/es/user/unfretted-strings.itely
+++ b/Documentation/es/user/unfretted-strings.itely
@@ -114,8 +114,8 @@ y el ejemplo siguiente muestra tres formas distintas de indicar un La
 sobre una cuerda al aire del violín:
 
 @lilypond[verbatim,quote,relative=2]
-a4 \open 
-a^\markup { \teeny "II" } 
+a4 \open
+a^\markup { \teeny "II" }
 a2^\markup { \small "sul A" }
 @end lilypond
 
diff --git a/Documentation/fr/user/cheatsheet.itely b/Documentation/fr/user/cheatsheet.itely
index 4a28f43bd0..9b2e8ed27b 100644
--- a/Documentation/fr/user/cheatsheet.itely
+++ b/Documentation/fr/user/cheatsheet.itely
@@ -37,7 +37,7 @@ c1 c2 c8 c16
 @tab
 @lilypond[fragment,relative=2,notime]
 \override Staff.Clef #'break-visibility = #all-invisible
-c4. c4..  
+c4. c4..
 @end lilypond
 
 @item @code{c d e f g a b }
@@ -68,7 +68,7 @@ s4_" "
 @tab chiffre de mesure
 @tab
 @lilypond[fragment]
-\override Staff.Clef #'transparent = ##t 
+\override Staff.Clef #'transparent = ##t
 \time 3/4
 s4_" "
 \time 4/4
@@ -99,7 +99,7 @@ d ~ d
 @lilypond[notime,fragment]
 \clef treble
 \key es \major
-s4 
+s4
 @end lilypond
 
 @item @var{note}@code{'}
@@ -213,7 +213,7 @@ a\> a a\!
 @tab
 @lilypond[fragment,relative=2]
 \set Staff.implicitTimeSignatureVisibility = #all-invisible
-<c e> 
+<c e>
 @end lilypond
 
 
@@ -264,7 +264,7 @@ twinkle
 <<
    { g'1 g }
   \new Lyrics \lyricsto "" { twin -- kle }
->> 
+>>
 @end lilypond
 
 @item @code{\chordmode @{ c:dim f:maj7 @}}
diff --git a/Documentation/fr/user/fundamental.itely b/Documentation/fr/user/fundamental.itely
index 84d6d4a8be..a4f55fa8c4 100644
--- a/Documentation/fr/user/fundamental.itely
+++ b/Documentation/fr/user/fundamental.itely
@@ -438,7 +438,7 @@ celle imprimée en tête de ligne.
 Une section ossia se placera au dessus de la portée en procédant ainsi :
 
 @lilypond[verbatim,quote,ragged-right]
-\new Staff ="main" {
+\new Staff = "main" {
   \relative g' {
     r4 g8 g c4 c8 d |
     e4 r8
@@ -2371,7 +2371,6 @@ sopranoMusic = \relative c' {
   \clef treble
   \key c \major
   \time 4/4
-
   a4 b c d
 }
 
@@ -2383,11 +2382,10 @@ celloMusic = \relative c {
   \clef bass
   \key c \major
   \time 4/4
-
   d4 g fis8 e d4
 }
 
-\score{
+\score {
   <<
     <<
       \new Voice = "one" {
diff --git a/Documentation/fr/user/introduction.itely b/Documentation/fr/user/introduction.itely
index 2a3fdccd27..10fbeedac4 100644
--- a/Documentation/fr/user/introduction.itely
+++ b/Documentation/fr/user/introduction.itely
@@ -752,8 +752,12 @@ une partition de chanson :
 @lilypond[quote,ragged-right]
 <<
    \chords { c2 c f2 c }
-   \new Staff \relative c' { \time 2/4 c4 c g'4 g a4 a g2 }
-   \new Lyrics \lyricmode { twin4 kle twin kle lit tle star2 }
+   \new Staff
+   \relative c' {
+     \time 2/4
+     c4 c g' g a a g2
+   }
+   \addlyrics { twin -- kle twin -- kle lit -- tle star }
 >>
 @end lilypond
 
@@ -776,7 +780,7 @@ plus exotiques :
       << {
         \revert Stem #'direction
         \change Staff = down
-        \set subdivideBeams = ##t	     
+        \set subdivideBeams = ##t
         g16.[
           \change Staff = up
           c'''32
@@ -807,7 +811,7 @@ plus exotiques :
       \override Beam  #'thickness = #0.3
       \override Stem  #'thickness = #4.0
       g'16[ b16 fis16 g16]
-      << \makeClusters { 
+      << \makeClusters {
         as16 <as b>
         <g b>
         <g cis>
-- 
2.39.2