New glyph (black diamond) and two harmonic-like notehead styles using it.

diff --git a/mf/parmesan-heads.mf b/mf/parmesan-heads.mf
index da64dbeb4b5a25a104f859a49bfb504dc5af3acc..551e3e3bd2ec48bc5f405d64b10d0abaabb87841 100644 (file)
--- a/mf/parmesan-heads.mf
+++ b/mf/parmesan-heads.mf
@@ -192,6 +192,13 @@ fet_beginchar("Harmonic notehead (Neo-mensural open)",
        charwy := 0;
 fet_endchar;
 
+fet_beginchar("Harmonic notehead (Neo-mensural black)",
+             "s2harmonic")
+       draw_neomensural_black_head (1.3 staff_space#, 1.3 noteheight#);
+       charwx := head_width#;
+       charwy := 0;
+fet_endchar;
+
 fet_beginchar("Neo-mensural semibrevis head","s0neomensural")
       draw_neomensural_open_head (staff_space#, noteheight#);
 fet_endchar;

diff --git a/scm/output-lib.scm b/scm/output-lib.scm
index f66a78bcbc7bf42082f35d66831dbd64c5e58c70..11f427bcec8761f0f8de7d3eb095a67402019cf5 100644 (file)
--- a/scm/output-lib.scm
+++ b/scm/output-lib.scm
@@ -168,6 +168,9 @@
       ;; statement.  -- jr
       ((xcircle) "2xcircle")
       ((harmonic) "0harmonic")
+      ((harmonic-black) "2harmonic")
+      ((harmonic-mixed) (if (<= log 1) "0harmonic"
+                                       "2harmonic"))
       ((baroque) 
        ;; Oops, I actually would not call this "baroque", but, for
        ;; backwards compatibility to 1.4, this is supposed to take