diff -urN lilypond-1.5.8/input/test/ancient-font.ly lilypond-1.5.8.NEW/input/test/ancient-font.ly
--- lilypond-1.5.8/input/test/ancient-font.ly	Sun Aug 19 22:02:00 2001
+++ lilypond-1.5.8.NEW/input/test/ancient-font.ly	Fri Aug 31 03:52:35 2001
@@ -38,30 +38,28 @@
 
 	\property Voice.NoteHead \override #'style = #'vaticana_subbipunctum
 	a! b! ces'
+	\property Staff.BarLine \override #'bar-size = #3.0 \bar "|"
 	\property Voice.NoteHead \override #'style = #'vaticana_virga
 	b! a! ges fes
+	\breathe
 	\clef "vaticana_fa1"
 	\property Voice.NoteHead \override #'style = #'vaticana_quilisma
 	es d
 	\property Voice.NoteHead \override #'style = #'vaticana_rvirga
 	c d
-	\breathe
+	\property Staff.BarLine \override #'bar-size = #3.0 \bar "|"
 	\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
@@ -71,30 +69,39 @@
 	\property Staff.Custos \override #'style = #'medicaea
 	\property Voice.NoteHead \override #'style = #'medicaea_punctum
 	\clef "medicaea_fa2"
-	ces! des! e! f! ges!
+	ces! des!
+	\property Staff.BarLine \override #'bar-size = #3.0 \bar "|"
+	e! f! ges!
 	\clef "medicaea_do2"
 	\property Voice.NoteHead \override #'style = #'medicaea_subbipunctum
 	a! b! ces'!
 	\property Voice.NoteHead \override #'style = #'medicaea_virga
-	b! a! ges! fes!
+	b! a!
+	\property Staff.BarLine \override #'bar-size = #3.0 \bar "|"
+	ges! fes!
 	\clef "medicaea_fa1"
 	\property Voice.NoteHead \override #'style = #'medicaea_rvirga
-	e! des! ces! \bar "|"
+	e! des! ces!
 
 	\property Staff.KeySignature \override #'style = #'hufnagel
 	\property Staff.Accidentals \override #'style = #'hufnagel
 	\property Staff.Custos \override #'style = #'hufnagel
 	\property Voice.NoteHead \override #'style = #'hufnagel_punctum
 	\clef "hufnagel_fa2"
-	ces! des! es! fes! ges!
+	ces! des! es!
+	\property Staff.BarLine \override #'bar-size = #3.0 \bar "|"
+	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!
+	bes! as!
+	\property Staff.BarLine \override #'bar-size = #3.0 \bar "|"
+	ges! fes!
 	\clef "hufnagel_do_fa"
 	\property Voice.NoteHead \override #'style = #'hufnagel_punctum
-	es! des! ces!1 \bar "||"
+	es! des! ces! des! es! fes!
+	\bar "||"
     }
 >
 
@@ -112,6 +119,7 @@
 	\property Staff.Accidentals \override #'style = #'mensural
 	\property Staff.Custos \override #'style = #'mensural
         \property Voice.NoteHead \override #'style = #'neo_mensural
+        \property Voice.Rest \override #'style = #'neo_mensural
 	\key a \major
 	\clef "neo_mensural_c2"
 	c2 dis es fis ges
@@ -123,31 +131,36 @@
 	e d c1 \bar "|"
 
 	\clef "petrucci_c2"
-	c2 d e f g
+	r\longa
         \property Staff.forceClef = ##t
 	\clef "mensural_c2"
-	a b c'
-	b a g f
+	r\breve r1 r2
 	\clef "mensural_g"
-	e d c1 \bar "|"
+	r4 r8 r16 r32 r32 \bar "|"
 
         \property Voice.NoteHead \override #'style = #'mensural
 	\property Voice.Stem \override #'style = #'mensural
 	\property Voice.Stem \override #'thickness = #1.0
+        \property Voice.Rest \override #'style = #'mensural
 	\clef "petrucci_f"
 	c8 b, c16 b, c32 b, c64 b, c b,
 	d8 e  d16 e  d32 e  d64 e  d e
-	c2 d e f g
+	r\longa
         \property Staff.forceClef = ##t
 	\clef "petrucci_f"
-	a b c'
-	b a g f
+	r\breve r1 \bar "|"
 	\clef "mensural_f"
-	e d c1 \bar "|"
+
+	% FIXME: need this to avoid segmentation fault on r8/r16/r32
+	% (Strange: what has Voice.Stem style to do with mensural rests?)
+	\property Voice.Stem \override #'style = #'neo_mensural
+
+	r2 r4 r8 r16 r32 r32
+	\property Voice.Stem \override #'style = #'mensural
 
         \property Staff.forceClef = ##t
 	\clef "mensural_f"
-	c2 d e f g
+	e2 f g
 	\clef "mensural_g"
 	as'! bes'! cis''!
 	bes'! as'! gis'! fis'!
