Merge remote-tracking branch 'origin/translation'

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

diff --git a/Documentation/notation/fretted-strings.itely b/Documentation/notation/fretted-strings.itely
index c4bf631efefd6e190bcd8190eba15bfc9c6c47be..235ab931587fe347af7392a7cec212a58f8a592c 100644 (file)
--- a/Documentation/notation/fretted-strings.itely
+++ b/Documentation/notation/fretted-strings.itely
@@ -7,7 +7,7 @@
     Guide, node Updating translation committishes..
 @end ignore
 
     Guide, node Updating translation committishes..
 @end ignore
 

-@c \version "2.15.16"
+@c \version "2.19.2"

 
 @node Fretted string instruments
 @section Fretted string instruments
 
 @node Fretted string instruments
 @section Fretted string instruments


@@ -76,7 +76,6 @@ in @ref{Collision resolution}.
 
 @end itemize
 
 
 @end itemize
 

-

 @seealso
 Notation Reference:
 @ref{Fingering instructions},
 @seealso
 Notation Reference:
 @ref{Fingering instructions},


@@ -98,25 +97,25 @@ Notation Reference:
 @cindex fingering vs. string numbers
 
 The string on which a note should be played may be indicated by
 @cindex fingering vs. string numbers
 
 The string on which a note should be played may be indicated by

-appending @code{\@var{number}} to a note inside a chord construct
-@code{<>}.
-
-@warning{String numbers @strong{must} be defined inside a chord
-construct even if there is only a single note.}
+appending @code{\@var{number}} to a note.

 
 @lilypond[verbatim,quote,relative=0]
 \clef "treble_8"
 
 @lilypond[verbatim,quote,relative=0]
 \clef "treble_8"

-<c\5>4 <e\4> <g\3>2
+c4\5 e\4 g2\3

 <c,\5 e\4 g\3>1
 @end lilypond
 
 When fingerings and string indications are used together, their
 <c,\5 e\4 g\3>1
 @end lilypond
 
 When fingerings and string indications are used together, their

-placement is controlled by the order in which the two items appear
-in the code:
+placement can be controlled by the order in which the two items appear
+in the code @emph{only} if they appear inside of an explicit chord:
+applied to whole chords or single notes @emph{outside} of chords,
+fingerings are placed using a different mechanism.

 
 @lilypond[verbatim,quote,relative=1]
 \clef "treble_8"
 
 @lilypond[verbatim,quote,relative=1]
 \clef "treble_8"

-<g\3-0>2
+g4\3-0
+g-0\3
+<g\3-0>

 <g-0\3>
 @end lilypond
 
 <g-0\3>
 @end lilypond
 


@@ -128,7 +127,6 @@ in the code:
 @lilypondfile[verbatim,quote,texidoc,doctitle]
 {allowing-fingerings-to-be-printed-inside-the-staff.ly}
 
 @lilypondfile[verbatim,quote,texidoc,doctitle]
 {allowing-fingerings-to-be-printed-inside-the-staff.ly}
 

-

 @seealso
 Notation Reference:
 @ref{Fingering instructions}.
 @seealso
 Notation Reference:
 @ref{Fingering instructions}.


