X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Documentation%2Fde%2Fuser%2Fmacros.itexi;h=fb62b014947fcabad29990acdf68cb5a829c97c5;hb=b97565a9af1c13369ac7e7e9ea80c2638dbc0e51;hp=05db816617075e12e39f188a8e91085a013d531a;hpb=cb2a453c1957c882e2941de7eaccc351a8cf6d3b;p=lilypond.git

diff --git a/Documentation/de/user/macros.itexi b/Documentation/de/user/macros.itexi
index 05db816617..fb62b01494 100644
--- 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: a88c1b861df238ad1c000e6a86926e6f19f2fedd
+    Translation of GIT committish: 01361d46dc9d514a79683d003eeea5f4fbf2b746
 
     When revising a translation, copy the HEAD committish of the
     version that you are working on.  See TRANSLATION for details.
@@ -10,16 +10,26 @@
 @include version.itexi
 
 
+@c Don't replace quotes with directed quotes.
+
+@set txicodequoteundirected
+@set txicodequotebacktick
+
+
+
 @c   ***** Displaying text *****
 
-@c we need this since @q{\} doesn't work with makeinfo 4.11 --
-@c say @q{@bs{}} instead
+@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.  :(
+
+@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}
 @quotesinglbase{}\TEXT\@quoteleft{}
 @end macro
@@ -28,15 +38,19 @@
 @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
@@ -46,134 +60,142 @@
 @end quotation
 @end quotation
 @end macro
+
 @end ifnothtml
 
+
 @ifnotinfo
+
 @macro notation{TEXT}
 @var{\TEXT\}
 @end macro
+
 @end ifnotinfo
 
 @ifinfo
+
 @macro notation{TEXT}
 \TEXT\
 @end macro
+
 @end ifinfo
 
+
 @macro smallspace
 @sp 1
 @end macro
 
 
-@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.
+@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 the `lilypond/' subdirectory.  `lilypond-book'
+@c already generates proper @image commands for images of music; these
+@c macro 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 ****
+@c   ***** Headings in a doc subsection *****
+
+@c Don't insert an empty line after @predefined!  Right now
+@c it doesn't matter, but a future implementation will probably
+@c add some code which needs this restriction.
 
 @macro predefined
 @noindent
 @subsubheading Predefined commands
+@end macro
 
+@c The next macro is a dummy currently since texinfo doesn't
+@c provide a real ragged-right environment yet.
+@c
+@c Due to a bug in texi2html (texi2html.pl CVS versions <= 1.245)
+@c the macro must not be empty.
+
+@macro endpredefined
+@c
 @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
 
-@end macro
+@c Don't insert an empty line after @seealso!  Otherwise we get
+@c unwanted extra vertical space in the PDF output.
 
 @macro seealso
 @noindent
 @subsubheading See also
-
+@indent
 @end macro
 
+
 @macro knownissues
 @noindent
 @subsubheading Known issues and warnings
-
 @end macro
 
+
 @macro lydoctitle {TEXT}
 @emph{\TEXT\}
-
 @end macro
 
