From 4b78ea65daabcab3c4b6baf90fdd6f98aa186917 Mon Sep 17 00:00:00 2001 From: Thomas Morley Date: Mon, 11 May 2015 22:43:51 +0200 Subject: [PATCH] Fretboards: markup strings in dot positions Issue 4120 Fixes disappeared strings, restores the behaviour before the fix for Issue 2752 Does not scale those strings, though, in order to fix the regression first and do other feature requests for issue 4120 in a follow up. --- scm/fret-diagrams.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/scm/fret-diagrams.scm b/scm/fret-diagrams.scm index 74ab65fedd..f8ccb59a11 100644 --- a/scm/fret-diagrams.scm +++ b/scm/fret-diagrams.scm @@ -109,11 +109,12 @@ to end-point." (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 -- 2.39.2