Merge branch 'master' into dev/jmandereau

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

diff --git a/Documentation/de/user/macros.itexi b/Documentation/de/user/macros.itexi
index c8dfedb9e4928271c38aab911ed674c0d99d2c50..fb3329078a50e8ca21d77b4ac3e0c9b6485d6864 100644 (file)
--- a/Documentation/de/user/macros.itexi
+++ b/Documentation/de/user/macros.itexi
@@ -1,12 +1,17 @@
 @c -*- coding: utf-8; mode: texinfo; -*-
 @ignore
-    Translation of GIT committish: d30aabb4adc9e13c7a5a99a22230e97a0f164255
+    Translation of GIT committish: db57f02c46305a587071dfb73a51bd8250df2482
 
     When revising a translation, copy the HEAD committish of the
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
 
+@macro version
+@value{version}
+@end macro
+
+
 @c   ***** Displaying text *****
 
 @c we need this since @q{\} doesn't work with makeinfo 4.8 --
@@ -15,68 +20,77 @@
 
 @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\`
+@quotesinglbase{}\TEXT\@quoteleft{}
 @end macro
 
 @macro qq{TEXT}
-@quotedblbase{}\TEXT\``
+@quotedblbase{}\TEXT\@quotedblleft{}
 @end macro
-@end iftex
 
+@macro warning{TEXT}
+@quotation
+@quotation
+@cartouche
+@b{Achtung:} \TEXT\
+@end cartouche
+@end quotation
+@end quotation
+@end macro
 
-@ifinfo
-@macro q{TEXT}
-‚\TEXT\‘
+@ifnotinfo
+@macro notation{TEXT}
+@var{\TEXT\}
 @end macro
+@end ifnotinfo
 
-@macro qq{TEXT}
-„\TEXT\“
+@ifinfo
+@macro notation{TEXT}
+\TEXT\
 @end macro
 @end ifinfo
 
-
-@ifhtml
-@macro q{TEXT}
-@html
-‚\TEXT\‘
-@end html
+@macro smallspace
+@sp 1
 @end macro
 
-@macro qq{TEXT}
-@html
-„\TEXT\“
-@end html
-@end macro
-@end ifhtml
 
+@c   **** Displaying images not generated by lilypond-book
 
-@ifdocbook
-@macro q{TEXT}
-@html
-‚\TEXT\‘
-@end html
-@end macro
+@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.
 
-@macro qq{TEXT}
-@html
-„\TEXT\“
-@end html
+@ifnotinfo
+@macro sourceimage{FILENAME,WIDTH,HEIGHT,ALTTEXT}
+@image{\FILENAME\,\WIDTH\,\HEIGHT\,\ALTTEXT\}
 @end macro
-@end ifdocbook
+@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 refcommands
+@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
@@ -89,22 +103,18 @@
 
 @end macro
 
-@macro refbugs
+@macro knownissues
 @noindent
-@subsubheading Bugs
+@subsubheading Known issues and warnings
 
 @end macro
 
-
+@c obsolete, remove when translation is fully updated
 @macro context{TEXT}
 @vindex \TEXT\
 @code{\TEXT\}@c should use internalsref
 @end macro
 
-@macro refcommand{TEXT}
-@vindex \TEXT\
-@code{\TEXT\}
-@end macro
 
 @macro funindex {TEXT}
 @findex \TEXT\
@@ -115,6 +125,7 @@
 
 @c   **** Links and references ****
 
+@c obsolete
 @c usage: @lsr{ancient,custodes.ly}
 @macro lsr{DIR,TEXT}
 @ifhtml
@@ -125,6 +136,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\}/}
@@ -147,14 +159,6 @@
 @ifhtml
 @c ***** HTML *****
 
-@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
-
 @ifset bigpage
 
 @macro internalsref{TEXT}
@@ -289,19 +293,19 @@
 
 @macro rglos {TEXT}
 @vindex \TEXT\
-@code{\TEXT\}
+@ref{\TEXT\,,,music-glossary}
 @end macro
 
 @macro rprogram{TEXT}
-Programmbenutzung, @internalsref{\TEXT\}
+Programmbenutzung, @ref{\TEXT\,,,lilypond-program.de}
 @end macro
 
 @macro ruser{TEXT}
-Benutzerhandbuch, @internalsref{\TEXT\}
+Benutzerhandbuch, @ref{\TEXT\,,,lilypond.de}
 @end macro
 
 @macro rlearning{TEXT}
-Handbuch zum Lernen, @internalsref{\TEXT\}
+Handbuch zum Lernen, @ref{\TEXT\,,,lilypond-learning.de}
 @end macro
 
 @end iftex