*** empty log message ***

[lilypond.git] / Documentation / user / notation.itely

diff --git a/Documentation/user/notation.itely b/Documentation/user/notation.itely
index fade972c13a72be756281174a84a3d5d455ad74b..ca8228a6b46f5d3abc076973bcd04af4722df101 100644 (file)
--- a/Documentation/user/notation.itely
+++ b/Documentation/user/notation.itely
@@ -1,4 +1,4 @@
-@c Note: -*-texinfo-*-
+@c -*- coding: latin-1; mode: texinfo; -*-
 @c This file is part of lilypond.tely
 
 @c A menu is needed before every deeper *section nesting of @node's; run
@@ -236,9 +236,10 @@ must be done with multi-measure rests.  They are discussed in
 
 
 A rest's vertical position may be explicitly specified by entering a
-note with the @code{\rest} keyword appended.  This makes manual
-formatting in polyphonic music easier.  Automatic rest collision
-formatting will leave these rests alone
+note with the @code{\rest} keyword appended, the rest will be placed at
+the note's place.  This makes manual formatting in polyphonic music
+easier.  Automatic rest collision formatting will leave these rests
+alone
 
 @lilypond[fragment,quote,raggedright,verbatim]
 a'4\rest d'4\rest
@@ -305,11 +306,12 @@ Program reference: @internalsref{SkipEvent}, @internalsref{SkipMusic}.
 @cindex @code{\maxima}
 
 
-In Note, Chord, and Lyrics mode, durations are designated by numbers
-and dots: durations are entered as their reciprocal values.  For example,
-a quarter note is entered using a @code{4} (since it is a 1/4 note), while
-a half note is entered using a @code{2} (since it is a 1/2 note).  For notes
-longer than a whole you must use variables
+In Note, Chord, and Lyrics mode, durations are designated by numbers and
+dots: durations are entered as their reciprocal values.  For example, a
+quarter note is entered using a @code{4} (since it is a 1/4 note), while
+a half note is entered using a @code{2} (since it is a 1/2 note).  For
+notes longer than a whole you must use the variables @code{\longa} and
+@code{\breve}
 
 @example 
 c'\breve  
@@ -819,6 +821,9 @@ Not all durations (especially those containing tuplets) can be
 represented exactly with normal notes and dots, but the engraver will
 not insert tuplets.
 
+The @internalsref{Completion_heads_engraver} can be combined with
+@code{\lyricsto} or @code{\addlyrics}.
+
 @seealso
 
 Examples: @inputfileref{input/regression,completion-heads.ly}.
@@ -884,9 +889,9 @@ exactly on the bar line.
 
 @cindex @code{\key}
 
-The key signature indicates the scale in which a piece is played.  It
-is denoted by a set of alterations (flats or sharps) at the start of
-the staff.
+The key signature indicates the tonality in which a piece is played.  It
+is denoted by a set of alterations (flats or sharps) at the start of the
+staff.
 
 
 Setting or changing the key signature is done with the @code{\key}
@@ -4408,6 +4413,7 @@ This section discusses issues that arise when writing popular music.
 * Chord names::                 
 * Chords mode::                 
 * Printing chord names::        
+* Fret diagrams::               
 * Improvisation::               
 @end menu
 
@@ -4415,10 +4421,10 @@ This section discusses issues that arise when writing popular music.
 @subsection Chord names
 @cindex Chords
 
-LilyPond has support for both 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
+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
 
 
 @lilypond[quote,raggedright,verbatim,raggedright]
@@ -4686,7 +4692,7 @@ The predefined variables @code{\germanChords},
 @code{\semiGermanChords} set these variables.  The effect is
 demonstrated here,
 
-@lilypondfile[raggedright,]{chord-names-german.ly}
+@lilypondfile[raggedright]{chord-names-german.ly}
 
 There are also two other chord name schemes implemented: an alternate
 Jazz chord notation, and a systematic scheme called Banter chords.  The
@@ -4728,6 +4734,55 @@ may result in strange chord names when chords are entered with the
 @code{< .. >} syntax.
 
 
+@node Fret diagrams
+@subsection Fret diagrams
+@cindex fret diagrams
+@cindex 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
+
+@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)
+                               (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' fis' fis'
+  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-);"
+      }
+    }
+  }
+  c' c' c' c'
+}
+@end 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 
+@internalsref{fret-diagram-interface}.
+
+
+@seealso
+
+Examples: @inputfileref{input/test,fret-diagram.ly}
+
+
 @node Improvisation
 @subsection Improvisation