Merge branch 'master' into nested-bookparts

[lilypond.git] / Documentation / fr / user / lilypond.tely

diff --git a/Documentation/fr/user/lilypond.tely b/Documentation/fr/user/lilypond.tely
index b47f0f694cf7cf8d6418d591041121c4d0c1cfb4..0a2bb003322da500d79ee0d372c9a266dcd6099c 100644 (file)
--- a/Documentation/fr/user/lilypond.tely
+++ b/Documentation/fr/user/lilypond.tely
@@ -1,25 +1,21 @@
 \input texinfo @c -*- coding: utf-8; mode: texinfo; documentlanguage: fr -*-
 @ignore
-    Translation of GIT committish: 1859194a9f46a8886166cafee0e450b39fc5a963
+    Translation of GIT committish: 6f84d7b264bf1faa8d9c586bbf06c762ae53183a
 
     When revising a translation, copy the HEAD committish of the
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@setfilename lilypond.info
-@settitle GNU LilyPond -- manuel de référence
 @documentencoding UTF-8
+@setfilename lilypond.info
+@settitle GNU LilyPond -- Manuel de notation
+
+@include macros.itexi
 
-@iftex
 @afourpaper
-@c don't replace quotes with directed quotes
-@tex
-\gdef\SETtxicodequoteundirected{Foo}
-\gdef\SETtxicodequotebacktick{Bla}
-@end tex
-@end iftex
 
-@c @direntry has not been added yet, as Emacs and standalone Info have no i18n support -JM
+@c @direntry has not been added yet, as Emacs and standalone Info have
+@c no i18n support -JM
 
 @c don't remove this comment.
 @ignore
@@ -30,6 +26,13 @@
 @omflanguage French
 @end ignore
 
+@c Translators: John Mandereau, Jean-Charles Malahieude
+
+@ifnottex
+@node Top
+@top GNU LilyPond --- Manuel de notation
+@end ifnottex
+
 @ifhtml
 Ce document est également disponible au format
 @uref{source/Documentation/user/lilypond.fr.pdf,PDF}.
@@ -52,11 +55,11 @@ Ce document est également disponible au format
 @titlepage
 @title GNU LilyPond
 @subtitle Le système de gravure musicale
-@titlefont{Manuel de référence}
+@titlefont{Manuel de notation}
 @author L'équipe de développement de LilyPond
 
 
-Copyright @copyright{} 1999--2007 by the authors
+Copyright @copyright{} 1999--2008 par les auteurs
 
 @emph{The translation of the following copyright notice is provided
 for courtesy to non-English speakers, but only the notice in English
@@ -85,28 +88,14 @@ Free Documentation License''.
 
 @vskip 20pt
 
-@lilypond[ragged-right]
-\score {
-    \context Lyrics {
-        \override Score.RehearsalMark #'self-alignment-X = #LEFT
-        \override Score.RehearsalMark #'font-size = #-2 
-        \mark #(ly:export (string-append
-             "(Pour LilyPond version " (lilypond-version) ")"))
-        s2
-     }
-     \layout {
-         indent = 0.0\pt
-     }
-}
-@end lilypond
-
+Pour LilyPond version @version{}
 @end titlepage
 
 
 @ifnottex
 Ce fichier documente GNU LilyPond.
 
-Copyright @copyright{} 1999--2007 par les auteurs
+Copyright @copyright{} 1999--2008 par les auteurs
 
 @emph{The translation of the following copyright notice is provided
 for courtesy to non-English speakers, but only the notice in English
@@ -136,14 +125,10 @@ Free Documentation License''.
 
 
 @ifnottex
-@node Top
-@top GNU LilyPond --- le système de gravure musicale
-@c HJJ: Info needs `@top', which is a synonym for `@unnumbered' in TeX.
 
-Ce document est le manuel de référence de GNU LilyPond 2.11.x.
-@ifhtml
-(Allez au bas de la page pour voir le numéro de version exact).
-@end ifhtml
+Ce document constitue le manuel de notation de GNU LilyPond
+@version{}.  Pour connaître la place qu'occupe ce manuel dans la
+documentation, consultez @rlearning{About the documentation}.
 
 @cindex web site
 @cindex URL
@@ -155,19 +140,17 @@ ligne de ce manuel, ainsi qu'une documentation supplémentaire.
 @include dedication.itely
 
 @menu
-* Musical notation::
-* Specialist notation::
-* Changing defaults::
-* Non-musical notation::           aspects autres que la notation musicale.
+* Musical notation::               notation générale.
+* Specialist notation::            notation à usage spécifique.
+* General input and output::       généralités sur les fichiers sources et les sorties.
 * Spacing issues::                 mise en page de la musique sur le papier.
+* Changing defaults::              ajustement de la gravure.
 * Interfaces for programmers::     utilisation avancée.
 
 Annexes
 
 * Literature list::                ouvrages de référence sur la notation musicale.
-* Scheme tutorial::                programmer au sein de LilyPond.
 * Notation manual tables::         tables et diagrammes.
-* Templates::                      modèles prêts à l'emploi.
 * Cheat sheet::                    résumé de la syntaxe de LilyPond.
 * GNU Free Documentation License:: licence de ce document.
 * LilyPond command index::
@@ -179,21 +162,18 @@ Annexes
 @contents
 
 
-@include macros.itexi
-
 @include notation.itely
 @include specialist.itely
 
-@include changing-defaults.itely
-@include non-music.itely
+@include input.itely
 @include spacing.itely
+
+@include changing-defaults.itely
 @include programming-interface.itely
 
 
 @include literature.itely
-@include scheme-tutorial.itely
 @include notation-appendices.itely
-@include templates.itely
 @include cheatsheet.itely
 @include fdl.itexi