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

diff --git a/Documentation/de/user/macros.itexi b/Documentation/de/user/macros.itexi
index bf7aa7ac00..05db816617 100644
--- a/Documentation/de/user/macros.itexi
+++ b/Documentation/de/user/macros.itexi
@@ -1,335 +1,399 @@
 @c -*- coding: utf-8; mode: texinfo; -*-
+@ignore
+    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 **** all formats ****
 
-@macro refbugs
-@noindent
-@subsubheading Bugs
+@include version.itexi
 
+
+@c   ***** Displaying text *****
+
+@c we need this since @q{\} doesn't work with makeinfo 4.11 --
+@c say @q{@bs{}} instead
+@macro bs
+\\
 @end macro
 
-@macro moreinfo
-@subheading More information
+@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
 
+@macro qq{TEXT}
+@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
+@cartouche
+@b{Achtung:} \TEXT\
+@end cartouche
+@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
 
-@macro seealso
-@noindent
-@subsubheading See also
 
+@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
 
-@macro refcommands
+
+
+@c   **** Headings in a doc subsection ****
+
+@macro predefined
 @noindent
 @subsubheading Predefined commands
 
 @end macro
 
-@macro context{NAME}
-@vindex \NAME\
-@code{\NAME\}@c should use internalsref
-@end macro
+@macro snippets
+@noindent
+@subsubheading Selected Snippets
 
-@macro refcommand{WHAT}
-@vindex \WHAT\
-@code{\WHAT\}
 @end macro
 
+@c obsolete, remove when translation is fully updated
 @macro commonprop
 @noindent
 @subsubheading Commonly tweaked properties
 
 @end macro
 
-@macro funindex {WORD}
-@findex \WORD\
-@kindex \WORD\
+@macro seealso
+@noindent
+@subsubheading See also
+
+@end macro
+
+@macro knownissues
+@noindent
+@subsubheading Known issues and warnings
+
 @end macro
 
+@macro lydoctitle {TEXT}
+@emph{\TEXT\}
 
+@end macro
 
-@c  *** Macros with variable output ***
+@macro funindex {TEXT}
+@findex \TEXT\
+@kindex \TEXT\
+@end macro
 
+
+
+@c   **** Links and references ****
+
+@c obsolete
 @c usage: @lsr{ancient,custodes.ly}
-@macro lsr{DIR,NAME}
+@macro lsr{DIR,TEXT}
 @ifhtml
-  @uref{source/input/lsr/\DIR\/collated-files.html#\NAME\,@file{\DIR\/\NAME\}}
+@uref{source/input/lsr/\DIR\/collated-files.html#\TEXT\,@file{\DIR\/\TEXT\}}
 @end ifhtml
 @ifnothtml
-  @file{\DIR\/\NAME\}
+@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\}}
+@uref{source/input/lsr/\DIR\/collated-files.html,@file{\DIR\}/}
 @end ifhtml
 @ifnothtml
-  @file{\DIR\}
+@file{\DIR\}
 @end ifnothtml
 @end macro
 
 
 
 
-@macro arrow{}
-@iftex
-@tex $\\Rightarrow$ @end tex@c
-@end iftex
-@ifhtml
-@html
-→
-@end html
-@end ifhtml
-@ifinfo
--->
-@end ifinfo
-@end macro
-
-
-@c we need this since @q{\} doesn't work with makeinfo 4.8 --
-@c say @q{@value{backslash}} instead
-@set backslash \
+@c   **** Links and references ****
 
+@c  Definitions for references:
+@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
 
-@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/\NAME\.html,\NAME\}@c
-@c @inforef{} adds ``See'' to the sentence, which is annoying, but
-@c better than a broken link.
-@c @inforef{\NAME\,,lilypond-internals}@c
-@c using @ref without punctuation is OK without for formats other than info
+@ifnottex
 
 @ifset bigpage
 
-@macro internalsref{NAME}
-@vindex \NAME\
-@ref{\NAME\,,,lilypond-internals-big-page}
+@macro rglos{TEXT}
+@vindex \TEXT\
+@ref{\TEXT\,,,music-glossary-big-page,Glossar}
 @end macro
 
