Merge branch 'master' into dev/texi2html

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

diff --git a/input/lsr/quoting-another-voice-with-transposition.ly b/input/lsr/quoting-another-voice-with-transposition.ly
index cd07810a5b57f2c4dfe675d511c78b67bba40d26..b0dba891d8d8d4f0b99bd36b361a4207aef9936b 100644 (file)
--- a/input/lsr/quoting-another-voice-with-transposition.ly
+++ b/input/lsr/quoting-another-voice-with-transposition.ly
@@ -1,40 +1,38 @@
 %% Do not edit this file; it is auto-generated from input/new
 %% This file is in the public domain.
-\version "2.11.38"
+\version "2.11.51"
 \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."
-}
-% begin verbatim
-\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 
+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"
+} % begin verbatim
+
+\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-align { Horn \line { in F } }
+  \quoteTest
+  \transpose c' d' << \quoteTest s4_"up a tone" >>
+}