Imported Upstream version 2.16.0

[lilypond.git] / scm / fret-diagrams.scm

diff --git a/scm/fret-diagrams.scm b/scm/fret-diagrams.scm
index acc095a567ec8a602fd7d4cebf1f03e8274825bb..a6645dc762d61024ae9cfeca770b9c03970a64de 100644 (file)
--- a/scm/fret-diagrams.scm
+++ b/scm/fret-diagrams.scm
@@ -1,6 +1,6 @@
 ;;;; This file is part of LilyPond, the GNU music typesetter.
 ;;;;
-;;;; Copyright (C) 2004--2011 Carl D. Sorensen <c_sorensen@byu.edu>
+;;;; Copyright (C) 2004--2012 Carl D. Sorensen <c_sorensen@byu.edu>
 ;;;;
 ;;;; LilyPond is free software: you can redistribute it and/or modify
 ;;;; it under the terms of the GNU General Public License as published by
@@ -528,10 +528,9 @@ fret-diagram overall parameters."
                   (+ (* size end-string-coordinate) half-thickness)))
               (x-extent (cons (car box-lower-left) (car box-upper-right)))
               (y-extent (cons (cdr box-lower-left) (cdr box-upper-right))))
-         (ly:make-stencil
-           (list 'bezier-sandwich
-                 `(quote ,bezier-list)
-                 (* size bezier-thick))
+         (make-bezier-sandwich-stencil
+           bezier-list
+           (* size bezier-thick)
            x-extent
            y-extent)))
 
@@ -822,6 +821,8 @@ a fret-indication list with the appropriate values"
            (case (car (string->list (substring test-string 0 1)))
              ((#\s) (let ((size (get-numeric-from-key test-string)))
                       (set! props (prepend-alist-chain 'size size props))))
+             ((#\t) (let ((th (get-numeric-from-key test-string)))
+                      (set! props (prepend-alist-chain 'thickness th props))))
              ((#\f) (let* ((finger-code (get-numeric-from-key test-string))
                            (finger-id (case finger-code
                                         ((0) 'none)
@@ -1030,8 +1031,9 @@ spaces).
 Default:@tie{}1.
 
 @item
-@code{t:}@var{number} -- Set the line thickness (in staff spaces).
-Default:@tie{}0.05.
+@code{t:}@var{number} -- Set the line thickness (relative to normal
+line thickness).
+Default:@tie{}0.5.
 
 @item
 @code{h:}@var{number} -- Set the height of the diagram in frets.
@@ -1116,13 +1118,13 @@ If there are multiple fret indicators desired on a string, they
 should be separated by spaces.
 
 @item
-Fingerings are given by following the fret number with a @code{-},
+Fingerings are given by following the fret number with a @w{@code{-},}
 followed by the finger indicator, e.g. @samp{3-2} for playing the third
 fret with the second finger.
 
 @item
 Where a barre indicator is desired, follow the fret (or fingering) symbol
-with @code{-(} to start a barre and @code{-)} to end the barre.
+with @w{@code{-(}} to start a barre and @w{@code{-)}} to end the barre.
 
 @end itemize"
   ;; TODO -- change syntax to fret\string-finger