Merge commit 'origin' into beamlets2

[lilypond.git] / Documentation / user / fretted-strings.itely

diff --git a/Documentation/user/fretted-strings.itely b/Documentation/user/fretted-strings.itely
index 65290e1f80578f13b1cd06e2dde6c2c9d1f4ee20..26eeeedca8c8160bc539afcaf5ce1b7d0b68cb80 100644 (file)
--- a/Documentation/user/fretted-strings.itely
+++ b/Documentation/user/fretted-strings.itely
@@ -70,8 +70,8 @@ in @ref{Collision resolution}.
 
 @end itemize
 
-@seealso
 
+@seealso
 Notation Reference:
 @ref{Fingering instructions},
 @ref{Ties},
@@ -82,6 +82,7 @@ Notation Reference:
 @ref{List of articulations},
 @ref{Clef}.
 
+
 @node String number indications
 @unnumberedsubsubsec String number indications
 
@@ -120,8 +121,8 @@ in the code:
 @lilypondfile[verbatim,lilyquote,texidoc,doctitle]
 {allowing-fingerings-to-be-printed-inside-the-staff.ly}
 
-@seealso
 
+@seealso
 Notation Reference:
 @ref{Fingering instructions}.
 
@@ -211,8 +212,8 @@ notation.
 @lilypondfile[verbatim,lilyquote,texidoc,doctitle]
 {polyphony-in-tablature.ly}
 
-@seealso
 
+@seealso
 Notation Reference:
 @ref{Stems}.
 
@@ -225,6 +226,7 @@ Internals Reference:
 @rinternals{TabVoice},
 @rinternals{Beam}.
 
+
 @knownissues
 
 Chords are not handled in a special way, and hence the automatic
@@ -335,8 +337,8 @@ mynotes = {
 >>
 @end lilypond
 
-@seealso
 
+@seealso
 Installed Files:
 @file{scm/output-lib.scm}.
 
@@ -602,14 +604,18 @@ element of the list indicates an item to be placed on the fret diagram.
 @end lilypond
 
 Fingering indications and barres can be included in a
-fret-diagram-verbose markup string.
+fret-diagram-verbose markup string.  Unique to the 
+fret-diagram-verbose interface is a capo indication that 
+can be placed on the fret diagram.  The capo indication is
+a thick bar that covers all strings.  The fret with the
+capo will be the lowest fret in the fret diagram.
 
 @c \override is necessary to make fingering visible
 @lilypond[quote, verbatim]
 <<
   \context ChordNames {
      \chordmode {
-       f1 g
+       f1 g c
      }
   }
   \context Staff {
@@ -636,7 +642,15 @@ fret-diagram-verbose markup string.
         (open 2)
         (place-fret 1 3 3)
       )
-  }
+    < c e g c' e'> ^\markup
+      \fret-diagram-verbose #'(
+        (capo 3)
+        (mute 6)
+        (place-fret 4 5 1)
+        (place-fret 3 5 2)
+        (place-fret 2 5 3)
+      )
+   }
 >>
 @end lilypond
 
@@ -697,7 +711,6 @@ markup, the interface properties belong to @code{Voice.TextScript}.
 
 
 @seealso
-
 Notation Reference:
 @ref{Text markup commands}.
 
@@ -707,6 +720,7 @@ Snippets:
 Internals Reference:
 @rinternals{fret-diagram-interface}.
 
+
 @node Predefined fret diagrams
 @unnumberedsubsubsec Predefined fret diagrams
 