-@macro rglos{NAME}
-@vindex \NAME\
-@ref{\NAME\,,,music-glossary-big-page}
+@macro rglosnamed{TEXT,DISPLAY}
+@vindex \TEXT\
+@ref{\TEXT\,,\DISPLAY\,music-glossary-big-page,Glossar}
 @end macro
 
-@end ifset
+@macro rlearning{TEXT}
+@vindex \TEXT\
+@ref{\TEXT\,,,lilypond-learning-big-page,Handbuch zum Lernen}
+@end macro
 
+@macro rlearningnamed{TEXT,DISPLAY}
+@vindex \TEXT\
+@ref{\TEXT\,,\DISPLAY\,lilypond-learning-big-page,Handbuch zum Lernen}
+@end macro
 
-@ifclear bigpage
+@macro ruser{TEXT}
+@vindex \TEXT\
+@ref{\TEXT\,,,lilypond-big-page,Benutzerhandbuch}
+@end macro
 
-@c annoying parentheses stripped by add-html-footer.py
-@macro internalsref{NAME}
-@vindex \NAME\
-@ref{\NAME\,,,lilypond-internals}
+@macro rusernamed{TEXT,DISPLAY}
+@vindex \TEXT\
+@ref{\TEXT\,,\DISPLAY\,lilypond-big-page,Benutzerhandbuch}
 @end macro
 
-@c annoying parentheses stripped by add-html-footer.py
-@macro rglos{NAME}
-@vindex \NAME\
-@ref{\NAME\,,,music-glossary}
+@macro rprogram{TEXT}
+@vindex \TEXT\
+@ref{\TEXT\,,,lilypond-program-big-page,Programmbenutzung}
 @end macro
 
-@end ifclear
+@macro rprogramnamed{TEXT,DISPLAY}
+@vindex \TEXT\
+@ref{\TEXT\,,\DISPLAY\,lilypond-program-big-page,Programmbenutzung}
+@end macro
 
+@macro rlsr{TEXT}
+@ref{\TEXT\,,,lilypond-snippets-big-page,Beispiele}
+@end macro
 
