partial: 1.5.47.jcn

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

diff --git a/input/tutorial/os-score.ly b/input/tutorial/os-score.ly
index b489c7a5b6f841f4f1f4f7cf6d3de2746f78c5d8..a5fe3ec333f63f8c18a0a9f14339fe485ed74717 100644 (file)
--- a/input/tutorial/os-score.ly
+++ b/input/tutorial/os-score.ly
@@ -1,13 +1,16 @@
 
-\include "os-music.ly";
-\include "paper13.ly";
+\version "1.3.138"
 
-#(set! point-and-click #t)
+\include "os-music.ly"
+\include "paper13.ly"
+
+#(set! point-and-click line-column-location)
 #(define text-flat '((font-relative-size . -2) (music "accidentals--1")))
 
 \score {
-  \notes <
+  <
     \global
+    \property Score.BarNumber \override #'padding = #3
     \context StaffGroup = woodwind <
       \context Staff = flauti <
        \property Staff.midiInstrument = #"flute"
@@ -23,7 +26,7 @@
        \property Staff.midiInstrument = #"timpani"
        \property Staff.instrument = #'(lines "Timpani" "(C-G)")
        \property Staff.instr = #"Timp."
-       \clef bass;
+       \clef bass
         \Key
        \timpani
       >
@@ -31,8 +34,8 @@
     \context StaffGroup = brass <
       \context Staff = trombe <
        \property Staff.midiInstrument = #"trumpet"
-       \property Staff.instrument = #`(lines "2 Trombe" (rows "(C)"))
-       \property Staff.instr = #`(lines "Tbe." (rows "(C)"))
+       \property Staff.instrument = #`(lines "2 Trombe" "(C)")
+       \property Staff.instr = #`(lines "Tbe." "(C)")
         \Key
        \context Voice=one \partcombine Voice
          \context Thread=one \tromboI
@@ -40,36 +43,30 @@
       >
       \context Staff = corni <
         \property Staff.midiInstrument = #"french horn"
-       \property Staff.instrument = #`(lines "Corno" (rows "(E" ,text-flat ")"))
-       \property Staff.instr = #`(lines "Cor."  (rows "(E" ,text-flat ")"))
+       \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;
+       \notes \key bes \major
        \context Voice=one \corno
       >
     >
   >
   \paper {
-    indent = 15 * \staffspace;
-    linewidth = 60 * \staffspace;
-    textheight = 90 * \staffspace;
-    \translator{
-      \ThreadContext
-      \consists "Rest_engraver";
-    }
+    indent = 15 * \staffspace
+    linewidth = 60 * \staffspace
+    textheight = 90 * \staffspace
     \translator{
       \VoiceContext
-      \remove "Rest_engraver";    
+      \consists "Multi_measure_rest_engraver"
     }
     \translator{
       \HaraKiriStaffContext
-    }
-    \translator {
-      \OrchestralScoreContext
-      BarNumber \override #'padding = #3
+      \remove "Multi_measure_rest_engraver"
     }
   }
   \midi {
-    \tempo 4 = 75;
+    \tempo 4 = 75
   }
 }
 
+