Merge master into nested-bookparts

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

diff --git a/input/new/quoting-another-voice-with-transposition.ly b/input/new/quoting-another-voice-with-transposition.ly
index 88c261edf39b9686f5c76719c915d86c5865095b..53768e2f15cded72569722033d51a735ad125428 100644 (file)
--- a/input/new/quoting-another-voice-with-transposition.ly
+++ b/input/new/quoting-another-voice-with-transposition.ly
@@ -1,38 +1,39 @@
-\version "2.11.10"
+\version "2.11.61"
 \header {
-  doctitle = "Quoting another voice with transposition"
   lsrtags = "pitches,staff-notation"
   texidoc = "Quotations take into account the transposition of both
 source and target.  In this example, all instruments play sounding
-central C, the target is a instrument in F.  The target part may be
-@code{\\transpose}d.  In this case, all the pitches (including the
-quoted ones) will transposed as well."
+middle C; the target is an instrument in F.  The target part may be
+transposed using @code{\\transpose}.  In this case, all the pitches
+(including the quoted ones) are transposed.
+"
+  doctitle = "Quoting another voice with transposition"
 }
 
-\addQuote clarinet  {
-    \transposition bes
-    d'16 d'16 d'8 
-    d'16 d'16 d'8 
-    d'16 d'16 d'8 
-    d'16 d'16 d'8 
+\addQuote clarinet {
+  \transposition bes
+  \repeat unfold 8 { d'16 d' d'8 }
 }
 
-\addQuote sax  {
-    \transposition es'
-    a8 a a a a a  a a 
+\addQuote sax {
+  \transposition es'
+  \repeat unfold 16 { a8 }
 }
 
 quoteTest = {
-    \transposition f  % french horn
-    
-    g'4
-    << \quoteDuring #"clarinet" { \skip 4 } s4^"clar" >> 
-    << \quoteDuring #"sax" { \skip 4 } s4^"sax" >> 
+  % french horn
+  \transposition f
+  g'4
+  << \quoteDuring #"clarinet" { \skip 4 } s4^"clar." >>
+  << \quoteDuring #"sax" { \skip 4 } s4^"sax." >>
+  g'4
 }
 
-<< \quoteTest
-   \new Staff
-   << \transpose c' d' \quoteTest
-     s4_"up 1 tone"
-  >>
->>
+{
+  \set Staff.instrumentName =
+    \markup {
+      \center-column { Horn \line { in F } }
+    }
+  \quoteTest
+  \transpose c' d' << \quoteTest s4_"up a tone" >>
+}