Web/Docs: fix nesting problem for @warning

[lilypond.git] / Documentation / de / macros.itexi

diff --git a/Documentation/de/macros.itexi b/Documentation/de/macros.itexi
index dfd9e8ea8a74b82e19534a74463c037ccc1e1249..a8be205b1dcc90aef9c91fd2d309501115851b59 100644 (file)
--- a/Documentation/de/macros.itexi
+++ b/Documentation/de/macros.itexi
@@ -1,6 +1,6 @@
 @c -*- coding: utf-8; mode: texinfo; -*-
 @ignore
-    Translation of GIT committish: 01361d46dc9d514a79683d003eeea5f4fbf2b746
+    Translation of GIT committish: 4582b7b24d22b2041bfcba49e716a714effcce92
 
     When revising a translation, copy the HEAD committish of the
     version that you are working on.  See TRANSLATION for details.
@@ -28,9 +28,15 @@
 @ifhtml
 
 @macro warning{TEXT}
-@cartouche
-@b{Achtung:} \TEXT\
-@end cartouche
+@html
+<div class="warning">
+@end html
+@strong{Achtung:} \TEXT\
+@c keep the space for proper nesting of </p>
+
+@html
+</div>
+@end html
 @end macro
 
 @end ifhtml
@@ -103,6 +109,7 @@
 @c     @rglos
 @c     @rlearning
 @c     @ruser
+@c     @ressay
 @c     @rprogram
 @c     @rlsr
 @c     @rinternals
@@ -152,14 +159,44 @@
 @ref{\TEXT\,,\DISPLAY\,notation-big-page,Notationsreferenz}
 @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,Aufsatz}
+@end macro
+
+@macro ressaynamed{TEXT,DISPLAY}
+@vindex \TEXT\
+@ref{\TEXT\,,\DISPLAY\,essay-big-page,Aufsatz}
+@end macro
+
 @macro rprogram{TEXT}
 @vindex \TEXT\
-@ref{\TEXT\,,,application-big-page,Anwendungsbenutzung}
+@ref{\TEXT\,,,usage-big-page,Anwendungsbenutzung}
 @end macro
 
 @macro rprogramnamed{TEXT,DISPLAY}
 @vindex \TEXT\
-@ref{\TEXT\,,\DISPLAY\,application-big-page,Anwendungsbenutzung}
+@ref{\TEXT\,,\DISPLAY\,usage-big-page,Anwendungsbenutzung}
 @end macro
 
 @macro rlsr{TEXT}
@@ -217,14 +254,44 @@
 @ref{\TEXT\,,\DISPLAY\,notation,Notationsreferenz}
 @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\,,,essay-big-page,Aufsatz}
+@end macro
+
+@macro ressaynamed{TEXT,DISPLAY}
+@vindex \TEXT\
+@ref{\TEXT\,,\DISPLAY\,essay-big-page,Aufsatz}
+@end macro
+
 @macro rprogram{TEXT}
 @vindex \TEXT\
-@ref{\TEXT\,,,application,Anwendungsbenutzung}
+@ref{\TEXT\,,,usage,Anwendungsbenutzung}
 @end macro
 
 @macro rprogramnamed{TEXT,DISPLAY}
 @vindex \TEXT\
-@ref{\TEXT\,,\DISPLAY\,application,Anwendungsbenutzung}
+@ref{\TEXT\,,\DISPLAY\,usage,Anwendungsbenutzung}
 @end macro
 
 @macro rlsr{TEXT}
@@ -261,7 +328,7 @@
 @c delimits arguments in the standard way (i.e., with braces).
 
 @tex
-\gdef\lilyvindex#1{\doind{vr}{\code #1}\ignorespaces}
+\gdef\lilyvindex#1{\doind{vr}{\code{#1}}\ignorespaces}
 @end tex
 
 @macro rglos{TEXT}
@@ -294,14 +361,44 @@
 @ref{\TEXT\,,\DISPLAY\,notation.de,Notationsreferenz}
 @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}
+@vindex \TEXT\
+@ref{\TEXT\,,,essay-big-page,Aufsatz}
+@end macro
+
+@macro ressaynamed{TEXT,DISPLAY}
+@vindex \TEXT\
+@ref{\TEXT\,,\DISPLAY\,essay-big-page,Aufsatz}
+@end macro
+
 @macro rprogram{TEXT}
 @lilyvindex{\TEXT\}
-@ref{\TEXT\,,,application.de,Anwendungsbenutzung}
+@ref{\TEXT\,,,usage.de,Anwendungsbenutzung}
 @end macro
 
 @macro rprogramnamed{TEXT,DISPLAY}
 @lilyvindex{\TEXT\}
-@ref{\TEXT\,,\DISPLAY\,application.de,Anwendungsbenutzung}
+@ref{\TEXT\,,\DISPLAY\,usage.de,Anwendungsbenutzung}
 @end macro
 
 @macro rlsr{TEXT}
@@ -327,6 +424,51 @@
 @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
+
+
 
 @c   ***** Macros specific to translated docs *****