-@c usage: @inputfileref{input@/regression,FILE@/-NAME.ly}
-@macro inputfileref{DIR,NAME}
-@uref{source/\DIR\/collated-files.html#\NAME\,@file{\DIR\/\NAME\}}@c
+@macro rlsrnamed{TEXT,DISPLAY}
+@ref{\TEXT\,,\DISPLAY\,lilypond-snippets-big-page,Beispiele}
 @end macro
 
-@c to get decent German quotes in `foo'
-@macro q{TEXT}
-@html
-‚\TEXT\‘
-@end html
+@macro rinternals{TEXT}
+@vindex \TEXT\
+@ref{\TEXT\,,,lilypond-internals-big-page,Programmreferenz}
 @end macro
 
-@c to get decent German quotes in ``foo''
-@macro qq{TEXT}
-@html
-„\TEXT\“
-@end html
+@macro rinternalsnamed{TEXT,DISPLAY}
+@vindex \TEXT\
+@ref{\TEXT\,,\DISPLAY\,lilypond-internals-big-page,Programmreferenz}
 @end macro
 
-@end ifhtml
+@end ifset
 
 
-@ifdocbook
-@c ***** DOCBOOK-XML *****
+@ifclear bigpage
 
-@macro internalsref{NAME}
-@vindex \NAME\
-@ref{\NAME\,,,lilypond-internals}
+@macro rglos{TEXT}
+@vindex \TEXT\
+@ref{\TEXT\,,,music-glossary,Glossar}
 @end macro
 
-@macro inputfileref{DIR,NAME}
-@uref{source/\DIR\/collated-files.html#\NAME\,@file{\DIR\/\NAME\}}
+@macro rglosnamed{TEXT,DISPLAY}
+@vindex \TEXT\
+@ref{\TEXT\,,\DISPLAY\,music-glossary,Glossar}
 @end macro
 
-@macro rglos{NAME}
-@vindex \NAME\
-@ref{\NAME\,,,music-glossary}
+@macro rlearning{TEXT}
+@vindex \TEXT\
+@ref{\TEXT\,,,lilypond-learning,Handbuch zum Lernen}
 @end macro
 
-@c to get decent German quotes in `foo'
-@macro q{TEXT}
-@html
-‚\TEXT\‘
-@end html
+@macro rlearningnamed{TEXT,DISPLAY}
+@vindex \TEXT\
+@ref{\TEXT\,,\DISPLAY\,lilypond-learning,Handbuch zum Lernen}
 @end macro
 
-@c to get decent German quotes in ``foo''
-@macro qq{TEXT}
-@html
-„\TEXT\“
-@end html
+@macro ruser{TEXT}
+@vindex \TEXT\
+@ref{\TEXT\,,,lilypond,Benutzerhandbuch}
 @end macro
 
-@end ifdocbook
-
-
-@ifinfo
-@c **** INFO ****
+@macro rusernamed{TEXT,DISPLAY}
+@vindex \TEXT\
+@ref{\TEXT\,,\DISPLAY\,lilypond,Benutzerhandbuch}
+@end macro
 
-@macro internalsref{NAME}
-@vindex \NAME\
-@inforef{\NAME\,,lilypond-internals}
+@macro rprogram{TEXT}
+@vindex \TEXT\
+@ref{\TEXT\,,,lilypond-program,Programmbenutzung}
 @end macro
 
-@macro inputfileref{DIR,NAME}
-@file{\DIR\/\NAME\}
+@macro rprogramnamed{TEXT,DISPLAY}
+@vindex \TEXT\
+@ref{\TEXT\,,\DISPLAY\,lilypond-program,Programmbenutzung}
 @end macro
 
-@macro rglos{NAME}@c
-@vindex \NAME\
-@inforef{\NAME\,,,music-glossary}
+@macro rlsr{TEXT}
+@ref{\TEXT\,,,lilypond-snippets,Beispiele}
 @end macro
 
-@macro usermanref{NAME}
-@inforef{\NAME\}
+@macro rlsrnamed{TEXT,DISPLAY}
+@ref{\TEXT\,,\DISPLAY\,lilypond-snippets,Beispiele}
 @end macro
 
-@c to get decent quotes in `foo'
-@macro q{TEXT}
-‚\TEXT\‘
+@macro rinternals{TEXT}
+@vindex \TEXT\
+@ref{\TEXT\,,,lilypond-internals,Programmreferenz}
 @end macro
 
-@c to get decent quotes in ``foo''
-@macro qq{TEXT}
-„\TEXT\“
+@macro rinternalsnamed{TEXT,DISPLAY}
+@vindex \TEXT\
+@ref{\TEXT\,,\DISPLAY\,lilypond-internals,Programmreferenz}
 @end macro
 
-@end ifinfo
+@end ifclear
+
+@end ifnottex
 
 
 @c **** TEX ****
 @iftex
 
-@macro internalsref{NAME}
-@vindex \NAME\
-@code{\NAME\}
+@macro rglos{TEXT}
+@vindex \TEXT\
+@ref{\TEXT\,,,music-glossary,Glossar}
 @end macro
 
-@macro inputfileref{DIR,NAME}
-@file{\DIR\/@/\NAME\}
+@macro rglosnamed{TEXT,DISPLAY}
+@vindex \TEXT\
+@ref{\TEXT\,,\DISPLAY\,music-glossary,Glossar}
 @end macro
 
-@macro rglos {NAME}
-@vindex \NAME\
-@code{\NAME\}
+@macro rlearning{TEXT}
+@vindex \TEXT\
+@ref{\TEXT\,,,lilypond-learning.de,Handbuch zum Lernen}
 @end macro
 
-@macro seeinternals{NAME}
-internals document, @internalsref{\NAME\}
+@macro rlearningnamed{TEXT,DISPLAY}
+@vindex \TEXT\
+@ref{\TEXT\,,\DISPLAY\,lilypond-learning.de,Handbuch zum Lernen}
 @end macro
 
-@macro usermanref{NAME}
-user manual, @internalsref{\NAME\}
+@macro ruser{TEXT}
+@vindex \TEXT\
+@ref{\TEXT\,,,lilypond.de,Benutzerhandbuch}
 @end macro
 
-@ignore
-@tex
-% from german.sty
-\def\allowhyphens{%
-  \penalty\@M
-  \hskip\z@skip}
-
-\gdef\set@low@box#1{%
-  \setbox\tw@\hbox{,}%
-  \setbox\z@\hbox{#1}%
-  \setbox\z@\hbox{%
-    \dimen@\ht\z@
-    \advance\dimen@ -\ht\tw@
-    \lower\dimen@\box\z@}%
-  \ht\z@\ht\tw@
-  \dp\z@\dp\tw@}
-
-\gdef\save@sf@q#1{%
-  {\ifhmode
-     \edef\@SF{\spacefactor\the\spacefactor}%
-   \else
-     \let\@SF\empty
-   \fi
-   \leavevmode #1
-   \@SF}}
-
-\gdef\glq{%
-  \save@sf@q{%
-    \set@low@box{'\/}%
-    \box\z@
-    \kern-.04em
-    \allowhyphens}}
-\gdef\grq{%
-  \save@sf@q{%
-    \kern-.0125em
-    `%
-    \kern.07em}}
-\gdef\glqq{%
-  \save@sf@q{%
-    \set@low@box{''\/}%
-    \box\z@
-    \kern-.04em
-    \allowhyphens}}
-\gdef\grqq{%
-  \save@sf@q{%
-    \kern-.07em
-    ``%
-    \kern.07em}}
-@end tex
-@end ignore
+@macro rusernamed{TEXT,DISPLAY}
+@vindex \TEXT\
+@ref{\TEXT\,,\DISPLAY\,lilypond.de,Benutzerhandbuch}
+@end macro
 
