X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=input%2Flsr%2Ffret-diagrams-explained-and-developed.ly;h=3d8a68e94b78e40837407a22ce10f424eb6fa845;hb=3eb1e37e2e0b3966142cd04b85e30ab882308612;hp=ff25b711c1e96917172f9e1156026456d7947275;hpb=bb91de5b7f8c4f753452730101c2422946067cc3;p=lilypond.git

diff --git a/input/lsr/fret-diagrams-explained-and-developed.ly b/input/lsr/fret-diagrams-explained-and-developed.ly
index ff25b711c1..3d8a68e94b 100644
--- a/input/lsr/fret-diagrams-explained-and-developed.ly
+++ b/input/lsr/fret-diagrams-explained-and-developed.ly
@@ -1,27 +1,32 @@
-%% Do not edit this file; it is auto-generated from input/new
+%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.12.0"
+\version "2.13.1"
 
 \header {
-  lsrtags = "fretted-strings,tweaks-and-overrides"
-  texidoc = "This snippet shows many possibilities for obtaining
-and tweaking fret diagrams."
+  lsrtags = "fretted-strings, tweaks-and-overrides"
+
+  texidoc = "
+This snippet shows many possibilities for obtaining and tweaking fret
+diagrams.
+
+"
   doctitle = "Fret diagrams explained and developed"
 } % begin verbatim
 
-
 <<
   \chords {
     a2 a
-    c2 c
-    d1
+    \repeat unfold 3 {
+      c c c d d
+    }
   }
   
   \new Voice = "mel" {
     \textLengthOn
     % Set global properties of fret diagram
     \override TextScript #'size = #1.2
-    \override TextScript #'fret-diagram-details #'finger-code = #'below-string
+    \override TextScript 
+      #'fret-diagram-details #'finger-code = #'below-string
     \override TextScript #'fret-diagram-details #'dot-color = #'black
     
     %% A chord for ukelele
@@ -45,6 +50,8 @@ and tweaking fret diagrams."
       }
     }
     
+      %% These chords will be in normal orientation
+
     %% C major for guitar, barred on third fret
     %  verbose style
     %  roman fret label, finger labels below string, straight barre
@@ -67,6 +74,7 @@ and tweaking fret diagrams."
     }
     
     %% C major for guitar, barred on third fret
+    %% Double barre used to test barre function
     %  verbose style
     c'2^\markup {
       % 110% of default size
@@ -79,7 +87,6 @@ and tweaking fret diagrams."
                      (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)
@@ -88,17 +95,252 @@ and tweaking fret diagrams."
                                    (place-fret 3 5 3)
                                    (place-fret 2 5 4)
                                    (place-fret 1 3 1)
+                                   (barre 4 2 5)
                                    (barre 5 1 3))
         }
       }
     }
     
+    %% C major for guitar, with capo on third fret
+    %  verbose style
+    c'2^\markup {
+      % 110% of default size
+      \override #'(size . 1.1) {
+        \override #'(fret-diagram-details . (
+                     (number-type . roman-upper)
+                     (dot-label-font-mag . 0.9)
+                     (finger-code . none)
+                     (fret-label-vertical-offset . 0.5)
+                     (xo-font-magnification . 0.4)
+                     (xo-padding . 0.3))) {
+          \fret-diagram-verbose #'((mute 6)
+                                   (capo 3)
+                                   (open 5)
+                                   (place-fret 4 5 1)
+                                   (place-fret 3 5 2)
+                                   (place-fret 2 5 3)
+                                   (open 1))
+        }
+      }
+    }
+    
     %% simple D chord
