X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=input%2Fregression%2Ffret-diagrams.ly;h=ec383e510442aeb958252914d9dadb898b370048;hb=a3bb260f7e9420412dc1fa05afc92eeb1dbed32f;hp=03ff52b5eeb5e5f4c9066e8f08665d58f36efe7d;hpb=7043b5d2a6a70935ef0e84b62dc021452e28a59f;p=lilypond.git

diff --git a/input/regression/fret-diagrams.ly b/input/regression/fret-diagrams.ly
index 03ff52b5ee..ec383e5104 100644
--- a/input/regression/fret-diagrams.ly
+++ b/input/regression/fret-diagrams.ly
@@ -1,48 +1,56 @@
-% regression test for fret diagram markups
-\version "2.5.27"
-\score {
-    <<
-       \chords {s2 c c c d}
-       
-     \context Voice=mel {
-
-% A chord for ukelele
-   a'2 ^\markup
-       \override #'(string-count . 4) {
-       \override #'(dot-color . white) {
+%% regression test for fret diagram markups
+
+
+\version "2.10.0"
+
+\paper {
+
+  %% stretch to prevent diagrams from colliding.
+  line-width = 18.0 \cm
+}
+
+
+<<
+  \chords {s2 c c c d}
+  
+  \new Voice =mel {
+
+    %% 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
+    %% 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
-  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
+	    \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
+    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
-  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
+	    \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
+    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)) }}}}
+	    \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
+    %% 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 #'(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;" }}}}
+
+  }
+>>