resolve merge

[lilypond.git] / input / regression / fret-diagrams-xo-label.ly

diff --git a/input/regression/fret-diagrams-xo-label.ly b/input/regression/fret-diagrams-xo-label.ly
index df97be4c49e52ece1df6e94142cbf64b9be1b71d..c1403b8921c59204b15df719020ca06ed30fd23c 100644 (file)
--- a/input/regression/fret-diagrams-xo-label.ly
+++ b/input/regression/fret-diagrams-xo-label.ly
@@ -1,9 +1,9 @@
-\version "2.12.0"
+\version "2.14.0"
 
 \header {
   texidoc="
-The label for the lowest fret can be changed in location,
-size, and number type.
+The size, spacing, and symbols used to indicate open and muted strings
+can be changed.
 
 "
 }
@@ -20,24 +20,24 @@ size, and number type.
   \new Voice {
     \textLengthOn
 
-     %% D major for guitar, terse style 
+     %% D major for guitar, terse style
     d'1 ^\markup {
             \fret-diagram-terse #"x;x;o;2-1;3-2;2-3;"}
 
-     %% D major for guitar, terse style 
-    \once \override TextScript #'fret-diagram-details 
-        #'top-fret-thickness = #5 
-    \once \override TextScript #'fret-diagram-details 
+     %% D major for guitar, terse style
+    \once \override TextScript #'fret-diagram-details
+        #'top-fret-thickness = #5
+    \once \override TextScript #'fret-diagram-details
         #'xo-font-magnification = #0.3
     d'1 ^\markup {
             \fret-diagram-terse #"x;x;o;2-1;3-2;2-3;"}
 
-     %% D major for guitar, terse style 
-    \override TextScript #'fret-diagram-details 
-        #'mute-string = #"M" 
-    \override TextScript #'fret-diagram-details 
+     %% D major for guitar, terse style
+    \override TextScript #'fret-diagram-details
+        #'mute-string = #"M"
+    \override TextScript #'fret-diagram-details
         #'open-string = #"*"
-    \override TextScript #'fret-diagram-details 
+    \override TextScript #'fret-diagram-details
         #'xo-padding = #0.5
     d'1 ^\markup {
             \fret-diagram-terse #"x;x;o;2-1;3-2;2-3;"}