X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=input%2Flsr%2Fsingle-staff-template-with-notes%2C-lyrics%2C-chords-and-frets.ly;h=9f9822ce03760c6d13f4b13cc1364df53a6a5b4b;hb=a8c9e8a7ca320ab0df5fd32e717fd62cd7635ce6;hp=3fc75d7cd5f277050ed5f20c71d078d2a51cbc82;hpb=e3d67c22f5f44859df86b9e3f1c26526a7f765dc;p=lilypond.git

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
index 3fc75d7cd5..9f9822ce03 100644
--- 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
@@ -1,6 +1,6 @@
 %% 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.11.66"
+\version "2.12.3"
 
 \header {
   lsrtags = "vocal-music, chords, template"
@@ -21,15 +21,6 @@ fret diagrams.
   doctitle = "Single staff template with notes, lyrics, chords and frets"
 } % begin verbatim
 
-% Define the fret diagrams to be used
-cFretDiagram = \markup {
-  \fret-diagram #"6-x;5-3-3;4-2-2;3-o;2-1-1;1-o;"
-}
-
-gFretDiagram = \markup {
-  \fret-diagram #"6-3-2;5-2-1;4-o;3-o;2-o;1-3-3;"
-}
-
 verseI = \lyricmode {
   \set stanza = #"1."
   This is the first verse
@@ -40,36 +31,34 @@ verseII = \lyricmode {
   This is the second verse.
 }
 
-theChords = \new ChordNames {
-  \chordmode {
-    % insert the chords for chordnames here
-    c2 g4 c
-  }
+theChords = \chordmode {
+  % insert chords for chordnames and fretboards here
+  c2 g4 c
 }
 
-staffMelody = \new Staff  {
- \context Voice = "voiceMelody" {
+staffMelody = \relative c' {
    \key c \major
    \clef treble
-   \relative c' {
-     % Type notes and fret diagram markups here
-     c4^\cFretDiagram d8 e f4^\gFretDiagram g^\cFretDiagram
-     \bar "|."
-   }
- }
+   % Type notes for melody here
+   c4 d8 e f4 g
+   \bar "|."
 }
 
 \score {
   <<
-    \theChords
-    \staffMelody
-    \new Lyrics = "lyricsI" \lyricmode {
+    \context ChordNames { \theChords }
+    \context FretBoards { \theChords }
+    \new Staff {
+      \context Voice = "voiceMelody" { \staffMelody }
+    }
+    \new Lyrics = "lyricsI" {
       \lyricsto "voiceMelody" \verseI
     }
-    \new Lyrics = "lyricsII" \lyricmode {
+    \new Lyrics = "lyricsII" {
       \lyricsto "voiceMelody" \verseII
     }
   >>
   \layout { }
   \midi { }
 }
+