Fix French docs snippets

diff --git a/Documentation/fr/user/working.itely b/Documentation/fr/user/working.itely
index 207722c68f170810f5f681f9c31172cdecba5116..c217b8bc27c2b080a7890497ba47cd00c32f11f0 100644 (file)
--- a/Documentation/fr/user/working.itely
+++ b/Documentation/fr/user/working.itely
@@ -194,9 +194,9 @@ Jusqu'à maintenant, vous avez vu ce type de code :
 @lilypond[quote,verbatim,ragged-right]
 hornNotes = \relative c'' { c4 b dis c }
 \score {
- {
-   \hornNotes
- }
+  {
+    \hornNotes
+  }
 }
 @end lilypond
 
@@ -208,9 +208,9 @@ fragA = \relative c'' { a4 a8. b16 }
 fragB = \relative c'' { a8. gis16 ees4 }
 violin = \new Staff { \fragA \fragA \fragB \fragA }
 \score {
- {
-   \violin
- }
+  {
+    \violin
+  }
 }
 @end lilypond
 
@@ -223,17 +223,17 @@ dolce = \markup{ \italic \bold dolce }
 padText = { \once \override TextScript #'padding = #5.0 }
 fthenp=_\markup{ \dynamic f \italic \small { 2nd } \hspace #0.1 \dynamic p }
 violin = \relative c'' {
- \repeat volta 2 {
-   c4._\dolce b8 a8 g a b |
-   \padText
-   c4.^"hi there!" d8 e' f g d |
-   c,4.\fthenp b8 c4 c-. |
- }
+  \repeat volta 2 {
+    c4._\dolce b8 a8 g a b |
+    \padText
+    c4.^"hi there!" d8 e' f g d |
+    c,4.\fthenp b8 c4 c-. |
+  }
 }
 \score {
- {
-   \violin
- }
+  {
+    \violin
+  }
 \layout{ragged-right=##t}
 }
 @end lilypond
@@ -246,13 +246,13 @@ lire, et particulièrement la dernière ligne.
 
 @example
 violin = \relative c'' @{
- \repeat volta 2 @{
-   c4._\markup@{ \italic \bold dolce @} b8 a8 g a b |
-   \once \override TextScript #'padding = #5.0
-   c4.^"hi there!" d8 e' f g d |
-   c,4.\markup@{ \dynamic f \italic \small @{ 2nd @}
-     \hspace #0.1 \dynamic p @} b8 c4 c-. |
- @}
+  \repeat volta 2 @{
+    c4._\markup@{ \italic \bold dolce @} b8 a8 g a b |
+    \once \override TextScript #'padding = #5.0
+    c4.^"hi there!" d8 e' f g d |
+    c,4.\markup@{ \dynamic f \italic \small @{ 2nd @}
+      \hspace #0.1 \dynamic p @} b8 c4 c-. |
+  @}
 @}
 @end example
 
@@ -266,16 +266,16 @@ pouvez les voir comme des fonctions.
 @lilypond[quote,verbatim,ragged-right]
 padText =
 #(define-music-function (parser location padding) (number?)
- #{
-   \once \override TextScript #'padding = #$padding
- #})
+  #{
+    \once \override TextScript #'padding = #$padding
+  #})
 
 \relative c''' {
- c4^"piu mosso" b a b
- \padText #1.8
- c4^"piu mosso" d e f
- \padText #2.6
- c4^"piu mosso" fis a g
+  c4^"piu mosso" b a b
+  \padText #1.8
+  c4^"piu mosso" d e f
+  \padText #2.6
+  c4^"piu mosso" fis a g
 }
 @end lilypond
 
@@ -303,19 +303,19 @@ les parties avec tous les @code{#()}.  Celles-ci sont expliquées dans
 
 @lilypond[quote,verbatim,ragged-right]
 mpdolce = #(make-dynamic-script (markup #:hspace 1 #:translate (cons 5 0)
- #:line(#:dynamic "mp" #:text #:italic "dolce" )))
+  #:line(#:dynamic "mp" #:text #:italic "dolce" )))
 tempoMark = #(define-music-function (parser location markp) (string?)
 #{
- \once \override Score . RehearsalMark #'self-alignment-X = #left
- \once \override Score . RehearsalMark #'extra-spacing-width = #'(+inf.0 . -inf.0)
- \mark \markup { \bold $markp }
+  \once \override Score . RehearsalMark #'self-alignment-X = #left
+  \once \override Score . RehearsalMark #'no-spacing-rods = ##t
+  \mark \markup { \bold $markp }
 #})
 
 \relative c'' {
- \tempo 4=50
- a4.\mpdolce d8 cis4--\glissando a | b4 bes a2
- \tempoMark "Poco piu mosso"
- cis4.\< d8 e4 fis | g8(\! fis)-. e( d)-. cis2
+  \tempo 4=50
+  a4.\mpdolce d8 cis4--\glissando a | b4 bes a2
+  \tempoMark "Poco piu mosso"
+  cis4.\< d8 e4 fis | g8(\! fis)-. e( d)-. cis2
 }
 @end lilypond
 
@@ -336,7 +336,7 @@ mpdolce = #(make-dynamic-script (markup #:hspace 1 #:translate (cons 5 0)
 tempoMark = #(define-music-function (parser location markp) (string?)
 #@{
  \once \override Score . RehearsalMark #'self-alignment-X = #left
- \once \override Score . RehearsalMark #'extra-spacing-width = #'(+inf.0 . -inf.0)
+  \once \override Score . RehearsalMark #'no-spacing-rods = ##t
  \mark \markup @{ \bold $markp @}
 #@})
 @end example
@@ -351,30 +351,30 @@ sous @file{"musique.ly"}).
 \include "definitions.ly"
 
 \relative c'' @{
- \tempo 4=50
- a4.\mpdolce d8 cis4--\glissando a | b4 bes a2
- \once \override Score.RehearsalMark #'padding = #2.0
- \tempoMark "Poco piu mosso"
- cis4.\< d8 e4 fis | g8(\! fis)-. e( d)-. cis2
+  \tempo 4=50
+  a4.\mpdolce d8 cis4--\glissando a | b4 bes a2
+  \once \override Score.RehearsalMark #'padding = #2.0
+  \tempoMark "Poco piu mosso"
+  cis4.\< d8 e4 fis | g8(\! fis)-. e( d)-. cis2
 @}
 @end example
 
 @lilypond[quote,ragged-right]
 mpdolce = #(make-dynamic-script (markup #:hspace 1 #:translate (cons 5 0)
- #:line(#:dynamic "mp" #:text #:italic "dolce" )))
+  #:line(#:dynamic "mp" #:text #:italic "dolce" )))
 tempoMark = #(define-music-function (parser location markp) (string?)
 #{
- \once \override Score . RehearsalMark #'self-alignment-X = #left
- \once \override Score . RehearsalMark #'extra-spacing-width = #'(+inf.0 . -inf.0)
- \mark \markup { \bold $markp }
+  \once \override Score . RehearsalMark #'self-alignment-X = #left
+  \once \override Score . RehearsalMark #'no-spacing-rods = ##t
+  \mark \markup { \bold $markp }
 #})
 
 \relative c'' {
- \tempo 4=50
- a4.\mpdolce d8 cis4--\glissando a | b4 bes a2
- \once \override Score.RehearsalMark #'padding = #2.0
- \tempoMark "Poco piu mosso"
- cis4.\< d8 e4 fis | g8(\! fis)-. e( d)-. cis2
+  \tempo 4=50
+  a4.\mpdolce d8 cis4--\glissando a | b4 bes a2
+  \once \override Score.RehearsalMark #'padding = #2.0
+  \tempoMark "Poco piu mosso"
+  cis4.\< d8 e4 fis | g8(\! fis)-. e( d)-. cis2
 }
 @end lilypond
 
@@ -391,59 +391,59 @@ fichier @file{definitions.ly} par ceci :
 @example
 %%%  definitions.ly
 mpdolce = #(make-dynamic-script (markup #:hspace 1 #:translate (cons 5 0)
- #:line( #:dynamic "mp" #:text #:italic "dolce" )))
+  #:line( #:dynamic "mp" #:text #:italic "dolce" )))
 tempoMark = #(define-music-function (parser location markp) (string?)
 #@{
- \once \override Score . RehearsalMark #'self-alignment-X = #left
- \once \override Score . RehearsalMark #'extra-spacing-width = #'(+inf.0 . -inf.0)
- \mark \markup @{ \bold $markp @}
+  \once \override Score . RehearsalMark #'self-alignment-X = #left
+  \once \override Score . RehearsalMark #'no-spacing-rods = ##t
+  \mark \markup @{ \bold $markp @}
 #@})
 
 \layout@{
- \context @{ \Score
-   \override MetronomeMark #'extra-offset = #'(-9 . 0)
-   \override MetronomeMark #'padding = #'3
- @}
- \context @{ \Staff
-   \override TimeSignature #'style = #'numbered
- @}
- \context @{ \Voice
-   \override Glissando #'thickness = #3
-   \override Glissando #'gap = #0.1
- @}
+  \context @{ \Score
+    \override MetronomeMark #'extra-offset = #'(-9 . 0)
+    \override MetronomeMark #'padding = #'3
+  @}
+  \context @{ \Staff
+    \override TimeSignature #'style = #'numbered
+  @}
+  \context @{ \Voice
+    \override Glissando #'thickness = #3
+    \override Glissando #'gap = #0.1
+  @}
 @}
 @end example
 
 @lilypond[quote,ragged-right]
 mpdolce = #(make-dynamic-script (markup #:hspace 1 #:translate (cons 5 0)
- #:line( #:dynamic "mp" #:text #:italic "dolce" )))
+  #:line( #:dynamic "mp" #:text #:italic "dolce" )))
 tempoMark = #(define-music-function (parser location markp) (string?)
 #{
- \once \override Score . RehearsalMark #'self-alignment-X = #left
- \once \override Score . RehearsalMark #'extra-spacing-width = #'(+inf.0 . -inf.0)
- \mark \markup { \bold $markp }
+  \once \override Score . RehearsalMark #'self-alignment-X = #left
+  \once \override Score . RehearsalMark #'no-spacing-rods = ##t
+  \mark \markup { \bold $markp }
 #})
 
 \layout{
- \context { \Score
-   \override MetronomeMark #'extra-offset = #'(-9 . 0)
-   \override MetronomeMark #'padding = #'3
- }
- \context { \Staff
-   \override TimeSignature #'style = #'numbered
- }
- \context { \Voice
-   \override Glissando #'thickness = #3
-   \override Glissando #'gap = #0.1
- }
+  \context { \Score
+    \override MetronomeMark #'extra-offset = #'(-9 . 0)
+    \override MetronomeMark #'padding = #'3
+  }
+  \context { \Staff
+    \override TimeSignature #'style = #'numbered
+  }
+  \context { \Voice
+    \override Glissando #'thickness = #3
+    \override Glissando #'gap = #0.1
+  }
 }
 
 \relative c'' {
- \tempo 4=50
- a4.\mpdolce d8 cis4--\glissando a | b4 bes a2
- \once \override Score.RehearsalMark #'padding = #2.0
- \tempoMark "Poco piu mosso"
- cis4.\< d8 e4 fis | g8(\! fis)-. e( d)-. cis2
+  \tempo 4=50
+  a4.\mpdolce d8 cis4--\glissando a | b4 bes a2
+  \once \override Score.RehearsalMark #'padding = #2.0
+  \tempoMark "Poco piu mosso"
+  cis4.\< d8 e4 fis | g8(\! fis)-. e( d)-. cis2
 }
 @end lilypond
 
@@ -458,78 +458,78 @@ globale de police.
 @example
 %%%  definitions.ly
 mpdolce = #(make-dynamic-script (markup #:hspace 1 #:translate (cons 5 0)
- #:line( #:dynamic "mp" #:text #:italic "dolce" )))
+  #:line( #:dynamic "mp" #:text #:italic "dolce" )))
 tempoMark = #(define-music-function (parser location markp) (string?)
 #@{
- \once \override Score . RehearsalMark #'self-alignment-X = #left
- \once \override Score . RehearsalMark #'extra-spacing-width = #'(+inf.0 . -inf.0)
- \mark \markup @{ \bold $markp @}
+  \once \override Score . RehearsalMark #'self-alignment-X = #left
+  \once \override Score . RehearsalMark #'no-spacing-rods = ##t
+  \mark \markup @{ \bold $markp @}
 #@})
 
 #(set-global-staff-size 23)
 \layout@{
- \context @{ \Score
-   \override MetronomeMark #'extra-offset = #'(-9 .  0)
-   \override MetronomeMark #'padding = #'3
- @}
- \context @{ \Staff
- @}
- \context @{ \Voice
-   \override Glissando #'thickness = #3
-   \override Glissando #'gap = #0.1
- @}
+  \context @{ \Score
+    \override MetronomeMark #'extra-offset = #'(-9 . 0)
+    \override MetronomeMark #'padding = #'3
+  @}
+  \context @{ \Staff
+  @}
+  \context @{ \Voice
+    \override Glissando #'thickness = #3
+    \override Glissando #'gap = #0.1
+  @}
 @}
 @end example
 
 @lilypond[quote,ragged-right]
 mpdolce = #(make-dynamic-script (markup #:hspace 1 #:translate (cons 5 0)
- #:line( #:dynamic "mp" #:text #:italic "dolce" )))
+  #:line( #:dynamic "mp" #:text #:italic "dolce" )))
 tempoMark = #(define-music-function (parser location markp) (string?)
 #{
- \once \override Score . RehearsalMark #'self-alignment-X = #left
- \once \override Score . RehearsalMark #'extra-spacing-width = #'(+inf.0 . -inf.0)
- \mark \markup { \bold $markp }
+  \once \override Score . RehearsalMark #'self-alignment-X = #left
+  \once \override Score . RehearsalMark #'no-spacing-rods = ##t
+  \mark \markup { \bold $markp }
 #})
 
 #(set-global-staff-size 23)
 \layout{
- \context { \Score
-   \override MetronomeMark #'extra-offset = #'(-9 . 0)
-   \override MetronomeMark #'padding = #'3
- }
- \context { \Voice
-   \override Glissando #'thickness = #3
-   \override Glissando #'gap = #0.1
- }
+  \context { \Score
+    \override MetronomeMark #'extra-offset = #'(-9 . 0)
+    \override MetronomeMark #'padding = #'3
+  }
+  \context { \Voice
+    \override Glissando #'thickness = #3
+    \override Glissando #'gap = #0.1
+  }
 }
 
 \relative c'' {
- \tempo 4=50
- a4.\mpdolce d8 cis4--\glissando a | b4 bes a2
- \once \override Score.RehearsalMark #'padding = #2.0
- \tempoMark "Poco piu mosso"
- cis4.\< d8 e4 fis | g8(\! fis)-. e( d)-. cis2
+  \tempo 4=50
+  a4.\mpdolce d8 cis4--\glissando a | b4 bes a2
+  \once \override Score.RehearsalMark #'padding = #2.0
+  \tempoMark "Poco piu mosso"
+  cis4.\< d8 e4 fis | g8(\! fis)-. e( d)-. cis2
 }
 @end lilypond
 
 Il ne nous reste plus qu'à remplacer @code{\include "definitions.ly"}
-par @code{\include "web-publish.ly"} dans notre fichier de musique.
+par @code{\include "publication-web.ly"} dans notre fichier de musique.
 
 Il est possible, bien sûr, de rendre cela encore plus pratique.  Nous
 pourrions créer un fichier @file{definitions.ly} qui ne contiendrait
 que les définitions de @code{mpdolce} et de @code{tempoMark}, un
 fichier @file{publication-web.ly} qui ne contiendrait que la section
-@code{layout} décrite ci-dessus et un fichier @file{university.ly} qui
+@code{layout} décrite ci-dessus et un fichier @file{universite.ly} qui
 ne contiendrait que les retouches pour produire le résultat que mon
-professeur préfère.  Le début du fichier @file{music.ly} ressemblerait
+professeur préfère.  Le début du fichier @file{musique.ly} ressemblerait
 alors à
 
 @example
 \include "definitions.ly"
 
 %%%  Décommentez seulement une de ces deux lignes !
-\include "web-publish.ly"
-%\include "university.ly"
+\include "publication-web.ly"
+%\include "universite.ly"
 @end example
 
 Cette approche peut être utile même si vous ne produisez qu'un seul