Fix #1660: Make \harmonicsOn work in tablature.

* ly/property-init.ly (harmonicsOn):

  add TabNoteHead to override-head-style call

* scm/tablature.scm (is-harmonic?):

  check grob property 'style for 'harmonic setting

diff --git a/ly/property-init.ly b/ly/property-init.ly
index 2e293352db97fa919700a03805a25d576b6fd440..4af2a8d689356d0d1050600aa8ba785f70c4bedc 100644 (file)
--- a/ly/property-init.ly
+++ b/ly/property-init.ly
@@ -217,7 +217,7 @@ glissando = #(make-music 'GlissandoEvent)
 harmonicsOn =
 #(define-music-function (parser location) ()
    (_i "Set the default note head style to a diamond-shaped style.")
-   (override-head-style 'NoteHead 'harmonic))
+   (override-head-style '(NoteHead TabNoteHead) 'harmonic))
 harmonicsOff = \defaultNoteHeads
 harmonicNote =
 #(define-music-function (parser location note) (ly:music?)

diff --git a/scm/tablature.scm b/scm/tablature.scm
index f4c67bebdc3f1baf5ecb0d40ee77b507760b0270..c26af257c8df13b1c14161a7314a6c201ffd99a7 100644 (file)
--- a/scm/tablature.scm
+++ b/scm/tablature.scm
@@ -220,9 +220,10 @@
 (define-public (tab-note-head::print grob)
   (define (is-harmonic? grob)
     (let ((arts (ly:event-property (event-cause grob) 'articulations)))
-      (not (null? (filter (lambda (a)
-                           (ly:in-event-class? a 'harmonic-event))
-                         arts)))))
+      (or (pair? (filter (lambda (a)
+                          (ly:in-event-class? a 'harmonic-event))
+                         arts))
+         (eq? (ly:grob-property grob 'style) 'harmonic))))
 
   (let* ((cautionary (ly:grob-property grob 'display-cautionary #f))
         (details (ly:grob-property grob 'details '()))