Improving \harmonicBy... functions

ly/music-functions-init.ly

 %%%% -*- Mode: Scheme -*-
 
 %%%% This file is part of LilyPond, the GNU music typesetter.
 %%%%
 %%%% Copyright (C) 2003--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
 %%%%                          Jan Nieuwenhuizen <janneke@gnu.org>
 %%%%
 %%%% 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
@@ skipping 356 matching lines @@
 grobdescriptions =
 #(define-scheme-function (parser location descriptions) (list?)
    (_i "Create a context modification from @var{descriptions}, a list
 in the format of @code{all-grob-descriptions}.")
    (ly:make-context-mod
     (map (lambda (p)
            (list 'assign (car p) (list (cdr p))))
          descriptions)))
 
 harmonicByFret = #(define-music-function (parser location fret music) (number? ly:music?)
-  (_i "Convert @var{music} into harmonics; the resulting notes resemble
-harmonics played on a fretted instrument by touching the strings above @var{fret}.")
+  (_i "Convert @var{music} into mixed harmonics; the resulting notes resemble
+harmonics played on a fretted instrument by touching the strings at @var{fret}.")
   (let* ((fret (number->string fret))
          (pitch (fret->pitch fret)))
         (make-sequential-music
          (list
           #{
+            \set harmonicDots = ##t
             \override TabNoteHead #'stencil = #(tab-note-head::print-custom-fret-label fret)
+            \override NoteHead #'Y-extent = #(ly:make-unpure-pure-container
+                                               ly:grob::stencil-height
+                                                 (lambda (grob start end)
+                                                         (ly:grob::stencil-height grob)))
+            \override NoteHead #'stencil = #(lambda (grob) (ly:grob-set-property! grob 'style 'harmonic-mixed)
+                                                    (ly:note-head::print grob))
           #}
           (make-harmonic

[dak, 2012/02/24 14:32:31]

As each #{...#} carries a bit of overhead, there is little point in having two
of them wrapped in make-sequential-music.  Just make a single #{ ... #} instead
of the whole make-sequential-music and splice $(make-harmonic ...) in the
middle.

             (calc-harmonic-pitch pitch music))
           #{
+            \unset harmonicDots
             \revert TabNoteHead #'stencil
+            \revert NoteHead #'Y-extent
+            \revert NoteHead #'stencil
           #}))))
 
 harmonicByRatio = #(define-music-function (parser location ratio music) (number? ly:music?)
-    (_i "Convert @var{music} into harmonics; the resulting notes resemble
-harmonics played on a fretted instrument by touching the strings above the point
+    (_i "Convert @var{music} into mixed harmonics; the resulting notes resemble
+harmonics played on a fretted instrument by touching the strings at the point
 given through @var{ratio}.")
   (let ((pitch (ratio->pitch ratio))
         (fret (ratio->fret ratio)))
        (make-sequential-music
         (list
          #{
+           \set harmonicDots = ##t
            \override TabNoteHead #'stencil = #(tab-note-head::print-custom-fret-label fret)
+           \override NoteHead #'Y-extent = #(ly:make-unpure-pure-container
+                                              ly:grob::stencil-height
+                                                (lambda (grob start end)
+                                                        (ly:grob::stencil-height grob)))
+           \override NoteHead #'stencil = #(lambda (grob) (ly:grob-set-property! grob 'style 'harmonic-mixed)
+                                                   (ly:note-head::print grob))
          #}
          (make-harmonic
            (calc-harmonic-pitch pitch music))
          #{
+            \unset harmonicDots
             \revert TabNoteHead #'stencil
+            \revert NoteHead #'Y-extent
+            \revert NoteHead #'stencil
          #}))))
 
 instrumentSwitch =
 #(define-music-function
    (parser location name) (string?)
    (_i "Switch instrument to @var{name}, which must be predefined with
 @code{\\addInstrumentDefinition}.")
    (let* ((handle (assoc name instrument-definitions))
           (instrument-def (if handle (cdr handle) '())))
 
@@ skipping 719 matching lines @@
 Use this if you want to have a scheme expression evaluated
 because of its side-effects, but its value ignored."))
 
 withMusicProperty =
 #(define-music-function (parser location sym val music)
    (symbol? scheme? ly:music?)
    (_i "Set @var{sym} to @var{val} in @var{music}.")
 
    (set! (ly:music-property music sym) val)
    music)