X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Documentation%2Fes%2Fmacros.itexi;h=163f64d0a45643e2184e038ca544711c13af0139;hb=c358ec6f8ed8f31b5fa1d97da6a2284b3759bdfd;hp=cec1c8384a8a902c853392f3a153875352f326e8;hpb=3dd2729c9b45d88b531874a342e3b18ef516ded8;p=lilypond.git

diff --git a/Documentation/es/macros.itexi b/Documentation/es/macros.itexi
index cec1c8384a..163f64d0a4 100644
--- a/Documentation/es/macros.itexi
+++ b/Documentation/es/macros.itexi
@@ -1,15 +1,28 @@
 @c -*- coding: utf-8; mode: texinfo; -*-
 @ignore
-    Translation of GIT committish: da7ce7d651c3a0d1bfed695f6e952975937a1c79
+    Translation of GIT committish: 52f98b4061e0eb74b7c1dbcc29e74538b374752f
 
     When revising a translation, copy the HEAD committish of the
-    version that you are working on.  See TRANSLATION for details.
+    version that you are working on.  For details, see the Contributors'
+    Guide, node Updating translation committishes..
 @end ignore
 
 
 @include version.itexi
 @include common-macros.itexi
 
+@ignore
+****************************
+MACRO DEFINITIONS GUIDELINES
+****************************
+
+This file should contain macro definitions which are common to all
+languages, i.e. all macro definitions which do not contain text that
+should be translated (namely text visible in the output).
+
+Macro definitions which contain text that should be translated in
+translations should be in macros.itexi.
+@end ignore
 
 @c   ***** Displaying text *****
 
@@ -54,6 +67,36 @@
 
 @end ifnothtml
 
+@c do not translate the following macro -- it is used in
+@c an untranslated manual.
+
+@ifhtml
+
+@macro advanced{TEXT}
+@html
+<div class="advanced">
+@end html
+@strong{Advanced note:} \TEXT\
+@c keep the space for proper nesting of </p>
+
+@html
+</div>
+@end html
+@end macro
+
+@end ifhtml
+
+@ifnothtml
+
+@macro advanced{TEXT}
+@quotation
+@b{Advanced note:} \TEXT\
+@end quotation
+@end macro
+
+@end ifnothtml
+
+
 @macro docMain
 @cartouche
 Para mayor información sobre la forma en que este manual se relaciona
@@ -143,7 +186,7 @@ Este documento se ha puesto en el dominio público.
 
 @vskip 0pt plus 1filll
 
-@insertcopying{}
+@insertcopying
 
 Para la versión de LilyPond @version{}
 @end titlepage
@@ -151,7 +194,6 @@ Para la versión de LilyPond @version{}
 @end macro
 
 
-
 @c   ***** Headings in a doc subsection *****
 
 @c The next macro is a dummy currently since texinfo doesn't
@@ -702,6 +744,35 @@ Para la versión de LilyPond @version{}
 
 @ifset web
 
+@macro exampleImage{IMAGE-FILE}
+@html
+<div class="float-center">
+  <a class="clickable" href="ly-examples/\IMAGE-FILE\.png">
+    <img src="ly-examples/\IMAGE-FILE\-small.png" alt="\IMAGE-FILE\">
+  </a>
+  <p style="text-align: center">
+    (pulse para ver una imagen más grande)
+  </p>
+</div>
+@end html
+@iftex
+@image{ly-examples/\IMAGE-FILE\,6in,,\IMAGE-FILE\,png}
+@end iftex
+@ifinfo
+@image{lilypond/ly-examples/\IMAGE-FILE\,,,\IMAGE-FILE\,png}
+@end ifinfo
+@end macro
+
+@macro help{TEXT}
+@html
+<div class="help">
+<strong>
+  <span style="text-decoration:blink">Necesitamos ayuda:</span>
+</strong> \TEXT\
+</div>
+@end html
+@end macro
+
 @c LEGALESE
 
 @macro logoLegalLinux
@@ -752,21 +823,3 @@ Esta sección aún no está traducida; consulte el manual en inglés.
 
 
 
-@macro exampleImage{IMAGE-FILE}
-@html
-<div class="float-center">
-  <a class="clickable" href="examples/\IMAGE-FILE\.png">
-    <img src="examples/\IMAGE-FILE\-small.png" alt="\IMAGE-FILE\">
-  </a>
-  <p style="text-align: center">
-    (pulse para ver una imagen más grande)
-  </p>
-</div>
-@end html
-@iftex
-@image{examples/\IMAGE-FILE\-small,,,\IMAGE-FILE\,png}
-@end iftex
-@ifinfo
-@image{lilypond/examples/\IMAGE-FILE\,,,\IMAGE-FILE\,png}
-@end ifinfo
-@end macro