-@c FIXME
-@c to get decent quotes in `foo'
-@macro q{TEXT}
-`\TEXT\'
+@macro rprogram{TEXT}
+@vindex \TEXT\
+@ref{\TEXT\,,,lilypond-program.de,Programmbenutzung}
 @end macro
 
-@c to get decent quotes in ``foo''
-@macro qq{TEXT}
-``\TEXT\''
+@macro rprogramnamed{TEXT,DISPLAY}
+@vindex \TEXT\
+@ref{\TEXT\,,\DISPLAY\,lilypond-program.de,Programmbenutzung}
 @end macro
 
-@end iftex
+@macro rlsr{TEXT}
+@ref{\TEXT\,,,lilypond-snippets,Beispiele}
+@end macro
 
+@macro rlsrnamed{TEXT,DISPLAY}
+@ref{\TEXT\,,\DISPLAY\,lilypond-snippets,Beispiele}
+@end macro
 
-@ifnottex
-@c **** not TEX ****
+@macro rinternals{TEXT}
+@vindex \TEXT\
+@ref{\TEXT\,,,lilypond-internals,Programmreferenz}
+@end macro
 
-@macro seeinternals{NAME}
-@internalsref{\NAME\}
+@macro rinternalsnamed{TEXT,DISPLAY}
+@vindex \TEXT\
+@ref{\TEXT\,,\DISPLAY\,lilypond-internals,Programmreferenz}
 @end macro
 
-@ifnotinfo
-@macro usermanref{NAME}
-@ref{\NAME\}
+@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 ifnotinfo
+@end iftex
 
-@end ifnottex
+@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}
+@macro englishref
+Dieser Abschnitt wurde noch nicht übersetzt, bitte lesen Sie den
+Abschnitt im englischen Benutzerhandbuch.
+@end macro
 
-@c EOF
+@ifhtml
+@macro untranslated
+UNTRANSLATED NODE: IGNORE ME
+@end macro
+@end ifhtml
 
+@ifnothtml
+@macro untranslated
+@end macro
+@end ifnothtml