Doc: update some snippets from Notation.

diff --git a/Documentation/de/notation/ancient.itely b/Documentation/de/notation/ancient.itely
index a9759df075bf6a8728f34eba4bfebd8feeb3918c..dcbf496a793a536f1dcc7e2355d9267c0cd39e2a 100644 (file)
--- a/Documentation/de/notation/ancient.itely
+++ b/Documentation/de/notation/ancient.itely
@@ -1327,11 +1327,11 @@ Vaticana-Stils zur Verfügung gestellt.
     \override TextScript #'font-family = #'typewriter
     \override TextScript #'font-shape = #'upright
     \override Script #'padding = #-0.1
-    a\ictus_"ictus" \bar "" \break
-    a\circulus_"circulus" \bar "" \break
-    a\semicirculus_"semicirculus" \bar "" \break
-    a\accentus_"accentus" \bar "" \break
-    \[ a_"episem" \episemInitium \pes b \flexa a b \episemFinis \flexa a \]
+    a\ictus_"ictus " \bar "" \break
+    a\circulus_"circulus " \bar "" \break
+    a\semicirculus_"semicirculus " \bar "" \break
+    a\accentus_"accentus " \bar "" \break
+    \[ a_"episema" \episemInitium \pes b \flexa a b \episemFinis \flexa a \]
   }
 }
 @end lilypond

diff --git a/Documentation/de/notation/cheatsheet.itely b/Documentation/de/notation/cheatsheet.itely
index bb549e7c27dab4dd19dd72fa78779270f3f8bc35..2c27cbae8ad2a0b4c40b81fdf0d9bb8421e93c11 100644 (file)
--- a/Documentation/de/notation/cheatsheet.itely
+++ b/Documentation/de/notation/cheatsheet.itely
@@ -164,11 +164,11 @@ a8-[ b-]
 @lilypond[relative=1]
 << \new Staff {
      \set Staff.implicitTimeSignatureVisibility = #all-invisible
-     c'1
+     c1
    }
    \new Staff {
      \set Staff.implicitTimeSignatureVisibility = #all-invisible
-     c'1
+     c1
    } >>
 @end lilypond
 

diff --git a/Documentation/de/notation/chords.itely b/Documentation/de/notation/chords.itely
index a01890d3a589af7db6a371927eb8006ae8c91a44..a5f0b35b2ac53d6714c1e63ef49c81a88de38c7e 100644 (file)
--- a/Documentation/de/notation/chords.itely
+++ b/Documentation/de/notation/chords.itely
@@ -153,7 +153,7 @@ Moll- übermäßige und verminderte Dreiklänge werden notiert, indem
 
 Septakkorde können erstellt werden:
 
-@lilypond[quote,ragged-right,fragment,verbatim]
+@lilypond[quote,ragged-right,verbatim]
 \chordmode { c1:7 c:m7 c:maj7 c:dim7 c:aug7 }
 @end lilypond
 
@@ -428,9 +428,7 @@ weil @code{5+} zuletzt gelesen wird.
 
 @cindex Cluster
 @lilypond[quote,ragged-right,verbatim]
-\chordmode {
-  c:5.5-.5+
-}
+\chordmode { c1:5.5-.5+ }
 @end lilypond
 
 Nur die zweite Umkehrung kann erstellt werden, indem eine

diff --git a/Documentation/de/notation/fretted-strings.itely b/Documentation/de/notation/fretted-strings.itely
index 2a65242376fc9a9ef903c6ad71c1d67db230fc7d..590adf2adfcc1b6234e3accad11beb7e8b89f168 100644 (file)
--- a/Documentation/de/notation/fretted-strings.itely
+++ b/Documentation/de/notation/fretted-strings.itely
@@ -851,16 +851,15 @@ unterste Bund im Diagramm.
 @c \override is necessary to make fingering visible
 @lilypond[quote, verbatim]
 <<
