From: Carl Sorensen <c_sorensen@byu.edu>
Date: Wed, 27 Oct 2004 00:56:49 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: release/2.3.25~6
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=5e065b5a37b39ec2d08c66c91043524e748d8027;p=lilypond.git

*** empty log message ***
---

diff --git a/ChangeLog b/ChangeLog
index 1689c9f5a5..746e64e25f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2004-10-26  Carl Sorensen  <carldsorensen@comcast.net>
 
+	* input/test/fret-diagram.ly: insert breaks, remove raggedright to
+	improve fret diagram spacing in printed output.
+
 	* Documentation/user/notation.itely (Fret diagrams): Remove raggedright
 	from options for the example so fret-diagrams won't overlap
 	one another.
diff --git a/input/test/fret-diagram.ly b/input/test/fret-diagram.ly
index f5db28fd7c..c3ab7757f2 100644
--- a/input/test/fret-diagram.ly
+++ b/input/test/fret-diagram.ly
@@ -7,21 +7,21 @@
 
 \score {
     <<
-       \chords {d2. d d s fis fis fis s c c c}
+       \chords {d2 d d s fis fis fis s c c c}
        
      \context Voice=mel {
 % simple D chord
 
-    d'2. ^\markup \fret-diagram-verbose #'((mute 6) (mute 5) (open 4) (place-fret 3 2) (place-fret 2 3) (place-fret 1 2))
+    d'2 ^\markup \fret-diagram-verbose #'((mute 6) (mute 5) (open 4) (place-fret 3 2) (place-fret 2 3) (place-fret 1 2))
     d' ^\markup \fret-diagram #"6-x;5-x;4-o;3-2;2-3;1-2;"
     d' ^\markup \fret-diagram-terse #"x;x;o;2;3;2;"
-    r
+    r \break
 % fis major chord, 3/4 size, fingering labeled below string
     
     fis' ^\markup \override #'(size . 0.75) {\override #'(finger-code . below-string){\fret-diagram-verbose #'((place-fret 6 2 1) (barre 6 1 2) (place-fret 5 4 3) (place-fret 4 4 4) (place-fret 3 3 2) (place-fret 2 2 1) (place-fret 1 2 1))}}
     fis' ^\markup \override #'(finger-code . below-string) {\fret-diagram #"s:0.75;c:6-1-2;6-2-1;5-4-3;4-4-4;3-3-2;2-2-1;1-2-1;"}
     fis' ^\markup \override #'(size . 0.75) {\override #'(finger-code . below-string){\fret-diagram-terse #"2-1-(;4-3;4-4;3-2;2-1;2-1-);"}}
-    r
+    r \break
 
 % c major barre chord, fingering labeled on frets
    c' ^\markup \override #'(dot-color . white) {
@@ -32,7 +32,7 @@
                 \override #'(finger-code . in-dot) {
                 \override #'(dot-color . white) {
                 \fret-diagram-terse #"x;3-1-(;5-2;5-3;5-4;3-1-);"}}}
-   r 
+   r  \break
    
 % c major scale using open strings
   c' ^\markup \fret-diagram-verbose #'((mute 6) (place-fret 5 3) (open 4) (place-fret 4 2) (place-fret 4 3) (open 3) (place-fret 3 2)  (open 2) (place-fret 2 1) (mute 1))
@@ -43,10 +43,11 @@
   c' ^\markup \fret-diagram-verbose #'((mute 6) (place-fret 5 3) (place-fret 5 5) (place-fret 4 2) (place-fret 4 3) (place-fret 4 5) (place-fret 3 2)  (place-fret 3 4) (place-fret 3 5) (mute 2) (mute 1))
   c' ^\markup \fret-diagram #'"6-x;5-3;5-5;4-2;4-3;4-5;3-2;3-4;3-5;2-x;1-x;"
   c' ^\markup \fret-diagram-terse #'"x;3 5;2 3 5;2 4 5;x;x;"
+  \break
   
 % g major scale, no open strings, two octaves on six strings, white dots
   g' ^\markup \override #'(dot-color . white) {\fret-diagram-terse #'"3 5;2 3 5;2 4 5;2 4 5;3 5;2 3;" }
-  }
+  r r r}
     >>
-  \layout{ raggedright = ##t }
+  \layout{ raggedright = ##f }
 }