Updated Spanish macros.itexi

diff --git a/Documentation/es/user/macros.itexi b/Documentation/es/user/macros.itexi
index d913212ec3048ae30463800266ddc0ff3232e5c6..40279f256d8c6c55850236e2e49162d33b385909 100644 (file)
--- a/Documentation/es/user/macros.itexi
+++ b/Documentation/es/user/macros.itexi
@@ -1,12 +1,11 @@
 @c -*- coding: utf-8; mode: texinfo; -*-
 @ignore
-    Translation of GIT committish: 5a52c19583b625c58901300ec9547da22ae50bdd
+    Translation of GIT committish: 02d2ef26f3a9fefa70eb70dd2c7e708a24b331e5
 
     When revising a translation, copy the HEAD committish of the
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-
 @c   ***** Displaying text *****
 
 @c we need this since @q{\} doesn't work with makeinfo 4.8 --
@@ -14,81 +13,97 @@
 @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}
 @quoteleft{}\TEXT\@quoteright{}
 @end macro
 
 @macro qq{TEXT}
-``\TEXT\''
+@quotedblleft{}\TEXT\@quotedblright{}
 @end macro
-@end iftex
 
+@macro warning{TEXT}
+@quotation
+@quotation
+@cartouche
+@b{Nota:} \TEXT\
+@end cartouche
+@end quotation
+@end quotation
+@end macro
 
