diff options
| author | Thomas Morley <thomasmorley65@gmail.com> | 2016-08-27 00:32:30 +0200 |
|---|---|---|
| committer | Thomas Morley <thomasmorley65@gmail.com> | 2016-09-02 22:38:28 +0200 |
| commit | 46a056a27c59a31ed53f20e27f8e2772dcbea0d0 (patch) | |
| tree | db3e0007d7e68dc40d5ae5bb5536ca350dccebde /scm | |
| parent | d6e93146b9f25e914373caeced7314237cc53e2f (diff) | |
Issue 4960 Fix micro-tones assigned to strings in TabStaff
This is an oversight from issue 4643
Also extending input/regression/tablature-micro-tone.ly to cover this case.
Diffstat (limited to 'scm')
| -rw-r--r-- | scm/translation-functions.scm | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/scm/translation-functions.scm b/scm/translation-functions.scm index 22f8648c31..0ed0deff0a 100644 --- a/scm/translation-functions.scm +++ b/scm/translation-functions.scm @@ -427,13 +427,21 @@ the current tuning?" (ly:warning (_ "No open string for pitch ~a") pitch))) ;; here we handle assigned strings - (let ((this-fret - (calc-fret pitch string tuning)) - (handle-negative - (ly:context-property context - 'handleNegativeFrets - 'recalculate))) - (cond ((or (and (>= this-fret 0) (integer? this-fret)) + (let* ((this-fret + (calc-fret pitch string tuning)) + (possible-fret? + (and (>= this-fret 0) + (if (and + (ly:context-property + context 'supportNonIntegerFret #f) + (null? rest)) + (integer? (truncate this-fret)) + (integer? this-fret)))) + (handle-negative + (ly:context-property context + 'handleNegativeFrets + 'recalculate))) + (cond ((or possible-fret? (eq? handle-negative 'include)) (set-fret! pitch-entry string finger)) ((eq? handle-negative 'recalculate) |