X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Documentation%2Fmacros.itexi;h=cf58c7890624be0bc4d717684b0c8c618280a4df;hb=f1b23dd196d0fe5b47f3baf6bf6b9afccf81adef;hp=3a4447a898bffd8301975f84218c30555fb537f4;hpb=d8f8e23dbd11cf213a37ad233c7f78b9b84e8ac1;p=lilypond.git
diff --git a/Documentation/macros.itexi b/Documentation/macros.itexi
index 3a4447a898..cf58c78906 100644
--- a/Documentation/macros.itexi
+++ b/Documentation/macros.itexi
@@ -1,15 +1,28 @@
-@c -*- coding: us-ascii; mode: texinfo; -*-
+@c -*- coding: utf-8; mode: texinfo; -*-
@ignore
Translation of GIT committish: FILL-IN-HEAD-COMMITTISH
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,35 @@
@end ifnothtml
+@c do not translate the following macro -- it is used in
+@c an untranslated manual.
+
+@ifhtml
+
+@macro advanced{TEXT}
+@html
+
+@end html
+@strong{Advanced note:} \TEXT\
+@c keep the space for proper nesting of
+
+@html
+
+@end html
+@end macro
+
+@end ifhtml
+
+@ifnothtml
+
+@macro advanced{TEXT}
+@quotation
+@b{Advanced note:} \TEXT\
+@end quotation
+@end macro
+
+@end ifnothtml
+
@macro docMain
@cartouche
@@ -62,7 +104,7 @@ documentation, or to read this manual in other formats, see
@rweb{Manuals}.
If you are missing any manuals, the complete documentation can be
-found at @w{@uref{http://@/www@/.lilypond@/.org/}}.
+found at @w{@uref{http://@/lilypond@/.org/}}.
@end cartouche
@end macro
@@ -127,7 +169,7 @@ This document has been placed in the public domain.
@vskip 0pt plus 1filll
-@insertcopying{}
+@insertcopying
For LilyPond version @version{}
@end titlepage
@@ -144,16 +186,20 @@ For LilyPond version @version{}
@c it doesn't matter, but a future implementation will probably
@c add some code which needs this restriction.
+@c @raggedright can be enabled as soon as texinfo 5.x or larger
+@c is in use for Gub and LilyDev 3.
+
@macro predefined
@noindent
@subsubheading Predefined commands
+@c @raggedright
@end macro
@c Due to a bug in texi2html (texi2html.pl CVS versions <= 1.245)
@c the next macro must not be empty.
@macro endpredefined
-@c
+@c @end raggedright
@end macro
@@ -685,6 +731,36 @@ For LilyPond version @version{}
@ifset web
+@macro exampleImage{IMAGE-FILE}
+@html
+
+
+
+
+
+ (click to enlarge)
+
+
+@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
+
+
+ Help wanted:
+ \TEXT\
+
+@end html
+@end macro
+
+
@c LEGALESE
@macro logoLegalLinux