-@ifinfo
-@macro q{TEXT}
-`\TEXT\'
+@ifnotinfo
+@macro notation{TEXT}
+@var{\TEXT\}
 @end macro
+@end ifnotinfo
 
-@macro qq{TEXT}
-``\TEXT\''
+@ifinfo
+@macro notation{TEXT}
+\TEXT\
 @end macro
 @end ifinfo
 
-
-@ifhtml
-@macro q{TEXT}
-@html
-‘\TEXT\’
-@end html
+@macro smallspace
+@sp 1
 @end macro
 
-@macro qq{TEXT}
-@html
-“\TEXT\”
-@end html
-@end macro
-@end ifhtml
 
+@c   **** Displaying images not generated by lilypond-book
 
-@ifdocbook
-@macro q{TEXT}
-@xml
-‘\TEXT\’
-@end xml
+@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
 
-@macro qq{TEXT}
-@xml
-“\TEXT\”
-@end xml
+@ifinfo
+@macro sourceimage{FILENAME,WIDTH,HEIGHT,ALTTEXT}
+@image{lilypond/\FILENAME\,\WIDTH\,\HEIGHT\,\ALTTEXT\}
 @end macro
-@end ifdocbook
+@end ifinfo
 
 
+@c   **** Headings in a doc subsection ****
 
+@macro predefined
+@noindent
+@subsubheading Instrucciones predefinidas
 
-@c   **** Headings in a doc subsection ****
+@end macro
 
+@macro snippets
+@noindent
+@subsubheading Fragmentos de código seleccionados
+
+@end macro
+
+@c * Deprecated: not in English macros.itexi *
 @macro refcommands
 @noindent
-@subsubheading Predefined commands
+@subsubheading Instrucciones predefinidas
 
 @end macro
 
+@c * Deprecated: not in English macros.itexi *
 @macro commonprop
 @noindent
-@subsubheading Commonly tweaked properties
+@subsubheading Propiedades trucadas frecuentemente
 
 @end macro
 
 @macro seealso
 @noindent
-@subsubheading See also
+@subsubheading Véase también
 
+@indent
 @end macro
 
+@c * Deprecated: not in English macros.itexi *
 @macro refbugs
 @noindent
 @subsubheading Bugs
@@ -101,11 +116,13 @@
 
 @end macro
 
+@c * Deprecated: not in English macros.itexi *
 @macro context{TEXT}
 @vindex \TEXT\
 @code{\TEXT\}@c should use internalsref
 @end macro
 
+@c * Deprecated: not in English macros.itexi *
 @macro refcommand{TEXT}
 @vindex \TEXT\
 @code{\TEXT\}
@@ -120,28 +137,28 @@
 
 @c   **** Links and references ****
 
-@c usage: @lsr{ancient,custodes.ly}
-@macro lsr{DIR,TEXT}
+@c  Possibly deprecated; under discussion.
+@c usage: @lsr{ancient,Ancient-notation,custodes.ly}
+@macro lsr{SECTION,DIR,TEXT}
 @ifhtml
-@uref{source/input/lsr/\DIR\/collated-files.html#\TEXT\,@file{\DIR\/\TEXT\}}
+@uref{source/input/lsr/snippets/\DIR\.html#\TEXT\,@file{\SECTION\/\TEXT\}}
 @end ifhtml
 @ifnothtml
-@file{\DIR\/\TEXT\}
+@file{\SECTION\/\TEXT\}
 @end ifnothtml
 @end macro
 
-@macro lsrdir{DIR}
+@c usage: @lsrdir{ancient,Ancient-notation}
+@macro lsrdir{SECTION,DIR}
 @ifhtml
-@uref{source/input/lsr/\DIR\/collated-files.html,@file{\DIR\}/}
+@uref{source/input/lsr/snippets/\DIR\.html,\SECTION\}
 @end ifhtml
 @ifnothtml
-@file{\DIR\}
+\DIR\
 @end ifnothtml
 @end macro
 
 
-
-
 @c  Definitions for references:
 @c     @internalsref
 @c     @rglos
@@ -152,14 +169,6 @@
 @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/\TEXT\.html,\TEXT\}@c
-@c @inforef{} adds ``See'' to the sentence, which is annoying, but
-@c better than a broken link.
-@c @inforef{\TEXT\,,lilypond-internals}@c
-@c using @ref without punctuation is OK without for formats other than info
-
 @ifset bigpage
 
 @macro internalsref{TEXT}
@@ -204,7 +213,7 @@
 
 @macro rprogram{TEXT}
 @vindex \TEXT\
-@ref{\TEXT\,,,lilypond-program}
+@ref{\TEXT\,,,lilypond-program-es}
 @end macro
 
 @macro ruser{TEXT}
@@ -214,7 +223,7 @@
 
 @macro rlearning{TEXT}
 @vindex \TEXT\
-@ref{\TEXT\,,,lilypond-learning}
+@ref{\TEXT\,,,lilypond-learning-es}
 @end macro
 
 @end ifclear
@@ -237,7 +246,7 @@
 
 @macro rprogram{TEXT}
 @vindex \TEXT\
-@ref{\TEXT\,,,lilypond-program}
+@ref{\TEXT\,,,lilypond-program-es}
 @end macro
 
 @macro ruser{TEXT}
@@ -247,7 +256,7 @@
 
 @macro rlearning{TEXT}
 @vindex \TEXT\
-@ref{\TEXT\,,,lilypond-learning}
+@ref{\TEXT\,,,lilypond-learning-es}
 @end macro
 
 @end ifdocbook
@@ -256,29 +265,29 @@
 @ifinfo
 @c **** INFO ****
 
-@macro internalsref{NAME}
-@vindex \NAME\
-@inforef{\NAME\,,lilypond-internals}
+@macro internalsref{TEXT}
+@vindex \TEXT\
+@inforef{\TEXT\,,lilypond-internals}
 @end macro
 
-@macro rglos{NAME}
-@vindex \NAME\
-@inforef{\NAME\,,music-glossary}
+@macro rglos{TEXT}
+@vindex \TEXT\
+@inforef{\TEXT\,,music-glossary}
 @end macro
 
 @macro rprogram{TEXT}
 @vindex \TEXT\
-@ref{\TEXT\,,,lilypond-program}
+@ref{\TEXT\,,,lilypond-program-es}
 @end macro
 
 @macro ruser{TEXT}
 @vindex \TEXT\
-@ref{\TEXT\,,,lilypond}
+@ref{\TEXT\,,,lilypond-es}
 @end macro
 
 @macro rlearning{TEXT}
 @vindex \TEXT\
-@ref{\TEXT\,,,lilypond-learning}
+@ref{\TEXT\,,,lilypond-learning-es}
 @end macro
 
 @end ifinfo
@@ -294,19 +303,22 @@
 
 @macro rglos {TEXT}
 @vindex \TEXT\
-@code{\TEXT\}
+@ref{\TEXT\,,,music-glossary}
 @end macro
 
 @macro rprogram{TEXT}
-el manual de utilización del programa, @internalsref{\TEXT\}
+el manual de utilización del programa, @ref{\TEXT\,,,lilypond-program-es}
+@c @internalsref{\TEXT\}
 @end macro
 
 @macro ruser{TEXT}
-el manual del usuario, @internalsref{\TEXT\}
+el manual de referencia de la notación, @ref{\TEXT\,,,lilypond-es}
+@c @internalsref{\TEXT\}
 @end macro
 
 @macro rlearning{TEXT}
-el manual de aprendizaje, @internalsref{\TEXT\}
+el manual de aprendizaje, @ref{\TEXT\,,,lilypond-learning-es}
+@c @internalsref{\TEXT\}
 @end macro
 
 @end iftex