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

[lilypond.git] / input / tutorial / os-score.ly

diff --git a/input/tutorial/os-score.ly b/input/tutorial/os-score.ly
index c45584b324a7864f9243789d6ab055842d36125c..198166af45690d76c62a44a0fa682b111ee56164 100644 (file)
--- a/input/tutorial/os-score.ly
+++ b/input/tutorial/os-score.ly
@@ -1,12 +1,10 @@
-
 \version "1.7.6"
 
 \include "os-music.ly"
 \include "paper13.ly"
 
 #(ly:set-point-and-click 'line-column)
-#(define text-flat '((font-relative-size . -2) (music "accidentals--1")))
-
+textFlat = \markup {\smaller \musicglyph #"accidentals--1"}
 \score {
   <
     \global
@@ -24,7 +22,7 @@
     \context StaffGroup = timpani <
       \context Staff = timpani <
        \property Staff.midiInstrument = #"timpani"
-       \property Staff.instrument = #'(lines "Timpani" "(C-G)")
+       \property Staff.instrument = \markup { \column <<  "Timpani" "(C-G)" >> }
        \property Staff.instr = #"Timp."
        \clef bass
         \Key
@@ -34,8 +32,8 @@
     \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.instrument = \markup { \column << "2 Trombe" "(C)" >> }
+       \property Staff.instr = \markup{ \column << "Tbe." "(C)">> }
         \Key
        \context Voice=one \partcombine Voice
          \context Thread=one \tromboI
@@ -43,8 +41,10 @@
       >
       \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.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