patch::: 1.3.132.jcn1

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

diff --git a/input/tutorial/orchestral-score.ly b/input/tutorial/orchestral-score.ly
index 64f7ba7f154a15bfaf9b7c40f74df3ce280d09d7..30e0dd208729095594d2c2bf63f433b307a0c2e7 100644 (file)
--- a/input/tutorial/orchestral-score.ly
+++ b/input/tutorial/orchestral-score.ly
@@ -1,4 +1,4 @@
-\version "1.3.120";
+\version "1.3.130";
 
 \include "paper16.ly";
 
@@ -15,6 +15,7 @@ staffCombinePianoStaffProperties = {
        \property PianoStaff.aDueText = #"\\`a2"
        \property PianoStaff.splitInterval = #'(1 . 0)
        \property PianoStaff.changeMoment = #`(,(make-moment 1 1) . ,(make-moment 1 1))
+       \property PianoStaff.noDirection = ##t
 }
 
 % Coriolan 218-222
@@ -122,10 +123,10 @@ contrabasso = \notes\relative c {
       >
       \context Staff = clarinets <
         \property Staff.midiInstrument = #"clarinet"
-       \property Staff.instrument = #`((kern . 0.5)
-         (lines "2 Clarinetti" (rows "(B" ,text-flat ")")))
-       \property Staff.instr = #`((kern . 0.5)
-         (lines "Cl."  (rows "(B" ,text-flat ")")))
+       \property Staff.instrument = #`(lines
+         "2 Clarinetti" (rows "(B" ,text-flat ")"))
+       \property Staff.instr = #`(lines
+         "Cl."  (rows "(B" ,text-flat ")"))
        \property Staff.transposing = #-2
        \notes \key f \major;
        \context Voice=one \partcombine Voice
@@ -145,10 +146,10 @@ contrabasso = \notes\relative c {
     \context StaffGroup = brass <
       \context Staff = frenshHorns <
         \property Staff.midiInstrument = #"french horn"
-       \property Staff.instrument = #`((kern . 0.5)
-         (lines "2 Corni" (rows "(E" ,text-flat ")")))
-       \property Staff.instr = #`((kern . 0.5)
-         (lines "Cor."  (rows "(E" ,text-flat ")")))
+       \property Staff.instrument = #`(lines
+         "2 Corni" (rows "(E" ,text-flat ")"))
+       \property Staff.instr = #`(lines
+         "Cor."  (rows "(E" ,text-flat ")"))
        \property Staff.transposing = #3
        \notes \key c \major;
        \context Voice=one \partcombine Voice
@@ -157,10 +158,10 @@ contrabasso = \notes\relative c {
       >
       \context Staff = trumpets <
        \property Staff.midiInstrument = #"clarinet"
-       \property Staff.instrument = #`((kern . 0.5)
-         (lines "2 Trombe" (rows "(C)")))
-       \property Staff.instr = #`((kern . 0.5)
-         (lines "Tbe." (rows "(C)")))
+       \property Staff.instrument = #`(lines
+         "2 Trombe" (rows "(C)"))
+       \property Staff.instr = #`(lines
+         "Tbe." (rows "(C)"))
        \context Voice=one \partcombine Voice
          \context Thread=one \tromboI
          \context Thread=two \tromboII
@@ -169,8 +170,8 @@ contrabasso = \notes\relative c {
     \context StaffGroup = timpani <
       \context Staff = timpani <
        \property Staff.midiInstrument = #"timpani"
-       \property Staff.instrument = #'((kern . 0.5)
-         (lines "2 Timpani" "(C-G)"))
+       \property Staff.instrument = #'(lines
+         "2 Timpani" "(C-G)")
        \property Staff.instr = #"Timp."
        \clef bass;
        \timpani
@@ -204,8 +205,8 @@ contrabasso = \notes\relative c {
        \staffCombinePianoStaffProperties
         \context Staff=one <
          \property Staff.midiInstrument = #"cello"
-         \property Staff.instrument = #'((kern . 0.5)
-           (lines "Violoncello" (rows "    e") (rows "Contrabasso")))
+         \property Staff.instrument = #'(lines
+           "Violoncello" "    e" "Contrabasso")
          \property Staff.instr = "Vc."
          \clef bass;
        >
@@ -229,6 +230,11 @@ contrabasso = \notes\relative c {
     \translator{
       \ThreadContext
       \consists "Rest_engraver";
+      
+      % Set value for engraver at thread level,
+      % to override the default that is set in ScoreContext
+      % for added engraver at Voice level
+      devNullThread = #'()
     }
     \translator{
       \VoiceContext
@@ -254,6 +260,8 @@ contrabasso = \notes\relative c {
 
       soloText = #"I."
       soloIIText = #"II."
+      % By default, turn off the Thread_devnull_engraver
+      % at Voice level
       devNullThread = #'never
 
       % Hmm