Merge branch 'master' into translation

[lilypond.git] / Documentation / de / notation / input.itely

diff --git a/Documentation/de/notation/input.itely b/Documentation/de/notation/input.itely
index 2d4765e5940f1fe901b498d5d8eb2434ca16ff06..5879d98eb894c2c6ec9a1e13e5407122f072a0b4 100644 (file)
--- a/Documentation/de/notation/input.itely
+++ b/Documentation/de/notation/input.itely
@@ -8,7 +8,7 @@
     Guide, node Updating translation committishes.
 @end ignore
 
-@c \version "2.19.21"
+@c \version "2.19.22"
 
 @c Translators: Till Paala
 
@@ -1631,7 +1631,7 @@ einer Oper in das Inhaltsverzeichnis aufzunehmen:
 }
 
 tocAct =
-#(define-music-function (parser location text) (markup?)
+#(define-music-function (text) (markup?)
    (add-toc-item! 'tocActMarkup text))
 @end verbatim
 
@@ -1646,7 +1646,7 @@ tocAct =
 }
 
 tocAct =
-#(define-music-function (parser location text) (markup?)
+#(define-music-function (text) (markup?)
    (add-toc-item! 'tocActMarkup text))
 
 \book {
@@ -2202,6 +2202,17 @@ Heir ein Beispiel mit Kyrilliza, hebräischem und portugiesischem Text:
 
 @lilypond[quote]
 %c No verbatim here as the code does not display correctly in PDF
+% Font settings for Cyrillic and Hebrew
+% Linux Libertine fonts contain Cyrillic and Hebrew glyphs.
+\paper {
+  #(define fonts
+    (set-global-fonts
+     #:roman "Linux Libertine O,serif"
+     #:sans "Linux Biolinum O,sans-serif"
+     #:typewriter "Linux Libertine Mono O,monospace"
+   ))
+}
+
 % Cyrillic
 bulgarian = \lyricmode {
   Жълтата дюля беше щастлива, че пухът, който цъфна, замръзна като гьон.
@@ -2425,12 +2436,14 @@ kontrollieren.  Hiermit werden alle Ereignisse, auch Tempo- und
 Instrumentenwechsel ausgelassen.  Man muss also sehr genau darauf
 achten, dass nichts unerwartetes geschieht.
 
-@lilypond[quote,relative=2,ragged-right,verbatim]
-c8 d
-\set Score.skipTypesetting = ##t
-e8 e e e e e e e
-\set Score.skipTypesetting = ##f
-c8 d b bes a g c2
+@lilypond[quote,ragged-right,verbatim]
+\relative {
+  c''8 d
+  \set Score.skipTypesetting = ##t
+  e8 e e e e e e e
+  \set Score.skipTypesetting = ##f
+  c8 d b bes a g c2
+}
 @end lilypond
 
 In polyphoner Notation wirkt sich @code{Score.skipTypesetting} auf