Merge branch 'lilypond/translation' of ssh://jomand@git.sv.gnu.org/srv/git/lilypond

[lilypond.git] / Documentation / macros.itexi

diff --git a/Documentation/macros.itexi b/Documentation/macros.itexi
index 86f549bc813cff16ffd2c632433a2607b9a8e0ee..503e517d7bd7ae57eaca0cf424c7b969acebd611 100644 (file)
--- a/Documentation/macros.itexi
+++ b/Documentation/macros.itexi
@@ -27,9 +27,13 @@
 @ifhtml
 
 @macro warning{TEXT}
-@cartouche
-@b{Note:} \TEXT\
-@end cartouche
+@html
+<div class="warning">
+@end html
+@strong{Note:} \TEXT\
+@html
+</div>
+@end html
 @end macro
 
 @end ifhtml
@@ -99,12 +103,15 @@
 
 @c  Definitions for references:
 @c
+@c     @rgeneral
+@c     @ressay
 @c     @rglos
+@c     @rinternals
 @c     @rlearning
-@c     @ruser
-@c     @rprogram
 @c     @rlsr
-@c     @rinternals
+@c     @rprogram
+@c     @ruser
+@c     @rchanges
 @c
 @c  All these also have a @...named version which allows to specify the
 @c  displayed text for the reference as second argument.
@@ -133,50 +140,80 @@
 
 @macro rlearning{TEXT}
 @vindex \TEXT\
-@ref{\TEXT\,,,lilypond-learning-big-page,Learning Manual}
+@ref{\TEXT\,,,learning-big-page,Learning Manual}
 @end macro
 
 @macro rlearningnamed{TEXT,DISPLAY}
 @vindex \TEXT\
-@ref{\TEXT\,,\DISPLAY\,lilypond-learning-big-page,Learning Manual}
+@ref{\TEXT\,,\DISPLAY\,learning-big-page,Learning Manual}
 @end macro
 
 @macro ruser{TEXT}
 @vindex \TEXT\
-@ref{\TEXT\,,,lilypond-big-page,Notation Reference}
+@ref{\TEXT\,,,notation-big-page,Notation Reference}
 @end macro
 
 @macro rusernamed{TEXT,DISPLAY}
 @vindex \TEXT\
-@ref{\TEXT\,,\DISPLAY\,lilypond-big-page,Notation Reference}
+@ref{\TEXT\,,\DISPLAY\,notation-big-page,Notation Reference}
+@end macro
+
+@macro rchanges{TEXT}
+@vindex \TEXT\
+@ref{\TEXT\,,,changes-big-page,Changes}
+@end macro
+
+@macro rchangesnamed{TEXT,DISPLAY}
+@vindex \TEXT\
+@ref{\TEXT\,,\DISPLAY\,changes-big-page,Changes}
+@end macro
+
+@macro rgeneral{TEXT}
+@vindex \TEXT\
+@ref{\TEXT\,,,general-big-page,General Information}
+@end macro
+
+@macro rgeneralnamed{TEXT,DISPLAY}
+@vindex \TEXT\
+@ref{\TEXT\,,\DISPLAY\,general-big-page,General Information}
+@end macro
+
+@macro ressay{TEXT}
+@vindex \TEXT\
+@ref{\TEXT\,,,essay-big-page,Essay}
+@end macro
+
+@macro ressaynamed{TEXT,DISPLAY}
+@vindex \TEXT\
+@ref{\TEXT\,,\DISPLAY\,essay-big-page,Essay}
 @end macro
 
 @macro rprogram{TEXT}
 @vindex \TEXT\
-@ref{\TEXT\,,,lilypond-program-big-page,Application Usage}
+@ref{\TEXT\,,,application-big-page,Application Usage}
 @end macro
 
 @macro rprogramnamed{TEXT,DISPLAY}
 @vindex \TEXT\
-@ref{\TEXT\,,\DISPLAY\,lilypond-program-big-page,Application Usage}
+@ref{\TEXT\,,\DISPLAY\,application-big-page,Application Usage}
 @end macro
 
 @macro rlsr{TEXT}
