* lily/new-chord-name-engraver.cc (process_music): give original

[lilypond.git] / Documentation / user / tutorial.itely

diff --git a/Documentation/user/tutorial.itely b/Documentation/user/tutorial.itely
index b7d81bee1942354cb42694234291ded2e85d8e69..61c630972b821dd646f0851fe5dcc48eeca3efef 100644 (file)
--- a/Documentation/user/tutorial.itely
+++ b/Documentation/user/tutorial.itely
@@ -2337,79 +2337,85 @@ for transposing instruments.
 @subsection The full score
 
 
-The second file, @file{input/tutorial/os-score.ly}, reads the definitions of the first
-(@file{input/tutorial/os-music.ly}), and defines the @code{\score} block for the full
-conductor's score.
+The second file, @file{input/tutorial/os-score.ly}, reads the
+definitions of the first (@file{input/tutorial/os-music.ly}), and
+defines the @code{\score} block for the full conductor's score.
 
+@verbatim
+\version "1.7.6"
 
-@example
-% os-score.ly
 \include "os-music.ly"
 \include "paper13.ly"
 
 #(ly:set-point-and-click 'line-column)
-#(define text-flat '((font-relative-size . -2)
-         (music "accidentals--1")))
-
-\score @{
+textFlat = \markup {\smaller \musicglyph #"accidentals--1"}
+\score {
   <
     \global
     \property Score.BarNumber \override #'padding = #3
     \context StaffGroup = woodwind <
       \context Staff = flauti <
-        \property Staff.midiInstrument = #"flute"
-        \property Staff.instrument = "2 Flauti"
-        \property Staff.instr = "Fl."
+       \property Staff.midiInstrument = #"flute"
+       \property Staff.instrument = "2 Flauti"
+       \property Staff.instr = "Fl."
         \Key
-        \context Voice=one @{ \voiceOne \flautoI @}
-        \context Voice=two @{ \voiceTwo \flautoII @}
+       \context Voice=one { \voiceOne \flautoI }
+       \context Voice=two { \voiceTwo \flautoII }
       >
     >
     \context StaffGroup = timpani <
       \context Staff = timpani <
-        \property Staff.midiInstrument = #"timpani"
-        \property Staff.instrument = #'(lines "Timpani" "(C-G)")
-        \property Staff.instr = #"Timp."
-        \clef bass
+       \property Staff.midiInstrument = #"timpani"
+       \property Staff.instrument = \markup { \column <<  "Timpani" "(C-G)" >> }
+       \property Staff.instr = #"Timp."
+       \clef bass
         \Key
-        \timpani
+       \timpani
       >
     >
     \context StaffGroup = brass <
       \context Staff = trombe <
-        \property Staff.midiInstrument = #"trumpet"
-        \property Staff.instrument = #`(lines "2 Trombe" "(C)")
-        \property Staff.instr = #`(lines "Tbe." "(C)")
+       \property Staff.midiInstrument = #"trumpet"
+       \property Staff.instrument = \markup { \column << "2 Trombe" "(C)" >> }
+       \property Staff.instr = \markup{ \column << "Tbe." "(C)">> }
         \Key
-        \context Voice=one \partcombine Voice
-          \context Thread=one \tromboI
-          \context Thread=two \tromboII
+       \context Voice=one \partcombine Voice
+         \context Thread=one \tromboI
+         \context Thread=two \tromboII
       >
       \context Staff = corni <
         \property Staff.midiInstrument = #"french horn"
-        \property Staff.instrument = #`(lines "Corno"
-          (columns "(E" ,text-flat ")"))
-        \property Staff.instr = #`(lines "Cor."
-          (columns "(E" ,text-flat ")"))
-        \property Staff.transposing = #3
-        \notes \key bes \major
-        \context Voice=one \corno
+       \property Staff.instrument
+       = \markup { \column << "Corno" { "(E"  \textFlat ")" } >> }
+       \property Staff.instr =
+       \markup { \column << "Cor." { "(E"  \textFlat ")" } >> }
+       \property Staff.transposing = #3
+       \notes \key bes \major
+       \context Voice=one \corno
       >
     >
   >
-  \paper @{
+  \paper {
     indent = 15 * \staffspace
-    linewidth = 55 * \staffspace
+    linewidth = 60 * \staffspace
     textheight = 90 * \staffspace
-    \translator@{
+    \translator{
+      \VoiceContext
+      \consists "Multi_measure_rest_engraver"
+    }
+    \translator{
       \HaraKiriStaffContext
-    @}
-  @}
-  \midi @{
+      \remove "Multi_measure_rest_engraver"
+    }
+  }
+  \midi {
     \tempo 4 = 75
-  @}
-@}
-@end example
+  }
+}
+
+
+
+@end verbatim
 
 @center @strong{Zo, goed lieverd?}
 @sp 1