@@ -836,8 +850,10 @@ mychords = \chordmode{
 @cindex adding custom fret diagrams
 
 Fret diagrams can be added to the fret diagram table.  To add a diagram,
-you must specify the chord for the diagram, the tuning to be used, and the
-fret-diagram-terse definition string for the diagram.
+you must specify the chord for the diagram, the tuning to be used, and 
+a definition for the diagram.  The diagram definition can be either a
+fret-diagram-terse definition string or a fret-diagram-verbose
+marking list.
 
 @lilypond[verbatim, ragged-right, quote]
 \include "predefined-guitar-fretboards.ly"
@@ -868,7 +884,7 @@ octaves of pitches.
 
 \storePredefinedDiagram \chordmode {c'}
                         #guitar-tuning
-                        #(offset-fret 2 (chord-shape 'bes))
+                        #(offset-fret 2 (chord-shape 'bes guitar-tuning))
 
 mychords = \chordmode{
   c1 c'
@@ -896,23 +912,27 @@ In addition to fret diagrams, LilyPond stores an internal list of chord
 shapes.  The chord shapes are fret diagrams that can be shifted along
 the neck to different posistions to provide different chords.  Chord
 shapes can be added to the internal list and then used to define
-predefined fret diagrams.
+predefined fret diagrams.  Because they can be moved to various
+positions on the neck, chord shapes will normally not contain
+any open strings.  Like fret diagrams, chord shapes can be
+entered as either fret-diagram-terse strings or fret-diagram-verbose
+marking lists.
 
 @lilypond[verbatim, ragged-right, quote]
 \include "predefined-guitar-fretboards.ly"
 
 % add a new chord shape
 
-\addChordShape #'powerf #"1-1;3-3;3-4;x;x;x;"
+\addChordShape #'powerf #guitar-tuning #"1-1;3-3;3-4;x;x;x;"
 
 % add some new chords based on the power chord shape
 
 \storePredefinedDiagram \chordmode {f'}
                         #guitar-tuning
-                        #(chord-shape 'powerf)
+                        #(chord-shape 'powerf guitar-tuning) 
 \storePredefinedDiagram \chordmode {g'}
                         #guitar-tuning
-                        #(offset-fret 2 (chord-shape 'powerf))
+                        #(offset-fret 2 (chord-shape 'powerf guitar-tuning))
 
 mychords = \chordmode{
   f1 f' g g'
@@ -942,8 +962,8 @@ predefined fret diagram, the interface properties belong to
 @lilypondfile[verbatim,lilyquote,texidoc,doctitle]
 {defining-predefined-fretboards-for-other-instruments.ly}
 
-@seealso
 
+@seealso
 Notation Reference:
 @ref{Custom tablatures},
 @ref{Automatic fret diagrams},
@@ -1106,7 +1126,6 @@ Details are found at @rinternals{fret-diagram-interface}.  For a
 
 
 @seealso
-
 Notation Reference:
 @ref{Custom tablatures}.
 
@@ -1160,8 +1179,8 @@ short, for example @code{RH},
 @lilypondfile[verbatim,lilyquote,texidoc,doctitle]
 {fingerings,-string-indications,-and-right-hand-fingerings.ly}
 
-@seealso
 
+@seealso
 Snippets:
 @rlsr{Fretted strings}.
 
@@ -1205,8 +1224,8 @@ b16 d g b e
 e16 b g d
 @end lilypond
 
-@seealso
 
+@seealso
 Notation Reference:
 @ref{Text spanners}.
 
@@ -1214,6 +1233,7 @@ Snippets:
 @rlsr{Fretted strings},
 @rlsr{Expressive marks}.
 
+
 @node Indicating harmonics and dampened notes
 @unnumberedsubsubsec Indicating harmonics and dampened notes
 
@@ -1236,8 +1256,8 @@ text markup.
 }
 @end lilypond
 
-@seealso
 
+@seealso
 Snippets:
 @rlsr{Fretted strings}.
 
@@ -1245,6 +1265,7 @@ Notation Reference:
 @ref{Special note heads},
 @ref{Note head styles}.
 
+
 @node Banjo
 @subsection Banjo
 
@@ -1298,14 +1319,9 @@ These tunings may be converted to four-string banjo tunings using the
 \set TabStaff.stringTunings = #(four-string-banjo banjo-c-tuning)
 @end example
 
-@seealso
 
+@seealso
 Snippets:
 @rlsr{Fretted strings}.
 
 The file @file{scm/@/output@/-lib@/.scm} contains predefined banjo tunings.
-
-
-
-
-