*** empty log message ***

diff --git a/ChangeLog b/ChangeLog
index 62667a79a3353e9b557e9697020d2674726fe36c..069a83945c54894eeb8692b49dd9f457c6368f3f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-10-28  Carl Sorensen  <carldsorensen@comcast.net>
+
+       * Documentation/user/notation.itely (Fret diagrams): add extra
+       notes to example to avoid collisions between fret diagrams.
+

 2004-10-29  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
        * lily/scm-option.cc: add 'resolution to ly:get-option argument
 2004-10-29  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
        * lily/scm-option.cc: add 'resolution to ly:get-option argument

diff --git a/Documentation/user/notation.itely b/Documentation/user/notation.itely
index 0e61b8cd83b1d4b874137f1c042e992b03beff35..0c24d9d39c2182f60e4bf1f1feb8f4cf7a76a1f5 100644 (file)
--- a/Documentation/user/notation.itely
+++ b/Documentation/user/notation.itely
@@ -4743,6 +4743,7 @@ following example
 @lilypond[verbatim, quote]
 \context Voice {
   d' ^\markup \fret-diagram #"6-x;5-x;4-o;3-2;2-3;1-2;"
 @lilypond[verbatim, quote]
 \context Voice {
   d' ^\markup \fret-diagram #"6-x;5-x;4-o;3-2;2-3;1-2;"

+  d' d' d'

   fis' ^\markup \override #'(size . 0.75) {
     \override #'(finger-code . below-string) {
       \fret-diagram-verbose #'((place-fret 6 2 1) (barre 6 1 2)
   fis' ^\markup \override #'(size . 0.75) {
     \override #'(finger-code . below-string) {
       \fret-diagram-verbose #'((place-fret 6 2 1) (barre 6 1 2)


@@ -4751,6 +4752,7 @@ following example
                                (place-fret 1 2 1))
     }
   }
                                (place-fret 1 2 1))
     }
   }

+  fis' fis' fis'

   c' ^\markup  \override #'(dot-radius . 0.35) {
     \override #'(finger-code . in-dot) {
       \override #'(dot-color . white) {
   c' ^\markup  \override #'(dot-radius . 0.35) {
     \override #'(finger-code . in-dot) {
       \override #'(dot-color . white) {


@@ -4758,6 +4760,7 @@ following example
       }
     }
   }
       }
     }
   }

+  c' c' c' c'

 }
 @end lilypond
 
 }
 @end lilypond