Index: ChangeLog
===================================================================
RCS file: /cvsroot/lilypond/lilypond/ChangeLog,v
retrieving revision 1.2730
diff -u -r1.2730 ChangeLog
--- ChangeLog	19 Oct 2004 03:37:45 -0000	1.2730
+++ ChangeLog	19 Oct 2004 03:51:27 -0000
@@ -1,5 +1,8 @@
 2004-10-18  Carl Sorensen  <address@hidden>
 
+	* Documentation/user/notation.itely (Fret diagrams): Add documentation
+	for fret diagram markups to user manual
+
 	* scm/fret-diagrams.scm (fret-diagram-terse): Fix mistake in internal
 	documentation for fret-diagram-terse
 
Index: Documentation/user/notation.itely
===================================================================
RCS file: /cvsroot/lilypond/lilypond/Documentation/user/notation.itely,v
retrieving revision 1.136
diff -u -r1.136 notation.itely
--- Documentation/user/notation.itely	13 Oct 2004 04:06:27 -0000	1.136
+++ Documentation/user/notation.itely	19 Oct 2004 03:51:34 -0000
@@ -1390,7 +1390,7 @@
 one voice on the same staff.
 
 @menu
-* Writing polyphonic music::
+* Writing polyphonic music::    
 @end menu
 
 @node Writing polyphonic music
@@ -1552,7 +1552,7 @@
 
 @cindex Automatic beams
 @menu
-* Automatic beams::
+* Automatic beams::             
 * Manual beams::                
 * Setting automatic beam behavior::  
 * Beam formatting::             
@@ -1676,7 +1676,7 @@
 @cindex @code{(begin * * * *)}
 @cindex automatic beams, tuning
 @cindex tuning automatic beaming
-
+f
 @c [TODO: use \applycontext]
 
 In normal time signatures, automatic beams can start on any note but can
@@ -1804,7 +1804,7 @@
 inserted automatically before notes.
 
 @menu
-* Automatic accidentals::
+* Automatic accidentals::       
 @end menu
 
 @node Automatic accidentals
@@ -2726,7 +2726,7 @@
 for repetitions.
 
 @menu
-* Repeat types::
+* Repeat types::                
 * Repeat syntax::               
 * Repeats and MIDI::            
 * Manual repeat commands::      
@@ -4410,6 +4410,7 @@
 * Chord names::                 
 * Chords mode::                 
 * Printing chord names::        
+* Fret diagrams::               
 * Improvisation::               
 @end menu
 
@@ -4417,7 +4418,7 @@
 @subsection Chord names
 @cindex Chords
 
-LilyPond has support for both printing chord names.  Chords may be
+LilyPond has support for printing chord names.  Chords may be
 entered in musical chord notation, i.e. @code{< .. >}, but they can
 also be entered by name.  Internally, the chords are represented as a
 set of pitches, so they can be transposed
@@ -4590,8 +4591,7 @@
   \chordmode {a1 b c} <d' f' a'>  <e' g' b'>
 }
 <<
-  \context ChordNames \harmonies
-  \context Staff \harmonies
+  \context ChordNames \harmonies \context Staff \harmonies
 >>
 @end lilypond
 
@@ -4729,6 +4729,41 @@
 may result in strange chord names when chords are entered with the
 @code{< .. >} syntax.
 
address@hidden Fret diagrams
address@hidden Fret diagrams
address@hidden fret diagrams
address@hidden chord diagrams
+
+Fret diagrams can be added to music as a markup to the desired note. The
+markup contains information about the desired fret diagram, as shown in the
+following example
+
address@hidden, raggetright, quote]
+\context Voice {
+d' ^\markup \fret-diagram #"6-x;5-x;4-o;3-2;2-3;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) (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))
+  }}
+ c' ^\markup  \override #'(dot-radius . 0.35) {
+              \override #'(finger-code . in-dot) {
+              \override #'(dot-color . white) {
+              \fret-diagram-terse #"x;3-1-(;5-2;5-3;5-4;3-1-);"}}}}
address@hidden lilypond
+
+
+There are three different fret-diagram markup interfaces: standard, terse,
+and verbose.  The three interfaces produce equivalent markups, but have
+varying amounts of information in the markup string.  Details about the
+markup interfaces are found at @ref{Overview of text markup commands}. 
+
+You can set a number of graphical properties according to your preference.
+Details about the property interface to fret diagrams are found at 
address@hidden
+
address@hidden
+
+Examples: @inputfileref{input/test,fret-diagram.ly}
 
 @node Improvisation
 @subsection Improvisation
@@ -7691,7 +7726,7 @@
 @menu
 * Balloon help::                
 * Blank music sheet::           
-* Hidden notes::     
+* Hidden notes::                
 * Easy Notation note heads::    
 @end menu