resolve merge

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

diff --git a/input/lsr/jazz-combo-template.ly b/input/lsr/jazz-combo-template.ly
deleted file mode 100644 (file)
index c230936..0000000
--- a/input/lsr/jazz-combo-template.ly
+++ /dev/null
@@ -1,296 +0,0 @@
-%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
-%% This file is in the public domain.
-\version "2.12.3"
-
-\header {
-  lsrtags = "keyboards, percussion, fretted-strings, template"
-
-  texidoces = "
-Ésta es una plantilla bastante avanzada, para un conjunto de
-jazz. Observe que la notación de todos los instrumentos está en
-@code{\\key c \\major} (Do mayor). Esto se refiere al tono de
-concierto; la armadura se transporta automáticamente si la música está
-dentro de una sección @code{\\transpose}.
-
-"
-  doctitlees = "Plantilla para combo de jazz"
-  
-  texidocde = "
-Hier ist ein ziemlich kompliziertes Beispiel für ein Jazz-Ensemble. Achtung: 
-Alle Instrumente sind in @code{\key c \major} (C-Dur) notiert. Das bezieht sich 
-auf die klingende Musik: LilyPond transponiert die Tonart automatisch, wenn 
-sich die Noten innerhalb eines @code{\transpose}-Abschnitts befinden.
-
-"
-
-  doctitlede = "Vorlage für Jazz-Combo"
-
-  texidoc = "
-This is quite an advanced template, for a jazz ensemble. Note that all
-instruments are notated in @code{\\key c \\major}. This refers to the
-key in concert pitch; the key will be automatically transposed if the
-music is within a @code{\\transpose} section.
-
-"
-  doctitle = "Jazz combo template"
-} % begin verbatim
-
-\header {
-  title = "Song"
-  subtitle = "(tune)"
-  composer = "Me"
-  meter = "moderato"
-  piece = "Swing"
-  tagline = \markup {
-    \column {
-      "LilyPond example file by Amelie Zapf,"
-      "Berlin 07/07/2003"
-    }
-  }
-}
-
-%#(set-global-staff-size 16)
-\include "english.ly"
-
-%%%%%%%%%%%% Some macros %%%%%%%%%%%%%%%%%%%
-
-sl = {
-  \override NoteHead #'style = #'slash
-  \override Stem #'transparent = ##t
-}
-nsl = {
-  \revert NoteHead #'style
-  \revert Stem #'transparent
-}
-crOn = \override NoteHead #'style = #'cross
-crOff = \revert NoteHead #'style
-
-%% insert chord name style stuff here.
-
-jazzChords = { }
-
-%%%%%%%%%%%% Keys'n'thangs %%%%%%%%%%%%%%%%%
-
-global = { \time 4/4 }
-
-Key = { \key c \major }
-
-% ############ Horns ############
-
-% ------ Trumpet ------
-trpt = \transpose c d \relative c'' {
-  \Key
-  c1 | c | c |
-}
-trpHarmony = \transpose c' d {
-  \jazzChords
-}
-trumpet = {
-  \global
-  \set Staff.instrumentName = #"Trumpet"
-  \clef treble
-  <<
-    \trpt
-  >>
-}
-
-% ------ Alto Saxophone ------
-alto = \transpose c a \relative c' {
-  \Key
-  c1 | c | c |
-}
-altoHarmony = \transpose c' a {
-  \jazzChords
-}
-altoSax = {
-  \global
-  \set Staff.instrumentName = #"Alto Sax"
-  \clef treble
-  <<
-    \alto
-  >>
-}
-
-% ------ Baritone Saxophone ------
-bari = \transpose c a' \relative c {
-  \Key
-  c1
-  c1
-  \sl
-  d4^"Solo" d d d
-  \nsl
-}
-bariHarmony = \transpose c' a \chordmode {
-  \jazzChords s1 s d2:maj e:m7
-}
-bariSax = {
-  \global
-  \set Staff.instrumentName = #"Bari Sax"
-  \clef treble
-  <<
-    \bari
-  >>
-}
-
-% ------ Trombone ------
-tbone = \relative c {
-  \Key
-  c1 | c | c
-}
-tboneHarmony = \chordmode {
-  \jazzChords
-}
-trombone = {
-  \global
-  \set Staff.instrumentName = #"Trombone"
-  \clef bass
-  <<
-    \tbone
-  >>
-}
-
-% ############ Rhythm Section #############
-
-% ------ Guitar ------
-gtr = \relative c'' {
-  \Key
-  c1
-  \sl
-  b4 b b b
-  \nsl
-  c1
-}
-gtrHarmony = \chordmode {
-  \jazzChords
-  s1 c2:min7+ d2:maj9
-}
-guitar = {
-  \global
-  \set Staff.instrumentName = #"Guitar"
-  \clef treble
-  <<
-    \gtr
-  >>
-}
-
-%% ------ Piano ------
-rhUpper = \relative c'' {
-  \voiceOne
-  \Key
-  c1 | c | c
-}
-rhLower = \relative c' {
-  \voiceTwo
-  \Key
-  e1 | e | e
-}
-
-lhUpper = \relative c' {
-  \voiceOne
-  \Key
-  g1 | g | g
-}
-lhLower = \relative c {
-  \voiceTwo
-  \Key
-  c1 | c | c
-}
-
-PianoRH = {
-  \clef treble
-  \global
-  \set Staff.midiInstrument = #"acoustic grand"
-  <<
-    \new Voice = "one" \rhUpper
-    \new Voice = "two" \rhLower
-  >>
-}
-PianoLH = {
-  \clef bass
-  \global
-  \set Staff.midiInstrument = "acoustic grand"
-  <<
-    \new Voice = "one" \lhUpper
-    \new Voice = "two" \lhLower
-  >>
-}
-
-piano = {
-  <<
-    \set PianoStaff.instrumentName = #"Piano"
-    \new Staff = "upper" \PianoRH
-    \new Staff = "lower" \PianoLH
-  >>
-}
-
-% ------ Bass Guitar ------
-Bass = \relative c {
-  \Key
-  c1 | c | c
-}
-bass = {
-  \global
-  \set Staff.instrumentName = #"Bass"
-  \clef bass
-  <<
-    \Bass
-  >>
-}
-
-% ------ Drums ------
-up = \drummode {
-  \voiceOne
-  hh4 <hh sn> hh <hh sn>
-  hh4 <hh sn> hh <hh sn>
-  hh4 <hh sn> hh <hh sn>
-}
-down = \drummode {
-  \voiceTwo
-  bd4 s bd s
-  bd4 s bd s
-  bd4 s bd s
-}
-
-drumContents = {
-  \global
-  <<
-    \set DrumStaff.instrumentName = #"Drums"
-    \new DrumVoice \up
-    \new DrumVoice \down
-  >>
-}
-
-%%%%%%%%% It All Goes Together Here %%%%%%%%%%%%%%%%%%%%%%
-
-\score {
-  <<
-    \new StaffGroup = "horns" <<
-      \new Staff = "trumpet" \trumpet
-      \new Staff = "altosax" \altoSax
-      \new ChordNames = "barichords" \bariHarmony
-      \new Staff = "barisax" \bariSax
-      \new Staff = "trombone" \trombone
-    >>
-    
-    \new StaffGroup = "rhythm" <<
-      \new ChordNames = "chords" \gtrHarmony
-      \new Staff = "guitar" \guitar
-      \new PianoStaff = "piano" \piano
-      \new Staff = "bass" \bass
-      \new DrumStaff \drumContents
-    >>
-  >>
-  
-  \layout {
-    \context { \RemoveEmptyStaffContext }
-    \context {
-      \Score
-      \override BarNumber #'padding = #3
-      \override RehearsalMark #'padding = #2
-      skipBars = ##t
-    }
-  }
-  
-  \midi { }
-}
-