@@ -182,7 +180,7 @@ symbols = {
   c4-.^"Allegro" d( e)
   f4-.\f g a^\fermata
   \mark \default
   c4-.^"Allegro" d( e)
   f4-.\f g a^\fermata
   \mark \default

-  c8_.\<\( c16 c~ c2\!
+  c8_.\<\( c16 c~ 2\!

   c'2.\prall\)
 }
 
   c'2.\prall\)
 }
 


@@ -208,7 +206,7 @@ symbols = {
   c4-.^"Allegro" d( e)
   f4-.\f g a^\fermata
   \mark \default
   c4-.^"Allegro" d( e)
   f4-.\f g a^\fermata
   \mark \default

-  c8_.\<\( c16 c~ c2\!
+  c8_.\<\( c16 c~ 2\!

   c'2.\prall\)
 }
 
   c'2.\prall\)
 }
 


@@ -223,19 +221,23 @@ symbols = {
 @cindex fret
 
 @funindex minimumFret
 @cindex fret
 
 @funindex minimumFret

+@funindex restrainOpenStrings

 
 By default pitches are assigned to the lowest playing position on the
 fret-board (first position).  Open strings are automatically preferred.
 
 By default pitches are assigned to the lowest playing position on the
 fret-board (first position).  Open strings are automatically preferred.

-If you would like a certain pitch to be played on a specific string
-you can add a string number indication to the pitch name.  If you
-define pitch names and string numbers without a chord construct
-(@code{<>}) the string number indications do not appear in traditional
-notation.  It is much more comfortable to define the playing position
-by using the value of @code{minimumFret}.  The default value for
-minimumFret is 0.
+If you would like a certain pitch to be played on a specific string you
+can add a string number indication to the pitch name.  If you don't want
+to have string number indications appear in traditional notation, you
+can override the respective stencil.  Usually it will be more
+comfortable to define the playing position by using the value of
+@code{minimumFret}.  The default value for minimumFret is 0.

 
 

+Even when @code{minimumFret} is set, open strings are used whenever
+possible.  This behaviour can be changed by setting @code{restrainOpenStrings}
+to @code{#t}.

 
 @lilypond[quote,ragged-right,verbatim]
 
 @lilypond[quote,ragged-right,verbatim]

+\layout { \omit Voice.StringNumber }

 \new StaffGroup <<
    \new Staff \relative c {
      \clef "treble_8"
 \new StaffGroup <<
    \new Staff \relative c {
      \clef "treble_8"


@@ -248,36 +250,40 @@ minimumFret is 0.
      c16 d e f g4
      c,16\5 d\5 e\4 f\4 g4\4
      \set TabStaff.minimumFret = #5
      c16 d e f g4
      c,16\5 d\5 e\4 f\4 g4\4
      \set TabStaff.minimumFret = #5

+     \set TabStaff.restrainOpenStrings = ##t

      c,16 d e f g4
    }
 >>
 @end lilypond
 
      c,16 d e f g4
    }
 >>
 @end lilypond
 

-@funindex \tabChordRepetition
+@funindex \tabChordRepeats
+@funindex \chordRepeats

 @cindex Chord, repetition
 @cindex repetition, using @code{q}
 
 Chord constructs can be repeated by the chord repetition symbol
 @cindex Chord, repetition
 @cindex repetition, using @code{q}
 
 Chord constructs can be repeated by the chord repetition symbol

-@code{q}. To use this feature in combination with tablature,
-@code{\tabChordRepetition} is provided.  It preserves the string
-information explicitly given within chord constructs so repeated chords
-get identical tablature representations.
+@code{q}.  In combination with tabulatures, its behavior of removing
+string and finger numbers alongside with other events is cumbersome, so
+you'll want to run
+@example
+\chordRepeats #'(string-number-event fingering-event)
+@end example
+explicitly on music expressions in tabulature using @ref{Chord
+repetition}.  This particular command is so common that it is available
+as @code{\tabChordRepeats}.

 
 @lilypond[quote,verbatim]
 
 @lilypond[quote,verbatim]

-\tabChordRepetition
-

 guitar = \relative c' {
 guitar = \relative c' {

-  r8 <gis\4 cis\3 b\2>~ q4 q8~ q q4
+  r8 <gis-2 cis-3 b-0>~ q4 q8~ 8 q4

 }
 
 \new StaffGroup <<
   \new Staff {
     \clef "treble_8"
 }
 
 \new StaffGroup <<
   \new Staff {
     \clef "treble_8"

-    \override Voice.StringNumber #'transparent = ##t

     \guitar
   }
   \new TabStaff {
     \guitar
   }
   \new TabStaff {

-    \guitar
+    \tabChordRepeats \guitar

   }
 >>
 @end lilypond
   }
 >>
 @end lilypond


@@ -289,7 +295,7 @@ the second alternative of a repeat.
 ties = \relative c' {
   \repeat volta 2 {
     e2. f4~
 ties = \relative c' {
   \repeat volta 2 {
     e2. f4~

-    f2 g2~
+    2 g2~

   }
   \alternative {
      { g4 f2. }
   }
   \alternative {
      { g4 f2. }


@@ -304,11 +310,11 @@ ties = \relative c' {
 \score {
   <<
     \new StaffGroup  <<
 \score {
   <<
     \new StaffGroup  <<

-      \context Staff {
+      \new Staff {

         \clef "treble_8"
         \ties
       }
         \clef "treble_8"
         \ties
       }

-      \context TabStaff {
+      \new TabStaff {

         \ties
       }
     >>
         \ties
       }
     >>


@@ -329,7 +335,7 @@ engraving fret numbers in parentheses:
 ties = \relative c' {
   \repeat volta 2 {
     e2. f4~
 ties = \relative c' {
   \repeat volta 2 {
     e2. f4~

-    f2 g2~ }
+    2 g2~ }

   \alternative {
     { g4 f2. }
     { g4\repeatTie c,2. }
   \alternative {
     { g4 f2. }
     { g4\repeatTie c,2. }


@@ -343,11 +349,11 @@ ties = \relative c' {
 \score {
   <<
     \new StaffGroup  <<
 \score {
   <<
     \new StaffGroup  <<

-      \context Staff {
+      \new Staff {

         \clef "treble_8"
         \ties
       }
         \clef "treble_8"
         \ties
       }

-      \context TabStaff {
+      \new TabStaff {

       \hideSplitTiedTabNotes
         \ties
       }
       \hideSplitTiedTabNotes
         \ties
       }


@@ -362,9 +368,6 @@ ties = \relative c' {
 
 @cindex harmonic indications in tablature notation
 @cindex tablature and harmonic indications
 
 @cindex harmonic indications in tablature notation
 @cindex tablature and harmonic indications

-@cindex slides in tablature notation
-@cindex tablature and slides
-@cindex chord glissandi

 @funindex \harmonic
 @funindex \harmonicByFret
 @funindex \harmonicByRatio
 @funindex \harmonic
 @funindex \harmonicByFret
 @funindex \harmonicByRatio


@@ -373,21 +376,26 @@ Harmonic indications can be added to tablature notation as sounding
 pitches:
 
 @lilypond[verbatim,quote]
 pitches:
 
 @lilypond[verbatim,quote]

+\layout { \omit Voice.StringNumber }

 firstHarmonic = {
 firstHarmonic = {

-  <d'\4\harmonic>4
-  <g'\3\harmonic>4
-  <b'\2\harmonic>2
+  d'4\4\harmonic
+  g'4\3\harmonic
+  b'2\2\harmonic

 }
 \score {
   <<
 }
 \score {
   <<

-    \new Staff { \firstHarmonic }
+    \new Staff {
+      \clef "treble_8"
+      \firstHarmonic
+    }

     \new TabStaff { \firstHarmonic }
   >>
 }
 @end lilypond
 
     \new TabStaff { \firstHarmonic }
   >>
 }
 @end lilypond
 

-Note that the command @code{\harmonic} must always be defined
-inside a chord construct. It only makes sense for open-string harmonics
+Note that the command @code{\harmonic} must always be attached to single
+notes (possibly inside of a chord) instead of whole chords.
+It only makes sense for open-string harmonics

 in the 12th fret. All other harmonics should be calculated by LilyPond.
 This can be achieved by indicating the fret where a finger of the
 fretting hand should touch a string.
 in the 12th fret. All other harmonics should be calculated by LilyPond.
 This can be achieved by indicating the fret where a finger of the
 fretting hand should touch a string.


@@ -401,7 +409,10 @@ fretHarmonics = {
 }
 \score {
   <<
 }
 \score {
   <<

-    \new Staff { \fretHarmonics }
+    \new Staff {
+      \clef "treble_8"
+      \fretHarmonics
+    }

     \new TabStaff { \fretHarmonics }
   >>
 }
     \new TabStaff { \fretHarmonics }
   >>
 }


@@ -418,7 +429,10 @@ ratioHarmonics = {
 }
 \score {
   <<
 }
 \score {
   <<

-    \new Staff { \ratioHarmonics }
+    \new Staff {
+      \clef "treble_8"
+      \ratioHarmonics
+    }

     \new TabStaff { \ratioHarmonics }
   >>
 }
     \new TabStaff { \ratioHarmonics }
   >>
 }


@@ -437,12 +451,29 @@ ratioHarmonics = {
 @lilypondfile[verbatim,quote,texidoc,doctitle]
 {fretted-string-harmonics-in-tablature.ly}
 
 @lilypondfile[verbatim,quote,texidoc,doctitle]
 {fretted-string-harmonics-in-tablature.ly}
 

+@cindex slides in tablature notation
+@cindex tablature and slides
+

 @lilypondfile[verbatim,quote,texidoc,doctitle]
 {slides-in-tablature.ly}
 
 @lilypondfile[verbatim,quote,texidoc,doctitle]
 {slides-in-tablature.ly}
 

+@cindex chord glissandi
+

 @lilypondfile[verbatim,quote,texidoc,doctitle]
 {chord-glissando-in-tablature.ly}
 
 @lilypondfile[verbatim,quote,texidoc,doctitle]
 {chord-glissando-in-tablature.ly}
 

+@cindex hammer on
+@cindex pull off
+
+@lilypondfile[verbatim,quote,texidoc,doctitle]
+{hammer-on-and-pull-off.ly}
+
+@lilypondfile[verbatim,quote,texidoc,doctitle]
+{hammer-on-and-pull-off-using-voices.ly}
+
+@lilypondfile[verbatim,quote,texidoc,doctitle]
+{hammer-on-and-pull-off-using-chords.ly}
+

 @seealso
 Notation Reference:
 @ref{Chord repetition},
 @seealso
 Notation Reference:
 @ref{Chord repetition},


@@ -483,6 +514,7 @@ melodia = \partcombine { e4 g g g } { e4 e e e }
 
 Guitar special effects are limited to harmonics and slides.
 
 
 Guitar special effects are limited to harmonics and slides.
 

+

 @node Custom tablatures
 @unnumberedsubsubsec Custom tablatures
 
 @node Custom tablatures
 @unnumberedsubsubsec Custom tablatures
 


@@ -518,14 +550,17 @@ written.
 
 @lilypond[quote,ragged-right,verbatim]
 <<
 
 @lilypond[quote,ragged-right,verbatim]
 <<

-  \new Staff {
+  \new Voice \with {
+    \omit StringNumber
+  } {

     \clef "bass_8"
     \relative c, {
       c4 d e f
     }
   }
     \clef "bass_8"
     \relative c, {
       c4 d e f
     }
   }

-  \new TabStaff {
-    \set TabStaff.stringTunings = #bass-tuning
+  \new TabStaff \with {
+    stringTunings = #bass-tuning
+  } {

     \relative c, {
       c4 d e f
     }
     \relative c, {
       c4 d e f
     }


@@ -537,7 +572,7 @@ The default string tuning is @code{guitar-tuning}, which
 is the standard EADGBE tuning.  Some other predefined tunings are
 @code{guitar-open-g-tuning}, @code{mandolin-tuning} and
 @code{banjo-open-g-tuning}.  The predefined string tunings
 is the standard EADGBE tuning.  Some other predefined tunings are
 @code{guitar-open-g-tuning}, @code{mandolin-tuning} and
 @code{banjo-open-g-tuning}.  The predefined string tunings

-are found in @file{ly/string-tuning-init.ly}.
+are found in @file{ly/string-tunings-init.ly}.

 
 @funindex stringTuning
 @funindex \stringTuning
 
 @funindex stringTuning
 @funindex \stringTuning


@@ -571,7 +606,7 @@ mynotes = {
     \mynotes
   }
   \new TabStaff {
     \mynotes
   }
   \new TabStaff {

-    \set stringTunings = \stringTuning <c' g' d'' a''>
+    \set Staff.stringTunings = \stringTuning <c' g' d'' a''>

     \mynotes
   }
 >>
     \mynotes
   }
 >>


@@ -587,7 +622,7 @@ for predefined fret diagrams
 The previous example could also be written as follows:
 
 @lilypond[quote,verbatim]
 The previous example could also be written as follows:
 
 @lilypond[quote,verbatim]

-"custom-tuning" = \stringTuning <c' g' d'' a''>
+custom-tuning = \stringTuning <c' g' d'' a''>

 
 mynotes = {
   c'4 e' g' c'' |
 
 mynotes = {
   c'4 e' g' c'' |


@@ -631,7 +666,7 @@ you can use
 \layout @{
   \context @{
     \TabStaff
 \layout @{
   \context @{
     \TabStaff

-    stringTunings = \stringTuning \notemode @{ <c' g' d'' a''> @}
+    stringTunings = \stringTuning <c' g' d'' a''>

   @}
 @}
 @end example
   @}
 @}
 @end example


@@ -663,7 +698,7 @@ Notation Reference:
 @ref{Scheme functions}.
 
 Installed Files:
 @ref{Scheme functions}.
 
 Installed Files:

-@file{ly/string-tuning-init.ly}
+@file{ly/string-tunings-init.ly},

 @file{scm/tablature.scm}.
 
 Snippets:
 @file{scm/tablature.scm}.
 
 Snippets:


@@ -677,6 +712,7 @@ Automatic tablature calculations do not work properly in most
 cases for instruments where string pitches do not vary
 monotonically with string number, such as ukuleles.
 
 cases for instruments where string pitches do not vary
 monotonically with string number, such as ukuleles.
 

+

 @node Fret diagram markups
 @unnumberedsubsubsec Fret diagram markups
 
 @node Fret diagram markups
 @unnumberedsubsubsec Fret diagram markups
 


@@ -702,12 +738,12 @@ In addition, open and unplayed (muted) strings can be indicated.
 
 @lilypond[quote, verbatim]
 <<
 
 @lilypond[quote, verbatim]
 <<

-  \context ChordNames {
+  \new ChordNames {

     \chordmode {
       c1 d:m
     }
   }
     \chordmode {
       c1 d:m
     }
   }

-  \context Staff {
+  \new Staff {

     \clef "treble_8"
     <c e g c' e'>1^\markup {
       \fret-diagram #"6-x;5-3;4-2;3-o;2-1;1-o;"
     \clef "treble_8"
     <c e g c' e'>1^\markup {
       \fret-diagram #"6-x;5-3;4-2;3-o;2-1;1-o;"


@@ -726,12 +762,12 @@ the fret-diagram markup string.
 
 @lilypond[quote, verbatim]
 <<
 
 @lilypond[quote, verbatim]
 <<

-  \context ChordNames {
+  \new ChordNames {

      \chordmode {
        f1 g
      }
   }
      \chordmode {
        f1 g
      }
   }

-  \context Staff {
+  \new Staff {

     \clef "treble_8"
     <f, c f a c' f'>1^\markup {
       \fret-diagram #"c:6-1-1;6-1;5-3;4-3;3-2;2-1;1-1;"
     \clef "treble_8"
     <f, c f a c' f'>1^\markup {
       \fret-diagram #"c:6-1-1;6-1;5-3;4-3;3-2;2-1;1-1;"


@@ -754,12 +790,12 @@ can be changed in the fret-diagram markup string.
 
 @lilypond[quote, verbatim]
 <<
 
 @lilypond[quote, verbatim]
 <<

-  \context ChordNames {
+  \new ChordNames {

      \chordmode {
        f1 g
      }
   }
      \chordmode {
        f1 g
      }
   }

-  \context Staff {
+  \new Staff {

     \clef "treble_8"
     <f, c f a c' f'>1^\markup {
       \fret-diagram #"s:1.5;c:6-1-1;6-1;5-3;4-3;3-2;2-1;1-1;"
     \clef "treble_8"
     <f, c f a c' f'>1^\markup {
       \fret-diagram #"s:1.5;c:6-1-1;6-1;5-3;4-3;3-2;2-1;1-1;"


@@ -777,12 +813,12 @@ markup string.
 
 @lilypond[quote, verbatim]
 <<
 
 @lilypond[quote, verbatim]
 <<

-  \context ChordNames {
+  \new ChordNames {

     \chordmode {
       a1
     }
   }
     \chordmode {
       a1
     }
   }

-  \context Staff {
+  \new Staff {

     % An 'A' chord for ukulele
     a'1^\markup {
       \fret-diagram #"w:4;4-2-2;3-1-1;2-o;1-o;"
     % An 'A' chord for ukulele
     a'1^\markup {
       \fret-diagram #"w:4;4-2-2;3-1-1;2-o;1-o;"


@@ -796,12 +832,12 @@ can be controlled by the fret-diagram markup string.
 
 @lilypond[quote, verbatim]
 <<
 
 @lilypond[quote, verbatim]
 <<

-  \context ChordNames {
+  \new ChordNames {

     \chordmode {
       c1 d:m
     }
   }
     \chordmode {
       c1 d:m
     }
   }

-  \context Staff {
+  \new Staff {

     \clef "treble_8"
     <c e g c' e'>1^\markup {
       \fret-diagram #"f:1;6-x;5-3-3;4-2-2;3-o;2-1-1;1-o;"
     \clef "treble_8"
     <c e g c' e'>1^\markup {
       \fret-diagram #"f:1;6-x;5-3-3;4-2-2;3-o;2-1-1;1-o;"


@@ -818,12 +854,12 @@ markup string.
 
 @lilypond[quote, verbatim]
 <<
 
 @lilypond[quote, verbatim]
 <<

-  \context ChordNames {
+  \new ChordNames {

     \chordmode {
       c1 d:m
     }
   }
     \chordmode {
       c1 d:m
     }
   }

-  \context Staff {
+  \new Staff {

     \clef "treble_8"
     <c e g c' e'>1^\markup {
       \fret-diagram #"d:0.35;6-x;5-3;4-2;3-o;2-1;1-o;"
     \clef "treble_8"
     <c e g c' e'>1^\markup {
       \fret-diagram #"d:0.35;6-x;5-3;4-2;3-o;2-1;1-o;"


@@ -848,12 +884,12 @@ Mute strings, open strings, and fret numbers can be indicated.
 
 @lilypond[quote, verbatim]
 <<
 
 @lilypond[quote, verbatim]
 <<

-  \context ChordNames {
+  \new ChordNames {

     \chordmode {
       c1 d:m
     }
   }
     \chordmode {
       c1 d:m
     }
   }

-  \context Staff {
+  \new Staff {

     \clef "treble_8"
     <c e g c' e'>1^\markup {
       \fret-diagram-terse #"x;3;2;o;1;o;"
     \clef "treble_8"
     <c e g c' e'>1^\markup {
       \fret-diagram-terse #"x;3;2;o;1;o;"


@@ -869,12 +905,12 @@ Barre indicators can be included in the fret-diagram-terse markup string.
 
 @lilypond[quote, verbatim]
 <<
 
 @lilypond[quote, verbatim]
 <<

-  \context ChordNames {
+  \new ChordNames {

     \chordmode {
       f1 g
     }
   }
     \chordmode {
       f1 g
     }
   }

-  \context Staff {
+  \new Staff {

     \clef "treble_8"
     <f, c f a c' f'>1^\markup {
       \fret-diagram-terse #"1-(;3;3;2;1;1-);"
     \clef "treble_8"
     <f, c f a c' f'>1^\markup {
       \fret-diagram-terse #"1-(;3;3;2;1;1-);"


@@ -891,14 +927,13 @@ Fingering indications can be included in the fret-diagram-terse markup string.
 @c Need to use override to enable fingerings to show this -- can we do so?
 @lilypond[quote, verbatim]
 <<
 @c Need to use override to enable fingerings to show this -- can we do so?
 @lilypond[quote, verbatim]
 <<

-  \context ChordNames {
+  \new ChordNames {

     \chordmode {
       c1 d:m
     }
   }
     \chordmode {
       c1 d:m
     }
   }

-  \context Staff {
-    \override Voice.TextScript
-      #'(fret-diagram-details finger-code) = #'below-string
+  \new Staff {
+    \override Voice.TextScript.fret-diagram-details.finger-code = #'below-string

     \clef "treble_8"
     <c e g c' e'>1^\markup {
       \fret-diagram-terse #"x;3-3;2-2;o;1-1;o;"
     \clef "treble_8"
     <c e g c' e'>1^\markup {
       \fret-diagram-terse #"x;3-3;2-2;o;1-1;o;"


@@ -924,12 +959,12 @@ element of the list indicates an item to be placed on the fret diagram.
 
 @lilypond[quote, verbatim]
 <<
 
 @lilypond[quote, verbatim]
 <<

-    \context ChordNames {
+    \new ChordNames {

       \chordmode {
         c1 d:m
       }
     }
       \chordmode {
         c1 d:m
       }
     }

-  \context Staff {
+  \new Staff {

     \clef "treble_8"
     <c e g c' e'>1^\markup {
       \fret-diagram-verbose #'(
     \clef "treble_8"
     <c e g c' e'>1^\markup {
       \fret-diagram-verbose #'(


@@ -965,15 +1000,14 @@ capo will be the lowest fret in the fret diagram.
 @c \override is necessary to make fingering visible
 @lilypond[quote, verbatim]
 <<
 @c \override is necessary to make fingering visible
 @lilypond[quote, verbatim]
 <<

-    \context ChordNames {
+    \new ChordNames {

       \chordmode {
         f1 g c
       }
     }
       \chordmode {
         f1 g c
       }
     }

-  \context Staff {
+  \new Staff {

     \clef "treble_8"
     \clef "treble_8"

-    \override Voice.TextScript
-      #'(fret-diagram-details finger-code) = #'below-string
+    \override Voice.TextScript.fret-diagram-details.finger-code = #'below-string

     <f, c f a c' f'>1^\markup {
       \fret-diagram-verbose #'(
         (place-fret 6 1)
     <f, c f a c' f'>1^\markup {
       \fret-diagram-verbose #'(
         (place-fret 6 1)


@@ -995,7 +1029,7 @@ capo will be the lowest fret in the fret diagram.
         (place-fret 1 3 3)
       )
     }
         (place-fret 1 3 3)
       )
     }

-    <c e g c' e'>1^\markup {
+    <c g c' e' g'>1^\markup {

       \fret-diagram-verbose #'(
         (capo 3)
         (mute 6)
       \fret-diagram-verbose #'(
         (capo 3)
         (mute 6)


@@ -1087,7 +1121,6 @@ Internals Reference:
 @node Predefined fret diagrams
 @unnumberedsubsubsec Predefined fret diagrams
 
 @node Predefined fret diagrams
 @unnumberedsubsubsec Predefined fret diagrams
 

-

 @cindex fret diagrams
 @cindex fret diagrams, ukulele
 @cindex fret diagrams, mandolin
 @cindex fret diagrams
 @cindex fret diagrams, ukulele
 @cindex fret diagrams, mandolin


@@ -1102,7 +1135,7 @@ are stored in a lookup table:
 
 @lilypond[verbatim, ragged-right, quote]
 \include "predefined-guitar-fretboards.ly"
 
 @lilypond[verbatim, ragged-right, quote]
 \include "predefined-guitar-fretboards.ly"

-\context FretBoards {
+\new FretBoards {

   \chordmode {
     c1 d
   }
   \chordmode {
     c1 d
   }


@@ -1119,7 +1152,7 @@ diagrams can be added for other instruments or other tunings
 by following the examples found in
 @file{predefined-guitar-fretboards.ly}.
 
 by following the examples found in
 @file{predefined-guitar-fretboards.ly}.
 

-Fret diagrams for the ukulele are contained in the file
+Fret diagrams for the ukulele are contained in the file @*

 @file{predefined-ukulele-fretboards.ly}.
 
 @lilypond[verbatim, ragged-right, quote]
 @file{predefined-ukulele-fretboards.ly}.
 
 @lilypond[verbatim, ragged-right, quote]


@@ -1132,12 +1165,12 @@ myChords = \chordmode { a1 a:m a:aug }
 }
 
 \new FretBoards {
 }
 
 \new FretBoards {

-  \set stringTunings = #ukulele-tuning
+  \set Staff.stringTunings = #ukulele-tuning

   \myChords
 }
 @end lilypond
 
   \myChords
 }
 @end lilypond
 

-Fret diagrams for the mandolin are contained in the file
+Fret diagrams for the mandolin are contained in the file @*

 @file{predefined-mandolin-fretboards.ly}.
 
 @lilypond[verbatim, ragged-right, quote]
 @file{predefined-mandolin-fretboards.ly}.
 
 @lilypond[verbatim, ragged-right, quote]


@@ -1150,7 +1183,7 @@ myChords = \chordmode { c1 c:m7.5- c:aug }
 }
 
 \new FretBoards {
 }
 
 \new FretBoards {

-  \set stringTunings = #mandolin-tuning
+  \set Staff.stringTunings = #mandolin-tuning

   \myChords
 }
 @end lilypond
   \myChords
 }
 @end lilypond


@@ -1161,7 +1194,7 @@ either as simultaneous music or using chord mode (see
 
 @lilypond[verbatim, ragged-right,quote]
 \include "predefined-guitar-fretboards.ly"
 
 @lilypond[verbatim, ragged-right,quote]
 \include "predefined-guitar-fretboards.ly"

-\context FretBoards {
+\new FretBoards {

   \chordmode { c1 }
   <c' e' g'>1
 }
   \chordmode { c1 }
   <c' e' g'>1
 }


@@ -1185,10 +1218,10 @@ mychords = \chordmode{
 }
 
 <<
 }
 
 <<

-  \context ChordNames {
+  \new ChordNames {

     \mychords
   }
     \mychords
   }

-  \context FretBoards {
+  \new FretBoards {

     \mychords
   }
 >>
     \mychords
   }
 >>


@@ -1212,10 +1245,10 @@ mychordlist = {
   \transpose c e { \mychords }
 }
 <<
   \transpose c e { \mychords }
 }
 <<

-  \context ChordNames {
+  \new ChordNames {

     \mychordlist
   }
     \mychordlist
   }

-  \context FretBoards {
+  \new FretBoards {

     \mychordlist
   }
 >>
     \mychordlist
   }
 >>


@@ -1241,10 +1274,10 @@ mychords = \chordmode{
 }
 
 <<
 }
 
 <<

-  \context ChordNames {
+  \new ChordNames {

     \mychords
   }
     \mychords
   }

-  \context FretBoards {
+  \new FretBoards {

     \mychords
   }
 >>
     \mychords
   }
 >>


@@ -1275,10 +1308,10 @@ mychords = \chordmode {
 }
 
 <<
 }
 
 <<

-  \context ChordNames {
+  \new ChordNames {

     \mychords
   }
     \mychords
   }

-  \context FretBoards {
+  \new FretBoards {

     \mychords
   }
 >>
     \mychords
   }
 >>


@@ -1302,10 +1335,10 @@ mychords = \chordmode {
 }
 
 <<
 }
 
 <<

-  \context ChordNames {
+  \new ChordNames {

     \mychords
   }
     \mychords
   }

-  \context FretBoards {
+  \new FretBoards {

     \mychords
   }
 >>
     \mychords
   }
 >>


@@ -1352,10 +1385,10 @@ mychords = \chordmode{
 }
 
 <<
 }
 
 <<

-  \context ChordNames {
+  \new ChordNames {

     \mychords
   }
     \mychords
   }

-  \context FretBoards {
+  \new FretBoards {

     \mychords
   }
 >>
     \mychords
   }
 >>


@@ -1375,13 +1408,12 @@ the interface properties belong to @code{FretBoards.FretBoard}.
 @lilypondfile[verbatim,quote,texidoc,doctitle]
 {defining-predefined-fretboards-for-other-instruments.ly}
 
 @lilypondfile[verbatim,quote,texidoc,doctitle]
 {defining-predefined-fretboards-for-other-instruments.ly}
 

-@lilypondfile[verbatim,quote,texidoc,doctitle]
+@lilypondfile[verbatim,quote,texidoc,doctitle,ragged-right]

 {chordchanges-for-fretboards.ly}
 
 @lilypondfile[verbatim,quote,texidoc,doctitle]
 {fretboards-alternate-tables.ly}
 
 {chordchanges-for-fretboards.ly}
 
 @lilypondfile[verbatim,quote,texidoc,doctitle]
 {fretboards-alternate-tables.ly}
 

-

 @seealso
 Notation Reference:
 @ref{Custom tablatures},
 @seealso
 Notation Reference:
 @ref{Custom tablatures},


@@ -1390,9 +1422,9 @@ Notation Reference:
 @ref{Predefined fretboard diagrams}.
 
 Installed Files:
 @ref{Predefined fretboard diagrams}.
 
 Installed Files:

-@file{ly/predefined-guitar-fretboards.ly},
-@file{ly/predefined-guitar-ninth-fretboards.ly},
-@file{ly/predefined-ukulele-fretboards.ly},
+@file{ly/predefined-guitar-fretboards.ly}, @*
+@file{ly/predefined-guitar-ninth-fretboards.ly}, @*
+@file{ly/predefined-ukulele-fretboards.ly}, @*

 @file{ly/predefined-mandolin-fretboards.ly}.
 
 Snippets:
 @file{ly/predefined-mandolin-fretboards.ly}.
 
 Snippets:


@@ -1417,16 +1449,16 @@ calculates strings and frets that can be used to play the notes.
 
 @lilypond[quote,ragged-right,verbatim]
 <<
 
 @lilypond[quote,ragged-right,verbatim]
 <<

-  \context ChordNames {
+  \new ChordNames {

     \chordmode {
       f1 g
     }
   }
     \chordmode {
       f1 g
     }
   }

-  \context FretBoards {
+  \new FretBoards {

     <f, c f a c' f'>1
     <g,\6 b, d g b g'>1
   }
     <f, c f a c' f'>1
     <g,\6 b, d g b g'>1
   }

-  \context Staff {
+  \new Staff {

     \clef "treble_8"
     <f, c f a c' f'>1
     <g, b, d g b' g'>1
     \clef "treble_8"
     <f, c f a c' f'>1
     <g, b, d g b' g'>1


@@ -1451,19 +1483,19 @@ commands:
                         #guitar-tuning
                         #"x;3-1-(;5-2;5-3;5-4;3-1-1-);"
 <<
                         #guitar-tuning
                         #"x;3-1-(;5-2;5-3;5-4;3-1-1-);"
 <<

-  \context ChordNames {
+  \new ChordNames {

     \chordmode {
       c1 c c
     }
   }
     \chordmode {
       c1 c c
     }
   }

-  \context FretBoards {
+  \new FretBoards {

     <c e g c' e'>1
     \predefinedFretboardsOff
     <c e g c' e'>1
     \predefinedFretboardsOn
     <c e g c' e'>1
   }
     <c e g c' e'>1
     \predefinedFretboardsOff
     <c e g c' e'>1
     \predefinedFretboardsOn
     <c e g c' e'>1
   }

-  \context Staff {
+  \new Staff {

     \clef "treble_8"
     <c e g c' e'>1
     <c e g c' e'>1
     \clef "treble_8"
     <c e g c' e'>1
     <c e g c' e'>1


@@ -1488,16 +1520,16 @@ Fingerings can be added to FretBoard fret diagrams.
 
 @lilypond[quote, verbatim]
 <<
 
 @lilypond[quote, verbatim]
 <<

-  \context ChordNames {
+  \new ChordNames {

     \chordmode {
       c1 d:m
     }
   }
     \chordmode {
       c1 d:m
     }
   }

-  \context FretBoards {
+  \new FretBoards {

     <c-3 e-2 g c'-1 e'>1
     <d a-2 d'-3 f'-1>1
   }
     <c-3 e-2 g c'-1 e'>1
     <d a-2 d'-3 f'-1>1
   }

-  \context Staff {
+  \new Staff {

     \clef "treble_8"
     <c e g c' e'>1
     <d a d' f'>1
     \clef "treble_8"
     <c e g c' e'>1
     <d a d' f'>1


@@ -1513,17 +1545,17 @@ property.
 
 @lilypond[quote, verbatim]
 <<
 
 @lilypond[quote, verbatim]
 <<

-  \context ChordNames {
+  \new ChordNames {

     \chordmode {
       d1:m d:m
     }
   }
     \chordmode {
       d1:m d:m
     }
   }

-  \context FretBoards {
+  \new FretBoards {

     <d a d' f'>1
     \set FretBoards.minimumFret = #5
     <d a d' f'>1
   }
     <d a d' f'>1
     \set FretBoards.minimumFret = #5
     <d a d' f'>1
   }

-  \context Staff {
+  \new Staff {

     \clef "treble_8"
     <d a d' f'>1
     <d a d' f'>1
     \clef "treble_8"
     <d a d' f'>1
     <d a d' f'>1


@@ -1549,7 +1581,6 @@ diagram, the interface properties belong to
 @code{\predefinedFretboardsOn}.
 @endpredefined
 
 @code{\predefinedFretboardsOn}.
 @endpredefined
 

-

 @seealso
 Notation Reference:
 @ref{Custom tablatures}.
 @seealso
 Notation Reference:
 @ref{Custom tablatures}.


@@ -1575,28 +1606,27 @@ with non-monotonic tunings.
 @funindex rightHandFinger
 @funindex \rightHandFinger
 
 @funindex rightHandFinger
 @funindex \rightHandFinger
 

-Right-hand fingerings @var{p-i-m-a} must be entered within a
-chord construct @code{<>} for them to be printed in the score,
-even when applied to a single note.
+Right-hand fingerings @var{p-i-m-a} must be entered using
+@code{\rightHandFinger} followed by a number.

 
 

-@warning{There @strong{must} be a hyphen before
-@code{@bs{}rightHandFinger} and a space before the closing @code{>}.}
+@warning{If the number is entered in Scheme notation, remember to append
+a space before following it with a closing @code{>} or similar.}

 
 @lilypond[quote,verbatim,relative=0]
 \clef "treble_8"
 
 @lilypond[quote,verbatim,relative=0]
 \clef "treble_8"

-<c-\rightHandFinger #1 >4
-<e-\rightHandFinger #2 >
-<g-\rightHandFinger #3 >
-<c-\rightHandFinger #4 >
-<c,-\rightHandFinger #1 e-\rightHandFinger #2
- g-\rightHandFinger #3 c-\rightHandFinger #4 >1
+c4\rightHandFinger #1
+e\rightHandFinger #2
+g\rightHandFinger #3
+c\rightHandFinger #4
+<c,\rightHandFinger #1 e\rightHandFinger #2
+ g\rightHandFinger #3 c\rightHandFinger #4 >1

 @end lilypond
 
 For convenience, you can abbreviate @code{\rightHandFinger} to something
 short, for example @code{RH},
 
 @example
 @end lilypond
 
 For convenience, you can abbreviate @code{\rightHandFinger} to something
 short, for example @code{RH},
 
 @example

-#(define RH rightHandFinger)
+RH=#rightHandFinger

 @end example
 
 
 @end example
 
 


@@ -1608,7 +1638,6 @@ short, for example @code{RH},
 @lilypondfile[verbatim,quote,texidoc,doctitle]
 {fingerings,-string-indications,-and-right-hand-fingerings.ly}
 
 @lilypondfile[verbatim,quote,texidoc,doctitle]
 {fingerings,-string-indications,-and-right-hand-fingerings.ly}
 

-

 @seealso
 Snippets:
 @rlsr{Fretted strings}.
 @seealso
 Snippets:
 @rlsr{Fretted strings}.


@@ -1648,13 +1677,12 @@ barring indications.
 \clef "treble_8"
 b16 d g b e
 \textSpannerDown
 \clef "treble_8"
 b16 d g b e
 \textSpannerDown

-\override TextSpanner #'(bound-details left text) = #"XII "
+\override TextSpanner.bound-details.left.text = #"XII "

 g16\startTextSpan
 b16 e g e b g\stopTextSpan
 e16 b g d
 @end lilypond
 
 g16\startTextSpan
 b16 e g e b g\stopTextSpan
 e16 b g d
 @end lilypond
 

-

 @seealso
 Notation Reference:
 @ref{Text spanners}.
 @seealso
 Notation Reference:
 @ref{Text spanners}.


@@ -1679,7 +1707,7 @@ text markup.
 @lilypond[quote,ragged-right,verbatim]
 \relative c' {
   \clef "treble_8"
 @lilypond[quote,ragged-right,verbatim]
 \relative c' {
   \clef "treble_8"

-  \override Staff.NoteHead #'style = #'harmonic-mixed
+  \override Staff.NoteHead.style = #'harmonic-mixed

   d^\markup { \italic { \fontsize #-2 { "harm. 12" }}} <g b>1
 }
 @end lilypond
   d^\markup { \italic { \fontsize #-2 { "harm. 12" }}} <g b>1
 }
 @end lilypond


@@ -1693,7 +1721,7 @@ music = \relative c' {
   < b\3 \deadNote d\2 b'\1 >
   < c\3 \deadNote e\2 c'\1 >
   \deadNotesOn
   < b\3 \deadNote d\2 b'\1 >
   < c\3 \deadNote e\2 c'\1 >
   \deadNotesOn

-  \times 2/3 { g8 b e }
+  \tuplet 3/2 { g8 b e }

   \deadNotesOff
   < a,\3 c\2 e\1 >1
 }
   \deadNotesOff
   < a,\3 c\2 e\1 >1
 }


@@ -1842,15 +1870,20 @@ correct fret numbers for the fifth string:
 @c due to crazy intervals of banjo music, absolute pitch is recommended
 
 @lilypond[quote,ragged-right,verbatim]
 @c due to crazy intervals of banjo music, absolute pitch is recommended
 
 @lilypond[quote,ragged-right,verbatim]

-\new TabStaff <<
-  \set TabStaff.tablatureFormat = #fret-number-tablature-format-banjo
-  \set TabStaff.stringTunings = #banjo-open-g-tuning
-  {
-    \stemDown
-    g8 d' g'\5 a b g e d' |
-    g4 d''8\5 b' a'\2 g'\5 e'\2 d' |
-    g4
+music = {
+  g8 d' g'\5 a b g e d' |
+  g4 d''8\5 b' a'\2 g'\5 e'\2 d' |
+  g4
+}
+
+<<
+  \new Staff \with { \omit StringNumber }
+  { \clef "treble_8"  \music }
+  \new TabStaff \with {
+    tablatureFormat = #fret-number-tablature-format-banjo
+    stringTunings = #banjo-open-g-tuning

   }
   }

+  { \music }

 >>
 @end lilypond
 
 >>
 @end lilypond
 


@@ -1876,8 +1909,8 @@ These may be converted to four-string tunings using the
 @end example
 
 @seealso
 @end example
 
 @seealso

+Installed Files:
+@file{ly/string-tunings-init.ly}.
+

 Snippets:
 @rlsr{Fretted strings}.
 Snippets:
 @rlsr{Fretted strings}.

-
-Installed Files:
-@file{ly/string-tunings-init.ly}