Move fret diagram specific properties to fret-diagram-details

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

diff --git a/input/regression/fret-diagrams.ly b/input/regression/fret-diagrams.ly
index a66735c40e1cde79a1aa74dae28363f95b934dba..a8d7fef802ce6331073d323279c5027af5c14a6e 100644 (file)
--- a/input/regression/fret-diagrams.ly
+++ b/input/regression/fret-diagrams.ly
@@ -1,56 +1,82 @@
+\version "2.11.27"
 
-\version "2.10.0"
-\header {
-  texidoc = "Fret diagrams can be created with @code{\markup}."
-}
 \paper {
-
-  %% stretch to prevent diagrams from colliding.
-  line-width = 18.0 \cm
+       ragged-right =  ##t
 }
 
-
 <<
-  \chords {s2 c c c d}
+  \chords {a2 a c c  d}
   
   \new Voice =mel {
-
+    \textLengthOn
+    % Set global properties of fret diagram
+    \override Voice.TextScript #'size = #'1.2
+    \override Voice.TextScript #'fret-diagram-details #'finger-code = #'below-string
+    \override Voice.TextScript #'fret-diagram-details #'dot-color = #'black
+    
     %% A chord for ukelele
     a'2 ^\markup
-    \override #'(string-count . 4) {
-      \override #'(dot-color . white) {
-        \fret-diagram #"4-2-2;3-1-1;2-o;1-o;"}}
-
-    %% C major for guitar, barred on third fret
-    c' ^\markup 
-    \override #'(number-type . roman-lower) {  % lower-case roman numeral fret label
-      \override #'(size . 1.1) {                  % 110% of default size
-       \override #'(finger-code . below-string) {  % string labels below strings
-          \override #'(barre-type . straight) {       % straight barre
-           \fret-diagram-verbose #'((mute 6) (place-fret 5 3 1) (place-fret 4 5 2) (place-fret 3 5 3) (place-fret 2 5 4) (place-fret 1 3 1) (barre 5 1 3)) }}}}
-    %% C major for guitar, barred on third fret
+    \override #'(fret-diagram-details . (
+                  (string-count . 4)
+                  (dot-color . white)
+                  (finger-code . in-dot))){
+                  \fret-diagram #"4-2-2;3-1-1;2-o;1-o;"}
+   %% A chord for ukelele, with formatting defined in definition string
+   %  1.2 * size, 4 strings, 4 frets, fingerings below string
+   %  dot radius .35 of fret spacing, dot position 0.55 of fret spacing
+    a'2 ^\markup
+    \override #'(fret-diagram-details . (
+                  (dot-color . white)
+                  (open-string . "o"))){
+                  \fret-diagram #"s:1.2;w:4;h:3;f:2;d:0.35;p:0.55;4-2-2;3-1-1;2-o;1-o;"}                  
+     %% C major for guitar, barred on third fret
+       % verbose style
+       % roman fret label, finger labels below string, straight barre
     c' ^\markup 
-    \override #'(number-type . arabic) {  % lower-case roman numeral fret label
-      \override #'(dot-color . white) {     % white dots
-       \override #'(finger-code . in-dot) {  % string labels in dots
-          \override #'(barre-type . curved) {       % straight barre
-           \fret-diagram-verbose #'((mute 6) (place-fret 5 3 1) (place-fret 4 5 2) (place-fret 3 5 3) (place-fret 2 5 4) (place-fret 1 3 1) (barre 5 1 3)) }}}}
-    %% C major for guitar, barred on third fret
+    \override #'(size . 1.1) { % 110% of default size
+       \override #'(fret-diagram-details . (
+                     (number-type . roman-lower)
+                    (finger-code . below-string)
+                    (barre-type . straight))) {
+           \fret-diagram-verbose #'((mute 6) 
+                                     (place-fret 5 3 1) 
+                                     (place-fret 4 5 2)
+                                     (place-fret 3 5 3)
+                                     (place-fret 2 5 4)
+                                     (place-fret 1 3 1)
+                                     (barre 5 1 3)) }}
+                                    
+      %% C major for guitar, barred on third fret
+       % verbose style
     c' ^\markup 
-    \override #'(number-type . roman-upper) {  % upper-case roman numeral fret label
-      \override #'(label-dir . -1) {            % label fret at left side of diagram
-       \override #'(finger-code . in-dot) {        % string labels in dots
-          \override #'(barre-type . curved) {         % curved barre
-           \fret-diagram-verbose #'((mute 6) (place-fret 5 3 1) (place-fret 4 5 2) (place-fret 3 5 3) (place-fret 2 5 4) (place-fret 1 3 1) (barre 5 1 3)) }}}}
-
+    \override #'(size . 1.1) { % 110% of default size
+       \override #'(fret-diagram-details . (
+                     (number-type . arabic)
+                    (dot-label-font-mag . 0.9)
+                    (finger-code . in-dot)
+                    (fret-label-font-mag . 0.6)
+                    (fret-label-vertical-offset . 0)
+                    (label-dir . -1)
+                    (mute-string . "M")
+                    (orientation . landscape)
+                    (xo-font-magnification . 0.4)
+                    (xo-padding . 0.3))) {
+           \fret-diagram-verbose #'((mute 6) 
+                                     (place-fret 5 3 1) 
+                                     (place-fret 4 5 2)
+                                     (place-fret 3 5 3)
+                                     (place-fret 2 5 4)
+                                     (place-fret 1 3 1)
+                                     (barre 5 1 3)) }}
     %% simple D chord
 
     d' ^\markup 
-    \override #'(finger-code . below-string) {
-      \override #'(dot-radius . 0.35) {
-       \override #'(dot-position . 0.5) {
-         \override #'(fret-count . 5) {
-           \fret-diagram-terse #"x;x;o;2-1;3-2;2-3;" }}}}
-
+        \override #'(fret-diagram-details . (
+                     (finger-code . below-string)
+                     (dot-radius . 0.35)
+                    (dot-position . 0.5)
+                    (fret-count . 3)))              
+                    {
+           \fret-diagram-terse #"x;x;o;2-1;3-2;2-3;" }
   }
 >>