Merge master into nested-bookparts

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

diff --git a/Documentation/de/user/macros.itexi b/Documentation/de/user/macros.itexi
index 693a21b4b37f554451b6a82c48e31b25958002a1..333775a2cc03d1d96f4abfc900418528079a2dfc 100644 (file)
--- a/Documentation/de/user/macros.itexi
+++ b/Documentation/de/user/macros.itexi
@@ -1,6 +1,6 @@
 @c -*- coding: utf-8; mode: texinfo; -*-
 @ignore
-    Translation of GIT committish: 1440fffdf8579046cc2033b9c697a190b34b91e5
+    Translation of GIT committish: 2881ea603b63e4e335dc1104b0c22c71f373b20d
 
     When revising a translation, copy the HEAD committish of the
     version that you are working on.  See TRANSLATION for details.
@@ -12,9 +12,11 @@
 
 @c   ***** Displaying text *****
 
-@c we need this since @q{\} doesn't work with makeinfo 4.8 --
-@c say @q{@value{backslash}} instead
-@set backslash \
+@c we need this since @q{\} doesn't work with makeinfo 4.11 --
+@c say @q{@bs{}} instead
+@macro bs
+\\
+@end macro
 
 @c to get decent quotes in `foo' and ``foo''
 @c  these need to be split up so that "@qq{foo}." looks nice.  :(
@@ -26,6 +28,15 @@
 @quotedblbase{}\TEXT\@quotedblleft{}
 @end macro
 
+@ifhtml
+@macro warning{TEXT}
+@cartouche
+@b{Achtung:} \TEXT\
+@end cartouche
+@end macro
+@end ifhtml
+
+@ifnothtml
 @macro warning{TEXT}
 @quotation
 @quotation
@@ -35,6 +46,7 @@
 @end quotation
 @end quotation
 @end macro
+@end ifnothtml
 
 @ifnotinfo
 @macro notation{TEXT}
@@ -107,12 +119,6 @@
 
 @end macro
 
-@c obsolete, remove when translation is fully updated
-@macro context{TEXT}
-@vindex \TEXT\
-@code{\TEXT\}@c should use rinternals
-@end macro
-
 @macro lydoctitle {TEXT}
 @emph{\TEXT\}
 
@@ -151,66 +157,96 @@
 
 
 
+@c   **** Links and references ****
+
 @c  Definitions for references:
-@c     @rinternals
 @c     @rglos
-@c     @rprogram
-@c     @ruser
 @c     @rlearning
+@c     @ruser
+@c     @rprogram
+@c     @rlsr
+@c     @rinternals
+@c  all these also have a @...named version, which allows to specify the
+@c  displayed text for the reference as second argument
 
-@ifhtml
-@c ***** HTML *****
+@c ***** HTML + bigpage is a special case (other manual names), all other
+@c formats are treated similarly
+
+@ifnottex
 
 @ifset bigpage
 
-@macro rinternals{TEXT}
+@macro rglos{TEXT}
 @vindex \TEXT\
-@ref{\TEXT\,,,lilypond-internals-big-page,Programmreferenz}
+@ref{\TEXT\,,,music-glossary-big-page,Glossar}
 @end macro
 
-@macro rglos{TEXT}
+@macro rglosnamed{TEXT,DISPLAY}
 @vindex \TEXT\
-@ref{\TEXT\,,,music-glossary-big-page,Glossar}
+@ref{\TEXT\,,\DISPLAY\,music-glossary-big-page,Glossar}
 @end macro
 
-@macro rprogram{TEXT}
+@macro rlearning{TEXT}
+@vindex \TEXT\
+@ref{\TEXT\,,,lilypond-learning-big-page,Handbuch zum Lernen}
+@end macro
+
+@macro rlearningnamed{TEXT,DISPLAY}
 @vindex \TEXT\
-@ref{\TEXT\,,,lilypond-program-big-page,Programmbenutzung}
+@ref{\TEXT\,,\DISPLAY\,lilypond-learning-big-page,Handbuch zum Lernen}
 @end macro
 
 @macro ruser{TEXT}
 @vindex \TEXT\
-@ref{\TEXT\,,,lilypond-big-page,Benutzerhandbuch}
+@ref{\TEXT\,,,lilypond-big-page,Notationsreferenz}
 @end macro
 
-@macro rlearning{TEXT}
+@macro rusernamed{TEXT,DISPLAY}
 @vindex \TEXT\
-@ref{\TEXT\,,,lilypond-learning-big-page,Handbuch zum Lernen}
+@ref{\TEXT\,,\DISPLAY\,lilypond-big-page,Notationsreferenz}
 @end macro
 
-@end ifset
+@macro rprogram{TEXT}
+@vindex \TEXT\
+@ref{\TEXT\,,,lilypond-program-big-page,Anwendungsbenutzung}
+@end macro
 
+@macro rprogramnamed{TEXT,DISPLAY}
+@vindex \TEXT\
+@ref{\TEXT\,,\DISPLAY\,lilypond-program-big-page,Anwendungsbenutzung}
+@end macro
 
-@ifclear bigpage
+@macro rlsr{TEXT}
+@ref{\TEXT\,,,lilypond-snippets-big-page,Schnipsel}
+@end macro
+
+@macro rlsrnamed{TEXT,DISPLAY}
+@ref{\TEXT\,,\DISPLAY\,lilypond-snippets-big-page,Schnipsel}
+@end macro
 
 @macro rinternals{TEXT}
 @vindex \TEXT\
-@ref{\TEXT\,,,lilypond-internals,Programmreferenz}
+@ref{\TEXT\,,,lilypond-internals-big-page,Referenz der Interna}
 @end macro
 
-@macro rglos{TEXT}
+@macro rinternalsnamed{TEXT,DISPLAY}
 @vindex \TEXT\
-@ref{\TEXT\,,,music-glossary,Glossar}
+@ref{\TEXT\,,\DISPLAY\,lilypond-internals-big-page,Referenz der Interna}
 @end macro
 
-@macro rprogram{TEXT}
+@end ifset
+
+
+@ifclear bigpage
+
+@macro rglos{TEXT}
 @vindex \TEXT\
-@ref{\TEXT\,,,lilypond-program,Programmbenutzung}
+@ref{\TEXT\,,,music-glossary,Glossar}
 @end macro
 
-@macro ruser{TEXT}
+@macro rglosnamed{TEXT,DISPLAY}
 @vindex \TEXT\
-@ref{\TEXT\,,,lilypond,Benutzerhandbuch}
+@ref{\TEXT\,,\DISPLAY\,music-glossary,Glossar}
 @end macro
 
 @macro rlearning{TEXT}
@@ -218,101 +254,118 @@
 @ref{\TEXT\,,,lilypond-learning,Handbuch zum Lernen}
 @end macro
 
-@end ifclear
-
-@end ifhtml
-
-
-@ifdocbook
-@c ***** DOCBOOK-XML *****
+@macro rlearningnamed{TEXT,DISPLAY}
+@vindex \TEXT\
+@ref{\TEXT\,,\DISPLAY\,lilypond-learning,Handbuch zum Lernen}
+@end macro
 
-@macro rinternals{TEXT}
+@macro ruser{TEXT}
 @vindex \TEXT\
-@ref{\TEXT\,,,lilypond-internals,Programmreferenz}
+@ref{\TEXT\,,,lilypond,Notationsreferenz}
 @end macro
 
-@macro rglos{TEXT}
+@macro rusernamed{TEXT,DISPLAY}
 @vindex \TEXT\
-@ref{\TEXT\,,,music-glossary,Glossar}
+@ref{\TEXT\,,\DISPLAY\,lilypond,Notationsreferenz}
 @end macro
 
 @macro rprogram{TEXT}
 @vindex \TEXT\
-@ref{\TEXT\,,,lilypond-program,Programmbenutzung}
+@ref{\TEXT\,,,lilypond-program,Anwendungsbenutzung}
 @end macro
 
-@macro ruser{TEXT}
+@macro rprogramnamed{TEXT,DISPLAY}
 @vindex \TEXT\
-@ref{\TEXT\,,,lilypond,Benutzerhandbuch}
+@ref{\TEXT\,,\DISPLAY\,lilypond-program,Anwendungsbenutzung}
 @end macro
 
-@macro rlearning{TEXT}
+@macro rlsr{TEXT}
+@ref{\TEXT\,,,lilypond-snippets,Schnipsel}
+@end macro
+
+@macro rlsrnamed{TEXT,DISPLAY}
+@ref{\TEXT\,,\DISPLAY\,lilypond-snippets,Schnipsel}
+@end macro
+
+@macro rinternals{TEXT}
 @vindex \TEXT\
-@ref{\TEXT\,,,lilypond-learning,Handbuch zum Lernen}
+@ref{\TEXT\,,,lilypond-internals,Referenz der Interna}
 @end macro
 
-@end ifdocbook
+@macro rinternalsnamed{TEXT,DISPLAY}
+@vindex \TEXT\
+@ref{\TEXT\,,\DISPLAY\,lilypond-internals,Referenz der Interna}
+@end macro
 
+@end ifclear
 
-@ifinfo
-@c **** INFO ****
+@end ifnottex
 
-@macro rinternals{NAME}
-@vindex \NAME\
-@inforef{\NAME\,,lilypond-internals,Programmreferenz}
-@end macro
 
-@macro rglos{NAME}
-@vindex \NAME\
-@inforef{\NAME\,,music-glossary,Glossar}
-@end macro
+@c **** TEX ****
+@iftex
 
-@macro rprogram{TEXT}
+@macro rglos{TEXT}
 @vindex \TEXT\
-@ref{\TEXT\,,,lilypond-program,Programmbenutzung}
+@ref{\TEXT\,,,music-glossary,Glossar}
 @end macro
 
-@macro ruser{TEXT}
+@macro rglosnamed{TEXT,DISPLAY}
 @vindex \TEXT\
-@ref{\TEXT\,,,lilypond,Benutzerhandbuch}
+@ref{\TEXT\,,\DISPLAY\,music-glossary,Glossar}
 @end macro
 
 @macro rlearning{TEXT}
 @vindex \TEXT\
-@ref{\TEXT\,,,lilypond-learning,Handbuch zum Lernen}
+@ref{\TEXT\,,,lilypond-learning.de,Handbuch zum Lernen}
 @end macro
 
-@end ifinfo
+@macro rlearningnamed{TEXT,DISPLAY}
+@vindex \TEXT\
+@ref{\TEXT\,,\DISPLAY\,lilypond-learning.de,Handbuch zum Lernen}
+@end macro
 
+@macro ruser{TEXT}
+@vindex \TEXT\
+@ref{\TEXT\,,,lilypond.de,Notationsreferenz}
+@end macro
 
-@c **** TEX ****
-@iftex
+@macro rusernamed{TEXT,DISPLAY}
+@vindex \TEXT\
+@ref{\TEXT\,,\DISPLAY\,lilypond.de,Notationsreferenz}
+@end macro
 
-@macro rinternals{TEXT}
+@macro rprogram{TEXT}
 @vindex \TEXT\
-@code{\TEXT\}
+@ref{\TEXT\,,,lilypond-program.de,Anwendungsbenutzung}
 @end macro
 
-@macro rglos {TEXT}
+@macro rprogramnamed{TEXT,DISPLAY}
 @vindex \TEXT\
-@ref{\TEXT\,,,music-glossary,Glossar}
+@ref{\TEXT\,,\DISPLAY\,lilypond-program.de,Anwendungsbenutzung}
 @end macro
 
-@macro rprogram{TEXT}
-@ref{\TEXT\,,,lilypond-program.de,Programmbenutzung}
+@macro rlsr{TEXT}
+@ref{\TEXT\,,,lilypond-snippets,Schnipsel}
 @end macro
 
-@macro ruser{TEXT}
-@ref{\TEXT\,,,lilypond.de,Benutzerhandbuch}
+@macro rlsrnamed{TEXT,DISPLAY}
+@ref{\TEXT\,,\DISPLAY\,lilypond-snippets,Schnipsel}
 @end macro
 
-@macro rlearning{TEXT}
-@ref{\TEXT\,,,lilypond-learning.de,Handbuch zum Lernen}
+@macro rinternals{TEXT}
+@vindex \TEXT\
+@ref{\TEXT\,,,lilypond-internals,Referenz der Interna}
+@end macro
+
+@macro rinternalsnamed{TEXT,DISPLAY}
+@vindex \TEXT\
+@ref{\TEXT\,,\DISPLAY\,lilypond-internals,Referenz der Interna}
 @end macro
 
 @end iftex
 
-@c Commands specific to translated docs
+@c **** Macros specific to translated docs ****
 
 @c ugh, cannot set/define global variable 'translationof' in some way?
 @iftex
@@ -334,3 +387,13 @@ Dieser Abschnitt wurde noch nicht übersetzt, bitte lesen Sie den
 Abschnitt im englischen Benutzerhandbuch.
 @end macro
 
+@ifhtml
+@macro untranslated
+UNTRANSLATED NODE: IGNORE ME
+@end macro
+@end ifhtml
+
+@ifnothtml
+@macro untranslated
+@end macro
+@end ifnothtml