;;;; This file is part of LilyPond, the GNU music typesetter.
;;;;
-;;;; Copyright (C) 2004--2014 Carl D. Sorensen <c_sorensen@byu.edu>
+;;;; Copyright (C) 2004--2015 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
(car this-list)
;; fret
(- (second this-list) base-fret)
- ;; finger
- (if (or (null? (cddr this-list))
- (not (number? (caddr this-list))))
- '()
- (third this-list))
+ ;; finger-number or markup
+ (if (and (not (null? (cddr this-list)))
+ (or (markup? (caddr this-list))
+ (number? (caddr this-list))))
+ (third this-list)
+ '())
;; inverted
(dot-is-inverted this-list)
;; parenthesis