Imported Upstream version 2.18.0

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

diff --git a/input/regression/fret-diagrams-fingering.ly b/input/regression/fret-diagrams-fingering.ly
index bebd9a621739e426cdff62e0d09760dfbf013b99..786d34110c6aa999ccffc21fd5b1fbe52ff3a24b 100644 (file)
--- a/input/regression/fret-diagrams-fingering.ly
+++ b/input/regression/fret-diagrams-fingering.ly
@@ -1,10 +1,10 @@
-\version "2.12.0"
+\version "2.17.6"
 
 \header {
   texidoc="
 Finger labels can be added, either in dots or below strings.
-Dot color can be changed, and fingering label font size
-can be adjusted.
+Dot color can be changed globally or on a per-dot basis,
+and fingering label font size can be adjusted.
 
 "
 }
@@ -17,14 +17,15 @@ can be adjusted.
     c1 |
     c1 |
     c1 |
+    c1 |
+    c1 |
     c1
   }
 
   \new Voice {
     \textLengthOn
      %% C major for guitar,  verbose style
-    \override TextScript #'fret-diagram-details
-      #'finger-code = #'below-string
+    \override TextScript.fret-diagram-details.finger-code = #'below-string
     c'1 ^\markup {
             \fret-diagram-verbose #'((mute 6)
                                      (place-fret 5 3 1)
@@ -32,11 +33,10 @@ can be adjusted.
                                      (place-fret 3 5 3)
                                      (place-fret 2 5 4)
                                      (place-fret 1 3 1)
-                                     (barre 5 1 1))}
+                                     (barre 5 1 3))}
 
      %% C major for guitar,  verbose style
-    \override TextScript #'fret-diagram-details 
-        #'string-label-font-mag = #0.4
+    \override TextScript.fret-diagram-details.string-label-font-mag = #0.4
     c'1 ^\markup {
             \fret-diagram-verbose #'((mute 6)
                                      (place-fret 5 3 1)
@@ -44,11 +44,10 @@ can be adjusted.
                                      (place-fret 3 5 3)
                                      (place-fret 2 5 4)
                                      (place-fret 1 3 1)
-                                     (barre 5 1 1))}
+                                     (barre 5 1 3))}
 
      %% C major for guitar, verbose style
-    \override TextScript #'fret-diagram-details
-      #'finger-code = #'in-dot
+    \override TextScript.fret-diagram-details.finger-code = #'in-dot
     c' ^\markup {
             \fret-diagram-verbose #'((mute 6)
                                      (place-fret 5 3 1)
@@ -56,11 +55,10 @@ can be adjusted.
                                      (place-fret 3 5 3)
                                      (place-fret 2 5 4)
                                      (place-fret 1 3 1)
-                                     (barre 5 1 1))}
+                                     (barre 5 1 3))}
 
      %% C major for guitar, verbose style
-    \once \override TextScript #'fret-diagram-details 
-        #'dot-color = #'white
+    \once \override TextScript.fret-diagram-details.dot-color = #'white
     c' ^\markup {
             \fret-diagram-verbose #'((mute 6)
                                      (place-fret 5 3 1)
@@ -68,11 +66,10 @@ can be adjusted.
                                      (place-fret 3 5 3)
                                      (place-fret 2 5 4)
                                      (place-fret 1 3 1)
-                                     (barre 5 1 1))}
+                                     (barre 5 1 3))}
 
      %% C major for guitar,  verbose style
-    \once \override TextScript #'fret-diagram-details 
-        #'dot-label-font-mag = #0.75
+    \once \override TextScript.fret-diagram-details.dot-label-font-mag = #0.75
     c'1 ^\markup {
             \fret-diagram-verbose #'((mute 6)
                                      (place-fret 5 3 1)
@@ -80,8 +77,27 @@ can be adjusted.
                                      (place-fret 3 5 3)
                                      (place-fret 2 5 4)
                                      (place-fret 1 3 1)
-                                     (barre 5 1 1))}
-
+                                     (barre 5 1 3))}
+    %% dot color inversion, white on black
+    \once \override TextScript.fret-diagram-details.dot-color = #'black
+    c' ^\markup {
+            \fret-diagram-verbose #'((mute 6)
+                                     (place-fret 5 3 1 inverted)
+                                     (place-fret 4 5 2)
+                                     (place-fret 3 5 3 inverted)
+                                     (place-fret 2 5 4)
+                                     (place-fret 1 3 1)
+                                     (barre 5 1 3))}
+    %% dot color inversion, black on white
+    \once \override TextScript.fret-diagram-details.dot-color = #'white
+    c' ^\markup {
+            \fret-diagram-verbose #'((mute 6)
+                                     (place-fret 5 3 1 inverted)
+                                     (place-fret 4 5 2)
+                                     (place-fret 3 5 3 inverted)
+                                     (place-fret 2 5 4)
+                                     (place-fret 1 3 1)
+                                     (barre 5 1 3))}
  }
 >>