+
+@c Don't remove the `@c' within the macro definition!  See section 19.3,
+@c `Macro Details and Caveats', in the texinfo info file for explanation.
+
 @macro funindex {TEXT}
 @findex \TEXT\
 @kindex \TEXT\
+@c
 @end macro
 
 
 
-@c   **** Links and references ****
-
-@c obsolete
-@c usage: @lsr{ancient,custodes.ly}
-@macro lsr{DIR,TEXT}
-@ifhtml
-@uref{source/input/lsr/\DIR\/collated-files.html#\TEXT\,@file{\DIR\/\TEXT\}}
-@end ifhtml
-@ifnothtml
-@file{\DIR\/\TEXT\}
-@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\}/}
-@end ifhtml
-@ifnothtml
-@file{\DIR\}
-@end ifnothtml
-@end macro
-
-
-
-
-@c   **** Links and references ****
+@c   ***** Links and references *****
 
 @c  Definitions for references:
+@c
 @c     @rglos
 @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
+@c
+@c  All these also have a @...named version which allows to specify the
+@c  displayed text for the reference as second argument.
+@c
+@c ***** HTML + bigpage is a special case (other manual names); all other
+@c formats are treated similarly.
 
-@c ***** HTML + bigpage is a special case (other manual names), all other
-@c formats are treated similarly
+
+@c *** not TeX ***
 
 @ifnottex
 
+@c ** bigpage **
+
 @ifset bigpage
 
 @macro rglos{TEXT}
@@ -198,45 +220,47 @@
 
 @macro ruser{TEXT}
 @vindex \TEXT\
-@ref{\TEXT\,,,lilypond-big-page,Benutzerhandbuch}
+@ref{\TEXT\,,,lilypond-big-page,Notationsreferenz}
 @end macro
 
 @macro rusernamed{TEXT,DISPLAY}
 @vindex \TEXT\
-@ref{\TEXT\,,\DISPLAY\,lilypond-big-page,Benutzerhandbuch}
+@ref{\TEXT\,,\DISPLAY\,lilypond-big-page,Notationsreferenz}
 @end macro
 
 @macro rprogram{TEXT}
 @vindex \TEXT\
-@ref{\TEXT\,,,lilypond-program-big-page,Programmbenutzung}
+@ref{\TEXT\,,,lilypond-program-big-page,Anwendungsbenutzung}
 @end macro
 
 @macro rprogramnamed{TEXT,DISPLAY}
 @vindex \TEXT\
-@ref{\TEXT\,,\DISPLAY\,lilypond-program-big-page,Programmbenutzung}
+@ref{\TEXT\,,\DISPLAY\,lilypond-program-big-page,Anwendungsbenutzung}
 @end macro
 
 @macro rlsr{TEXT}
-@ref{\TEXT\,,,lilypond-snippets-big-page,Beispiele}
+@ref{\TEXT\,,,lilypond-snippets-big-page,Schnipsel}
 @end macro
 
 @macro rlsrnamed{TEXT,DISPLAY}
-@ref{\TEXT\,,\DISPLAY\,lilypond-snippets-big-page,Beispiele}
+@ref{\TEXT\,,\DISPLAY\,lilypond-snippets-big-page,Schnipsel}
 @end macro
 
 @macro rinternals{TEXT}
 @vindex \TEXT\
-@ref{\TEXT\,,,lilypond-internals-big-page,Programmreferenz}
+@ref{\TEXT\,,,lilypond-internals-big-page,Referenz der Interna}
 @end macro
 
 @macro rinternalsnamed{TEXT,DISPLAY}
 @vindex \TEXT\
-@ref{\TEXT\,,\DISPLAY\,lilypond-internals-big-page,Programmreferenz}
+@ref{\TEXT\,,\DISPLAY\,lilypond-internals-big-page,Referenz der Interna}
 @end macro
 
 @end ifset
 
 
+@c ** not bigpage **
+
 @ifclear bigpage
 
 @macro rglos{TEXT}
@@ -261,40 +285,40 @@
 
 @macro ruser{TEXT}
 @vindex \TEXT\
-@ref{\TEXT\,,,lilypond,Benutzerhandbuch}
+@ref{\TEXT\,,,lilypond,Notationsreferenz}
 @end macro
 
 @macro rusernamed{TEXT,DISPLAY}
 @vindex \TEXT\
-@ref{\TEXT\,,\DISPLAY\,lilypond,Benutzerhandbuch}
+@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 rprogramnamed{TEXT,DISPLAY}
 @vindex \TEXT\
-@ref{\TEXT\,,\DISPLAY\,lilypond-program,Programmbenutzung}
+@ref{\TEXT\,,\DISPLAY\,lilypond-program,Anwendungsbenutzung}
 @end macro
 
 @macro rlsr{TEXT}
-@ref{\TEXT\,,,lilypond-snippets,Beispiele}
+@ref{\TEXT\,,,lilypond-snippets,Schnipsel}
 @end macro
 
 @macro rlsrnamed{TEXT,DISPLAY}
-@ref{\TEXT\,,\DISPLAY\,lilypond-snippets,Beispiele}
+@ref{\TEXT\,,\DISPLAY\,lilypond-snippets,Schnipsel}
 @end macro
 
 @macro rinternals{TEXT}
 @vindex \TEXT\
-@ref{\TEXT\,,,lilypond-internals,Programmreferenz}
+@ref{\TEXT\,,,lilypond-internals,Referenz der Interna}
 @end macro
 
 @macro rinternalsnamed{TEXT,DISPLAY}
 @vindex \TEXT\
-@ref{\TEXT\,,\DISPLAY\,lilypond-internals,Programmreferenz}
+@ref{\TEXT\,,\DISPLAY\,lilypond-internals,Referenz der Interna}
 @end macro
 
 @end ifclear
@@ -302,95 +326,127 @@
 @end ifnottex
 
 
-@c **** TEX ****
+@c *** TeX ***
+
 @iftex
 
+@c All commands below should work in the middle of the line;
+@c we thus must not use @vindex directly since it works only if placed
+@c on a line of its own.  To overcome this problem, we define a
+@c replacement macro using the internal definition of @vindex which
+@c delimits arguments in the standard way (i.e., with braces).
+
+@tex
+\gdef\lilyvindex#1{\doind{vr}{\code #1}\ignorespaces}
+@end tex
+
 @macro rglos{TEXT}
-@vindex \TEXT\
+@lilyvindex{\TEXT\}
 @ref{\TEXT\,,,music-glossary,Glossar}
 @end macro
 
 @macro rglosnamed{TEXT,DISPLAY}
-@vindex \TEXT\
+@lilyvindex{\TEXT\}
 @ref{\TEXT\,,\DISPLAY\,music-glossary,Glossar}
 @end macro
 
 @macro rlearning{TEXT}
-@vindex \TEXT\
+@lilyvindex{\TEXT\}
 @ref{\TEXT\,,,lilypond-learning.de,Handbuch zum Lernen}
 @end macro
 
 @macro rlearningnamed{TEXT,DISPLAY}
-@vindex \TEXT\
+@lilyvindex{\TEXT\}
 @ref{\TEXT\,,\DISPLAY\,lilypond-learning.de,Handbuch zum Lernen}
 @end macro
 
 @macro ruser{TEXT}
-@vindex \TEXT\
-@ref{\TEXT\,,,lilypond.de,Benutzerhandbuch}
+@lilyvindex{\TEXT\}
+@ref{\TEXT\,,,lilypond.de,Notationsreferenz}
 @end macro
 
 @macro rusernamed{TEXT,DISPLAY}
-@vindex \TEXT\
-@ref{\TEXT\,,\DISPLAY\,lilypond.de,Benutzerhandbuch}
+@lilyvindex{\TEXT\}
+@ref{\TEXT\,,\DISPLAY\,lilypond.de,Notationsreferenz}
 @end macro
 
 @macro rprogram{TEXT}
-@vindex \TEXT\
-@ref{\TEXT\,,,lilypond-program.de,Programmbenutzung}
+@lilyvindex{\TEXT\}
+@ref{\TEXT\,,,lilypond-program.de,Anwendungsbenutzung}
 @end macro
 
 @macro rprogramnamed{TEXT,DISPLAY}
-@vindex \TEXT\
-@ref{\TEXT\,,\DISPLAY\,lilypond-program.de,Programmbenutzung}
+@lilyvindex{\TEXT\}
+@ref{\TEXT\,,\DISPLAY\,lilypond-program.de,Anwendungsbenutzung}
 @end macro
 
 @macro rlsr{TEXT}
-@ref{\TEXT\,,,lilypond-snippets,Beispiele}
+@lilyvindex{\TEXT\}
+@ref{\TEXT\,,,lilypond-snippets,Schnipsel}
 @end macro
 
 @macro rlsrnamed{TEXT,DISPLAY}
-@ref{\TEXT\,,\DISPLAY\,lilypond-snippets,Beispiele}
+@lilyvindex{\TEXT\}
+@ref{\TEXT\,,\DISPLAY\,lilypond-snippets,Schnipsel}
 @end macro
 
 @macro rinternals{TEXT}
-@vindex \TEXT\
-@ref{\TEXT\,,,lilypond-internals,Programmreferenz}
+@lilyvindex{\TEXT\}
+@ref{\TEXT\,,,lilypond-internals,Referenz der Interna}
 @end macro
 
 @macro rinternalsnamed{TEXT,DISPLAY}
-@vindex \TEXT\
-@ref{\TEXT\,,\DISPLAY\,lilypond-internals,Programmreferenz}
+@lilyvindex{\TEXT\}
+@ref{\TEXT\,,\DISPLAY\,lilypond-internals,Referenz der Interna}
 @end macro
 
 @end iftex
 
-@c **** Macros specific to translated docs ****
+
+
+@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 TODO when @translationof is used in translated docs
-@c see if it's feasible to say @value{translationof}
+
+@c TODO: If @translationof is used in translated docs
+@c see whether it is feasible to say @value{translationof}.
+
 @macro englishref
-Dieser Abschnitt wurde noch nicht übersetzt, bitte lesen Sie den
+Dieser Abschnitt wurde noch nicht übersetzt.  Bitte lesen Sie den
 Abschnitt im englischen Benutzerhandbuch.
 @end macro
 
+
 @ifhtml
+
+@ifset bigpage
+@macro untranslated
+@end macro
+@end ifset
+
+@ifclear bigpage
 @macro untranslated
 UNTRANSLATED NODE: IGNORE ME
 @end macro
+@end ifclear
+
 @end ifhtml
 
 @ifnothtml