X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=input%2Fregression%2Ffret-diagrams-dots.ly;h=e765d8e5ce5447bd2cb5bc7a1538cbf8b2bdc981;hb=c001bb5d89b90e26c03228ddf26a6e85bf4fb967;hp=a38d0b2218ec0e5ba7e6b1b2d120ba94988e4333;hpb=cb47f0d75cc88e34d5cb06fcfbf4104ce0780c90;p=lilypond.git

diff --git a/input/regression/fret-diagrams-dots.ly b/input/regression/fret-diagrams-dots.ly
index a38d0b2218..e765d8e5ce 100644
--- a/input/regression/fret-diagrams-dots.ly
+++ b/input/regression/fret-diagrams-dots.ly
@@ -1,9 +1,14 @@
-\version "2.12.0"
+\version "2.19.8"
 
 \header {
   texidoc="
 Dots indicating fingerings can be changed in location,
 size, and coloring.
+It is possible to parenthesize a single dot.  The color
+of the paranthesis may be taken from dot or default.
+A possible collision between parathesis and fret-label-
+indication can be resolved by an override for
+@code{fret-label-horizontal-offset} in @code{fret-diagram-details}.
 
 "
 }
@@ -12,6 +17,8 @@ size, and coloring.
 
 <<
   \chords {
+    c1 |
+    c1 |
     c1 |
     c1 |
     c1 |
@@ -32,8 +39,7 @@ size, and coloring.
                                      (barre 5 1 3))}
 
      %% C major for guitar, verbose style
-    \override TextScript #'fret-diagram-details 
-        #'dot-radius = #0.3
+    \override TextScript.fret-diagram-details.dot-radius = #0.3
     c' ^\markup {
             \fret-diagram-verbose #'((mute 6)
                                      (place-fret 5 3 1)
@@ -44,9 +50,8 @@ size, and coloring.
                                      (barre 5 1 3))}
 
      %% C major for guitar, verbose style
-    \revert TextScript #'fret-diagram-details #'dot-radius
-    \once \override TextScript #'fret-diagram-details 
-        #'dot-color = #'white
+    \revert TextScript.fret-diagram-details.dot-radius
+    \once \override TextScript.fret-diagram-details.dot-color = #'white
     c' ^\markup {
             \fret-diagram-verbose #'((mute 6)
                                      (place-fret 5 3 1)
@@ -57,8 +62,7 @@ size, and coloring.
                                      (barre 5 1 3))}
 
      %% C major for guitar,  verbose style
-    \once \override TextScript #'fret-diagram-details 
-        #'dot-position = #0.5
+    \once \override TextScript.fret-diagram-details.dot-position = #0.5
     c'1 ^\markup {
             \fret-diagram-verbose #'((mute 6)
                                      (place-fret 5 3 1)
@@ -68,7 +72,34 @@ size, and coloring.
                                      (place-fret 1 3 1)
                                      (barre 5 1 3))}
 
- }
->>
+     %% C major for guitar,  verbose style
+    \once \override TextScript.size = #1.4
+    c'1 ^\markup {
+            \fret-diagram-verbose #'((mute 6)
+                                     (place-fret 5 3 1 blue)
+                                     (place-fret 4 5 2 red parenthesized)
+                                     (place-fret 3 5 3)
+                                     (place-fret 2 5 4 red)
+                                     (place-fret 1 3 1 blue parenthesized)
+                                     (barre 5 1 3))}
 
+     %% C major for guitar,  verbose style
+     %% larger size and dot-radius
+     %% different dot-colors
+     %% parenthesizing single dots, with different paren-color
+     %% horizontal moving fret-label-indication
+    \once \override TextScript.size = #1.5
+    \once \override TextScript.fret-diagram-details.dot-radius = #0.4
+    \once \override TextScript.fret-diagram-details.fret-label-horizontal-offset = #0.2
+    c'1 ^\markup {
+            \fret-diagram-verbose
+              #'((mute 6)
+                 (place-fret 5 3 1 blue)
+                 (place-fret 4 5 2 red parenthesized default-paren-color)
+                 (place-fret 3 5 3)
+                 (place-fret 2 5 4 red)
+                 (place-fret 1 3 1 blue parenthesized)
+                 (barre 5 1 3))}
 
+ }
+>>