From: Jean-Charles Malahieude <lilyfan@orange.fr>
Date: Wed, 25 Aug 2010 12:04:25 +0000 (+0200)
Subject: Merge branch 'lilypond/translation'
X-Git-Tag: release/2.13.32-1~39
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=9158bc17904d4dd930a1f776cfe3226f1ad84092;p=lilypond.git

Merge branch 'lilypond/translation'
---

9158bc17904d4dd930a1f776cfe3226f1ad84092
diff --cc Documentation/fr/learning/tweaks.itely
index 716476b950,587fc0ee70..fc388267e4
--- a/Documentation/fr/learning/tweaks.itely
+++ b/Documentation/fr/learning/tweaks.itely
@@@ -1,6 -1,6 +1,6 @@@
 -@c -*- coding: utf-8; mode: texinfo; documentlanguage: fr -*-
 +r@c -*- coding: utf-8; mode: texinfo; documentlanguage: fr -*-
  @ignore
- 	Translation of GIT committish: 26375d5016d8d180fc914bfd07cf76f4168f2e37
+ 	Translation of GIT committish: 11b44eeed204540f7a4e638f12afe5a9f5466ca8
  
      When revising a translation, copy the HEAD committish of the
      version that you are working on.  For details, see the Contributors'
@@@ -3159,27 -3237,36 +3237,36 @@@ demi-intervalles de lignes au-dessus d
  
  @code{\once \override Tie #'staff-position = #3.5}
  
 -Cela s'adjoint à la deuxième mesure, pour donner :
 +Cela s'adjoint à la deuxième mesure, pour donner@tie{}:
  
- @lilypond[quote,verbatim,ragged-right]
+ @c line-width ensures no break
+ @lilypond[quote,verbatim,ragged-right,line-width=6\in]
  rhMusic = \relative c'' {
-   r2 c4.\( g8 |
-   \once \override Tie #'staff-position = #3.5
-   bes1~ |
-   \bar "||"
-   \time 6/4
-   bes2. r8
-   % Start polyphonic section of four voices
-   <<
-     {c,8[ d fis bes a] | }
-   \\
-     {c,8~ c2 | }
-   \\
-     {s8 d2 | }
-   \\
-     {s4 fis4. | }
-   >>
-   g2.\)
+   \new Voice {
+     r2 c4.\( g8 |
+     \once \override Tie #'staff-position = #3.5
+     bes1~ |
+     \bar "||"
+     \time 6/4
+     bes2. r8
+     % Start polyphonic section of four voices
+     <<
+       { c,8 d fis bes a }  % continuation of main voice
+       \new Voice {
+         \voiceTwo
+         c,8~ c2
+       }
+       \new Voice {
+         \voiceThree
+         s8 d2
+       }
+       \new Voice {
+         \voiceFour
+         s4 fis4.
+       }
+     >> |
+     g2.\)  % continuation of main voice
+   }
  }
  
  lhMusic = \relative c' {