Update fretted-strings.itely for revised automatic fretboards

diff --git a/Documentation/user/fretted-strings.itely b/Documentation/user/fretted-strings.itely
index 8b6beef4f59431cae504a6a377258a7faddb0768..60394cd626b10f5dac35fd0fd2b45e133de10c12 100644 (file)
--- a/Documentation/user/fretted-strings.itely
+++ b/Documentation/user/fretted-strings.itely
@@ -878,7 +878,7 @@ commands:
 
 @lilypond[quote,ragged-right,verbatim]
 
-\storePredefinedDiagram <c\5 e g c' e'>
+\storePredefinedDiagram <c e g c' e'>
                         #guitar-tuning
                         #"x;3-1-(;5-2;5-3;5-4;3-1-1);"
 <<
@@ -888,25 +888,27 @@ commands:
      }
   }
   \context FretBoards {
-    <c\5 e g c' e'>1
+    <c e g c' e'>1
     \predefinedFretboardsOff
-    <c\5 e g c' e'>
+    <c e g c' e'>
     \predefinedFretboardsOn
-    <c\5 e g c' e'>
+    <c e g c' e'>
   }
   \context Staff {
     \clef "treble_8"
-    <c\5 e g c' e'>1
-    <c\5 e g c' e'>
-    <c\5 e g c' e'>
+    <c e g c' e'>1
+    <c e g c' e'>
+    <c e g c' e'>
   }  
 >>
 @end lilypond
 
   
 
-Notes can be explicitly placed on a string.  It is often enough
-to place only the lowest note on an explicit string; the rest of 
+Sometimes the fretboard calculator will be unable to find
+an accceptable diagram.  This can often be remedied by
+manually assigning a note to a string.  In many cases, only one
+note need be manually placed on a string; the rest of 
 the notes will then be placed appropriately by the @code{FretBoards}
 context.
 
@@ -914,21 +916,17 @@ context.
 <<
   \context ChordNames {
      \chordmode { 
-       c1 c d:m d:m    
+       c1 c 
      }
   }
   \context FretBoards {
-    < c e g c' e' > 1
-    < c\5 e g c' e' > 1
-    < d a d' f'>
-    < d\4 a d' f'>
+    < c g c' e' g'> 1
+    < c g\4 c' e' g'> 1
   }
   \context Staff {
     \clef "treble_8"
-    < c e g c' e' > 1
-    < c e g c' e' > 1
-    < d a d' f'>
-    < d a d' f'>
+    < c g c' e' g'> 1
+    < c g c' e' g'> 1
   }  
 >>
 @end lilypond
@@ -943,8 +941,8 @@ Fingerings can be added to FretBoard fret diagrams.
      }
   }
   \context FretBoards {
-    < c\5-3 e-2 g c'-1 e' > 1
-    < d\4 a-2 d'-3 f'-1>
+    < c-3 e-2 g c'-1 e' > 1
+    < d a-2 d'-3 f'-1>
   }
   \context Staff {
     \clef "treble_8"
@@ -954,6 +952,30 @@ Fingerings can be added to FretBoard fret diagrams.
 >>
 @end lilypond
 
+The minimum fret to be used in calculating strings and frets for
+the FretBoard context can be set with the @code{minimumFret}
+property.
+
+@lilypond[quote, verbatim]
+<<
+  \context ChordNames {
+     \chordmode {
+       d1:m d:m
+     }
+  }
+  \context FretBoards {
+    < d a d' f'>
+    \set FretBoards.minimumFret = #5
+    < d a d' f'>
+  }
+  \context Staff {
+    \clef "treble_8"
+    < d a d' f'>
+    < d a d' f'>
+  }
+>>
+@end lilypond
+
 The strings and frets for the @code{FretBoards} context depend
 on the @code{stringTunings} property, which has the same meaning
 as in the TabStaff context.  See @ref{Custom tablatures} for 
@@ -965,15 +987,6 @@ Details are found at @rinternals{fret-diagram-interface}.  For a
 @code{FretBoards} fret diagram, the interface properties belong to 
 @code{FretBoards.FretBoard}.
 
-@snippets
-The minimum fret to be used in calculating strings and frets for
-the FretBoard context can be set with the @code{minimumFret}
-property.
-
-@c TODO -- snippet showing minimum fret.
-
-@c TODO -- snippet for using StringTunings
-
 @predefined
 \predefinedFretboardsOff,
 \predefinedFretboardsOn.

diff --git a/scm/translation-functions.scm b/scm/translation-functions.scm
index cefdf707764b893e31b7e18f3b98b423b3463560..79a924812ab224c6804b1ae938a18607e05c41db 100644 (file)
--- a/scm/translation-functions.scm
+++ b/scm/translation-functions.scm
@@ -339,7 +339,8 @@
                            free-strings)))
           (if fit-string
               (set-fret note fit-string)
-              (ly:warning "No string for pitch ~a (given frets ~a)" (note-pitch note)
+              (ly:warning "No string for pitch ~a (given frets ~a)" 
+                           (note-pitch note)
                           specified-frets))
                           
               )))