Merge branch '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 111f35f97de38cc9dcace91f745d0496b95a3898..05db816617075e12e39f188a8e91085a013d531a 100644 (file)
--- a/Documentation/de/user/macros.itexi
+++ b/Documentation/de/user/macros.itexi
@@ -1,71 +1,42 @@
 @c -*- coding: utf-8; mode: texinfo; -*-
 @ignore
-    Translation of GIT committish: db57f02c46305a587071dfb73a51bd8250df2482
+    Translation of GIT committish: a88c1b861df238ad1c000e6a86926e6f19f2fedd
 
     When revising a translation, copy the HEAD committish of the
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
 
-@c   ***** Displaying text *****
+@include version.itexi
 
-@c we need this since @q{\} doesn't work with makeinfo 4.8 --
-@c say @q{@value{backslash}} instead
-@set backslash \
 
-@c to get decent quotes in `foo' and ``foo''
-@c  these need to be split up so that "@qq{foo}." looks nice.  :(
-@iftex
-@macro q{TEXT}
-@quotesinglbase{}\TEXT\`
-@end macro
+@c   ***** Displaying text *****
 
-@macro qq{TEXT}
-@quotedblbase{}\TEXT\``
+@c we need this since @q{\} doesn't work with makeinfo 4.11 --
+@c say @q{@bs{}} instead
+@macro bs
+\\
 @end macro
-@end iftex
-
 
