From 1ec09f60b78b43f5790113e24d79c670f76258ab Mon Sep 17 00:00:00 2001 From: Werner Lemberg Date: Sat, 29 Nov 2008 08:33:42 +0100 Subject: [PATCH] Synchronize with user/macros.itexi. --- Documentation/de/user/macros.itexi | 125 ++++++++++++++++++++++------- Documentation/es/user/macros.itexi | 117 +++++++++++++++++++++------ Documentation/fr/user/macros.itexi | 121 ++++++++++++++++++++++------ 3 files changed, 283 insertions(+), 80 deletions(-) diff --git a/Documentation/de/user/macros.itexi b/Documentation/de/user/macros.itexi index 4715fe1264..f0987d4534 100644 --- a/Documentation/de/user/macros.itexi +++ b/Documentation/de/user/macros.itexi @@ -9,20 +9,27 @@ @include version.itexi -@c don't replace quotes with directed quotes + +@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.11 -- -@c say @q{@bs{}} instead +@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. :( + +@c To get decent quotes in ,foo' and ,,foo''. +@c These need to be split up so that "@qq{foo}." looks nice. :( + @macro q{TEXT} @quotesinglbase{}\TEXT\@quoteleft{} @end macro @@ -31,15 +38,19 @@ @quotedblbase{}\TEXT\@quotedblleft{} @end macro + @ifhtml + @macro warning{TEXT} @cartouche @b{Achtung:} \TEXT\ @end cartouche @end macro + @end ifhtml @ifnothtml + @macro warning{TEXT} @quotation @quotation @@ -49,92 +60,126 @@ @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. +@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 + @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 obsolete @c usage: @lsr{ancient,custodes.ly} @@ -158,25 +203,28 @@ @end macro - - -@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} @@ -240,6 +288,8 @@ @end ifset +@c ** not bigpage ** + @ifclear bigpage @macro rglos{TEXT} @@ -305,7 +355,8 @@ @end ifnottex -@c **** TEX **** +@c *** TeX *** + @iftex @macro rglos{TEXT} @@ -368,35 +419,49 @@ @end iftex -@c **** Macros 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 -Dieser Abschnitt wurde noch nicht übersetzt, bitte lesen Sie den +Dieser Abschnitt wurde noch nicht übersetzt. Bitte lesen Sie den Abschnitt im englischen Benutzerhandbuch. @end macro + @ifhtml + @macro untranslated UNTRANSLATED NODE: IGNORE ME @end macro + @end ifhtml @ifnothtml + @macro untranslated @end macro + @end ifnothtml diff --git a/Documentation/es/user/macros.itexi b/Documentation/es/user/macros.itexi index 7ca5c50d40..bfae4c7d57 100644 --- a/Documentation/es/user/macros.itexi +++ b/Documentation/es/user/macros.itexi @@ -6,21 +6,29 @@ version that you are working on. See TRANSLATION for details. @end ignore + @include version.itexi -@c don't replace quotes with directed quotes + +@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.11 -- -@c say @q{@bs{}} instead +@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 To get decent quotes in `foo' and ``foo''. + @macro q{TEXT} @quoteleft{}\TEXT\@quoteright{} @end macro @@ -29,15 +37,19 @@ @quotedblleft{}\TEXT\@quotedblright{} @end macro + @ifhtml + @macro warning{TEXT} @cartouche @b{Nota:} \TEXT\ @end cartouche @end macro + @end ifhtml @ifnothtml + @macro warning{TEXT} @quotation @quotation @@ -47,108 +59,149 @@ @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. +@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 Instrucciones predefinidas +@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 Fragmentos de código seleccionados - @end macro + @c * Deprecated: not in English macros.itexi * @macro commonprop @noindent @subsubheading Propiedades trucadas frecuentemente - @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 Véase también - @indent @end macro + @macro knownissues @noindent @subsubheading Advertencias y problemas conocidos - @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 @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} @@ -212,6 +265,8 @@ @end ifset +@c ** not bigpage ** + @ifclear bigpage @macro rglos{TEXT} @@ -277,7 +332,8 @@ @end ifnottex -@c **** TEX **** +@c *** TeX *** + @iftex @macro rglos{TEXT} @@ -341,34 +397,47 @@ @end iftex -@c **** Macros 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 Esta sección aún no está traducida; consulte el manual en inglés. @end macro + @ifhtml + @macro untranslated UNTRANSLATED NODE: IGNORE ME @end macro + @end ifhtml @ifnothtml + @macro untranslated @end macro + @end ifnothtml diff --git a/Documentation/fr/user/macros.itexi b/Documentation/fr/user/macros.itexi index 16860ee093..11aa1fbe42 100644 --- a/Documentation/fr/user/macros.itexi +++ b/Documentation/fr/user/macros.itexi @@ -6,23 +6,31 @@ version that you are working on. See TRANSLATION for details. @end ignore + @include version.itexi -@c don't replace quotes with directed quotes + +@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.11 -- -@c say @q{@bs} instead +@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 +@c To get decent quotes in `foo' and ``foo''. +@c FIXME: Use thin spaces for @qq. + @ifnotinfo + @macro q{TEXT} @quoteleft{}\TEXT\@quoteright{} @end macro @@ -30,9 +38,11 @@ @macro qq{TEXT} @guillemetleft{}@tie{}\TEXT\@tie{}@guillemetright{} @end macro + @end ifnotinfo @ifinfo + @macro q{TEXT} `\TEXT\' @end macro @@ -40,18 +50,22 @@ @macro qq{TEXT} « \TEXT\ » @end macro + @end ifinfo @ifhtml + @macro warning{TEXT} @cartouche @b{Note :} \TEXT\ @end cartouche @end macro + @end ifhtml @ifnothtml + @macro warning{TEXT} @quotation @quotation @@ -61,109 +75,149 @@ @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. +@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 + @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 @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} @@ -228,6 +282,8 @@ @end ifset +@c ** not bigpage ** + @ifclear bigpage @macro rglos{TEXT} @@ -294,7 +350,8 @@ @end ifnottex -@c **** TEX **** +@c *** TeX *** + @iftex @macro rglos{TEXT} @@ -358,35 +415,47 @@ @end iftex -@c **** Macros 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 -- 2.39.2