Update macros.itexi translations

diff --git a/Documentation/de/user/macros.itexi b/Documentation/de/user/macros.itexi
index 82d6b0fba0efc62ea58a5396fbbcea0392ee3ffd..c8dfedb9e4928271c38aab911ed674c0d99d2c50 100644 (file)
--- a/Documentation/de/user/macros.itexi
+++ b/Documentation/de/user/macros.itexi
@@ -1,29 +1,75 @@
 @c -*- coding: utf-8; mode: texinfo; -*-
 @ignore
-    Translation of GIT committish: 3db3697bb5109201192c9cecdd2e4b7a5520421a
+    Translation of GIT committish: d30aabb4adc9e13c7a5a99a22230e97a0f164255
 
     When revising a translation, copy the HEAD committish of the
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c **** all formats ****
 
-@macro refbugs
-@noindent
-@subsubheading Bugs
+@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 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}
+@quotesinglbase{}\TEXT\`
+@end macro
 
+@macro qq{TEXT}
+@quotedblbase{}\TEXT\``
 @end macro
+@end iftex
 
-@macro moreinfo
-@subheading More information
 
+@ifinfo
+@macro q{TEXT}
+‚\TEXT\‘
 @end macro
 
-@macro seealso
-@noindent
-@subsubheading See also
+@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}
+@html
+‚\TEXT\‘
+@end html
+@end macro
 
+@macro qq{TEXT}
+@html
+„\TEXT\“
+@end html
 @end macro
+@end ifdocbook
+
+
+
+
+@c   **** Headings in a doc subsection ****
 
 @macro refcommands
 @noindent
@@ -31,109 +77,109 @@
 
 @end macro
 
-@macro context{NAME}
-@vindex \NAME\
-@code{\NAME\}@c should use internalsref
+@macro commonprop
+@noindent
+@subsubheading Commonly tweaked properties
+
 @end macro
 
-@macro refcommand{WHAT}
-@vindex \WHAT\
-@code{\WHAT\}
+@macro seealso
+@noindent
+@subsubheading See also
+
 @end macro
 
-@macro commonprop
+@macro refbugs
 @noindent
-@subsubheading Commonly tweaked properties
+@subsubheading Bugs
 
 @end macro
 
-@macro funindex {WORD}
-@findex \WORD\
-@kindex \WORD\
+
+@macro context{TEXT}
+@vindex \TEXT\
+@code{\TEXT\}@c should use internalsref
+@end macro
+
+@macro refcommand{TEXT}
+@vindex \TEXT\
+@code{\TEXT\}
+@end macro
+
+@macro funindex {TEXT}
+@findex \TEXT\
+@kindex \TEXT\
 @end macro
 
 
 
-@c  *** Macros with variable output ***
+@c   **** Links and references ****
 
 @c usage: @lsr{ancient,custodes.ly}
-@macro lsr{DIR,NAME}
+@macro lsr{DIR,TEXT}
 @ifhtml
