X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Documentation%2Fuser%2Ffretted-strings.itely;h=1f153e3d9b18916d01406620b705602ea93dca1d;hb=374d57cf9b68ddf32a95409ce08ba75816900f6b;hp=eb645ebaa324924bdb040f0f15a49bb6e0503d1e;hpb=182efb446c931203ff00a376cca609a7e979d2dc;p=lilypond.git

diff --git a/Documentation/user/fretted-strings.itely b/Documentation/user/fretted-strings.itely
index eb645ebaa3..1f153e3d9b 100644
--- a/Documentation/user/fretted-strings.itely
+++ b/Documentation/user/fretted-strings.itely
@@ -6,7 +6,7 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.11.65"
+@c \version "2.12.0"
 
 @node Fretted string instruments
 @section Fretted string instruments
@@ -59,19 +59,22 @@ Some other elements pertinent to fretted string instruments
 are covered elsewhere:
 
 @itemize
-@item Fingerings are indicated with @ref{Fingering instructions}.
+@item Fingerings are indicated as shown in @ref{Fingering instructions}.
 
 @item Instructions for @notation{Laissez vibrer} ties
-as well as ties on arpeggios and tremolos is described in
+as well as ties on arpeggios and tremolos can be found in
 @ref{Ties}.
 
-@item Instructions on handling multiple voices is described
+@item Instructions for handling multiple voices can be found
 in @ref{Collision resolution}.
 
+@item Instructions for indicating harmonics can be found in
+@ref{Harmonics}.
+
 @end itemize
 
-@seealso
 
+@seealso
 Notation Reference:
 @ref{Fingering instructions},
 @ref{Ties},
@@ -82,6 +85,7 @@ Notation Reference:
 @ref{List of articulations},
 @ref{Clef}.
 
+
 @node String number indications
 @unnumberedsubsubsec String number indications
 
@@ -120,8 +124,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 +215,8 @@ notation.
 @lilypondfile[verbatim,lilyquote,texidoc,doctitle]
 {polyphony-in-tablature.ly}
 
-@seealso
 
+@seealso
 Notation Reference:
 @ref{Stems}.
 
@@ -225,6 +229,7 @@ Internals Reference:
 @rinternals{TabVoice},
 @rinternals{Beam}.
 
+
 @knownissues
 
 Chords are not handled in a special way, and hence the automatic
@@ -269,7 +274,7 @@ specified.  The tuning of the strings is given in the
 @code{StringTunings} property.
 
 LilyPond comes with predefined string tunings for banjo, mandolin,
-guitar and bass guitar.  Lilypond automatically sets the correct
+guitar and bass guitar.  LilyPond automatically sets the correct
 transposition for predefined tunings.  The following example is
 for bass guitar, which sounds an octave lower than written.
 
@@ -305,7 +310,7 @@ from highest pitch to lowest pitch, but some instruments
 
 A string pitch in a string tuning list is the pitch difference
 of the open string from middle C measured in semitones.  The
-string pitch must be an integer.  Lilypond calculates the actual
+string pitch must be an integer.  LilyPond calculates the actual
 pitch of the string by adding the string tuning pitch to the
 actual pitch for middle C.
 
@@ -335,8 +340,8 @@ mynotes = {
 >>
 @end lilypond
 
-@seealso
 
+@seealso
 Installed Files:
 @file{scm/output-lib.scm}.
 
@@ -602,14 +607,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 +645,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 +714,6 @@ markup, the interface properties belong to @code{Voice.TextScript}.
 
 
 @seealso
-
 Notation Reference:
 @ref{Text markup commands}.
 
@@ -707,6 +723,7 @@ Snippets:
 Internals Reference:
 @rinternals{fret-diagram-interface}.
 
+
 @node Predefined fret diagrams
 @unnumberedsubsubsec Predefined fret diagrams
 
@@ -836,8 +853,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"
@@ -861,17 +880,19 @@ mychords = \chordmode{
 @end lilypond
 
 Different fret diagrams for the same chord name can be stored using different
-octaves of pitches.
+octaves of pitches.  The different octave should be at least two octaves
+above or below the default octave, because the octaves above and  below the
+default octave are used for transposing fretboards.
 
 @lilypond[verbatim, ragged-right, quote]
 \include "predefined-guitar-fretboards.ly"
 
-\storePredefinedDiagram \chordmode {c'}
+\storePredefinedDiagram \chordmode {c''}
                         #guitar-tuning
-                        #(offset-fret 2 (chord-shape 'bes))
+                        #(offset-fret 2 (chord-shape 'bes guitar-tuning))
 
 mychords = \chordmode{
-  c1 c'
+  c1 c''
 }
 
 <<
@@ -896,26 +917,30 @@ 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'}
+\storePredefinedDiagram \chordmode {f''}
                         #guitar-tuning
-                        #(chord-shape 'powerf)
-\storePredefinedDiagram \chordmode {g'}
+                        #(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'
+  f1 f'' g g''
 }
 
 <<
@@ -942,8 +967,10 @@ predefined fret diagram, the interface properties belong to
 @lilypondfile[verbatim,lilyquote,texidoc,doctitle]
 {defining-predefined-fretboards-for-other-instruments.ly}
 
-@seealso
+@lilypondfile[verbatim,lilyquote,texidoc,doctitle]
+{chordchanges-for-fretboards.ly}
 
+@seealso
 Notation Reference:
 @ref{Custom tablatures},
 @ref{Automatic fret diagrams},
@@ -1098,12 +1125,14 @@ Details are found at @rinternals{fret-diagram-interface}.  For a
 @code{FretBoards} fret diagram, the interface properties belong to
 @code{FretBoards.FretBoard}.
 
+
 @predefined
 @code{\predefinedFretboardsOff},
 @code{\predefinedFretboardsOn}.
+@endpredefined
 
-@seealso
 
+@seealso
 Notation Reference:
 @ref{Custom tablatures}.
 
@@ -1157,8 +1186,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}.
 
@@ -1173,7 +1202,7 @@ Most of the notational issues associated with guitar music are
 covered sufficiently in the general fretted strings section, but there
 are a few more worth covering here.  Occasionally users want to
 create songbook-type documents having only lyrics with chord
-indications above them.  Since Lilypond is a music typesetter,
+indications above them.  Since LilyPond is a music typesetter,
 it is not recommended for documents that have no music notation
 in them.  A better alternative is a word processor, text editor,
 or, for experienced users, a typesetter like GuitarTeX.
@@ -1202,8 +1231,8 @@ b16 d g b e
 e16 b g d
 @end lilypond
 
-@seealso
 
+@seealso
 Notation Reference:
 @ref{Text spanners}.
 
@@ -1211,6 +1240,7 @@ Snippets:
 @rlsr{Fretted strings},
 @rlsr{Expressive marks}.
 
+
 @node Indicating harmonics and dampened notes
 @unnumberedsubsubsec Indicating harmonics and dampened notes
 
@@ -1233,8 +1263,8 @@ text markup.
 }
 @end lilypond
 
-@seealso
 
+@seealso
 Snippets:
 @rlsr{Fretted strings}.
 
@@ -1242,6 +1272,7 @@ Notation Reference:
 @ref{Special note heads},
 @ref{Note head styles}.
 
+
 @node Banjo
 @subsection Banjo
 
@@ -1295,14 +1326,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.
-
-
-
-
-