-@ref{\TEXT\,,,lilypond-snippets-big-page,Snippets}
+@ref{\TEXT\,,,snippets-big-page,Snippets}
 @end macro
 
 @macro rlsrnamed{TEXT,DISPLAY}
-@ref{\TEXT\,,\DISPLAY\,lilypond-snippets-big-page,Snippets}
+@ref{\TEXT\,,\DISPLAY\,snippets-big-page,Snippets}
 @end macro
 
 @macro rinternals{TEXT}
 @vindex \TEXT\
-@ref{\TEXT\,,,lilypond-internals-big-page,Internals Reference}
+@ref{\TEXT\,,,internals-big-page,Internals Reference}
 @end macro
 
 @macro rinternalsnamed{TEXT,DISPLAY}
 @vindex \TEXT\
-@ref{\TEXT\,,\DISPLAY\,lilypond-internals-big-page,Internals Reference}
+@ref{\TEXT\,,\DISPLAY\,internals-big-page,Internals Reference}
 @end macro
 
 @end ifset
@@ -186,6 +223,100 @@
 
 @ifclear bigpage
 
+@ifnotinfo
+
+@macro rglos{TEXT}
+@vindex \TEXT\
+@ref{\TEXT\,,,music-glossary,Music Glossary}
+@end macro
+
+@macro rglosnamed{TEXT,DISPLAY}
+@vindex \TEXT\
+@ref{\TEXT\,,\DISPLAY\,music-glossary,Music Glossary}
+@end macro
+
+@macro rlearning{TEXT}
+@vindex \TEXT\
+@ref{\TEXT\,,,learning,Learning Manual}
+@end macro
+
+@macro rlearningnamed{TEXT,DISPLAY}
+@vindex \TEXT\
+@ref{\TEXT\,,,learning,Learning Manual}
+@end macro
+
+@macro ruser{TEXT}
+@vindex \TEXT\
+@ref{\TEXT\,,,notation,Notation Reference}
+@end macro
+
+@macro rusernamed{TEXT,DISPLAY}
+@vindex \TEXT\
+@ref{\TEXT\,,\DISPLAY\,notation,Notation Reference}
+@end macro
+
+@macro rchanges{TEXT}
+@vindex \TEXT\
+@ref{\TEXT\,,,changes,Changes}
+@end macro
+
+@macro rchangesnamed{TEXT,DISPLAY}
+@vindex \TEXT\
+@ref{\TEXT\,,\DISPLAY\,changes,Changes}
+@end macro
+
+@macro rgeneral{TEXT}
+@vindex \TEXT\
+@ref{\TEXT\,,,general,General Information}
+@end macro
+
+@macro rgeneralnamed{TEXT,DISPLAY}
+@vindex \TEXT\
+@ref{\TEXT\,,\DISPLAY\,general,General Information}
+@end macro
+
+@macro ressay{TEXT}
+@vindex \TEXT\
+@ref{\TEXT\,,,essay,Essay}
+@end macro
+
+@macro ressaynamed{TEXT,DISPLAY}
+@vindex \TEXT\
+@ref{\TEXT\,,\DISPLAY\,essay,Essay}
+@end macro
+
+@macro rprogram{TEXT}
+@vindex \TEXT\
+@ref{\TEXT\,,,application,Application Usage}
+@end macro
+
+@macro rprogramnamed{TEXT,DISPLAY}
+@vindex \TEXT\
+@ref{\TEXT\,,\DISPLAY\,application,Application Usage}
+@end macro
+
+@macro rlsr{TEXT}
+@ref{\TEXT\,,,snippets,Snippets}
+@end macro
+
+@macro rlsrnamed{TEXT,DISPLAY}
+@ref{\TEXT\,,\DISPLAY\,snippets,Snippets}
+@end macro
+
+@macro rinternals{TEXT}
+@vindex \TEXT\
+@ref{\TEXT\,,,internals,Internals Reference}
+@end macro
+
+@macro rinternalsnamed{TEXT,DISPLAY}
+@vindex \TEXT\
+@ref{\TEXT\,,\DISPLAY\,internals,Internals Reference}
+@end macro
+
+@end ifnotinfo
+
+@ifinfo
+
 @macro rglos{TEXT}
 @vindex \TEXT\
 @ref{\TEXT\,,,music-glossary,Music Glossary}
