X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Documentation%2Ffr%2Fuser%2Fmacros.itexi;h=d6e35c4fba561e3f46de6ff766188ee1f6377527;hb=def21b306e2b8fa2d5630fab0878e9922e197f0c;hp=f7678315b9ec6e3ded2ed5b1ca24873b39f4e64b;hpb=db80c3933647182a0bb571682bebc91e16d622ba;p=lilypond.git
diff --git a/Documentation/fr/user/macros.itexi b/Documentation/fr/user/macros.itexi
index f7678315b9..d6e35c4fba 100644
--- a/Documentation/fr/user/macros.itexi
+++ b/Documentation/fr/user/macros.itexi
@@ -1,6 +1,6 @@
@c -*- coding: utf-8; mode: texinfo; -*-
@ignore
- Translation of GIT committish: d30aabb4adc9e13c7a5a99a22230e97a0f164255
+ Translation of GIT committish: a88c1b861df238ad1c000e6a86926e6f19f2fedd
When revising a translation, copy the HEAD committish of the
version that you are working on. See TRANSLATION for details.
@@ -10,13 +10,15 @@
@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 these need to be split up so that "@qq{foo}." looks nice. :(
-@iftex
+@c FIXME: use thin spaces for @qq
+@ifnotinfo
@macro q{TEXT}
@quoteleft{}\TEXT\@quoteright{}
@end macro
@@ -24,8 +26,7 @@
@macro qq{TEXT}
@guillemetleft{}@tie{}\TEXT\@tie{}@guillemetright{}
@end macro
-@end iftex
-
+@end ifnotinfo
@ifinfo
@macro q{TEXT}
@@ -39,34 +40,14 @@
@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
-
-@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
@quotation
@@ -76,6 +57,7 @@
@end quotation
@end quotation
@end macro
+@end ifnothtml
@ifnotinfo
@macro notation{TEXT}
@@ -148,18 +130,6 @@
@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\}
@@ -174,44 +144,42 @@
@c **** Links and references ****
-@c obsolete, not replaced by anything (maybe will be replaced
-@c with rlsr in the future)
-@c usage: @lsr{ancient,custodes.ly}
-@macro lsr{DIR,TEXT}
-@ifhtml
-@uref{source/input/lsr/\DIR\/collated-files.html#\TEXT\,@file{\DIR\/\TEXT\}}
-@end ifhtml
-@ifnothtml
-@file{\DIR\/\TEXT\}
-@end ifnothtml
-@end macro
-
@c Definitions for references:
-@c @rinternals
@c @rglos
-@c @rprogram
-@c @ruser
@c @rlearning
+@c @ruser
+@c @rprogram
@c @rlsr
+@c @rinternals
+@c all these also have a @...named version, which allows to specify the
+@c displayed text for the reference as second argument
-@ifhtml
-@c ***** HTML *****
+
+@c ***** HTML + bigpage is a special case (other manual names), all other
+@c formats are treated similarly
+
+@ifnottex
@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}
@@ -219,39 +187,53 @@
@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
+
+
+@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}
@@ -259,27 +241,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}
@@ -287,92 +261,100 @@
@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
-@end ifdocbook
+@macro rinternalsnamed{TEXT,DISPLAY}
+@vindex \TEXT\
+@ref{\TEXT\,,,lilypond-internals,Référence des propriétés internes}
+@end macro
+@end ifclear
-@ifinfo
-@c **** INFO ****
+@end ifnottex
-@macro rinternals{NAME}
-@vindex \NAME\
-@inforef{\NAME\,,lilypond-internals,Référence des propriétés internes}
-@end macro
-@macro rglos{NAME}
-@vindex \NAME\
-@inforef{\NAME\,,music-glossary,Glossaire}
-@end macro
+@c **** TEX ****
+@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
@@ -393,3 +375,14 @@
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