@@ -185,6 +198,16 @@
 	    \remove Time_signature_engraver
 %	    StaffSymbol \override #'thickness = #2.0
 %	    StaffSymbol \override #'line-count = #4
+	}
+	\translator {
+	    \ScoreContext
+%	    \remove System_start_delimiter_engraver
+%	    SystemStartDelimiter \override #'glyph = #'brace
+	}
+	\translator {
+	    \ChoirStaffContext
+	    \remove System_start_delimiter_engraver
+%	    SystemStartDelimiter \override #'glyph = #'empty
 	}
     }
 }
diff -urN lilypond-1.5.8/lily/rest.cc lilypond-1.5.8.NEW/lily/rest.cc
--- lilypond-1.5.8/lily/rest.cc	Mon Apr  9 00:26:48 2001
+++ lilypond-1.5.8.NEW/lily/rest.cc	Tue Aug 28 23:15:41 2001
@@ -82,7 +82,7 @@
   
   String style; 
   SCM style_sym =me->get_grob_property ("style");
-  if (balltype >= 2 && gh_symbol_p (style_sym))
+  if (gh_symbol_p (style_sym))
     {
       style = ly_scm2string (scm_symbol_to_string (style_sym));
     }
diff -urN lilypond-1.5.8/mf/feta-eindelijk.mf lilypond-1.5.8.NEW/mf/feta-eindelijk.mf
--- lilypond-1.5.8/mf/feta-eindelijk.mf	Sat Feb 24 22:06:31 2001
+++ lilypond-1.5.8.NEW/mf/feta-eindelijk.mf	Fri Aug 31 02:50:01 2001
@@ -345,12 +345,59 @@
 
 endgroup;
 