-    d'1^\markup {
+    d'2^\markup {
+      \override #'(fret-diagram-details . (
+                   (finger-code . below-string)
+                   (dot-radius . 0.35)
+                   (string-thickness-factor . 0.3)
+                   (dot-position . 0.5)
+                   (fret-count . 3))) {
+        \fret-diagram-terse #"x;x;o;2-1;3-2;2-3;"
+      }
+    }
+
+    %% simple D chord, large top fret thickness
+    d'2^\markup  {
+      \override #'(fret-diagram-details . (
+                   (finger-code . below-string)
+                   (dot-radius . 0.35)
+                   (dot-position . 0.5)
+                   (top-fret-thickness . 7)
+                   (fret-count . 3))) {
+        \fret-diagram-terse #"x;x;o;2-1;3-2;2-3;"
+      }
+    }
+
+      % These chords will be in landscape orientation
+    \override TextScript 
+       #'fret-diagram-details #'orientation = #'landscape
+
+    %% C major for guitar, barred on third fret
+    %  verbose style
+    %  roman fret label, finger labels below string, straight barre
+    c'2^\markup {
+      % 110% of default size
+      \override #'(size . 1.1) {
+        \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
+    %% Double barre used to test barre function
+    %  verbose style
+    c'2^\markup {
+      % 110% of default size
+      \override #'(size . 1.1) {
+        \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")
+                     (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 4 2 5)
+                                   (barre 5 1 3))
+        }
+      }
+    }
+    
+    %% C major for guitar, with capo on third fret
+    %  verbose style
+    c'2^\markup {
+      % 110% of default size
+      \override #'(size . 1.1) {
+        \override #'(fret-diagram-details . (
+                     (number-type . roman-upper)
+                     (dot-label-font-mag . 0.9)
+                     (finger-code . none)
+                     (fret-label-vertical-offset . 0.5)
+                     (xo-font-magnification . 0.4)
+                     (xo-padding . 0.3))) {
+          \fret-diagram-verbose #'((mute 6)
+                                   (capo 3)
+                                   (open 5)
+                                   (place-fret 4 5 1)
+                                   (place-fret 3 5 2)
+                                   (place-fret 2 5 3)
+                                   (open 1))
+        }
+      }
+    }
+    
+    %% simple D chord
+    d'2^\markup {
+      \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;"
+      }
+    }
+
+    %% simple D chord, large top fret thickness
+    d'2^\markup {
+      \override #'(fret-diagram-details . (
+                   (finger-code . below-string)
+                   (dot-radius . 0.35)
+                   (dot-position . 0.5)
+                   (top-fret-thickness . 7)
+                   (fret-count . 3))) {
+        \fret-diagram-terse #"x;x;o;2-1;3-2;2-3;"
+      }
+    }
+
+      % These chords will be in opposing-landscape orientation
+    \override TextScript #'fret-diagram-details 
+                           #'orientation = #'opposing-landscape
+
+    %% C major for guitar, barred on third fret
+    %  verbose style
+    %  roman fret label, finger labels below string, straight barre
+    c'2^\markup {
+      % 110% of default size
+      \override #'(size . 1.1) {
+        \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
+    %% Double barre used to test barre function
+    %  verbose style
+    c'2^\markup {
+      % 110% of default size
+      \override #'(size . 1.1) {
+        \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")
+                     (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 4 2 5)
+                                   (barre 5 1 3))
+        }
+      }
+    }
+    
+    %% C major for guitar, with capo on third fret
+    %  verbose style
+    c'2^\markup {
+      % 110% of default size
+      \override #'(size . 1.1) {
+        \override #'(fret-diagram-details . (
+                     (number-type . roman-upper)
+                     (dot-label-font-mag . 0.9)
+                     (finger-code . none)
+                     (fret-label-vertical-offset . 0.5)
+                     (xo-font-magnification . 0.4)
+                     (xo-padding . 0.3))) {
+          \fret-diagram-verbose #'((mute 6)
+                                   (capo 3)
+                                   (open 5)
+                                   (place-fret 4 5 1)
+                                   (place-fret 3 5 2)
+                                   (place-fret 2 5 3)
+                                   (open 1))
+        }
+      }
+    }
+    
+    %% simple D chord
+    d'2^\markup {
+      \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;"
+      }
+    }
+
+    %% simple D chord, large top fret thickness
+    d'2^\markup {
       \override #'(fret-diagram-details . (
                    (finger-code . below-string)
                    (dot-radius . 0.35)
                    (dot-position . 0.5)
+                   (top-fret-thickness . 7)
                    (fret-count . 3))) {
         \fret-diagram-terse #"x;x;o;2-1;3-2;2-3;"
       }