resolve merge

[lilypond.git] / input / regression / predefined-fretboards.ly

diff --git a/input/regression/predefined-fretboards.ly b/input/regression/predefined-fretboards.ly
index 00a9397ff649856aa47c93c8dcd289a8b29d046e..8bb8d496b7cf167feac87496eee866b82a6253b2 100644 (file)
--- a/input/regression/predefined-fretboards.ly
+++ b/input/regression/predefined-fretboards.ly
@@ -1,4 +1,9 @@
-\version "2.12.0"
+\version "2.14.0"
+
+\header {
+texidoc = "Predefined fretboards and chord shapes can be added.
+"
+}
 
 % add a chord shape
 
@@ -6,11 +11,11 @@
 
 % add chords
 
-\storePredefinedDiagram \chordmode {bes}
+\storePredefinedDiagram #default-fret-table \chordmode {bes}
                         #guitar-tuning
                         #(chord-shape 'bes guitar-tuning)
 
-\storePredefinedDiagram \chordmode {c}
+\storePredefinedDiagram #default-fret-table \chordmode {c}
                         #guitar-tuning
                         #(offset-fret 2 (chord-shape 'bes guitar-tuning))