Merge branch 'master' into lilypond/translation

[lilypond.git] / Documentation / fr / essay / engraving.itely

diff --git a/Documentation/fr/essay/engraving.itely b/Documentation/fr/essay/engraving.itely
index ded945f40b27b81c069538ae6f0f374b55ebe152..ec3a054d7ee71d8c3f01fb0d8d3968c1cfa0ac80 100644 (file)
--- a/Documentation/fr/essay/engraving.itely
+++ b/Documentation/fr/essay/engraving.itely
@@ -1,14 +1,14 @@
 @c -*- coding: utf-8; mode: texinfo; documentlanguage: fr -*-
 
 @ignore
-    Translation of GIT committish: 541f77187b475f4ea84ca36485d2255dd7db0437
+    Translation of GIT committish: ee20a00bbe6704553bb1f761899a727fc150ab46
 
     When revising a translation, copy the HEAD committish of the
     version that you are working on.  For details, see the Contributors'
     Guide, node Updating translation committishes..
 @end ignore
 
-@c \version "2.13.4"
+@c \version "2.13.36"
 
 @c Translators: Jean-Charles Malahieude, John Mandereau, Gauvain Pocentek
 @c Translation checkers: 
@@ -492,8 +492,9 @@ global = {
   \key c \minor
 }
 
-\new Score <<
-  \new Staff \with {
+\score {
+  <<
+    \new Staff \with {
       fontSize = #-4
       \override StaffSymbol #'staff-space = #(magstep -4)
       \override StaffSymbol #'thickness = #(magstep -3)
@@ -505,18 +506,18 @@ global = {
       g8.(^> b16 c ees) g8-.^> r r
       R2.
     }
-  \new PianoStaff <<
-    \set PianoStaff.instrumentName = #"Piano"
-    \new Staff \relative c' {
-      \global
-      s2.
-      s4. s8 r8 r16 <c f aes c>
-      <c f aes c>4.^> <c ees g>8 r r
-    }
-    \new Staff \relative c {
-      \global
-      \clef "bass"
-      <<
+    \new PianoStaff <<
+      \set PianoStaff.instrumentName = #"Piano"
+      \new Staff \relative c' {
+        \global
+        s2.
+        s4. s8 r8 r16 <c f aes c>
+        <c f aes c>4.^> <c ees g>8 r r
+      }
+      \new Staff \relative c {
+        \global
+        \clef "bass"
+        <<
         {
           \once \override DynamicText #'X-offset = #-3
           <ees g c>2.~->^\f
@@ -525,12 +526,13 @@ global = {
           <c g c,>2.~
           <c g c,>4.~ <c g c,>8
         }
-      >>
-      r8 r16 <f, c' aes'>16
-      <f c' aes'>4.-> <c' g'>8 r r
-    }
+        >>
+        r8 r16 <f, c' aes'>16
+        <f c' aes'>4.-> <c' g'>8 r r
+      }
+    >>
   >>
->>
+}
 @end lilypond
 @end ignore
 
@@ -850,10 +852,12 @@ partII = \relative c' {
   d4 r4 r8 d'16 c bes8 c16 d
   ees8 d c ees a, r r4
 }
+
 partIII = \relative c' {
   \voiceOne
   r2 r8 d ees g, fis4 g r8 a16 bes c8 bes16 a
 }
+
 partIV = \relative c {
   \voiceTwo
   d4 r r2
@@ -909,16 +913,18 @@ inférieure de croisent temporairement@tie{}:
 @c KEEPLY
 @lilypond
 collide = \once \override NoteColumn #'force-hshift = #0
-\new Score <<
-  \new Voice = "sample" \relative c''{
-    \key g \minor
-    <<
-      {\voiceOne g4 \collide g4}
-      \new Voice {\voiceTwo bes \collide bes}
-    >>
-  }
-  \new Lyrics \lyricsto "sample" \lyricmode { "bien " " mauvais" }
->>
+\score {
+  <<
+    \new Voice = "sample" \relative c''{
+      \key g \minor
+      <<
+        {\voiceOne g4 \collide g4}
+        \new Voice {\voiceTwo bes \collide bes}
+      >>
+    }
+    \new Lyrics \lyricsto "sample" \lyricmode { "bien " " mauvais" }
+  >>
+}
 @end lilypond
 
 @item Finale positionne tous les silences d'une même voix à une hauteur
@@ -1449,13 +1455,19 @@ chaque objet est vers le bas (ou la gauche).  Les objets sont dirigés
 vers le haut (ou la droite) pour le second.
 
 @lilypond[quote,ragged-right]
-\new Score \with {
-   \override SpacingSpanner #'spacing-increment = #3
-   \override TimeSignature #'transparent = ##t
-} \relative c' {
-   \stemDown <e g b>4_>-\arpeggio
-   \override Arpeggio #'direction = #RIGHT
-   \stemUp <e g b>4^>-\arpeggio
+\score {
+  \relative c' {
+    \stemDown <e g b>4_>-\arpeggio
+    \override Arpeggio #'direction = #RIGHT
+    \stemUp <e g b>4^>-\arpeggio
+  }
+  \layout {
+    \context {
+      \Score
+      \override SpacingSpanner #'spacing-increment = #3
+      \override TimeSignature #'transparent = ##t
+    }
+  }
 }
 @end lilypond