Merge remote-tracking branch 'origin/master' into translation

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

diff --git a/input/regression/fret-diagrams-fret-label.ly b/input/regression/fret-diagrams-fret-label.ly
index 390b01c737cdaa655d929ff9b4ee7cedb45d0c27..495562dc281ab9b19779ed50c9fd05d60cd22c75 100644 (file)
--- a/input/regression/fret-diagrams-fret-label.ly
+++ b/input/regression/fret-diagrams-fret-label.ly
@@ -1,4 +1,4 @@
-\version "2.12.0"
+\version "2.19.8"
 
 \header {
   texidoc="
@@ -32,10 +32,8 @@ size, and number type.
                                      (barre 5 1 3))}
 
      %% C major for guitar, verbose style
-    \override TextScript #'fret-diagram-details 
-        #'label-dir = #LEFT 
-    \override TextScript #'fret-diagram-details 
-        #'number-type = #'roman-upper 
+    \override TextScript.fret-diagram-details.label-dir = #LEFT
+    \override TextScript.fret-diagram-details.number-type = #'roman-upper
     c' ^\markup {
             \fret-diagram-verbose #'((mute 6)
                                      (place-fret 5 3 1)
@@ -46,13 +44,10 @@ size, and number type.
                                      (barre 5 1 3))}
 
      %% C major for guitar, verbose style
-    \revert TextScript #'fret-diagram-details #'label-dir
-    \override TextScript #'fret-diagram-details 
-        #'fret-label-font-mag = #0.4 
-    \override TextScript #'fret-diagram-details 
-        #'number-type = #'arabic 
-    \once \override TextScript #'fret-diagram-details 
-        #'fret-label-vertical-offset = #0.25
+    \revert TextScript.fret-diagram-details.label-dir
+    \override TextScript.fret-diagram-details.fret-label-font-mag = #0.4
+    \override TextScript.fret-diagram-details.number-type = #'arabic
+    \once \override TextScript.fret-diagram-details.fret-label-vertical-offset = #0.25
     c' ^\markup {
             \fret-diagram-verbose #'((mute 6)
                                      (place-fret 5 3 1)
@@ -63,11 +58,10 @@ size, and number type.
                                      (barre 5 1 3))}
 
      %% C major for guitar, verbose style
-    \revert TextScript #'fret-diagram-details #'label-dir
-    \once \override TextScript #'fret-diagram-details 
-        #'number-type = #'custom
-    \once \override TextScript #'fret-diagram-details 
-        #'fret-label-custom-format = #"~d°"
+    \revert TextScript.fret-diagram-details.label-dir
+    \once \override TextScript.fret-diagram-details.number-type = #'custom
+    \once \override TextScript.fret-diagram-details.fret-label-horizontal-offset = #0.5
+    \once \override TextScript.fret-diagram-details.fret-label-custom-format = #"~d°"
     c' ^\markup {
             \fret-diagram-verbose #'((mute 6)
                                      (place-fret 5 3 1)
@@ -79,5 +73,3 @@ size, and number type.
 
  }
 >>
-
-