-;;;; fret-diagrams.scm --
+;;;; This file is part of LilyPond, the GNU music typesetter.
;;;;
-;;;; source file of the GNU LilyPond music typesetter
+;;;; Copyright (C) 2004--2009 Carl D. Sorensen <c_sorensen@byu.edu>
;;;;
-;;;; (c) 2004--2009 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
+;;;; the Free Software Foundation, either version 3 of the License, or
+;;;; (at your option) any later version.
+;;;;
+;;;; LilyPond is distributed in the hope that it will be useful,
+;;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+;;;; GNU General Public License for more details.
+;;;;
+;;;; You should have received a copy of the GNU General Public License
+;;;; along with LilyPond. If not, see <http://www.gnu.org/licenses/>.
;
; Utility functions
`(,props . ,output-list))) ; ugh -- hard coded; proc is better
-(define-builtin-markup-command
+(define-markup-command
(fret-diagram-verbose layout props marking-list)
(pair?) ; argument type (list, but use pair? for speed)
- instrument-specific-markup ; markup type
- ((align-dir -0.4) ; properties and defaults
- (size 1.0)
- (fret-diagram-details)
- (thickness 0.5))
+ #:category instrument-specific-markup ; markup type
+ #:properties ((align-dir -0.4) ; properties and defaults
+ (size 1.0)
+ (fret-diagram-details)
+ (thickness 0.5))
"Make a fret diagram containing the symbols indicated in @var{marking-list}.
For example,
(make-fret-diagram layout props marking-list))
-(define-builtin-markup-command (fret-diagram layout props definition-string)
+(define-markup-command (fret-diagram layout props definition-string)
(string?) ; argument type
- instrument-specific-markup ; markup category
- (fret-diagram-verbose-markup) ; properties and defaults
+ #:category instrument-specific-markup ; markup category
+ #:properties (fret-diagram-verbose-markup) ; properties and defaults
"Make a (guitar) fret diagram. For example, say
@example
(fret-diagram-verbose-markup
layout (car definition-list) (cdr definition-list))))
-(define-builtin-markup-command
+(define-markup-command
(fret-diagram-terse layout props definition-string)
(string?) ; argument type
- instrument-specific-markup ; markup category
- (fret-diagram-verbose-markup) ; properties
+ #:category instrument-specific-markup ; markup category
+ #:properties (fret-diagram-verbose-markup) ; properties
"Make a fret diagram markup using terse string-based syntax.
Here is an example