resolve merge

[lilypond.git] / input / lsr / single-staff-template-with-notes,-lyrics,-chords-and-frets.ly

diff --git a/input/lsr/single-staff-template-with-notes,-lyrics,-chords-and-frets.ly b/input/lsr/single-staff-template-with-notes,-lyrics,-chords-and-frets.ly
deleted file mode 100644 (file)
index 9f9822c..0000000
--- a/input/lsr/single-staff-template-with-notes,-lyrics,-chords-and-frets.ly
+++ /dev/null
@@ -1,64 +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 = "vocal-music, chords, template"
-
-  texidoces = "
-Presentamos a continuación un ejemplo de plantilla para una hoja
-guía de acordes con melodía, letra, acordes y diagramas de
-trastes.
-"
-
-  doctitlees = "Plantilla para un pentagrama único con música, letra, acordes y trastes"
-
-  texidoc = "
-Here is a simple lead sheet template with melody, lyrics, chords and
-fret diagrams.
-
-"
-  doctitle = "Single staff template with notes, lyrics, chords and frets"
-} % begin verbatim
-
-verseI = \lyricmode {
-  \set stanza = #"1."
-  This is the first verse
-}
-
-verseII = \lyricmode {
-  \set stanza = #"2."
-  This is the second verse.
-}
-
-theChords = \chordmode {
-  % insert chords for chordnames and fretboards here
-  c2 g4 c
-}
-
-staffMelody = \relative c' {
-   \key c \major
-   \clef treble
-   % Type notes for melody here
-   c4 d8 e f4 g
-   \bar "|."
-}
-
-\score {
-  <<
-    \context ChordNames { \theChords }
-    \context FretBoards { \theChords }
-    \new Staff {
-      \context Voice = "voiceMelody" { \staffMelody }
-    }
-    \new Lyrics = "lyricsI" {
-      \lyricsto "voiceMelody" \verseI
-    }
-    \new Lyrics = "lyricsII" {
-      \lyricsto "voiceMelody" \verseII
-    }
-  >>
-  \layout { }
-  \midi { }
-}
-