Merge branch 'master' of git://git.sv.gnu.org/lilypond

[lilypond.git] / Documentation / fr / user / spacing.itely

diff --git a/Documentation/fr/user/spacing.itely b/Documentation/fr/user/spacing.itely
index bb9119890ea450e9e37fff4176a165ce4b429bd9..d8b8366561c3c5f7f908af2ba3008b350093de80 100644 (file)
--- a/Documentation/fr/user/spacing.itely
+++ b/Documentation/fr/user/spacing.itely
@@ -1,3 +1,13 @@
+@c -*- coding: utf-8; mode: texinfo; documentlanguage: fr -*-
+@c This file is part of lilypond.tely
+@ignore
+    Translation of GIT committish: 007d0b5b94c36f9d9e228309d5b0e6a67ae27ebc
+
+    When revising a translation, copy the HEAD committish of the
+    version that you are working on.  See TRANSLATION for details.
+@end ignore
+
+
 @node Spacing issues
 @chapter Spacing issues
 
@@ -6,10 +16,10 @@ UNTRANSLATED NODE: IGNORE ME
 @menu 
 * Paper and pages::
 * Music layout::
+* Displaying spacing::
+* Breaks::
 * Vertical spacing::
 * Horizontal spacing::
-* Breaks::
-* Displaying spacing::
 @end menu 
 @node Paper and pages
 @section Paper and pages
@@ -36,11 +46,11 @@ UNTRANSLATED NODE: IGNORE ME
 UNTRANSLATED NODE: IGNORE ME
 
 @menu 
-* Setting global staff size::
+* Setting the staff size::
 * Score layout::
 @end menu 
-@node Setting global staff size
-@subsection Setting global staff size
+@node Setting the staff size
+@subsection Setting the staff size
 
 UNTRANSLATED NODE: IGNORE ME
 
@@ -49,6 +59,60 @@ UNTRANSLATED NODE: IGNORE ME
 
 UNTRANSLATED NODE: IGNORE ME
 
+@node Displaying spacing
+@section Displaying spacing
+
+UNTRANSLATED NODE: IGNORE ME
+
+@node Breaks
+@section Breaks
+
+UNTRANSLATED NODE: IGNORE ME
+
+@menu 
+* Line breaking::
+* Page breaking::
+* Optimal page breaking::
+* Optimal page turning::
+* Minimal page breaking::
+* Explicit breaks::
+* Using an extra voice for breaks::
+@end menu 
+@node Line breaking
+@subsection Line breaking
+
+UNTRANSLATED NODE: IGNORE ME
+
+@node Page breaking
+@subsection Page breaking
+
+UNTRANSLATED NODE: IGNORE ME
+
+@node Optimal page breaking
+@subsection Optimal page breaking
+
+UNTRANSLATED NODE: IGNORE ME
+
+@node Optimal page turning
+@subsection Optimal page turning
+
+UNTRANSLATED NODE: IGNORE ME
+
+@node Minimal page breaking
+@subsection Minimal page breaking
+
+UNTRANSLATED NODE: IGNORE ME
+
+@node Explicit breaks
+@subsection Explicit breaks
+
+UNTRANSLATED NODE: IGNORE ME
+
+@node Using an extra voice for breaks
+@subsection Using an extra voice for breaks
+
+UNTRANSLATED NODE: IGNORE ME
+
 @node Vertical spacing
 @section Vertical spacing
 
@@ -56,28 +120,23 @@ UNTRANSLATED NODE: IGNORE ME
 
 @menu 
 * Vertical spacing inside a system::
-* Vertical spacing of piano staves::
 * Vertical spacing between systems::
-* Controlling spacing of individual systems::
+* Explicit staff and system positioning::
 * Two-pass vertical spacing::
+* Vertical collision avoidance::
 @end menu 
 @node Vertical spacing inside a system
 @subsection Vertical spacing inside a system
 
 UNTRANSLATED NODE: IGNORE ME
 
-@node Vertical spacing of piano staves
-@subsection Vertical spacing of piano staves
-
-UNTRANSLATED NODE: IGNORE ME
-
 @node Vertical spacing between systems
 @subsection Vertical spacing between systems
 
 UNTRANSLATED NODE: IGNORE ME
 
-@node Controlling spacing of individual systems
-@subsection Controlling spacing of individual systems
+@node Explicit staff and system positioning
+@subsection Explicit staff and system positioning
 
 UNTRANSLATED NODE: IGNORE ME
 
@@ -86,6 +145,11 @@ UNTRANSLATED NODE: IGNORE ME
 
 UNTRANSLATED NODE: IGNORE ME
 
+@node Vertical collision avoidance
+@subsection Vertical collision avoidance
+
+UNTRANSLATED NODE: IGNORE ME
+
 @node Horizontal spacing
 @section Horizontal Spacing
 
@@ -96,6 +160,7 @@ UNTRANSLATED NODE: IGNORE ME
 * New spacing area::
 * Changing horizontal spacing::
 * Line length::
+* Proportional notation::
 @end menu 
 @node Horizontal spacing overview
 @subsection Horizontal spacing overview
@@ -117,39 +182,12 @@ UNTRANSLATED NODE: IGNORE ME
 
 UNTRANSLATED NODE: IGNORE ME
 
-@node Breaks
-@section Breaks
+@node Proportional notation
+@subsection Proportional notation
 
 UNTRANSLATED NODE: IGNORE ME
 
-@menu 
-* Line breaking::
-* Page breaking::
-* Optimal page breaking::
-* Optimal page turning::
-@end menu 
-@node Line breaking
-@subsection Line breaking
-
-UNTRANSLATED NODE: IGNORE ME
-
-@node Page breaking
-@subsection Page breaking
-
-UNTRANSLATED NODE: IGNORE ME
-
-@node Optimal page breaking
-@subsection Optimal page breaking
-
-UNTRANSLATED NODE: IGNORE ME
-
-@node Optimal page turning
-@subsection Optimal page turning
-
-UNTRANSLATED NODE: IGNORE ME
-
-@node Displaying spacing
-@section Displaying spacing
-
-UNTRANSLATED NODE: IGNORE ME
 
+-- SKELETON FILE --
+When you actually translate this file, please remove these lines as
+well as all `UNTRANSLATED NODE: IGNORE ME' lines.