--- feta-bolletjes.mf.orig	Thu Aug  9 14:31:04 2001
+++ feta-bolletjes.mf	Tue Aug 14 03:00:17 2001
@@ -110,7 +110,7 @@
 	draw_brevis(brevis_wid#);
 fet_endchar;
 
-def draw_mensural_black_head (expr wid) =
+def draw_neo_mensural_black_head (expr wid) =
 	save head_width;
 	head_width# = wid;
 	set_char_box (0, head_width#, noteheight#/2, noteheight#/2);
@@ -128,8 +128,8 @@
 	filldraw z1 -- z2 -- z3 -- z4 -- cycle;
 enddef;
 
-def draw_mensural_open_head (expr wid)=
-	draw_mensural_black_head (wid);
+def draw_neo_mensural_open_head (expr wid)=
+	draw_neo_mensural_black_head (wid);
 	save diamNW, diamSW;
 	diamNW = length (z2 - z1) + blot_diameter;
 	diamSW = length (z4 - z1) + blot_diameter;
@@ -148,16 +148,57 @@
 	unfill z5 -- z6 -- z7 -- z8 --cycle;
 enddef;
 
+fet_beginchar("Neo-mensural open head","0neo_mensural","neomensuralminimhead")
+      draw_neo_mensural_open_head (staff_space#);
+fet_endchar;
+
+fet_beginchar("Neo-mensural open head","1neo_mensural","neomensuralsemiminimhead")
+      draw_neo_mensural_open_head (staff_space#);
+fet_endchar;
+
+fet_beginchar("Neo-mensural black head","2neo_mensural","neofusahead")
+      draw_neo_mensural_black_head (staff_space#);
+fet_endchar;
+
+
+def draw_mensural_head (expr wid, open) =
+      save head_width;
+      head_width# = wid;
+      set_char_box (0, head_width#,
+		    noteheight#/2, noteheight#/2);
+
+      define_pixels(head_width, noteheight);
+
+      x2 = head_width/2;
+      y2 = 1.1 noteheight/2;
+      y1 = 0;
+      (x2 - x1) / (y2 - y1) = tand(30);
+      z3 = (2x2 - x1, y1);
+      z4 = z3 + z1 - z2;
+
+      pickup pencircle
+	     xscaled 0.18 head_width
+	     yscaled 0.36 head_width
+	     rotated -30;
+
+      if open:
+	      draw z1 -- z2 -- z3 -- z4 -- cycle;
+      else:
+	      filldraw z1 -- z2 -- z3 -- z4 -- cycle;
+      fi;
+enddef;
+
+
 fet_beginchar("Mensural open head","0mensural","mensuralminimhead")
-	draw_mensural_open_head (staff_space#);
+	draw_mensural_head (staff_space#, true);
 fet_endchar;
 
 fet_beginchar("Mensural open head","1mensural","mensuralsemiminimhead")
-	draw_mensural_open_head (staff_space#);
+	draw_mensural_head (staff_space#, true);
 fet_endchar;
 
 fet_beginchar("Mensural black head","2mensural","fusahead")
-	draw_mensural_black_head (staff_space#);
+	draw_mensural_head (staff_space#, false);
 fet_endchar;
 
 
@@ -582,7 +623,7 @@
 	2beta# = ht# * b_h;
 	a# = beta# * a_b;
 	wd# = 2a# / a_w;
-	set_char_box(0, wd#, 0.5 ht#, 0.5 ht#);
+	set_char_box(0.3wd#, 0.3wd#, 0.5 ht#, 0.5 ht#);
 	black_notehead_width# := wd#;
 
 	save za, alpha, size;
@@ -615,7 +656,7 @@
 		2beta# = ht# * b_h;
 		a# = beta# * a_b;
 		wd# = 2a# / a_w;
-		set_char_box(0.0, 0.4wd#, 0.5ht#, 0.5ht#);
+		set_char_box(0.25wd#, 0.25wd#, 0.5ht#, 0.5ht#);
 		black_notehead_width# := wd#;
 
 		save convexity;
@@ -733,7 +774,7 @@
 	2beta#=ht#*b_h;
 	a# = beta#*a_b;
 	wd# = 2a# / a_w;
-	set_char_box(0, wd#, 0.5 ht#, 0.5 ht#);
+	set_char_box(0.1wd#, 0.4wd#, 0.5 ht#, 0.5 ht#);
 	black_notehead_width# := wd#;
 
 	define_pixels(ht, wd);
@@ -770,7 +811,7 @@
 	2beta# = ht# * b_h;
 	a# = beta# * a_b;
 	wd# = 2a# / a_w;
-	set_char_box(0, wd#, 0.5 ht#, 0.5 ht#);
+	set_char_box(wd#/2, wd#/2, 0.5 ht#, 0.5 ht#);
 	black_notehead_width# := wd#;
 
 	save za, alpha, size;
@@ -899,11 +940,11 @@
 	2beta# = ht# * b_h;
 	a# = beta# * a_b;
 	wd# = 2a# / a_w;
-	set_char_box(wd#/2, wd#/2, 0.7 ht#, 0.7 ht#);
+	set_char_box(wd#, wd#, 0.7 ht#, 0.7 ht#);
 	black_notehead_width# := wd#;
 
-	save za, zb, zc, alpha, size;
-	pair za, zb, zc;
+	save za, alpha, size;
+	pair za;
 	define_pixels(ht, wd);
 	alpha = 35;
 	size = 0.7ht;


###############################################################################


--- feta-toevallig.mf.orig	Fri Aug 10 14:56:43 2001
+++ feta-toevallig.mf	Tue Aug 14 03:02:49 2001
@@ -328,7 +328,7 @@
 %
 %
 fet_beginchar("Ed. Vat. Flat" , "vaticana-1", "vaticanaflat");
-        set_char_box(0, 0.8 staff_space#, 0.6 staff_space#, 
+        set_char_box(0, 0.7 staff_space#, 0.6 staff_space#, 
                 2.0 staff_space#);
         define_pixels (stafflinethickness, staff_space);
 
@@ -349,7 +349,7 @@
         fet_endchar;
 
 fet_beginchar("Ed. Vat. Natural" , "vaticana0", "vaticananatural");
-	set_char_box(0, 0.7 staff_space#, 0.6 staff_space#, 
+	set_char_box(0, 0.6 staff_space#, 0.6 staff_space#, 
 		2.0 staff_space#);
 	define_pixels (stafflinethickness, staff_space);
 
@@ -381,7 +381,7 @@
 %
 %
 fet_beginchar("Mensural Sharp" , "mensural1", "mensuralsharp");
-	set_char_box(0, 0.7 staff_space#, 0.5 staff_space#, 
+	set_char_box(0.4 staff_space#, 0.6 staff_space#, 0.5 staff_space#, 
 		0.5 staff_space#);
 	save stemthick;
 	define_pixels (stemthick, staff_space);
@@ -400,7 +400,7 @@
 	fet_endchar;
 
 fet_beginchar("Mensural Flat" , "mensural-1", "mensuralflat");
-	set_char_box(0, 0.7 staff_space#, 0.4 staff_space#, 
+	set_char_box(0.1 staff_space#, 0.7 staff_space#, 0.4 staff_space#, 
 		1.8 staff_space#);
 	save stemthick;
 	define_pixels (stemthick, staff_space);
@@ -422,7 +422,7 @@
 	fet_endchar;
 
 fet_beginchar("Hufnagel Flat" , "hufnagel-1", "hufnagelflat");
-	set_char_box(0, 0.7 staff_space#, 0.4 staff_space#, 
+	set_char_box(0.5 staff_space#, 0.7 staff_space#, 0.4 staff_space#, 
 		1.8 staff_space#);
 	save stemthick;
 	define_pixels (stemthick, staff_space);


###############################################################################


--- output-lib.scm.orig	Sat May  5 18:22:36 2001
+++ output-lib.scm	Tue Aug 14 00:52:46 2001
@@ -83,6 +83,7 @@
     ((default) '(1.0 . 0.5))
     ((cross) '(1.0 . 0.75))
     ((mensural) '(0.0 . 0.6))
+    ((neo_mensural) '(0.0 . 0.6))
     ((diamond) '(1.0 . 0.8))
     ((transparent) '(1.0 . 1.0))
     ((slash) '(1.0 . 1.0))


###############################################################################


--- ancient-font.ly.orig	Thu Aug  9 14:32:01 2001
+++ ancient-font.ly	Tue Aug 14 03:20:03 2001
@@ -26,43 +26,74 @@
 	\property Staff.KeySignature \override #'style = #'vaticana
 	\property Staff.Accidentals \override #'style = #'vaticana
 	\property Staff.Custos \override #'style = #'vaticana
-	\property Voice.NoteHead \override #'style = #'mensural
+	\property Voice.NoteHead \override #'style = #'vaticana_punctum
 	\key es \major
 	\clef "vaticana_fa2"
-	cis!2 des! e! fis! ges!
+	c!1 des! e! f! ges!
 
 %	\property Staff.clefGlyph = #"clefs-vaticana_do"
 %	\property Staff.clefPosition = #1
 %	\property Staff.clefOctavation = #0 
 	\clef "vaticana_do2"
 
-	a b c'
-	b as gis fes
+	\property Voice.NoteHead \override #'style = #'vaticana_subbipunctum
+	a! b! ces'
+	\property Voice.NoteHead \override #'style = #'vaticana_virga
+	b! a! ges fes
 	\clef "vaticana_fa1"
-	es dis ces1 \bar "|"
+	\property Voice.NoteHead \override #'style = #'vaticana_quilisma
+	es d
+	\property Voice.NoteHead \override #'style = #'vaticana_rvirga
+	c d
+	\breathe
+	\property Voice.NoteHead \override #'style = #'vaticana_rvirga
+	es f
+	\property Staff.BarLine \override #'bar-size = #3.0 \bar "|"
+	\property Voice.NoteHead \override #'style = #'vaticana_lpes
+	g as
+	\property Staff.BarLine \override #'bar-size = #2.0 \bar "|"
+	\property Voice.NoteHead \override #'style = #'vaticana_upes
+	bes as
+	\breathe
+	\property Voice.NoteHead \override #'style = #'vaticana_vupes
+	g f
+	\property Voice.NoteHead \override #'style = #'vaticana_plica
+	\property Staff.BarLine \override #'bar-size = #2.0 \bar "|"
+	es d
+	\property Voice.NoteHead \override #'style = #'vaticana_epiphonus
+	\property Staff.BarLine \override #'bar-size = #3.0 \bar "|"
+	c d
+	\property Voice.NoteHead \override #'style = #'vaticana_cephalicus
+	es f
 
 	\property Staff.KeySignature \override #'style = #'medicaea
 	\property Staff.Accidentals \override #'style = #'medicaea
 	\property Staff.Custos \override #'style = #'medicaea
-	\property Voice.NoteHead \override #'style = #'mensural
+	\property Voice.NoteHead \override #'style = #'medicaea_punctum
 	\clef "medicaea_fa2"
-	ces2 des es fes ges
+	ces! des! e! f! ges!
 	\clef "medicaea_do2"
-	as bes ces'
-	bes as ges fes
+	\property Voice.NoteHead \override #'style = #'medicaea_subbipunctum
+	a! b! ces'!
+	\property Voice.NoteHead \override #'style = #'medicaea_virga
+	b! a! ges! fes!
 	\clef "medicaea_fa1"
-	es des ces1 \bar "|"
+	\property Voice.NoteHead \override #'style = #'medicaea_rvirga
+	e! des! ces! \bar "|"
 
 	\property Staff.KeySignature \override #'style = #'hufnagel
 	\property Staff.Accidentals \override #'style = #'hufnagel
 	\property Staff.Custos \override #'style = #'hufnagel
-	\property Voice.NoteHead \override #'style = #'mensural
+	\property Voice.NoteHead \override #'style = #'hufnagel_punctum
 	\clef "hufnagel_fa2"
-	ces!2 des! es! fes! ges!
+	ces! des! es! fes! ges!
 	\clef "hufnagel_do2"
+	\property Voice.NoteHead \override #'style = #'hufnagel_lpes
 	as! bes! ces'!
+	\property Voice.NoteHead \override #'style = #'hufnagel_virga
 	bes! as! ges! fes!
 	\clef "hufnagel_do_fa"
+	\property Voice.NoteHead \override #'style = #'hufnagel_punctum
 	es! des! ces!1 \bar "||"
     }
 >
@@ -79,7 +110,7 @@
 	\property Staff.KeySignature \override #'style = #'mensural
 	\property Staff.Accidentals \override #'style = #'mensural
 	\property Staff.Custos \override #'style = #'mensural
-        \property Voice.NoteHead \override #'style = #'mensural
+        \property Voice.NoteHead \override #'style = #'neo_mensural
 	\key a \major
 	\clef "neo_mensural_c2"
 	c2 dis es fis ges
@@ -99,6 +130,7 @@
 	\clef "mensural_g"
 	e d c1 \bar "|"
 
+        \property Voice.NoteHead \override #'style = #'mensural
 	\clef "petrucci_f"
 	c2 d e f g
         \property Staff.forceClef = ##t
@@ -139,15 +171,15 @@
 %	\paperTwentysix
 	linewidth = 17.25\cm
 	textheight = 26.0\cm
-	stafflinethickness = \staffspace / 5.0
+%	stafflinethickness = \staffspace / 5.0
 	indent = 0.0
 	\translator {
 	    \StaffContext
 	    \consists Custos_engraver
 %	    Custos \override #'style = #'mensural
 	    \remove Time_signature_engraver
+	    StaffSymbol \override #'thickness = #2.0
 %	    StaffSymbol \override #'line-count = #4
 	}
     }
 }
-


###############################################################################