-@ifinfo
+@c to get decent quotes in `foo' and ``foo''
+@c  these need to be split up so that "@qq{foo}." looks nice.  :(
 @macro q{TEXT}
-‚\TEXT\‘
+@quotesinglbase{}\TEXT\@quoteleft{}
 @end macro
 
 @macro qq{TEXT}
-„\TEXT\“
+@quotedblbase{}\TEXT\@quotedblleft{}
 @end macro
-@end ifinfo
-
 
 @ifhtml
-@macro q{TEXT}
-@html
-‚\TEXT\‘
-@end html
-@end macro
-
-@macro qq{TEXT}
-@html
-„\TEXT\“
-@end html
+@macro warning{TEXT}
+@cartouche
+@b{Achtung:} \TEXT\
+@end cartouche
 @end macro
 @end ifhtml
 
-
-@ifdocbook
-@macro q{TEXT}
-@html
-‚\TEXT\‘
-@end html
-@end macro
-
-@macro qq{TEXT}
-@html
-„\TEXT\“
-@end html
-@end macro
-@end ifdocbook
-
+@ifnothtml
 @macro warning{TEXT}
 @quotation
 @quotation
@@ -75,27 +46,61 @@
 @end quotation
 @end quotation
 @end macro
+@end ifnothtml
 
-@c TODO: define different output for info
+@ifnotinfo
 @macro notation{TEXT}
 @var{\TEXT\}
 @end macro
+@end ifnotinfo
 
+@ifinfo
+@macro notation{TEXT}
+\TEXT\
+@end macro
+@end ifinfo
 
-@c   **** Headings in a doc subsection ****
-
-@c not really a heading, but...
 @macro smallspace
 @sp 1
 @end macro
 
-@c obsolete; being removed.
-@macro refcommands
+
+@c   **** Displaying images not generated by lilypond-book
+
+@c current installation setup of Info docs requires that all images are
+@c expected to be found in lilypond/ subdirectory.  lilypond-book already
+@c generates proper @image commands for images of music; these macros
+@c definitions do the same for other images.
+
+@ifnotinfo
+@macro sourceimage{FILENAME,WIDTH,HEIGHT,ALTTEXT}
+@image{\FILENAME\,\WIDTH\,\HEIGHT\,\ALTTEXT\}
+@end macro
+@end ifnotinfo
+
+@ifinfo
+@macro sourceimage{FILENAME,WIDTH,HEIGHT,ALTTEXT}
+@image{lilypond/\FILENAME\,\WIDTH\,\HEIGHT\,\ALTTEXT\}
+@end macro
+@end ifinfo
+
+
+
+@c   **** Headings in a doc subsection ****
+
+@macro predefined
 @noindent
 @subsubheading Predefined commands
 
 @end macro
 
+@macro snippets
+@noindent
+@subsubheading Selected Snippets
+
+@end macro
+
+@c obsolete, remove when translation is fully updated
 @macro commonprop
 @noindent
 @subsubheading Commonly tweaked properties
@@ -108,19 +113,17 @@
 
 @end macro
 
-@macro refbugs
+@macro knownissues
 @noindent
-@subsubheading Bugs
+@subsubheading Known issues and warnings
 
 @end macro
 
+@macro lydoctitle {TEXT}
+@emph{\TEXT\}
 
-@macro context{TEXT}
-@vindex \TEXT\
-@code{\TEXT\}@c should use internalsref
 @end macro
 
-
 @macro funindex {TEXT}
 @findex \TEXT\
 @kindex \TEXT\
@@ -130,6 +133,7 @@
 
 @c   **** Links and references ****
 
+@c obsolete
 @c usage: @lsr{ancient,custodes.ly}
 @macro lsr{DIR,TEXT}
 @ifhtml
@@ -140,6 +144,7 @@
 @end ifnothtml
 @end macro
 
+@c don't update until this macro is correctly set up in English docs
 @macro lsrdir{DIR}
 @ifhtml
 @uref{source/input/lsr/\DIR\/collated-files.html,@file{\DIR\}/}
@@ -152,177 +157,243 @@
 
 
 
+@c   **** Links and references ****
+
 @c  Definitions for references:
-@c     @internalsref
 @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
 
-@c makeinfo-4.7 encodes html names, which means that nodes that
-@c contain nonalphanum characters will be broken links on the website.
-@c @uref{../lilypond-internals/\TEXT\.html,\TEXT\}@c
-@c @inforef{} adds ``See'' to the sentence, which is annoying, but
-@c better than a broken link.
-@c @inforef{\TEXT\,,lilypond-internals}@c
-@c using @ref without punctuation is OK without for formats other than info
+@ifnottex
 
 @ifset bigpage
 
-@macro internalsref{TEXT}
+@macro rglos{TEXT}
 @vindex \TEXT\
-@ref{\TEXT\,,,lilypond-internals-big-page}
+@ref{\TEXT\,,,music-glossary-big-page,Glossar}
 @end macro
 
-@macro rglos{TEXT}
+@macro rglosnamed{TEXT,DISPLAY}
 @vindex \TEXT\
-@ref{\TEXT\,,,music-glossary-big-page}
+@ref{\TEXT\,,\DISPLAY\,music-glossary-big-page,Glossar}
 @end macro
 
-@macro rprogram{TEXT}
+@macro rlearning{TEXT}
 @vindex \TEXT\
-@ref{\TEXT\,,,lilypond-program-big-page}
+@ref{\TEXT\,,,lilypond-learning-big-page,Handbuch zum Lernen}
 @end macro
 
-@macro ruser{TEXT}
+@macro rlearningnamed{TEXT,DISPLAY}
 @vindex \TEXT\
-@ref{\TEXT\,,,lilypond-big-page}
+@ref{\TEXT\,,\DISPLAY\,lilypond-learning-big-page,Handbuch zum Lernen}
 @end macro
 
-@macro rlearning{TEXT}
+@macro ruser{TEXT}
 @vindex \TEXT\
-@ref{\TEXT\,,,lilypond-learning-big-page}
+@ref{\TEXT\,,,lilypond-big-page,Benutzerhandbuch}
 @end macro
 
-@end ifset
-
-
-@ifclear bigpage
-
-@macro internalsref{TEXT}
+@macro rusernamed{TEXT,DISPLAY}
 @vindex \TEXT\
-@ref{\TEXT\,,,lilypond-internals}
+@ref{\TEXT\,,\DISPLAY\,lilypond-big-page,Benutzerhandbuch}
 @end macro
 
-@macro rglos{TEXT}
+@macro rprogram{TEXT}
 @vindex \TEXT\
-@ref{\TEXT\,,,music-glossary}
+@ref{\TEXT\,,,lilypond-program-big-page,Programmbenutzung}
 @end macro
 
-@macro rprogram{TEXT}
+@macro rprogramnamed{TEXT,DISPLAY}
 @vindex \TEXT\
-@ref{\TEXT\,,,lilypond-program}
+@ref{\TEXT\,,\DISPLAY\,lilypond-program-big-page,Programmbenutzung}
 @end macro
 
-@macro ruser{TEXT}
+@macro rlsr{TEXT}
+@ref{\TEXT\,,,lilypond-snippets-big-page,Beispiele}
+@end macro
+
+@macro rlsrnamed{TEXT,DISPLAY}
+@ref{\TEXT\,,\DISPLAY\,lilypond-snippets-big-page,Beispiele}
+@end macro
+
+@macro rinternals{TEXT}
 @vindex \TEXT\
-@ref{\TEXT\,,,lilypond}
+@ref{\TEXT\,,,lilypond-internals-big-page,Programmreferenz}
 @end macro
 
-@macro rlearning{TEXT}
+@macro rinternalsnamed{TEXT,DISPLAY}
 @vindex \TEXT\
-@ref{\TEXT\,,,lilypond-learning}
+@ref{\TEXT\,,\DISPLAY\,lilypond-internals-big-page,Programmreferenz}
 @end macro
 
-@end ifclear
+@end ifset
 
-@end ifhtml
 
+@ifclear bigpage
 
-@ifdocbook
-@c ***** DOCBOOK-XML *****
+@macro rglos{TEXT}
+@vindex \TEXT\
+@ref{\TEXT\,,,music-glossary,Glossar}
+@end macro
 
-@macro internalsref{TEXT}
+@macro rglosnamed{TEXT,DISPLAY}
 @vindex \TEXT\
-@ref{\TEXT\,,,lilypond-internals}
+@ref{\TEXT\,,\DISPLAY\,music-glossary,Glossar}
 @end macro
 
-@macro rglos{TEXT}
+@macro rlearning{TEXT}
 @vindex \TEXT\
-@ref{\TEXT\,,,music-glossary}
+@ref{\TEXT\,,,lilypond-learning,Handbuch zum Lernen}
 @end macro
 
-@macro rprogram{TEXT}
+@macro rlearningnamed{TEXT,DISPLAY}
 @vindex \TEXT\
-@ref{\TEXT\,,,lilypond-program}
+@ref{\TEXT\,,\DISPLAY\,lilypond-learning,Handbuch zum Lernen}
 @end macro
 
 @macro ruser{TEXT}
 @vindex \TEXT\
-@ref{\TEXT\,,,lilypond}
+@ref{\TEXT\,,,lilypond,Benutzerhandbuch}
 @end macro
 
-@macro rlearning{TEXT}
+@macro rusernamed{TEXT,DISPLAY}
 @vindex \TEXT\
-@ref{\TEXT\,,,lilypond-learning}
+@ref{\TEXT\,,\DISPLAY\,lilypond,Benutzerhandbuch}
 @end macro
 
-@end ifdocbook
+@macro rprogram{TEXT}
+@vindex \TEXT\
+@ref{\TEXT\,,,lilypond-program,Programmbenutzung}
+@end macro
 
+@macro rprogramnamed{TEXT,DISPLAY}
+@vindex \TEXT\
+@ref{\TEXT\,,\DISPLAY\,lilypond-program,Programmbenutzung}
+@end macro
 
-@ifinfo
-@c **** INFO ****
+@macro rlsr{TEXT}
+@ref{\TEXT\,,,lilypond-snippets,Beispiele}
+@end macro
 
-@macro internalsref{NAME}
-@vindex \NAME\
-@inforef{\NAME\,,lilypond-internals}
+@macro rlsrnamed{TEXT,DISPLAY}
+@ref{\TEXT\,,\DISPLAY\,lilypond-snippets,Beispiele}
 @end macro
 
-@macro rglos{NAME}
-@vindex \NAME\
-@inforef{\NAME\,,music-glossary}
+@macro rinternals{TEXT}
+@vindex \TEXT\
+@ref{\TEXT\,,,lilypond-internals,Programmreferenz}
 @end macro
 
-@macro rprogram{TEXT}
+@macro rinternalsnamed{TEXT,DISPLAY}
 @vindex \TEXT\
-@ref{\TEXT\,,,lilypond-program}
+@ref{\TEXT\,,\DISPLAY\,lilypond-internals,Programmreferenz}
 @end macro
 
-@macro ruser{TEXT}
+@end ifclear
+
+@end ifnottex
+
+
+@c **** TEX ****
+@iftex
+
+@macro rglos{TEXT}
 @vindex \TEXT\
-@ref{\TEXT\,,,lilypond}
+@ref{\TEXT\,,,music-glossary,Glossar}
+@end macro
+
+@macro rglosnamed{TEXT,DISPLAY}
+@vindex \TEXT\
+@ref{\TEXT\,,\DISPLAY\,music-glossary,Glossar}
 @end macro
 
 @macro rlearning{TEXT}
 @vindex \TEXT\
-@ref{\TEXT\,,,lilypond-learning}
+@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,Benutzerhandbuch}
+@end macro
 
-@c **** TEX ****
-@iftex
+@macro rusernamed{TEXT,DISPLAY}
+@vindex \TEXT\
+@ref{\TEXT\,,\DISPLAY\,lilypond.de,Benutzerhandbuch}
+@end macro
 
-@macro internalsref{TEXT}
+@macro rprogram{TEXT}
 @vindex \TEXT\
-@code{\TEXT\}
+@ref{\TEXT\,,,lilypond-program.de,Programmbenutzung}
 @end macro
 
-@macro rglos {TEXT}
+@macro rprogramnamed{TEXT,DISPLAY}
 @vindex \TEXT\
-@ref{\TEXT\,,,music-glossary}
+@ref{\TEXT\,,\DISPLAY\,lilypond-program.de,Programmbenutzung}
 @end macro
 
-@macro rprogram{TEXT}
-Programmbenutzung, @ref{\TEXT\,,,lilypond-program}
-@c @internalsref{\TEXT\}
+@macro rlsr{TEXT}
+@ref{\TEXT\,,,lilypond-snippets,Beispiele}
 @end macro
 
-@macro ruser{TEXT}
-Benutzerhandbuch, @ref{\TEXT\,,,lilypond}
-@c @internalsref{\TEXT\}
+@macro rlsrnamed{TEXT,DISPLAY}
+@ref{\TEXT\,,\DISPLAY\,lilypond-snippets,Beispiele}
 @end macro
 
-@macro rlearning{TEXT}
-Handbuch zum Lernen, @ref{\TEXT\,,,lilypond-learning}
-@c @internalsref{\TEXT\}
+@macro rinternals{TEXT}
+@vindex \TEXT\
+@ref{\TEXT\,,,lilypond-internals,Programmreferenz}
+@end macro
+
+@macro rinternalsnamed{TEXT,DISPLAY}
+@vindex \TEXT\
+@ref{\TEXT\,,\DISPLAY\,lilypond-internals,Programmreferenz}
 @end macro
 
 @end iftex
 
+@c **** Macros specific to translated docs ****
+
+@c ugh, cannot set/define global variable 'translationof' in some way?
+@iftex
+@macro translationof{TEXT}
+@end macro
+@end iftex
+
+@ifinfo
+@macro
+@macro translationof{TEXT}
+@set translationof \TEXT\
+@end macro
+@end ifinfo
 
-@c EOF
+@c TODO when @translationof is used in translated docs
+@c see if it's feasible to say @value{translationof}
+@macro englishref
+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