X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Documentation%2Fmacros.itexi;h=cf58c7890624be0bc4d717684b0c8c618280a4df;hb=8659a99f233f5c4684292728e7ad4206669b35b0;hp=d580fdf02785314123b6df9b50fce7f28dee975d;hpb=e9cea040855f3f40cb37b21c078ba1c90ea22714;p=lilypond.git
diff --git a/Documentation/macros.itexi b/Documentation/macros.itexi
index d580fdf027..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,15 +67,44 @@
@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
For more information about how this manual fits with the other
documentation, or to read this manual in other formats, see
-@rgeneral{Manuals}.
+@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
@@ -184,7 +230,7 @@ For LilyPond version @version{}
@c Definitions for references:
@c
-@c @rgeneral
+@c @rweb
@c @ressay
@c @rglos
@c @rinternals
@@ -271,14 +317,14 @@ For LilyPond version @version{}
@ref{\TEXT\,,\DISPLAY\,contributor-big-page,Contributor's Guide}
@end macro
-@macro rgeneral{TEXT}
+@macro rweb{TEXT}
@vindex \TEXT\
-@ref{\TEXT\,,,general-big-page,General Information}
+@ref{\TEXT\,,,web-big-page,General Information}
@end macro
-@macro rgeneralnamed{TEXT,DISPLAY}
+@macro rwebnamed{TEXT,DISPLAY}
@vindex \TEXT\
-@ref{\TEXT\,,\DISPLAY\,general-big-page,General Information}
+@ref{\TEXT\,,\DISPLAY\,web-big-page,General Information}
@end macro
@macro ressay{TEXT}
@@ -388,14 +434,14 @@ For LilyPond version @version{}
@ref{\TEXT\,,\DISPLAY\,contributor,Contributor's Guide}
@end macro
-@macro rgeneral{TEXT}
+@macro rweb{TEXT}
@vindex \TEXT\
-@ref{\TEXT\,,,general,General Information}
+@ref{\TEXT\,,,web,General Information}
@end macro
-@macro rgeneralnamed{TEXT,DISPLAY}
+@macro rwebnamed{TEXT,DISPLAY}
@vindex \TEXT\
-@ref{\TEXT\,,\DISPLAY\,general,General Information}
+@ref{\TEXT\,,\DISPLAY\,web,General Information}
@end macro
@macro ressay{TEXT}
@@ -500,14 +546,14 @@ For LilyPond version @version{}
@ref{\TEXT\,,\DISPLAY\,lilypond-contributor,Contributor's Guide}
@end macro
-@macro rgeneral{TEXT}
+@macro rweb{TEXT}
@vindex \TEXT\
-@ref{\TEXT\,,,lilypond-general,General Information}
+@ref{\TEXT\,,,lilypond-web,General Information}
@end macro
-@macro rgeneralnamed{TEXT,DISPLAY}
+@macro rwebnamed{TEXT,DISPLAY}
@vindex \TEXT\
-@ref{\TEXT\,,\DISPLAY\,lilypond-general, General Information}
+@ref{\TEXT\,,\DISPLAY\,lilypond-web, General Information}
@end macro
@macro ressay{TEXT}
@@ -629,14 +675,14 @@ For LilyPond version @version{}
@ref{\TEXT\,,\DISPLAY\,contributor,Contributor's Guide}
@end macro
-@macro rgeneral{TEXT}
+@macro rweb{TEXT}
@lilyvindex{\TEXT\}
-@ref{\TEXT\,,,general,General Information}
+@ref{\TEXT\,,,web,General Information}
@end macro
-@macro rgeneralnamed{TEXT,DISPLAY}
+@macro rwebnamed{TEXT,DISPLAY}
@lilyvindex{\TEXT\}
-@ref{\TEXT\,,\DISPLAY\,general,General Information}
+@ref{\TEXT\,,\DISPLAY\,web,General Information}
@end macro
@macro ressay{TEXT}
@@ -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
@@ -708,7 +784,7 @@ The @qq{X image} is not a registered trademark. It was created by
placed under the GNU Free Documentation License version 1.2 or later.
We found the image on
@uref{http://commons.wikimedia.org/wiki/File:Mac_OS_X_Userbox_X.png,
-this Wikipedia Commons page}.
+this Wikimedia Commons page}.
@end macro
@@ -719,7 +795,7 @@ trademark. It was created by
placed under the GNU Free Documentation License version 1.2. We
found the image on
@uref{http://commons.wikimedia.org/wiki/Category:Microsoft_Windows_logos,
-this Wikipedia Commons page}.
+this Wikimedia Commons page}.
@end macro