Merge branch 'lilypond/translation' of ssh://trettig@git.sv.gnu.org/srv/git/lilypond...

[lilypond.git] / input / new / quoting-another-voice.ly

diff --git a/input/new/quoting-another-voice.ly b/input/new/quoting-another-voice.ly
index 9a1c58eea38827d07ba25f1e88d507aaeedadacf..e6fff64c1363537c33baf5f5ff4f1ea85e3354d2 100644 (file)
--- a/input/new/quoting-another-voice.ly
+++ b/input/new/quoting-another-voice.ly
@@ -1,37 +1,40 @@
 \version "2.11.10"
-\layout { ragged-right= ##t }
 \header {
-  doctitle = "Quoting another voice"
   lsrtags = "staff-notation"
   texidoc = "With @code{\\quote}, fragments of previously entered
-music may be quoted. @code{quotedEventTypes} will determines what
-things are quoted.  In this example, a 16th rest is not quoted, since
+music may be quoted.  @code{quotedEventTypes} will determines which
+items are quoted.  In this example, a 16th rest is not quoted, since
 @code{rest-event} is not in @code{quotedEventTypes}."
+  doctitle = "Quoting another voice"
 }
 
 quoteMe = \relative c' { fis4 r16  a8.-> b4-\ff c }
 
-\addQuote quoteMe \quoteMe 
-original = \relative c'' { c8 d s2 es8 gis8 }
+\addQuote quoteMe \quoteMe
+original = \relative c'' {
+  c8 d s2
+  \once \override NoteColumn #'ignore-collision = ##t
+  es8 gis8
+}
 
 <<
-    \new Staff {
-       \set Staff.instrumentName = "quoteMe"
-       \quoteMe
-    }
-    \new Staff {
-       \set Staff.instrumentName = "orig"
-       \original
-    }
-    \new Staff \relative c'' <<
-       \set Staff.instrumentName = "orig+quote"        
-       \set Staff.quotedEventTypes = #'(note-event articulation-event)
-       \original
-       \new Voice {
-           s4
+  \new Staff {
+    \set Staff.instrumentName = #"quoteMe"
+    \quoteMe
+  }
+  \new Staff {
+    \set Staff.instrumentName = #"orig"
+    \original
+  }
+  \new Staff \relative c'' <<
+    \set Staff.instrumentName = #"orig+quote"
+    \set Staff.quotedEventTypes = #'(note-event articulation-event)
+    \original
+    \new Voice {
+      s4
            \set fontSize = #-4
            \override Stem #'length-fraction = #(magstep -4)
            \quoteDuring #"quoteMe" { \skip 2. }
-       }
-    >>
+    }
+  >>
 >>