@@ -208,22 +339,52 @@
 
 @macro ruser{TEXT}
 @vindex \TEXT\
-@ref{\TEXT\,,,lilypond,Notation Reference}
+@ref{\TEXT\,,,lilypond-notation,Notation Reference}
 @end macro
 
 @macro rusernamed{TEXT,DISPLAY}
 @vindex \TEXT\
-@ref{\TEXT\,,\DISPLAY\,lilypond,Notation Reference}
+@ref{\TEXT\,,\DISPLAY\,lilypond-notation,Notation Reference}
+@end macro
+
+@macro rchanges{TEXT}
+@vindex \TEXT\
+@ref{\TEXT\,,,lilypond-changes,Changes}
+@end macro
+
+@macro rchangesnamed{TEXT,DISPLAY}
+@vindex \TEXT\
+@ref{\TEXT\,,\DISPLAY\,lilypond-changes,Changes}
+@end macro
+
+@macro rgeneral{TEXT}
+@vindex \TEXT\
+@ref{\TEXT\,,,lilypond-general,General Information}
+@end macro
+
+@macro rgeneralnamed{TEXT,DISPLAY}
+@vindex \TEXT\
+@ref{\TEXT\,,\DISPLAY\,lilypond-general, General Information}
+@end macro
+
+@macro ressay{TEXT}
+@vindex \TEXT\
+@ref{\TEXT\,,,lilypond-essay,Essay}
+@end macro
+
+@macro ressaynamed{TEXT,DISPLAY}
+@vindex \TEXT\
+@ref{\TEXT\,,\DISPLAY\,lilypond-essay,Essay}
 @end macro
 
 @macro rprogram{TEXT}
 @vindex \TEXT\
-@ref{\TEXT\,,,lilypond-program,Application Usage}
+@ref{\TEXT\,,,lilypond-application,Application Usage}
 @end macro
 
 @macro rprogramnamed{TEXT,DISPLAY}
 @vindex \TEXT\
-@ref{\TEXT\,,\DISPLAY\,lilypond-program,Application Usage}
+@ref{\TEXT\,,\DISPLAY\,lilypond-application,Application Usage}
 @end macro
 
 @macro rlsr{TEXT}
@@ -244,6 +405,8 @@
 @ref{\TEXT\,,\DISPLAY\,lilypond-internals,Internals Reference}
 @end macro
 
+@end ifinfo
+
 @end ifclear
 
 @end ifnottex
@@ -275,52 +438,126 @@
 
 @macro rlearning{TEXT}
 @lilyvindex{\TEXT\}
-@ref{\TEXT\,,,lilypond-learning,Learning Manual}
+@ref{\TEXT\,,,learning,Learning Manual}
 @end macro
 
 @macro rlearningnamed{TEXT,DISPLAY}
 @lilyvindex{\TEXT\}
-@ref{\TEXT\,,\DISPLAY\,lilypond-learning,Learning Manual}
+@ref{\TEXT\,,\DISPLAY\,learning,Learning Manual}
 @end macro
 
 @macro ruser{TEXT}
 @lilyvindex{\TEXT\}
-@ref{\TEXT\,,,lilypond,Notation Reference}
+@ref{\TEXT\,,,notation,Notation Reference}
 @end macro
 
 @macro rusernamed{TEXT,DISPLAY}
 @lilyvindex{\TEXT\}
