release commit

[lilypond.git] / input / template / jazz-combo.ly

diff --git a/input/template/jazz-combo.ly b/input/template/jazz-combo.ly
index 981822bff659f8083014a25a2daf9f18f3c0cbb6..2e1539de9e5f74ded968661a0f7328a184bb310e 100644 (file)
--- a/input/template/jazz-combo.ly
+++ b/input/template/jazz-combo.ly
@@ -1,11 +1,11 @@
-\version "1.6.6"
+\version "1.9.1"
 \header {
         title = "Song"
         subtitle = "(tune)"
         composer = "Me"
         meter = "moderato"
         piece = "Swing"
-       tagline = "Lilypond example file by Amelie Zapf, Berlin 07/07/2003"
+       tagline = "LilyPond example file by Amelie Zapf, Berlin 07/07/2003"
        texidoc = "Jazz tune for combo (horns, piano, drums, bass, guitar)."
 }
 
@@ -22,7 +22,10 @@ nsl = {
          \property Voice.Stem \revert #'length }
 cr = \property Voice.NoteHead \override #'style = #'cross
 ncr = \property Voice.NoteHead \revert #'style
-jzchords = \property ChordNames.ChordName \override #'style = #'jazz
+
+%% insert chord name style stuff here.
+
+jzchords = { } 
 
 %%%%%%%%%%%% Keys'n'thangs %%%%%%%%%%%%%%%%%
 
@@ -34,12 +37,12 @@ Key = \notes \key c \major
 
 % ############ Horns ############
 % ------ Trumpet ------
-trpt = \notes \transpose d' \relative c'' {
+trpt = \notes \transpose c d \relative c'' {
        \Key
         c1 c c
 }
 
-trpharmony = \chords \transpose d { \jzchords }
+trpharmony = \chords \transpose c' d { \jzchords }
 trumpet = {
         \global 
         \property Staff.instrument = #"Trumpet"
@@ -50,12 +53,12 @@ trumpet = {
 }
 
 % ------ Alto Saxophone ------
-alto = \notes \transpose a' \relative c' {
+alto = \notes \transpose c a \relative c' {
        \Key
         c1 c c
 }
 
-altoharmony = \chords \transpose a { \jzchords }
+altoharmony = \chords \transpose c' a { \jzchords }
 altosax = {
         \global
         \property Staff.instrument = #"Alto Sax"
@@ -66,12 +69,12 @@ altosax = {
 }
 
 % ------ Baritone Saxophone ------
-bari = \notes \transpose a'' \relative c {
+bari = \notes \transpose c a' \relative c {
        \Key
         c1 c \sl d4^"Solo" d d d \nsl
 }
 
-bariharmony = \chords \transpose a { \jzchords s1 s d2:maj e:m.7 }
+bariharmony = \chords \transpose c' a { \jzchords s1 s d2:maj e:m7 }
 barisax = {
         \global
         \property Staff.instrument = #"Bari Sax"
@@ -103,7 +106,7 @@ gtr = \notes \relative c'' {
 }
 
 gtrharmony = \chords { \jzchords
-        s1 c2:min.7+ d2:maj.9
+        s1 c2:min7+ d2:maj9
 }
 
 guitar = {
@@ -193,11 +196,11 @@ down = \notes {
         bd4 s bd s bd s bd s bd s bd s
 }
 
-drums = {
+drums = \context Staff = drums {
        \global
        \property Staff.instrument = #"Drums"
        \clef percussion
-       \context Staff <
+       <
                \context Voice = first { \voiceOne \up }
                \context Voice = second { \voiceTwo \down }
        >
@@ -226,17 +229,13 @@ drums = {
                 
                 \context Staff = bass \bass
                 
-                \apply #(drums->paper 'drums) \context Staff = drums \drums
+                \apply #(drums->paper 'drums) \drums
         >
 >
         \midi { \tempo 4 = 75 }
         \paper {
                 linewidth = 15.0 \cm
-                \translator { \HaraKiriStaffContext }
-                \translator {
-                        \StaffContext
-                        \consists Instrument_name_engraver
-                }
+                \translator { \RemoveEmptyStaffContext }
                 \translator {
                         \ScoreContext
                         BarNumber \override #'padding = #3