* mf/feta-bolletjes.mf (overdone_heads): cleanup triangle

note-head, to have different attachment points for up and down.

* mf/feta-bolletjes.mf: merge solfa heads into main note heads.

* mf/feta-bolletjes.mf (tishape): remove unicode test.

diff --git a/input/regression/note-head-solfa.ly b/input/regression/note-head-solfa.ly
new file mode 100644 (file)
index 0000000..1e5b776
--- /dev/null
+++ b/input/regression/note-head-solfa.ly
@@ -0,0 +1,28 @@
+
+\header {
+
+  texidoc = "With @code{Shape_note_heads_engraver}, the style of the
+note head is adjusted according to the step of the scale, as measured
+relative to the @code{tonic} property."
+
+}
+\version "2.5.1"
+
+fragment = {
+  \key c \major
+  \set shapeNoteStyles = ##(triangle cross slash  triangle cross slash  triangle cross slash)
+  c d e f g a b c 
+  \set shapeNoteStyles = ##(do re mi fa #f la ti)
+  b a g f e d c 
+}
+
+
+\transpose c d 
+\new Voice \with {
+  \remove "Note_heads_engraver"
+  \consists "Shape_note_heads_engraver"
+} \relative {
+
+  \fragment
+}
+   

diff --git a/mf/feta-bolletjes.mf b/mf/feta-bolletjes.mf
index 8a9145eb8e6824fbf53427c73fa665d92ecceee9..219105285d86b6f950e1affbc33462a26a6a21b0 100644 (file)
--- a/mf/feta-bolletjes.mf
+++ b/mf/feta-bolletjes.mf
@@ -264,8 +264,8 @@ def define_triangle_shape(expr stemdir) =
                charwy := ypart exact_right_point;
                charwx := xpart exact_right_point;
        else:
-               charwy := ypart exact_down_point;
-               charwx := xpart exact_down_point;
+               charwy := - ypart exact_down_point;
+               charwx := (width# - xpart exact_down_point);
        fi
 enddef;
 
@@ -599,7 +599,7 @@ fet_beginchar("Half rehead", "s1re", "halfrehead")
   draw_solfa_note_shape;
 fet_endchar;
 
-fet_beginchar("Quart rehead", "s2ro", "rehead")
+fet_beginchar("Quart rehead", "s2re", "rehead")
   save a_b, noteshape;
   path noteshape;
   a_b = 1.54;
@@ -785,7 +785,7 @@ fet_beginchar("Half tihead", "s1ti", "halftihead")
   draw_solfa_note_shape;
 fet_endchar;
 
-fet_beginchar("Quart tihead", "2ti", "tihead")
+fet_beginchar("Quart tihead", "s2ti", "tihead")
   save a_b, noteshape;
   path noteshape;
   a_b = 1.54;