X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Documentation%2Ffr%2Fuser%2Fmacros.itexi;h=1e4e7c74083716c7703cf2b1cc538be06e499467;hb=3eb1e37e2e0b3966142cd04b85e30ab882308612;hp=096dcf59cf2e8c446a78875b2199052354453384;hpb=407be6aca707178dc8dcae673803b16916f59d50;p=lilypond.git diff --git a/Documentation/fr/user/macros.itexi b/Documentation/fr/user/macros.itexi index 096dcf59cf..1e4e7c7408 100644 --- a/Documentation/fr/user/macros.itexi +++ b/Documentation/fr/user/macros.itexi @@ -1,24 +1,23 @@ @c -*- coding: utf-8; mode: texinfo; -*- @ignore - Translation of GIT committish: a88c1b861df238ad1c000e6a86926e6f19f2fedd + 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 +@include common-macros.itexi + @c ***** Displaying text ***** -@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 @@ -26,10 +25,11 @@ @macro qq{TEXT} @guillemetleft{}@tie{}\TEXT\@tie{}@guillemetright{} @end macro -@end iftex +@end ifnotinfo @ifinfo + @macro q{TEXT} `\TEXT\' @end macro @@ -37,47 +37,22 @@ @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 -@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 - -@ifhtml @macro warning{TEXT} @cartouche @b{Note :} \TEXT\ @end cartouche @end macro + @end ifhtml @ifnothtml + @macro warning{TEXT} @quotation @quotation @@ -87,109 +62,88 @@ @end quotation @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. - -@ifnotinfo -@macro sourceimage{FILENAME,WIDTH,HEIGHT,ALTTEXT} -@image{\FILENAME\,\WIDTH\,\HEIGHT\,\ALTTEXT\} -@end macro -@end ifnotinfo +@end ifnothtml -@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 -@macro lydoctitle {TEXT} -@emph{\TEXT\} - -@end macro - -@macro funindex {TEXT} -@findex \TEXT\ -@kindex \TEXT\ -@end macro -@c **** Links and references **** +@c ***** Links and references ***** @c Definitions for references: +@c @c @rglos @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 +@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. -@c ***** HTML + bigpage is a special case (other manual names), all other -@c formats are treated similarly +@c *** not TeX *** @ifnottex +@c ** bigpage ** + @ifset bigpage @macro rglos{TEXT} @@ -254,6 +208,8 @@ @end ifset +@c ** not bigpage ** + @ifclear bigpage @macro rglos{TEXT} @@ -320,99 +276,86 @@ @end ifnottex -@c **** TEX **** +@c *** TeX *** + @iftex +@c All commands below should work in the middle of the line; +@c we thus must not use @vindex directly since it works only if placed +@c on a line of its own. To overcome this problem, we define a +@c replacement macro using the internal definition of @vindex which +@c delimits arguments in the standard way (i.e., with braces). + +@tex +\gdef\lilyvindex#1{\doind{vr}{\code #1}\ignorespaces} +@end tex + @macro rglos{TEXT} -@vindex \TEXT\ +@lilyvindex{\TEXT\} @ref{\TEXT\,,,music-glossary,Glossaire} @end macro @macro rglosnamed{TEXT,DISPLAY} -@vindex \TEXT\ +@lilyvindex{\TEXT\} @ref{\TEXT\,,\DISPLAY\,music-glossary,Glossaire} @end macro @macro rlearning{TEXT} -@vindex \TEXT\ +@lilyvindex{\TEXT\} @ref{\TEXT\,,,lilypond-learning.fr,Manuel d'initiation} @end macro @macro rlearningnamed{TEXT,DISPLAY} -@vindex \TEXT\ +@lilyvindex{\TEXT\} @ref{\TEXT\,,\DISPLAY\,lilypond-learning.fr,Manuel d'initiation} @end macro @macro ruser{TEXT} -@vindex \TEXT\ +@lilyvindex{\TEXT\} @ref{\TEXT\,,,lilypond.fr,Manuel de notation} @end macro @macro rusernamed{TEXT,DISPLAY} -@vindex \TEXT\ +@lilyvindex{\TEXT\} @ref{\TEXT\,,\DISPLAY\,lilypond.fr,Manuel de notation} @end macro @macro rprogram{TEXT} -@vindex \TEXT\ +@lilyvindex{\TEXT\} @ref{\TEXT\,,,lilypond-program.fr,Manuel d'utilisation du programme} @end macro @macro rprogramnamed{TEXT,DISPLAY} -@vindex \TEXT\ +@lilyvindex{\TEXT\} @ref{\TEXT\,,\DISPLAY\,lilypond-program.fr,Manuel d'utilisation du programme} @end macro @macro rlsr{TEXT} +@lilyvindex{\TEXT\} @ref{\TEXT\,,,lilypond-snippets,Exemples de code} @end macro @macro rlsrnamed{TEXT,DISPLAY} +@lilyvindex{\TEXT\} @ref{\TEXT\,,\DISPLAY\,lilypond-snippets,Exemples de code} @end macro @macro rinternals{TEXT} -@vindex \TEXT\ +@lilyvindex{\TEXT\} @ref{\TEXT\,,,lilypond-internals,Référence des propriétés internes} @end macro @macro rinternalsnamed{TEXT,DISPLAY} -@vindex \TEXT\ +@lilyvindex{\TEXT\} @ref{\TEXT\,,,lilypond-internals,Référence des propriétés internes} @end macro @end iftex -@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 +@c ***** Macros specific to translated docs ***** -@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} @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