-@ref{\TEXT\,,\DISPLAY\,lilypond,Notation Reference}
+@ref{\TEXT\,,\DISPLAY\,notation,Notation Reference}
+@end macro
+
+@macro rchanges{TEXT}
+@lilyvindex{\TEXT\}
+@ref{\TEXT\,,,changes,Changes}
+@end macro
+
+@macro rchangesnamed{TEXT,DISPLAY}
+@lilyvindex{\TEXT\}
+@ref{\TEXT\,,\DISPLAY\,changes,Changes}
+@end macro
+
+@macro rgeneral{TEXT}
+@lilyvindex{\TEXT\}
+@ref{\TEXT\,,,general,General Information}
+@end macro
+
+@macro rgeneralnamed{TEXT,DISPLAY}
+@lilyvindex{\TEXT\}
+@ref{\TEXT\,,\DISPLAY\,general,General Information}
+@end macro
+
+@macro ressay{TEXT}
+@lilyvindex{\TEXT\}
+@ref{\TEXT\,,,essay,Essay}
+@end macro
+
+@macro ressaynamed{TEXT,DISPLAY}
+@lilyvindex{\TEXT\}
+@ref{\TEXT\,,\DISPLAY\,essay,Essay}
 @end macro
 
 @macro rprogram{TEXT}
 @lilyvindex{\TEXT\}
-@ref{\TEXT\,,,lilypond-program,Application Usage}
+@ref{\TEXT\,,,application,Application Usage}
 @end macro
 
 @macro rprogramnamed{TEXT,DISPLAY}
 @lilyvindex{\TEXT\}
-@ref{\TEXT\,,\DISPLAY\,lilypond-program,Application Usage}
+@ref{\TEXT\,,\DISPLAY\,application,Application Usage}
 @end macro
 
 @macro rlsr{TEXT}
 @lilyvindex{\TEXT\}
-@ref{\TEXT\,,,lilypond-snippets,Snippets}
+@ref{\TEXT\,,,snippets,Snippets}
 @end macro
 
 @macro rlsrnamed{TEXT,DISPLAY}
 @lilyvindex{\TEXT\}
-@ref{\TEXT\,,\DISPLAY\,lilypond-snippets,Snippets}
+@ref{\TEXT\,,\DISPLAY\,snippets,Snippets}
 @end macro
 
 @macro rinternals{TEXT}
 @lilyvindex{\TEXT\}
-@ref{\TEXT\,,,lilypond-internals,Internals Reference}
+@ref{\TEXT\,,,internals,Internals Reference}
 @end macro
 
 @macro rinternalsnamed{TEXT,DISPLAY}
 @lilyvindex{\TEXT\}
-@ref{\TEXT\,,\DISPLAY\,lilypond-internals,Internals Reference}
+@ref{\TEXT\,,\DISPLAY\,internals,Internals Reference}
 @end macro
 
 @end iftex
+
+@c  ***** Macros specific to the web site *****
+
+@ifset web
+
+@c LEGALESE
+
+@macro logoLegalLinux
+Tux the Linux Penguin was created by
+@uref{mailto:lewing@@isc.tamu.edu, lewing@@isc.tamu.edu} with
+@uref{http://www.isc.tamu.edu/~lewing/gimp/, the Gnu Image
+Manipulation Program}.
+
+@end macro
+
+@macro logoLegalFreeBSD
+The FreeBSD logo is a registered trademark of
+@uref{http://www.freebsd.org/, The FreeBSD Foundation}.
+
+@end macro
+
+@macro logoLegalMacOSX
+The @qq{X image} is not a registered trademark.  It was created by
+@uref{http://en.wikipedia.org/wiki/User:Nihonjoe, Nihonjoe} and
+@uref{http://en.wikipedia.org/wiki/User:CyberSkull, CyberSkull}, and
+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}.
+
+@end macro
+
+@macro logoLegalWindows
+The @qq{four colored rectangles image} is not a registered
+trademark.  It was created by
+@uref{http://en.wikipedia.org/wiki/User:Rohitbd, Rohitbd} and
+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}.
+
+@end macro
+
+@end ifset