-  @uref{source/input/lsr/\DIR\/collated-files.html#\NAME\,@file{\DIR\/\NAME\}}
+@uref{source/input/lsr/\DIR\/collated-files.html#\TEXT\,@file{\DIR\/\TEXT\}}
 @end ifhtml
 @ifnothtml
-  @file{\DIR\/\NAME\}
+@file{\DIR\/\TEXT\}
 @end ifnothtml
 @end macro
 
 @macro lsrdir{DIR}
 @ifhtml
-  @uref{source/input/lsr/\DIR\/collated-files.html,@file{\DIR\}/}
+@uref{source/input/lsr/\DIR\/collated-files.html,@file{\DIR\}/}
 @end ifhtml
 @ifnothtml
-  @file{\DIR\}
+@file{\DIR\}
 @end ifnothtml
 @end macro
 
 
 
 
-@macro arrow{}
-@iftex
-@tex $\\Rightarrow$ @end tex@c
-@end iftex
-@ifhtml
-@html
-→
-@end html
-@end ifhtml
-@ifinfo
--->
-@end ifinfo
-@end macro
-
-
-@c we need this since @q{\} doesn't work with makeinfo 4.8 --
-@c say @q{@value{backslash}} instead
-@set backslash \
-
+@c  Definitions for references:
+@c     @internalsref
+@c     @rglos
+@c     @rprogram
+@c     @ruser
+@c     @rlearning
 
 @ifhtml
 @c ***** HTML *****
 
 @c makeinfo-4.7 encodes html names, which means that nodes that
 @c contain nonalphanum characters will be broken links on the website.
-@c @uref{../lilypond-internals/\NAME\.html,\NAME\}@c
+@c @uref{../lilypond-internals/\TEXT\.html,\TEXT\}@c
 @c @inforef{} adds ``See'' to the sentence, which is annoying, but
 @c better than a broken link.
-@c @inforef{\NAME\,,lilypond-internals}@c
+@c @inforef{\TEXT\,,lilypond-internals}@c
 @c using @ref without punctuation is OK without for formats other than info
 
 @ifset bigpage
 
-@macro internalsref{NAME}
-@vindex \NAME\
-@ref{\NAME\,,,lilypond-internals-big-page}
+@macro internalsref{TEXT}
+@vindex \TEXT\
+@ref{\TEXT\,,,lilypond-internals-big-page}
 @end macro
 
-@macro rglos{NAME}
-@vindex \NAME\
-@ref{\NAME\,,,music-glossary-big-page}
+@macro rglos{TEXT}
+@vindex \TEXT\
+@ref{\TEXT\,,,music-glossary-big-page}
 @end macro
 
-@macro rprogram{NAME}
-@vindex \NAME\
-@ref{\NAME\,,,lilypond-program-big-page}
+@macro rprogram{TEXT}
+@vindex \TEXT\
+@ref{\TEXT\,,,lilypond-program-big-page}
 @end macro
 
-@macro ruser{NAME}
-@vindex \NAME\
-@ref{\NAME\,,,lilypond-big-page}
+@macro ruser{TEXT}
+@vindex \TEXT\
+@ref{\TEXT\,,,lilypond-big-page}
 @end macro
 
-@macro rlearning{NAME}
-@vindex \NAME\
-@ref{\NAME\,,,lilypond-learning-big-page}
+@macro rlearning{TEXT}
+@vindex \TEXT\
+@ref{\TEXT\,,,lilypond-learning-big-page}
 @end macro
 
 @end ifset
@@ -141,99 +187,62 @@
 
 @ifclear bigpage
 
-@macro internalsref{NAME}
-@vindex \NAME\
-@ref{\NAME\,,,lilypond-internals}
+@macro internalsref{TEXT}
+@vindex \TEXT\
+@ref{\TEXT\,,,lilypond-internals}
 @end macro
 
-@macro rglos{NAME}
-@vindex \NAME\
-@ref{\NAME\,,,music-glossary}
+@macro rglos{TEXT}
+@vindex \TEXT\
+@ref{\TEXT\,,,music-glossary}
 @end macro
 
-@macro rprogram{NAME}
-@vindex \NAME\
-@ref{\NAME\,,,lilypond-program}
+@macro rprogram{TEXT}
+@vindex \TEXT\
+@ref{\TEXT\,,,lilypond-program}
 @end macro
 
-@macro ruser{NAME}
-@vindex \NAME\
-@ref{\NAME\,,,lilypond}
+@macro ruser{TEXT}
+@vindex \TEXT\
+@ref{\TEXT\,,,lilypond}
 @end macro
 
-@macro rlearning{NAME}
-@vindex \NAME\
-@ref{\NAME\,,,lilypond-learning}
+@macro rlearning{TEXT}
+@vindex \TEXT\
+@ref{\TEXT\,,,lilypond-learning}
 @end macro
 
 @end ifclear
 
-
-@c usage: @inputfileref{input@/regression,FILE@/-NAME.ly}
-@macro inputfileref{DIR,NAME}
-@uref{source/\DIR\/collated-files.html#\NAME\,@file{\DIR\/\NAME\}}@c
-@end macro
-
-@c to get decent German quotes in `foo'
-@macro q{TEXT}
-@html
-‚\TEXT\‘
-@end html
-@end macro
-
-@c to get decent German quotes in ``foo''
-@macro qq{TEXT}
-@html
-„\TEXT\“
-@end html
-@end macro
-
 @end ifhtml
 
 
 @ifdocbook
 @c ***** DOCBOOK-XML *****
 
-@macro internalsref{NAME}
-@vindex \NAME\
-@ref{\NAME\,,,lilypond-internals}
+@macro internalsref{TEXT}
+@vindex \TEXT\
+@ref{\TEXT\,,,lilypond-internals}
 @end macro
 
-
-
-@macro rglos{NAME}
-@vindex \NAME\
-@ref{\NAME\,,,music-glossary}
+@macro rglos{TEXT}
+@vindex \TEXT\
+@ref{\TEXT\,,,music-glossary}
 @end macro
 
-@macro rprogram{NAME}
-@vindex \NAME\
-@ref{\NAME\,,,lilypond-program}
+@macro rprogram{TEXT}
+@vindex \TEXT\
+@ref{\TEXT\,,,lilypond-program}
 @end macro
 
-@macro ruser{NAME}
-@vindex \NAME\
-@ref{\NAME\,,,lilypond}
+@macro ruser{TEXT}
+@vindex \TEXT\
+@ref{\TEXT\,,,lilypond}
 @end macro
 
-@macro rlearning{NAME}
-@vindex \NAME\
-@ref{\NAME\,,,lilypond-learning}
-@end macro
-
-@c to get decent German quotes in `foo'
-@c to get decent German quotes in `foo'
-@macro q{TEXT}
-@html
-‚\TEXT\‘
-@end html
-@end macro
-
-@c to get decent German quotes in ``foo''
-@macro qq{TEXT}
-@html
-„\TEXT\“
-@end html
+@macro rlearning{TEXT}
+@vindex \TEXT\
+@ref{\TEXT\,,,lilypond-learning}
 @end macro
 
 @end ifdocbook
@@ -249,36 +258,22 @@
 
 @macro rglos{NAME}
 @vindex \NAME\
-@inforef{\NAME\,,,music-glossary}
-@end macro
-
-@macro rprogram{NAME}
-@vindex \NAME\
-@ref{\NAME\,,,lilypond-program}
+@inforef{\NAME\,,music-glossary}
 @end macro
 
-@macro ruser{NAME}
-@vindex \NAME\
-@ref{\NAME\,,,lilypond}
-@end macro
-
-@macro rlearning{NAME}
-@vindex \NAME\
-@ref{\NAME\,,,lilypond-learning}
+@macro rprogram{TEXT}
+@vindex \TEXT\
+@ref{\TEXT\,,,lilypond-program}
 @end macro
 
-@macro usermanref{NAME}
-@inforef{\NAME\}
+@macro ruser{TEXT}
+@vindex \TEXT\
+@ref{\TEXT\,,,lilypond}
 @end macro
 
-@c to get decent quotes in `foo'
-@macro q{TEXT}
-‚\TEXT\‘
-@end macro
-
-@c to get decent quotes in ``foo''
-@macro qq{TEXT}
-„\TEXT\“
+@macro rlearning{TEXT}
+@vindex \TEXT\
+@ref{\TEXT\,,,lilypond-learning}
 @end macro
 
 @end ifinfo
@@ -287,62 +282,29 @@
 @c **** TEX ****
 @iftex
 
-@macro internalsref{NAME}
-@vindex \NAME\
-@code{\NAME\}
-@end macro
-
-@macro rglos {NAME}
-@vindex \NAME\
-@code{\NAME\}
+@macro internalsref{TEXT}
+@vindex \TEXT\
+@code{\TEXT\}
 @end macro
 
-@macro seeinternals{NAME}
-Programmreferenz, @internalsref{\NAME\}
+@macro rglos {TEXT}
+@vindex \TEXT\
+@code{\TEXT\}
 @end macro
 
-@macro usermanref{NAME}
-Benutzerhandbuch, @internalsref{\NAME\}
+@macro rprogram{TEXT}
+Programmbenutzung, @internalsref{\TEXT\}
 @end macro
 
-@macro rprogram{NAME}
-Programmbenutzung, @internalsref{\NAME\}
+@macro ruser{TEXT}
+Benutzerhandbuch, @internalsref{\TEXT\}
 @end macro
 
-@macro rlearning{NAME}
-Handbuch zum Lernen, @internalsref{\NAME\}
-@end macro
-
-@alias ruser=usermanref
-
-@c to get decent German quotes in `foo'
-@macro q{TEXT}
-@quotesinglbase{}\TEXT\`
-@end macro
-
-@c to get decent German quotes in ``foo''
-@macro qq{TEXT}
-@quotedblbase{}\TEXT\``
+@macro rlearning{TEXT}
+Handbuch zum Lernen, @internalsref{\TEXT\}
 @end macro
 
 @end iftex
 
 
-@ifnottex
-@c **** not TEX ****
-
-@macro seeinternals{NAME}
-@internalsref{\NAME\}
-@end macro
-
-@ifnotinfo
-@macro usermanref{NAME}
-@ref{\NAME\}
-@end macro
-@end ifnotinfo
-
-@end ifnottex
-
-
 @c EOF
-

diff --git a/Documentation/es/user/macros.itexi b/Documentation/es/user/macros.itexi
index 7687f3be53fb10ca044c54ad440485c978488298..1882e26bcd301cabb8254155e53911e64343066e 100644 (file)
--- a/Documentation/es/user/macros.itexi
+++ b/Documentation/es/user/macros.itexi
@@ -1,139 +1,185 @@
 @c -*- coding: utf-8; mode: texinfo; -*-
 @ignore
-    Translation of GIT committish: 17e8e47bc1e57c3633c15ed08edcf4977f3aa298
+    Translation of GIT committish: d30aabb4adc9e13c7a5a99a22230e97a0f164255
 
     When revising a translation, copy the HEAD committish of the
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c **** all formats ****
 
-@macro refbugs
-@noindent
-@subsubheading Bugs
+@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 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}
+`\TEXT\'
+@end macro
 
+@macro qq{TEXT}
+``\TEXT\''
 @end macro
+@end iftex
 
-@macro moreinfo
-@subheading More information
 
+@ifinfo
+@macro q{TEXT}
+`\TEXT\'
 @end macro
 
-@macro seealso
-@noindent
-@subsubheading See also
+@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
+
+
+
+
+@c   **** Headings in a doc subsection ****
+
 @macro refcommands
 @noindent
 @subsubheading Predefined commands
 
 @end macro
 
-@macro context{NAME}
-@vindex \NAME\
-@code{\NAME\}@c should use internalsref
+@macro commonprop
+@noindent
+@subsubheading Commonly tweaked properties
+
 @end macro
 
-@macro refcommand{WHAT}
-@vindex \WHAT\
-@code{\WHAT\}
+@macro seealso
+@noindent
+@subsubheading See also
+
 @end macro
 
-@macro commonprop
+@macro refbugs
 @noindent
-@subsubheading Commonly tweaked properties
+@subsubheading Bugs
+
+@end macro
+
+
+@macro context{TEXT}
+@vindex \TEXT\
+@code{\TEXT\}@c should use internalsref
+@end macro
 
+@macro refcommand{TEXT}
+@vindex \TEXT\
+@code{\TEXT\}
 @end macro
 
-@macro funindex {WORD}
-@findex \WORD\
-@kindex \WORD\
+@macro funindex {TEXT}
+@findex \TEXT\
+@kindex \TEXT\
 @end macro
 
 
 
-@c  *** Macros with variable output ***
+@c   **** Links and references ****
 
 @c usage: @lsr{ancient,custodes.ly}
-@macro lsr{DIR,NAME}
+@macro lsr{DIR,TEXT}
 @ifhtml
-  @uref{source/input/lsr/\DIR\/collated-files.html#\NAME\,@file{\DIR\/\NAME\}}
+@uref{source/input/lsr/\DIR\/collated-files.html#\TEXT\,@file{\DIR\/\TEXT\}}
 @end ifhtml
 @ifnothtml
-  @file{\DIR\/\NAME\}
+@file{\DIR\/\TEXT\}
 @end ifnothtml
 @end macro
 
 @macro lsrdir{DIR}
 @ifhtml
-  @uref{source/input/lsr/\DIR\/collated-files.html,@file{\DIR\}/}
+@uref{source/input/lsr/\DIR\/collated-files.html,@file{\DIR\}/}
 @end ifhtml
 @ifnothtml
-  @file{\DIR\}
+@file{\DIR\}
 @end ifnothtml
 @end macro
 
 
 
 
-@macro arrow{}
-@iftex
-@tex $\\Rightarrow$ @end tex@c
-@end iftex
-@ifhtml
-@html
-→
-@end html
-@end ifhtml
-@ifinfo
--->
-@end ifinfo
-@end macro
-
-
-@c we need this since @q{\} doesn't work with makeinfo 4.8 --
-@c say @q{@value{backslash}} instead
-@set backslash \
-
+@c  Definitions for references:
+@c     @internalsref
+@c     @rglos
+@c     @rprogram
+@c     @ruser
+@c     @rlearning
 
 @ifhtml
 @c ***** HTML *****
 
 @c makeinfo-4.7 encodes html names, which means that nodes that
 @c contain nonalphanum characters will be broken links on the website.
-@c @uref{../lilypond-internals/\NAME\.html,\NAME\}@c
+@c @uref{../lilypond-internals/\TEXT\.html,\TEXT\}@c
 @c @inforef{} adds ``See'' to the sentence, which is annoying, but
 @c better than a broken link.
-@c @inforef{\NAME\,,lilypond-internals}@c
+@c @inforef{\TEXT\,,lilypond-internals}@c
 @c using @ref without punctuation is OK without for formats other than info
 
 @ifset bigpage
 
-@macro internalsref{NAME}
-@vindex \NAME\
-@ref{\NAME\,,,lilypond-internals-big-page}
+@macro internalsref{TEXT}
+@vindex \TEXT\
+@ref{\TEXT\,,,lilypond-internals-big-page}
 @end macro
 
-@macro rglos{NAME}
-@vindex \NAME\
-@ref{\NAME\,,,music-glossary-big-page}
+@macro rglos{TEXT}
+@vindex \TEXT\
+@ref{\TEXT\,,,music-glossary-big-page}
 @end macro
 
-@macro rprogram{NAME}
-@vindex \NAME\
-@ref{\NAME\,,,lilypond-program-big-page}
+@macro rprogram{TEXT}
+@vindex \TEXT\
+@ref{\TEXT\,,,lilypond-program-big-page}
 @end macro
 
-@macro ruser{NAME}
-@vindex \NAME\
-@ref{\NAME\,,,lilypond-big-page}
+@macro ruser{TEXT}
+@vindex \TEXT\
+@ref{\TEXT\,,,lilypond-big-page}
 @end macro
 
-@macro rlearning{NAME}
-@vindex \NAME\
-@ref{\NAME\,,,lilypond-learning-big-page}
+@macro rlearning{TEXT}
+@vindex \TEXT\
+@ref{\TEXT\,,,lilypond-learning-big-page}
 @end macro
 
 @end ifset
@@ -141,91 +187,62 @@
 
 @ifclear bigpage
 
-@macro internalsref{NAME}
-@vindex \NAME\
-@ref{\NAME\,,,lilypond-internals}
+@macro internalsref{TEXT}
+@vindex \TEXT\
+@ref{\TEXT\,,,lilypond-internals}
 @end macro
 
-@macro rglos{NAME}
-@vindex \NAME\
-@ref{\NAME\,,,music-glossary}
+@macro rglos{TEXT}
+@vindex \TEXT\
+@ref{\TEXT\,,,music-glossary}
 @end macro
 
-@macro rprogram{NAME}
-@vindex \NAME\
-@ref{\NAME\,,,lilypond-program}
+@macro rprogram{TEXT}
+@vindex \TEXT\
+@ref{\TEXT\,,,lilypond-program}
 @end macro
 
-@macro ruser{NAME}
-@vindex \NAME\
-@ref{\NAME\,,,lilypond}
+@macro ruser{TEXT}
+@vindex \TEXT\
+@ref{\TEXT\,,,lilypond}
 @end macro
 
-@macro rlearning{NAME}
-@vindex \NAME\
-@ref{\NAME\,,,lilypond-learning}
+@macro rlearning{TEXT}
+@vindex \TEXT\
+@ref{\TEXT\,,,lilypond-learning}
 @end macro
 
 @end ifclear
 
-
-@c to get decent quotes in `foo'
-@macro q{TEXT}
-@html
-‘\TEXT\’
-@end html
-@end macro
-
-@c to get decent quotes in ``foo''
-@macro qq{TEXT}
-@html
-“\TEXT\”
-@end html
-@end macro
-
 @end ifhtml
 
 
 @ifdocbook
 @c ***** DOCBOOK-XML *****
 
-@macro internalsref{NAME}
-@vindex \NAME\
-@ref{\NAME\,,,lilypond-internals}
+@macro internalsref{TEXT}
+@vindex \TEXT\
+@ref{\TEXT\,,,lilypond-internals}
 @end macro
 
-@macro rglos{NAME}
-@vindex \NAME\
-@ref{\NAME\,,,music-glossary}
+@macro rglos{TEXT}
+@vindex \TEXT\
+@ref{\TEXT\,,,music-glossary}
 @end macro
 
-@macro rprogram{NAME}
-@vindex \NAME\
-@ref{\NAME\,,,lilypond-program}
+@macro rprogram{TEXT}
+@vindex \TEXT\
+@ref{\TEXT\,,,lilypond-program}
 @end macro
 
-@macro ruser{NAME}
-@vindex \NAME\
-@ref{\NAME\,,,lilypond}
+@macro ruser{TEXT}
+@vindex \TEXT\
+@ref{\TEXT\,,,lilypond}
 @end macro
 
-@macro rlearning{NAME}
-@vindex \NAME\
-@ref{\NAME\,,,lilypond-learning}
-@end macro
-
-@c to get decent quotes in `foo'
-@macro q{TEXT}
-@xml
-‘\TEXT\’
-@end xml
-@end macro
-
-@c to get decent quotes in ``foo''
-@macro qq{TEXT}
-@xml
-“\TEXT\”
-@end xml
+@macro rlearning{TEXT}
+@vindex \TEXT\
+@ref{\TEXT\,,,lilypond-learning}
 @end macro
 
 @end ifdocbook
@@ -241,36 +258,22 @@
 
 @macro rglos{NAME}
 @vindex \NAME\
-@inforef{\NAME\,,,music-glossary}
+@inforef{\NAME\,,music-glossary}
 @end macro
 
-@macro usermanref{NAME}
-@inforef{\NAME\}
+@macro rprogram{TEXT}
+@vindex \TEXT\
+@ref{\TEXT\,,,lilypond-program}
 @end macro
 
-@macro rprogram{NAME}
-@vindex \NAME\
-@ref{\NAME\,,,lilypond-program}
+@macro ruser{TEXT}
+@vindex \TEXT\
+@ref{\TEXT\,,,lilypond}
 @end macro
 
-@macro ruser{NAME}
-@vindex \NAME\
-@ref{\NAME\,,,lilypond}
-@end macro
-
-@macro rlearning{NAME}
-@vindex \NAME\
-@ref{\NAME\,,,lilypond-learning}
-@end macro
-
-@c to get decent quotes in `foo'
-@macro q{TEXT}
-`\TEXT\'
-@end macro
-
-@c to get decent quotes in ``foo''
-@macro qq{TEXT}
-``\TEXT\''
+@macro rlearning{TEXT}
+@vindex \TEXT\
+@ref{\TEXT\,,,lilypond-learning}
 @end macro
 
 @end ifinfo
@@ -279,61 +282,29 @@
 @c **** TEX ****
 @iftex
 
-@macro internalsref{NAME}
-@vindex \NAME\
-@code{\NAME\}
-@end macro
-
-@macro rglos {NAME}
-@vindex \NAME\
-@code{\NAME\}
+@macro internalsref{TEXT}
+@vindex \TEXT\
+@code{\TEXT\}
 @end macro
 
-@macro seeinternals{NAME}
-el documento de funcionamiento interno, @internalsref{\NAME\}
+@macro rglos {TEXT}
+@vindex \TEXT\
+@code{\TEXT\}
 @end macro
 
-@macro usermanref{NAME}
-el manual del usuario, @internalsref{\NAME\}
+@macro rprogram{TEXT}
+el manual de utilización del programa, @internalsref{\TEXT\}
 @end macro
 
-@macro rlearning{NAME}
-el manual de aprendizaje, @internalsref{\NAME\}
+@macro ruser{TEXT}
+el manual del usuario, @internalsref{\TEXT\}
 @end macro
 
-@macro rprogram{NAME}
-el manual de utilización del programa, @internalsref{\NAME\}
-@end macro
-
-@alias ruser=usermanref
-
-@c to get decent quotes in `foo'
-@macro q{TEXT}
-`\TEXT\'
-@end macro
-
-@c to get decent quotes in ``foo''
-@macro qq{TEXT}
-``\TEXT\''
+@macro rlearning{TEXT}
+el manual de aprendizaje, @internalsref{\TEXT\}
 @end macro
 
 @end iftex
 
 
-@ifnottex
-@c **** not TEX ****
-
-@macro seeinternals{NAME}
-@internalsref{\NAME\}
-@end macro
-
-@ifnotinfo
-@macro usermanref{NAME}
-@ref{\NAME\}
-@end macro
-@end ifnotinfo
-
-@end ifnottex
-
-
 @c EOF

diff --git a/Documentation/fr/user/macros.itexi b/Documentation/fr/user/macros.itexi
index 59934dacd4c5b9ffbd13365807054ec7803a8d20..184955b3bb2942effe93884e42f7dac5e433b0e8 100644 (file)
--- a/Documentation/fr/user/macros.itexi
+++ b/Documentation/fr/user/macros.itexi
@@ -1,29 +1,77 @@
 @c -*- coding: utf-8; mode: texinfo; -*-
 @ignore
-    Translation of GIT committish: 6ffead15d2e3dffd294c8e030938facef896d861
+    Translation of GIT committish: d30aabb4adc9e13c7a5a99a22230e97a0f164255
 
     When revising a translation, copy the HEAD committish of the
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c **** all formats ****
 
-@macro refbugs
-@noindent
-@subsubheading Bugs
+@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 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}
+`\TEXT\'
 @end macro
 
-@macro moreinfo
-@subheading More information
+@macro qq{TEXT}
+@guillemetleft{}@tie{}\TEXT\@tie{}@guillemetright{}
+@end macro
+@end iftex
 
+
+@ifinfo
+@macro q{TEXT}
+`\TEXT\'
 @end macro
 
-@macro seealso
-@noindent
-@subsubheading See also
+@macro qq{TEXT}
+« \TEXT\ »
+@end macro
+@end ifinfo
+
+
+@ifhtml
+@macro q{TEXT}
+@html
+‘\TEXT\’
+@end html
+@end macro
+
+@c FIXME: hack unbreakable thin spaces
+@macro qq{TEXT}
+@html
+« \TEXT\ »
+@end html
+@end macro
+@end ifhtml
+
+
+@ifdocbook
+@macro q{TEXT}
+@xml
+‘\TEXT\’
+@end xml
+@end macro
 
+@c FIXME: hack unbreakable thin spaces
+@macro qq{TEXT}
+@xml
+« \TEXT\ »
+@end xml
 @end macro
+@end ifdocbook
+
+
+
+
+@c   **** Headings in a doc subsection ****
 
 @macro refcommands
 @noindent
@@ -31,202 +79,172 @@
 
 @end macro
 
-@macro context{NAME}
-@vindex \NAME\
-@code{\NAME\}@c should use internalsref
+@macro commonprop
+@noindent
+@subsubheading Commonly tweaked properties
+
 @end macro
 
-@macro refcommand{WHAT}
-@vindex \WHAT\
-@code{\WHAT\}
+@macro seealso
+@noindent
+@subsubheading See also
+
 @end macro
 
-@macro commonprop
+@macro refbugs
 @noindent
-@subsubheading Commonly tweaked properties
+@subsubheading Bugs
+
+@end macro
+
 
+@macro context{TEXT}
+@vindex \TEXT\
+@code{\TEXT\}@c should use internalsref
 @end macro
 
-@macro funindex {WORD}
-@findex \WORD\
-@kindex \WORD\
+@macro refcommand{TEXT}
+@vindex \TEXT\
+@code{\TEXT\}
+@end macro
+
+@macro funindex {TEXT}
+@findex \TEXT\
+@kindex \TEXT\
 @end macro
 
 
 
-@c  *** Macros with variable output ***
+@c   **** Links and references ****
 
 @c usage: @lsr{ancient,custodes.ly}
-@macro lsr{DIR,NAME}
+@macro lsr{DIR,TEXT}
 @ifhtml
-  @uref{source/input/lsr/\DIR\/collated-files.html#\NAME\,@file{\DIR\/\NAME\}}
+@uref{source/input/lsr/\DIR\/collated-files.html#\TEXT\,@file{\DIR\/\TEXT\}}
 @end ifhtml
 @ifnothtml
-  @file{\DIR\/\NAME\}
+@file{\DIR\/\TEXT\}
 @end ifnothtml
 @end macro
 
 @macro lsrdir{DIR}
 @ifhtml
-  @uref{source/input/lsr/\DIR\/collated-files.html,@file{\DIR\}/}
+@uref{source/input/lsr/\DIR\/collated-files.html,@file{\DIR\}/}
 @end ifhtml
 @ifnothtml
-  @file{\DIR\}
+@file{\DIR\}
 @end ifnothtml
 @end macro
 
 
 
 
-@macro arrow{}
-@iftex
-@tex $\\Rightarrow$ @end tex@c
-@end iftex
-@ifhtml
-@html
-→
-@end html
-@end ifhtml
-@ifinfo
--->
-@end ifinfo
-@end macro
-
-
-@c we need this since @q{\} doesn't work with makeinfo 4.8 --
-@c say @q{@value{backslash}} instead
-@set backslash \
-
+@c  Definitions for references:
+@c     @internalsref
+@c     @rglos
+@c     @rprogram
+@c     @ruser
+@c     @rlearning
 
 @ifhtml
 @c ***** HTML *****
 
 @c makeinfo-4.7 encodes html names, which means that nodes that
 @c contain nonalphanum characters will be broken links on the website.
-@c @uref{../lilypond-internals/\NAME\.html,\NAME\}@c
+@c @uref{../lilypond-internals/\TEXT\.html,\TEXT\}@c
 @c @inforef{} adds ``See'' to the sentence, which is annoying, but
 @c better than a broken link.
-@c @inforef{\NAME\,,lilypond-internals}@c
+@c @inforef{\TEXT\,,lilypond-internals}@c
 @c using @ref without punctuation is OK without for formats other than info
 
 @ifset bigpage
 
-@macro internalsref{NAME}
-@vindex \NAME\
-@ref{\NAME\,,,lilypond-internals-big-page}
+@macro internalsref{TEXT}
+@vindex \TEXT\
+@ref{\TEXT\,,,lilypond-internals-big-page}
 @end macro
 
-@macro rglos{NAME}
-@vindex \NAME\
-@ref{\NAME\,,,music-glossary-big-page}
+@macro rglos{TEXT}
+@vindex \TEXT\
+@ref{\TEXT\,,,music-glossary-big-page}
 @end macro
 
-@macro rprogram{NAME}
-@vindex \NAME\
-@ref{\NAME\,,,lilypond-program-big-page}
+@macro rprogram{TEXT}
+@vindex \TEXT\
+@ref{\TEXT\,,,lilypond-program-big-page}
 @end macro
 
-@macro ruser{NAME}
-@vindex \NAME\
-@ref{\NAME\,,,lilypond-big-page}
+@macro ruser{TEXT}
+@vindex \TEXT\
+@ref{\TEXT\,,,lilypond-big-page}
 @end macro
 
-@macro rlearing{NAME}
-@vindex \NAME\
-@ref{\NAME\,,,lilypond-learning-big-page}
+@macro rlearning{TEXT}
+@vindex \TEXT\
+@ref{\TEXT\,,,lilypond-learning-big-page}
 @end macro
 
-
 @end ifset
 
 
 @ifclear bigpage
 
-@macro internalsref{NAME}
-@vindex \NAME\
-@ref{\NAME\,,,lilypond-internals}
+@macro internalsref{TEXT}
+@vindex \TEXT\
+@ref{\TEXT\,,,lilypond-internals}
 @end macro
 
-@macro rglos{NAME}
-@vindex \NAME\
-@ref{\NAME\,,,music-glossary}
+@macro rglos{TEXT}
+@vindex \TEXT\
+@ref{\TEXT\,,,music-glossary}
 @end macro
 
-@macro rprogram{NAME}
-@vindex \NAME\
-@ref{\NAME\,,,lilypond-program}
+@macro rprogram{TEXT}
+@vindex \TEXT\
+@ref{\TEXT\,,,lilypond-program}
 @end macro
 
-@macro ruser{NAME}
-@vindex \NAME\
-@ref{\NAME\,,,lilypond}
+@macro ruser{TEXT}
+@vindex \TEXT\
+@ref{\TEXT\,,,lilypond}
 @end macro
 
-@macro rlearning{NAME}
-@vindex \NAME\
-@ref{\NAME\,,,lilypond-learning}
+@macro rlearning{TEXT}
+@vindex \TEXT\
+@ref{\TEXT\,,,lilypond-learning}
 @end macro
 
 @end ifclear
 
-
-@c to get decent quotes in `foo'
-@macro q{TEXT}
-@html
-‘\TEXT\’
-@end html
-@end macro
-
-@c to get decent French quotes in ``foo''
-@macro qq{TEXT}
-@html
-« \TEXT\ »
-@end html
-@end macro
-
 @end ifhtml
 
 
 @ifdocbook
 @c ***** DOCBOOK-XML *****
 
-@macro internalsref{NAME}
-@vindex \NAME\
-@ref{\NAME\,,,lilypond-internals}
+@macro internalsref{TEXT}
+@vindex \TEXT\
+@ref{\TEXT\,,,lilypond-internals}
 @end macro
 
-@macro rglos{NAME}
-@vindex \NAME\
-@ref{\NAME\,,,music-glossary}
+@macro rglos{TEXT}
+@vindex \TEXT\
+@ref{\TEXT\,,,music-glossary}
 @end macro
 
-@macro rprogram{NAME}
-@vindex \NAME\
-@ref{\NAME\,,,lilypond-program}
+@macro rprogram{TEXT}
+@vindex \TEXT\
+@ref{\TEXT\,,,lilypond-program}
 @end macro
 
-@macro ruser{NAME}
-@vindex \NAME\
-@ref{\NAME\,,,lilypond}
+@macro ruser{TEXT}
+@vindex \TEXT\
+@ref{\TEXT\,,,lilypond}
 @end macro
 
-@macro rlearning{NAME}
-@vindex \NAME\
-@ref{\NAME\,,,lilypond-learning}
-@end macro
-
-@c to get decent quotes in `foo'
-@macro q{TEXT}
-@html
-‘\TEXT\’
-@end html
-@end macro
-
-@c to get decent French quotes in ``foo''
-@macro qq{TEXT}
-@html
-« \TEXT\ »
-@end html
+@macro rlearning{TEXT}
+@vindex \TEXT\
+@ref{\TEXT\,,,lilypond-learning}
 @end macro
 
 @end ifdocbook
@@ -242,36 +260,22 @@
 
 @macro rglos{NAME}
 @vindex \NAME\
-@inforef{\NAME\,,,music-glossary}
-@end macro
-
-@macro usermanref{NAME}
-@inforef{\NAME\}
-@end macro
-
-@macro rprogram{NAME}
-@vindex \NAME\
-@ref{\NAME\,,,lilypond-program}
+@inforef{\NAME\,,music-glossary}
 @end macro
 
-@macro ruser{NAME}
-@vindex \NAME\
-@ref{\NAME\,,,lilypond}
-@end macro
-
-@macro rlearning{NAME}
-@vindex \NAME\
-@ref{\NAME\,,,lilypond-learning}
+@macro rprogram{TEXT}
+@vindex \TEXT\
+@ref{\TEXT\,,,lilypond-program}
 @end macro
 
-@c to get decent quotes in `foo'
-@macro q{TEXT}
-`\TEXT\'
+@macro ruser{TEXT}
+@vindex \TEXT\
+@ref{\TEXT\,,,lilypond}
 @end macro
 
-@c to get decent French quotes in ``foo''
-@macro qq{TEXT}
-« \TEXT\ »
+@macro rlearning{TEXT}
+@vindex \TEXT\
+@ref{\TEXT\,,,lilypond-learning}
 @end macro
 
 @end ifinfo
@@ -280,61 +284,29 @@
 @c **** TEX ****
 @iftex
 
-@macro internalsref{NAME}
-@vindex \NAME\
-@code{\NAME\}
-@end macro
-
-@macro rglos {NAME}
-@vindex \NAME\
-@code{\NAME\}
-@end macro
-
-@macro seeinternals{NAME}
-@emph{Référence du programme}, @internalsref{\NAME\}
-@end macro
-
-@macro usermanref{NAME}
-@emph{Manuel de l'utilisateur, \NAME\}
+@macro internalsref{TEXT}
+@vindex \TEXT\
+@code{\TEXT\}
 @end macro
 
-@macro rprogram{NAME}
-@emph{Manuel d'utilisation du programme, \NAME\}
+@macro rglos {TEXT}
+@vindex \TEXT\
+@code{\TEXT\}
 @end macro
 
-@macro rlearning{NAME}
-@emph{Manuel d'apprentissage du programme, \NAME\}
+@macro rprogram{TEXT}
+@emph{Manuel d'utilisation du programme, \TEXT\}
 @end macro
 
-@alias ruser=usermanref
-
-@c to get decent French quotes in `foo'
-@macro q{TEXT}
-`\TEXT\'
+@macro ruser{TEXT}
+@emph{Manuel de l'utilisateur, \TEXT\}
 @end macro
 
-@c to get decent French quotes in ``foo''
-@macro qq{TEXT}
-@guillemetleft{}@tie{}\TEXT\@tie{}@guillemetright{}
+@macro rlearning{TEXT}
+@emph{Manuel d'apprentissage du programme, \TEXT\}
 @end macro
 
 @end iftex
 
 
-@ifnottex
-@c **** not TEX ****
-
-@macro seeinternals{NAME}
-@internalsref{\NAME\}
-@end macro
-
-@ifnotinfo
-@macro usermanref{NAME}
-@ref{\NAME\}
-@end macro
-@end ifnotinfo
-
-@end ifnottex
-
-
 @c EOF