Change example for fret diagrams to show opposing-landscape

diff --git a/input/new/fret-diagrams-explained-and-developed.ly b/input/new/fret-diagrams-explained-and-developed.ly
index a5b548e497241430bbf5da9246c842198bb518b5..b37fd5f8ad68b89964db21c1542819a429e5ce5d 100644 (file)
--- a/input/new/fret-diagrams-explained-and-developed.ly
+++ b/input/new/fret-diagrams-explained-and-developed.ly
@@ -10,15 +10,17 @@ and tweaking fret diagrams."
 <<
   \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
@@ -42,6 +44,206 @@ 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
+    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 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
@@ -64,6 +266,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
@@ -76,7 +279,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)
@@ -85,17 +287,53 @@ 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)
+                   (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;"
       }