X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Documentation%2Ffr%2Fuser%2Fmacros.itexi;h=11aa1fbe42efda83c696167690db87f3f15e144c;hb=1ec09f60b78b43f5790113e24d79c670f76258ab;hp=438029098e2bdd9f26d353a98f1f2bff5561615e;hpb=42c706f4fef5722fa97e5dccc6487a301c98e683;p=lilypond.git
diff --git a/Documentation/fr/user/macros.itexi b/Documentation/fr/user/macros.itexi
index 438029098e..11aa1fbe42 100644
--- a/Documentation/fr/user/macros.itexi
+++ b/Documentation/fr/user/macros.itexi
@@ -1,22 +1,36 @@
@c -*- coding: utf-8; mode: texinfo; -*-
@ignore
- Translation of GIT committish: d30aabb4adc9e13c7a5a99a22230e97a0f164255
+ Translation of GIT committish: 8135382760aa0adfac5aed987a272c394e59dbdb
When revising a translation, copy the HEAD committish of the
version that you are working on. See TRANSLATION for details.
@end ignore
+
@include version.itexi
+
+@c Don't replace quotes with directed quotes.
+
+@set txicodequoteundirected
+@set txicodequotebacktick
+
+
+
@c ***** Displaying text *****
-@c we need this since @q{\} doesn't work with makeinfo 4.8 --
-@c say @q{@value{backslash}} instead
-@set backslash \
+@c We need this since @q{\} doesn't work with makeinfo 4.11 --
+@c say @q{@bs{}} instead.
+
+@macro bs
+\\
+@end macro
+
+@c To get decent quotes in `foo' and ``foo''.
+@c FIXME: Use thin spaces for @qq.
+
+@ifnotinfo
-@c to get decent quotes in `foo' and ``foo''
-@c these need to be split up so that "@qq{foo}." looks nice. :(
-@iftex
@macro q{TEXT}
@quoteleft{}\TEXT\@quoteright{}
@end macro
@@ -24,10 +38,11 @@
@macro qq{TEXT}
@guillemetleft{}@tie{}\TEXT\@tie{}@guillemetright{}
@end macro
-@end iftex
+@end ifnotinfo
@ifinfo
+
@macro q{TEXT}
`\TEXT\'
@end macro
@@ -35,37 +50,21 @@
@macro qq{TEXT}
« \TEXT\ »
@end macro
+
@end ifinfo
@ifhtml
-@macro q{TEXT}
-@html
-‘\TEXT\’
-@end html
-@end macro
-@macro qq{TEXT}
-@html
-« \TEXT\ »
-@end html
+@macro warning{TEXT}
+@cartouche
+@b{Note :} \TEXT\
+@end cartouche
@end macro
-@end ifhtml
+@end ifhtml
-@ifdocbook
-@macro q{TEXT}
-@xml
-‘\TEXT\’
-@end xml
-@end macro
-
-@macro qq{TEXT}
-@xml
-« \TEXT\ »
-@end xml
-@end macro
-@end ifdocbook
+@ifnothtml
@macro warning{TEXT}
@quotation
@@ -77,129 +76,168 @@
@end quotation
@end macro
+@end ifnothtml
+
+
@ifnotinfo
+
@macro notation{TEXT}
@var{\TEXT\}
@end macro
+
@end ifnotinfo
@ifinfo
+
@macro notation{TEXT}
\TEXT\
@end macro
+
@end ifinfo
+
@macro smallspace
@sp 1
@end macro
-@c **** Displaying images not generated by lilypond-book
-@c current installation setup of Info docs requires that all images are
-@c expected to be found in lilypond/ subdirectory. lilypond-book already
-@c generates proper @image commands for images of music; these macros
-@c definitions do the same for other images.
+@c ***** Displaying images not generated by lilypond-book *****
+
+@c Current installation setup of Info docs requires that all images are
+@c expected to be found in the `lilypond/' subdirectory. `lilypond-book'
+@c already generates proper @image commands for images of music; these
+@c macro definitions do the same for other images.
@ifnotinfo
+
@macro sourceimage{FILENAME,WIDTH,HEIGHT,ALTTEXT}
@image{\FILENAME\,\WIDTH\,\HEIGHT\,\ALTTEXT\}
@end macro
+
@end ifnotinfo
@ifinfo
+
@macro sourceimage{FILENAME,WIDTH,HEIGHT,ALTTEXT}
@image{lilypond/\FILENAME\,\WIDTH\,\HEIGHT\,\ALTTEXT\}
@end macro
+
@end ifinfo
-@c **** Headings in a doc subsection ****
+@c ***** Headings in a doc subsection *****
+
+@c Don't insert an empty line after @predefined! Right now
+@c it doesn't matter, but a future implementation will probably
+@c add some code which needs this restriction.
@macro predefined
@noindent
@subsubheading Predefined commands
+@end macro
+@c The next macro is a dummy currently since texinfo doesn't
+@c provide a real ragged-right environment yet.
+@c
+@c Due to a bug in texi2html (texi2html.pl CVS versions <= 1.245)
+@c the macro must not be empty.
+
+@macro endpredefined
+@c
@end macro
+
@macro snippets
@noindent
@subsubheading Selected Snippets
-
@end macro
+
@c obsolete, remove when translation is fully updated
@macro commonprop
@noindent
@subsubheading Commonly tweaked properties
-
@end macro
+
+@c Don't insert an empty line after @seealso! Otherwise we get
+@c unwanted extra vertical space in the PDF output.
+
@macro seealso
@noindent
@subsubheading See also
-
+@indent
@end macro
+
@macro knownissues
@noindent
@subsubheading Known issues and warnings
-
@end macro
-@c obsolete, remove when translation is fully updated
-@macro context{TEXT}
-@vindex \TEXT\
-@code{\TEXT\}@c should use rinternals
-@end macro
-
-@c obsolete, remove when translation is fully updated
-@macro refcommand{TEXT}
-@vindex \TEXT\
-@code{\TEXT\}
-@end macro
@macro lydoctitle {TEXT}
@emph{\TEXT\}
-
@end macro
+
+@c Don't remove the `@c' within the macro definition! See section 19.3,
+@c `Macro Details and Caveats', in the texinfo info file for explanation.
+
@macro funindex {TEXT}
@findex \TEXT\
@kindex \TEXT\
+@c
@end macro
-@c **** Links and references ****
+@c ***** Links and references *****
@c Definitions for references:
-@c @rinternals
+@c
@c @rglos
-@c @rprogram
-@c @ruser
@c @rlearning
+@c @ruser
+@c @rprogram
@c @rlsr
+@c @rinternals
+@c
+@c All these also have a @...named version which allows to specify the
+@c displayed text for the reference as second argument.
+@c
+@c ***** HTML + bigpage is a special case (other manual names); all other
+@c formats are treated similarly.
-@ifhtml
-@c ***** HTML *****
+
+@c *** not TeX ***
+
+@ifnottex
+
+@c ** bigpage **
@ifset bigpage
-@macro rinternals{TEXT}
+@macro rglos{TEXT}
@vindex \TEXT\
-@ref{\TEXT\,,,lilypond-internals-big-page,Référence des propriétés internes}
+@ref{\TEXT\,,,music-glossary-big-page,Glossaire}
@end macro
-@macro rglos{TEXT}
+@macro rglosnamed{TEXT,DISPLAY}
@vindex \TEXT\
-@ref{\TEXT\,,,music-glossary-big-page,Glossaire}
+@ref{\TEXT\,,\DISPLAY\,music-glossary-big-page,Glossaire}
@end macro
-@macro rprogram{TEXT}
+@macro rlearning{TEXT}
@vindex \TEXT\
-@ref{\TEXT\,,,lilypond-program-big-page,Manuel d'utilisation du programme}
+@ref{\TEXT\,,,lilypond-learning-big-page,Manuel d'initiation}
+@end macro
+
+@macro rlearningnamed{TEXT,DISPLAY}
+@vindex \TEXT\
+@ref{\TEXT\,,\DISPLAY\,lilypond-learning-big-page,Manuel d'initiation}
@end macro
@macro ruser{TEXT}
@@ -207,39 +245,55 @@
@ref{\TEXT\,,,lilypond-big-page,Manuel de notation}
@end macro
-@macro rlearning{TEXT}
+@macro rusernamed{TEXT,DISPLAY}
@vindex \TEXT\
-@ref{\TEXT\,,,lilypond-learning-big-page,Manuel d'initiation}
+@ref{\TEXT\,,\DISPLAY\,lilypond-big-page,Manuel de notation}
@end macro
-@macro rlsr{TEXT}
+@macro rprogram{TEXT}
@vindex \TEXT\
-@ref{\TEXT\,,,lilypond-snippets-big-page,Exemples de code}
+@ref{\TEXT\,,,lilypond-program-big-page,Manuel d'utilisation du programme}
@end macro
-@end ifset
+@macro rprogramnamed{TEXT,DISPLAY}
+@vindex \TEXT\
+@ref{\TEXT\,,\DISPLAY\,lilypond-program-big-page,Manuel d'utilisation du programme}
+@end macro
+@macro rlsr{TEXT}
+@vindex \TEXT\
+@ref{\TEXT\,,,lilypond-snippets-big-page,Exemples de code}
+@end macro
-@ifclear bigpage
+@macro rlsrnamed{TEXT,DISPLAY}
+@ref{\TEXT\,,\DISPLAY\,lilypond-snippets-big-page,Exemples de code}
+@end macro
@macro rinternals{TEXT}
@vindex \TEXT\
-@ref{\TEXT\,,,lilypond-internals,Référence des propriétés internes}
+@ref{\TEXT\,,,lilypond-internals-big-page,Référence des propriétés internes}
@end macro
-@macro rglos{TEXT}
+@macro rinternalsnamed{TEXT,DISPLAY}
@vindex \TEXT\
-@ref{\TEXT\,,,music-glossary,Glossaire}
+@ref{\TEXT\,,,lilypond-internals-big-page,Référence des propriétés internes}
@end macro
-@macro rprogram{TEXT}
+@end ifset
+
+
+@c ** not bigpage **
+
+@ifclear bigpage
+
+@macro rglos{TEXT}
@vindex \TEXT\
-@ref{\TEXT\,,,lilypond-program,Manuel d'utilisation du programme}
+@ref{\TEXT\,,,music-glossary,Glossaire}
@end macro
-@macro ruser{TEXT}
+@macro rglosnamed{TEXT,DISPLAY}
@vindex \TEXT\
-@ref{\TEXT\,,,lilypond,Manuel de notation}
+@ref{\TEXT\,,\DISPLAY\,music-glossary,Glossaire}
@end macro
@macro rlearning{TEXT}
@@ -247,27 +301,19 @@
@ref{\TEXT\,,,lilypond-learning,Manuel d'initiation}
@end macro
-@macro rlsr{TEXT}
+@macro rlearningnamed{TEXT,DISPLAY}
@vindex \TEXT\
-@ref{\TEXT\,,,lilypond-snippets,Exemples de code}
+@ref{\TEXT\,,\DISPLAY\,lilypond-learning,Manuel d'initiation}
@end macro
-@end ifclear
-
-@end ifhtml
-
-
-@ifdocbook
-@c ***** DOCBOOK-XML *****
-
-@macro rinternals{TEXT}
+@macro ruser{TEXT}
@vindex \TEXT\
-@ref{\TEXT\,,,lilypond-internals,Référence des propriétés internes}
+@ref{\TEXT\,,,lilypond,Manuel de notation}
@end macro
-@macro rglos{TEXT}
+@macro rusernamed{TEXT,DISPLAY}
@vindex \TEXT\
-@ref{\TEXT\,,,music-glossary,Glossaire}
+@ref{\TEXT\,,\DISPLAY\,lilypond,Manuel de notation}
@end macro
@macro rprogram{TEXT}
@@ -275,109 +321,141 @@
@ref{\TEXT\,,,lilypond-program,Manuel d'utilisation du programme}
@end macro
-@macro ruser{TEXT}
+@macro rprogramnamed{TEXT,DISPLAY}
@vindex \TEXT\
-@ref{\TEXT\,,,lilypond,Manuel de notation}
+@ref{\TEXT\,,\DISPLAY\,lilypond-program,Manuel d'utilisation du programme}
@end macro
-@macro rlearning{TEXT}
+@macro rlsr{TEXT}
@vindex \TEXT\
-@ref{\TEXT\,,,lilypond-learning,Manuel d'initiation}
+@ref{\TEXT\,,,lilypond-snippets,Exemples de code}
@end macro
-@macro rlsr{TEXT}
+@macro rlsrnamed{TEXT,DISPLAY}
+@ref{\TEXT\,,\DISPLAY\,lilypond-snippets,Exemples de code}
+@end macro
+
+@macro rinternals{TEXT}
@vindex \TEXT\
-@ref{\TEXT\,,,lilypond-snippets,Exemples de code}
+@ref{\TEXT\,,,lilypond-internals,Référence des propriétés internes}
+@end macro
+
+@macro rinternalsnamed{TEXT,DISPLAY}
+@vindex \TEXT\
+@ref{\TEXT\,,,lilypond-internals,Référence des propriétés internes}
@end macro
-@end ifdocbook
+@end ifclear
+@end ifnottex
-@ifinfo
-@c **** INFO ****
-@macro rinternals{NAME}
-@vindex \NAME\
-@inforef{\NAME\,,lilypond-internals,Référence des propriétés internes}
-@end macro
+@c *** TeX ***
-@macro rglos{NAME}
-@vindex \NAME\
-@inforef{\NAME\,,music-glossary,Glossaire}
-@end macro
+@iftex
-@macro rprogram{TEXT}
+@macro rglos{TEXT}
@vindex \TEXT\
-@ref{\TEXT\,,,lilypond-program,Manuel d'utilisation du programme}
+@ref{\TEXT\,,,music-glossary,Glossaire}
@end macro
-@macro ruser{TEXT}
+@macro rglosnamed{TEXT,DISPLAY}
@vindex \TEXT\
-@ref{\TEXT\,,,lilypond,Manuel de notation}
+@ref{\TEXT\,,\DISPLAY\,music-glossary,Glossaire}
@end macro
@macro rlearning{TEXT}
@vindex \TEXT\
-@ref{\TEXT\,,,lilypond-learning,Manuel d'initiation}
+@ref{\TEXT\,,,lilypond-learning.fr,Manuel d'initiation}
@end macro
-@macro rlsr{TEXT}
-@ref{\TEXT\,,,lilypond-snippets,Exemples de code}
+@macro rlearningnamed{TEXT,DISPLAY}
+@vindex \TEXT\
+@ref{\TEXT\,,\DISPLAY\,lilypond-learning.fr,Manuel d'initiation}
@end macro
-@end ifinfo
-
-
-@c **** TEX ****
-@iftex
-
-@macro rinternals{TEXT}
+@macro ruser{TEXT}
@vindex \TEXT\
-@code{\TEXT\}
+@ref{\TEXT\,,,lilypond.fr,Manuel de notation}
@end macro
-@macro rglos {TEXT}
+@macro rusernamed{TEXT,DISPLAY}
@vindex \TEXT\
-@ref{\TEXT\,,,music-glossary,Glossaire}
+@ref{\TEXT\,,\DISPLAY\,lilypond.fr,Manuel de notation}
@end macro
@macro rprogram{TEXT}
+@vindex \TEXT\
@ref{\TEXT\,,,lilypond-program.fr,Manuel d'utilisation du programme}
@end macro
-@macro ruser{TEXT}
-@ref{\TEXT\,,,lilypond.fr,Manuel de notation}
-@end macro
-
-@macro rlearning{TEXT}
-@ref{\TEXT\,,,lilypond-learning.fr,Manuel d'initiation}
+@macro rprogramnamed{TEXT,DISPLAY}
+@vindex \TEXT\
+@ref{\TEXT\,,\DISPLAY\,lilypond-program.fr,Manuel d'utilisation du programme}
@end macro
@macro rlsr{TEXT}
@ref{\TEXT\,,,lilypond-snippets,Exemples de code}
@end macro
+@macro rlsrnamed{TEXT,DISPLAY}
+@ref{\TEXT\,,\DISPLAY\,lilypond-snippets,Exemples de code}
+@end macro
+
+@macro rinternals{TEXT}
+@vindex \TEXT\
+@ref{\TEXT\,,,lilypond-internals,Référence des propriétés internes}
+@end macro
+
+@macro rinternalsnamed{TEXT,DISPLAY}
+@vindex \TEXT\
+@ref{\TEXT\,,,lilypond-internals,Référence des propriétés internes}
+@end macro
+
@end iftex
-@c Commands specific to translated docs
+
+@c ***** Macros specific to translated docs *****
@c ugh, cannot set/define global variable 'translationof' in some way?
+
@iftex
+
@macro translationof{TEXT}
@end macro
+
@end iftex
@ifinfo
-@macro
+
@macro translationof{TEXT}
@set translationof \TEXT\
@end macro
+
@end ifinfo
-@c TODO when @translationof is used in translated docs
-@c see if it's feasible to say @value{translationof}
+
+@c TODO: If @translationof is used in translated docs
+@c see whether it is feasible to say @value{translationof}.
+
@macro englishref
Cette section n'est pas encore encore traduite, veuillez
vous reporter à la documentation correspondante en anglais.
@end macro
+
+
+@ifhtml
+
+@macro untranslated
+UNTRANSLATED NODE: IGNORE ME
+@end macro
+
+@end ifhtml
+
+@ifnothtml
+
+@macro untranslated
+@end macro
+
+@end ifnothtml