-  \context ChordNames {
-     \chordmode {
-       f1 g c
-     }
-  }
+    \context ChordNames {
+      \chordmode {
+        f1 g c
+      }
+    }
   \context Staff {
     \clef "treble_8"
     \override Voice.TextScript
       #'(fret-diagram-details finger-code) = #'below-string
-
     <f, c f a c' f'>1^\markup {
       \fret-diagram-verbose #'(
         (place-fret 6 1)

diff --git a/Documentation/de/notation/input.itely b/Documentation/de/notation/input.itely
index a3eaec832a567217cbaf4abd0ace76ac0d9d60cc..cdfb94ff60e9e4ba68ddc32fc4c477cdce5a0825 100644 (file)
--- a/Documentation/de/notation/input.itely
+++ b/Documentation/de/notation/input.itely
@@ -1324,7 +1324,7 @@ erfordert manchmal weniger Schreibarbeit:
 music = \relative g' {
   g8. c32 d
   \tag #'trills { d8.\trill }
-  \tag #'expand { \repeat unfold 3 { e32 d } }
+  \tag #'expand {\repeat unfold 3 { e32 d } }
   c32 d
  }
 
@@ -1664,7 +1664,6 @@ c8 d
 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

diff --git a/Documentation/de/notation/staff.itely b/Documentation/de/notation/staff.itely
index 4d1842db42e63ac137533f71fd97c043c2d523fd..54448dd7f8f6194985674ef390e4e42e2987f6f2 100644 (file)
--- a/Documentation/de/notation/staff.itely
+++ b/Documentation/de/notation/staff.itely
@@ -1317,20 +1317,22 @@ werden, kann auch ausgegeben werden, wenn die Eigenschaft
 @code{instrumentCueName} im @code{CueVoice}-Kontext definiert wird.
 
 @lilypond[verbatim,quote]
-oboe = \relative c''' {
-  g4 r8 e16 f e4 d
+flute = \relative c'' {
+  r2. c4 d8 c d e fis2 g2 d2
+}
+bassoon = \relative c {
+  \clef bass
+  R1
+  \clef treble
+  s1*0^\markup { \tiny "flute" }
+  \cueDuring #"flute" #UP { R1 }
+  \clef bass
+  g4. b8 d2
+}
+\addQuote "flute" { \flute }
+\new Staff {
+  \bassoon
 }
-\addQuote "oboe" { \oboe }
-
-\new Staff \relative c'' <<
-  \new CueVoice \with {
-    instrumentCueName = "ob."
-  }
-  \new Voice {
-    \cueDuring #"oboe" #UP { R1 }
-    g4. b8 d2
-  }
->>
 @end lilypond
 
 @cindex Entfernen von Stichnoten
@@ -1356,17 +1358,33 @@ Stichnoten von einer Stimme entfernt werden sollen, aber in
 einer anderen Edition benötigt werden.
 
 @lilypond[verbatim,quote]
-flute = \relative c''' {
-  r2 cis2 r2 dis2
+flute = \relative c'' {
+  r2. c4 d8 c d e fis2 g2 d2
+}
+bassoon = \relative c {
+  \clef bass
+  R1
+  \tag #'part {
+    \clef treble
+    s1*0^\markup { \tiny "flute" }
+  }
+  \cueDuring #"flute" #UP { R1 }
+  \tag #'part \clef bass
+  g4. b8 d2
 }
 \addQuote "flute" { \flute }
 
-\new Voice \relative c'' {
-  \killCues {
-    \cueDuring #"flute" #UP { R1 }
-    g4. b8 d2
-  }
+\new Staff {
+  \bassoon
 }
+\new StaffGroup <<
+  \new Staff {
+    \flute
+  }
+  \new Staff {
+    \removeWithTag #'part { \killCues { \bassoon } }
+  }
+>>
 @end lilypond
 
 Der @code{\transposedCueDuring}-Befehl bietet sich an, wenn man
@@ -1382,20 +1400,21 @@ piccolo = \relative c''' {
   \clef "treble^8"
   R1
   c8 c c e g2
-  a4 g g2
+  c4 g g2
 }
-\addQuote "piccolo" { \piccolo }
-
-cbassoon = \relative c, {
-  \clef "bass_8"
-  c4 r g r
-  \transposedCueDuring #"piccolo" #UP c,, { R1 }
-  c4 r g r
+bassClarinet = \relative c' {
+  \key d \major
+  \transposition bes,
+  d4 r a r
+  \transposedCueDuring #"piccolo" #UP d { R1 }
+  d4 r a r
 }
 
+\addQuote "piccolo" { \piccolo }
+
 <<
-  \new Staff = "piccolo" \piccolo
-  \new Staff = "cbassoon" \cbassoon
+  \new Staff \piccolo
+  \new Staff \bassClarinet
 >>
 @end lilypond
 

diff --git a/Documentation/de/notation/text.itely b/Documentation/de/notation/text.itely
index a64b5f671b662391761037b31b2c1f30de18c568..b9eff1c6dc82a67ff3ad133634b45e36c153bdc4 100644 (file)
--- a/Documentation/de/notation/text.itely
+++ b/Documentation/de/notation/text.itely
@@ -70,7 +70,7 @@ Notensystem platziert werden, die Syntax hierzu ist beschrieben
 in @ref{Richtung und Platzierung}.
 
 @lilypond[quote,verbatim,relative=2]
-d8^"pizz." g f e a4-"scherz." f
+a8^"pizz." g f e a4-"scherz." f
 @end lilypond
 
 Diese Syntax ist eine Kurzform, komplexere Formatierungen
@@ -270,7 +270,7 @@ zu platzieren, weitere Formatierungsmöglichkeiten sind mit dem
 @code{\markup}-Befehl gegeben, wie beschrieben in
 @ref{Text formatieren}:
 
-@lilypond[fragment,quote,relative=1]
+@lilypond[quote,verbatim,relative=1]
 <c e>1
 \mark \markup { \italic { colla parte } }
 <d f>2 <e g>
@@ -284,7 +284,7 @@ Symbol mit dem Befehl @code{\musicglyph} angegeben wird, wie
 beschrieben in
 @ref{Musikalische Notation innerhalb einer Textbeschriftung}:
 
-@lilypond[fragment,quote,relative=2]
+@lilypond[quote,verbatim,relative=2]
 <bes f>2 <aes d>
 \mark \markup { \musicglyph #"scripts.ufermata" }
 <e g>1
@@ -297,7 +297,7 @@ Ende notiert werden, werden sie zwischen Noten oder über der
 Taktlinie gesetzt.  Wenn sie an einem Zeilenumbruch angegeben
 werden, wird das Zeichen zu Beginn der nächsten Zeile ausgegeben.
 
-@lilypond[fragment,quote,relative=2]
+@lilypond[quote,verbatim,relative=2]
 \mark "Allegro"
 c1 c
 \mark "assai" \break
@@ -959,7 +959,7 @@ linksbündig oder im Blocksatz, wie das nächste Beispiel illustriert:
     \line \bold { Acto I }
     \wordwrap \italic {
       (La escena representa el corral de una casa de
-      gitanos en el Albaicín de Granada. Al fondo una
+      gitanos en el Albaicín de Granada.  Al fondo una
       puerta por la que se ve el negro interior de
       una Fragua, iluminado por los rojos resplandores
       del fuego.)
@@ -969,7 +969,7 @@ linksbündig oder im Blocksatz, wie das nächste Beispiel illustriert:
     \line \bold { Acto II }
     \override #'(line-width . 50)
     \justify \italic {
-      (Calle de Granada. Fachada de la casa de Carmela
+      (Calle de Granada.  Fachada de la casa de Carmela
       y su hermano Manuel con grandes ventanas abiertas
       a través de las que se ve el patio
       donde se celebra una alegre fiesta)
@@ -1302,7 +1302,7 @@ eine @code{\layout}-Umgebung haben, wie in diesem Beispiel:
 @lilypond[quote,verbatim,relative=1]
 c4 d^\markup {
   \score {
-    \relative { c4 d e f }
+    \relative c' { c4 d e f }
     \layout { }
   }
 }
@@ -1486,13 +1486,13 @@ Der Wert, der @code{font-size} übergeben wird, entspricht der geforderten
 Änderung in Bezug auf die Standardschriftgröße.
 
 @lilypond[quote,verbatim,relative=2]
-  \override Score.RehearsalMark #'font-family = #'typewriter
-  \mark \markup "Ouverture"
-  \override  Voice.TextScript #'font-shape = #'italic
-  \override  Voice.TextScript #'font-series = #'bold
-  d'2.^\markup "Allegro"
-  \override Voice.TextScript #'font-size = #-3
-  c4^smaller
+\override Score.RehearsalMark #'font-family = #'typewriter
+\mark \markup "Ouverture"
+\override Voice.TextScript #'font-shape = #'italic
+\override Voice.TextScript #'font-series = #'bold
+d2.^\markup "Allegro"
+\override Voice.TextScript #'font-size = #-3
+c4^smaller
 @end lilypond
 
 @noindent

diff --git a/Documentation/es/notation/staff.itely b/Documentation/es/notation/staff.itely
index d3bbcff780917aa64fec21e963f670cc508e85a4..2390e9a921382db6073db5e721028b4a769f04a8 100644 (file)
--- a/Documentation/es/notation/staff.itely
+++ b/Documentation/es/notation/staff.itely
@@ -1272,20 +1272,22 @@ estableciendo la propiedad @code{instrumentCueName} en el contexto
 @code{CueVoice}.
 
 @lilypond[verbatim,quote]
-oboe = \relative c''' {
-  g4 r8 e16 f e4 d
+flute = \relative c'' {
+  r2. c4 d8 c d e fis2 g2 d2
+}
+bassoon = \relative c {
+  \clef bass
+  R1
+  \clef treble
+  s1*0^\markup { \tiny "flute" }
+  \cueDuring #"flute" #UP { R1 }
+  \clef bass
+  g4. b8 d2
+}
+\addQuote "flute" { \flute }
+\new Staff {
+  \bassoon
 }
-\addQuote "oboe" { \oboe }
-
-\new Staff \relative c'' <<
-  \new CueVoice \with {
-    instrumentCueName = "ob."
-  }
-  \new Voice {
-    \cueDuring #"oboe" #UP { R1 }
-    g4. b8 d2
-  }
->>
 @end lilypond
 
 @cindex quitar notas guía
@@ -1309,17 +1311,33 @@ musical.  Esto puede ser útil si las notas guía se tienen que eliminar
 de una particella pero posiblemente se deban reponer más tarde.
 
 @lilypond[verbatim,quote]
-flute = \relative c''' {
-  r2 cis2 r2 dis2
+flute = \relative c'' {
+  r2. c4 d8 c d e fis2 g2 d2
+}
+bassoon = \relative c {
+  \clef bass
+  R1
+  \tag #'part {
+    \clef treble
+    s1*0^\markup { \tiny "flute" }
+  }
+  \cueDuring #"flute" #UP { R1 }
+  \tag #'part \clef bass
+  g4. b8 d2
 }
 \addQuote "flute" { \flute }
 
-\new Voice \relative c'' {
-  \killCues {
-    \cueDuring #"flute" #UP { R1 }
-    g4. b8 d2
-  }
+\new Staff {
+  \bassoon
 }
+\new StaffGroup <<
+  \new Staff {
+    \flute
+  }
+  \new Staff {
+    \removeWithTag #'part { \killCues { \bassoon } }
+  }
+>>
 @end lilypond
 
 La instrucción @code{\transposedCueDuring} es útil para añadir guías
@@ -1334,20 +1352,21 @@ piccolo = \relative c''' {
   \clef "treble^8"
   R1
   c8 c c e g2
-  a4 g g2
+  c4 g g2
 }
-\addQuote "piccolo" { \piccolo }
-
-cbassoon = \relative c, {
-  \clef "bass_8"
-  c4 r g r
-  \transposedCueDuring #"piccolo" #UP c,, { R1 }
-  c4 r g r
+bassClarinet = \relative c' {
+  \key d \major
+  \transposition bes,
+  d4 r a r
+  \transposedCueDuring #"piccolo" #UP d { R1 }
+  d4 r a r
 }
 
+\addQuote "piccolo" { \piccolo }
+
 <<
-  \new Staff = "piccolo" \piccolo
-  \new Staff = "cbassoon" \cbassoon
+  \new Staff \piccolo
+  \new Staff \bassClarinet
 >>
 @end lilypond