-% Rest symbols for mensural notation:
+%%%%%%%%
+%
+%
+%
+% MENSURAL NOTATION
+%
+%
+%
+
+% Neo-mensural longa and breve are identical with default longa and breve.
+
+neomens_block_rest_x# = 2/5 staff_space#;
+neomens_block_rest_y# = 1/1 staff_space#;
+neomens_half_block_rest_y# = 5/8 staff_space#;
+
+define_pixels(neomens_block_rest_x,
+	      neomens_block_rest_y, neomens_half_block_rest_y);
+
+def neomens_half_block_rest =
+	draw_block ((0,0), (neomens_block_rest_x, neomens_half_block_rest_y));
+	enddef;
+
+fet_beginchar("Neo-mensural longa rest", "-2neo_mensural", "neomenslongarest");
+       set_char_box(0, neomens_block_rest_x#,
+		    neomens_block_rest_y#, neomens_block_rest_y#);
+       draw_block ((0,-neomens_block_rest_y),
+		   (neomens_block_rest_x, neomens_block_rest_y));
+fet_endchar;
+
+fet_beginchar("Neo-mensural breve rest", "-1neo_mensural", "neomensbreverest");
+       set_char_box(0, neomens_block_rest_x#,
+		    0, neomens_block_rest_y#);
+       draw_block ((0,0), (neomens_block_rest_x, neomens_block_rest_y));
+fet_endchar;
+
+fet_beginchar("Neo-mensural whole rest", "0neo_mensural", "neomenssemibrevisrest");
+	set_char_box(0, neomens_block_rest_x#,
+		     neomens_half_block_rest_y#,  0);
+	neomens_half_block_rest;
+	currentpicture :=
+		currentpicture shifted (0,- neomens_half_block_rest_y);
+fet_endchar;
+
+fet_beginchar("Neo-mensural half rest", "1neo_mensural", "neomensminimahalfrest");
+	set_char_box(0, neomens_block_rest_x#,
+		     0, neomens_half_block_rest_y#);
+	neomens_half_block_rest;
+fet_endchar;
 
-mensrestsize# = .8staff_space#;
+neomensrestsize# = .8staff_space#;
 
-fet_beginchar("Mensural 4th rest","2mensural","minimarest")
-	set_char_box(0,mensrestsize#,0,mensrestsize#);
+fet_beginchar("Neo-mensural 4th rest","2neo_mensural","neomenssemiminimarest")
+	set_char_box(0,neomensrestsize#,0,neomensrestsize#);
         pickup pencircle scaled 2 stafflinethickness;
 	lft x1 = 0;
 	bot y1 = 0;
@@ -362,8 +409,8 @@
 	draw z2 .. z3;
 fet_endchar
 
-fet_beginchar("Mensural 8th rest","3mensural","fusarest")
-	set_char_box(0,mensrestsize#,0,mensrestsize#);
+fet_beginchar("Neo-mensural 8th rest","3neo_mensural","neomensfusarest")
+	set_char_box(0,neomensrestsize#,0,neomensrestsize#);
         pickup pencircle scaled 2 stafflinethickness;
 	rt x1 = w;
 	bot y1 = 0;
@@ -375,8 +422,8 @@
 	draw z2 .. z3;
 fet_endchar
 
-fet_beginchar("Mensural 16th rest","4mensural","semifusarest")
-	set_char_box(0,mensrestsize#,0,staff_space#);
+fet_beginchar("Neo-mensural 16th rest","4neo_mensural","neomenssemifusarest")
+	set_char_box(0,neomensrestsize#,0,staff_space#);
         pickup pencircle scaled 2 stafflinethickness;
 	rt x1 = w;
 	bot y1 = 0;
@@ -397,6 +444,103 @@
 
 	draw z3 .. z4;
 	draw z5 .. z6;
+fet_endchar
+
+pen_width# = 2/5 staff_space#;
+pen_height# = 0;
+pen_rotation = 30;
+slight_pen_rotation = 15;
+
+mens_block_rest_y# = 1/1 staff_space#;
+mens_half_block_rest_y# = 5/8 staff_space#;
+
+define_pixels(mens_block_rest_y, mens_half_block_rest_y,
+	      pen_width, pen_height);
+
+fet_beginchar("Mensural longa rest", "-2mensural", "menslongarest");
+	set_char_box(pen_width#/2, pen_width#/2,
+		     mens_block_rest_y#, mens_block_rest_y#);
+	pickup pencircle
+		xscaled pen_width
+		yscaled pen_height
+		rotated slight_pen_rotation;
+	draw (0, -mens_block_rest_y) -- (0, mens_block_rest_y);
+fet_endchar;
+
+fet_beginchar("Mensural breve rest", "-1mensural", "mensbreverest");
+	set_char_box(pen_width#/2, pen_width#/2,
+		     0, mens_block_rest_y#);
+	pickup pencircle
+		xscaled pen_width
+		yscaled pen_height
+		rotated slight_pen_rotation;
+	draw (0, 0) -- (0, mens_block_rest_y);
+fet_endchar;
+
+fet_beginchar("Mensural whole rest", "0mensural", "menssemibrevisrest");
+	set_char_box(pen_width#/2, pen_width#/2,
+		     mens_half_block_rest_y#, 0);
+	pickup pencircle
+		xscaled pen_width
+		yscaled pen_height
+		rotated slight_pen_rotation;
+	draw (0, 0) -- (0, -mens_half_block_rest_y);
+fet_endchar;
+
+fet_beginchar("Mensural half rest", "1mensural", "mensminimahalfrest");
+	set_char_box(pen_width#/2, pen_width#/2,
+		     0, mens_half_block_rest_y#);
+	pickup pencircle
+		xscaled pen_width
+		yscaled pen_height
+		rotated slight_pen_rotation;
+	draw (0, 0) -- (0, mens_half_block_rest_y);
+fet_endchar;
+
+mensrestsize# = .8staff_space#;
+
+fet_beginchar("Mensural 4th rest","2mensural","menssemiminimarest")
+	set_char_box(0,mensrestsize#,0,mensrestsize#);
+	pickup pencircle
+		xscaled pen_width
+		yscaled pen_height
+		rotated pen_rotation;
+	lft x1 =      0;     y1 = 0;
+	lft x2 =      0; top y2 = 5/8 h;
+	rt  x3 =  4/8 w; bot y3 = 6/8 h;
+	rt  x4 = 10/8 w; bot y4 = 4/8 h;
+	draw z1 -- z2 -- z3 -- z4;
+fet_endchar
+
+fet_beginchar("Mensural 8th rest","3mensural","mensfusarest")
+	set_char_box(0,mensrestsize#,0,mensrestsize#);
+	pickup pencircle
+		xscaled pen_width
+		yscaled pen_height
+		rotated pen_rotation;
+	rt  x1 = 10/8 w;     y1 = 0;
+	rt  x2 = 10/8 w; top y2 = 5/8 h;
+	lft x3 =  2/8 w; bot y3 = 6/8 h;
+	lft x4 =      0; bot y4 = 4/8 h;
+	draw z1 -- z2 -- z3 -- z4;
+fet_endchar
+
+fet_beginchar("Mensural 16th rest","4mensural","menssemifusarest")
+	set_char_box(0,mensrestsize#,0,staff_space#);
+	pickup pencircle
+		xscaled pen_width
+		yscaled pen_height
+		rotated pen_rotation;
+
+	rt  x1 = 10/8 w;     y1 = 0;
+	rt  x2 = 10/8 w; top y2 = 5.5/8 h;
+	lft x3 =  2/8 w; bot y3 = 6.5/8 h;
+	lft x4 =      0; bot y4 = 4.5/8 h;
+	rt  x5 = 10/8 w; top y5 = 2.5/8 h;
+	lft x6 =  2/8 w; bot y6 = 3.5/8 h;
+	lft x7 =      0; bot y7 = 1.5/8 h;
+	draw z1 -- z2 -- z3 -- z4;
+	draw z5 -- z6 -- z7;
 fet_endchar
 
 fet_endgroup("rests")