From 93cc5ac709275d7186d6f270b60f39d5effe3128 Mon Sep 17 00:00:00 2001
From: fred <fred>
Date: Wed, 27 Mar 2002 02:06:28 +0000
Subject: [PATCH] lilypond-1.5.38

---
 Documentation/user/refman.itely | 37 +++++++++++++--------
 VERSION                         |  2 +-
 mf/feta-toevallig.mf            | 59 +++++++++++++++++++++++++--------
 scm/interface-description.scm   |  5 ++-
 4 files changed, 72 insertions(+), 31 deletions(-)

diff --git a/Documentation/user/refman.itely b/Documentation/user/refman.itely
index c2786787ff..8a6f012082 100644
--- a/Documentation/user/refman.itely
+++ b/Documentation/user/refman.itely
@@ -3610,8 +3610,8 @@ Lilypond and @code{ly2dvi})
 @cindex breaking lines
 
 Line breaks are normally computed automatically. They are chosen such
-that the resulting spacing has low variation, and looks neither cramped
-nor loose.
+that it looks neither cramped nor loose, and that consecutive lines have
+similar density.
 
 Occasionally you might want to override the automatic breaks; you can do
 this by specifying @code{\break}. This will force a line break at this
@@ -3620,6 +3620,17 @@ are bar lines.  If you want to have a line break where there is no
 bar line, you can force an invisible bar line by entering @code{\bar
 ""}. Similarly, @code{\noBreak} forbids a line break at a certain point.
 
+If you want linebreaks at regular intervals, you can use the following:
+@example
+
+<  \repeat 7 unfold @{ s1 * 4 \break  @}
+   @emph{real music}
+> 
+@end  example
+This makes the following 28 measures (assuming 4/4 time) be broken every
+4 measures.
+
+
 @cindex @code{\penalty}
 
 The @code{\break} and @code{\noBreak} commands are defined in terms of
@@ -5082,16 +5093,16 @@ See @ref{convert-ly} for more information on @code{convert-ly}.
 
 
 
-
-@c .{Local emacs vars}
-@c Local variables:
-@c mode: texinfo
-@c minor-mode: font-lock
-@c minor-mode: outline
-@c outline-layout: (-1 : 0)
-@c outline-use-mode-specific-leader: "@c \."
-@c outline-primary-bullet: "{"
-@c outline-stylish-prefixes: nil
-@c outline-override-protect: t
+@c broken with  emacs-21
+@c {Local emac s  vars}
+@c Local varia bles:
+@c mode: texi nfo
+@c minor-mod e: font-lock
+@c minor-mo de: outline
+@c outline -layout: (-1 : 0)
+@c outlin e-use-mode-specific-leader: "@c \."
+@c outli ne-primary-bullet: "{"
+@c outli ne-stylish-prefixes: nil
+@c outli ne-override-protect: t
 @c End:
 
diff --git a/VERSION b/VERSION
index b958c5e8df..b4dfcf2045 100644
--- a/VERSION
+++ b/VERSION
@@ -1,7 +1,7 @@
 PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=5
-PATCH_LEVEL=37
+PATCH_LEVEL=38
 MY_PATCH_LEVEL=
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
diff --git a/mf/feta-toevallig.mf b/mf/feta-toevallig.mf
index ed316e66f0..accc2310ac 100644
--- a/mf/feta-toevallig.mf
+++ b/mf/feta-toevallig.mf
@@ -79,13 +79,28 @@ fet_beginchar("Sharp" , "1", "sharp");
 	labels(1,2,3,4);
 	fet_endchar;
 
-fet_beginchar( "Natural", "0", "natural")
-	set_char_box(0, 8/12 staff_space#, 1.5 staff_space#, 1.5 staff_space#);
 
+%
+% The stems of the natural are brushed (at least, in Barenreiter SCS )
+%
+%
+
+fet_beginchar( "Natural", "0", "natural")
+	save height;	
 	save interbeam, interstem, beamheight, beamwidth, 
-		stemwidth;
+	stemwidth;
+	save top_stem_thick;
+
+	beamheight# = 4.0 stafflinethickness#;
+	height# = 1.5 staff_space#;
+	set_char_box(0, 2/3 staff_space#, height#, height#);
+
+	define_pixels(height);
+	define_blacker_pixels(beamheight);
+
+	% perhaps we should have a lowres fix?
+	top_stem_thick = 1.9 stafflinethickness;
 
-	beamheight = 4.5 stafflinethickness;
 	interstem + stemwidth =  w;
 	stemwidth = 1.3 stafflinethickness;
 
@@ -101,17 +116,32 @@ fet_beginchar( "Natural", "0", "natural")
 	draw z1 .. z2;
 	draw (xpart z1, -y2) .. (xpart z2, -y1);
 	beamtop = top y2;
-	
+
 	pickup pencircle scaled stemwidth;
-	xpart z3 = xpart z1;
-	xpart z4 = xpart z2;
-	top y3 = 1.5 staff_space;
+	x3 := round (xpart z1);
+	x4 := round (xpart z2);
+
+	penpos3(top_stem_thick, 0);
+	penpos5(top_stem_thick, 0);	
+	penpos4(stemwidth, 0);
+	penpos6(stemwidth, 0);	
+	
+	y3 = height;
 	top y4 = beamtop;
 
-	draw_gridline((xpart z1, -y4),z3,stemwidth);
-	draw_gridline((xpart z2, -y3),z4,stemwidth);
+	x5 = x4;
+	x6 = x3;
+	bot y6 = -beamtop;
+	y5 = - height;
 
-	labels(1,2,3,4);
+	fill simple_serif (z3l, z3r, -30) -- simple_serif(z6r, z6l, -90) -- cycle;
+	fill simple_serif (z5l, z5r, 30) -- simple_serif(z4r, z4l, 90) -- cycle;
+
+
+
+	penlabels(3,4,5,6);
+
+	labels(1,2);
 	fet_endchar;
 
 
@@ -180,12 +210,13 @@ def draw_meta_flat(expr xcenter, w, crook_fatness) =
 	x8r =  xpart center - bottom_stem_thick/2;
 	penlabels(range 0 thru 10);
 
-	z10 = (bottom_stem_thick/2, -1/5 staff_space) + center;
+	y10 = -1/5 staff_space;
+	z10 = whatever [z2r, z1r];
 
-	unfill z3r{up} .. z4r{right} .. tension .9 
+	unfill z3r .. z4r{right} .. tension .9 
 		.. z6r ---
 		z7r{left}
-		.. z10 {up} -- cycle;
+		.. z10  -- cycle;
 	fill z8r{down}
 		.. tension 0.8 ..z8l{(z9-z8)}
 		.. z7l
diff --git a/scm/interface-description.scm b/scm/interface-description.scm
index 220a2ff457..4deb27f649 100644
--- a/scm/interface-description.scm
+++ b/scm/interface-description.scm
@@ -677,9 +677,8 @@ arithmetic_basicspace = 4.;
 
 @end example"
    '(
-  maximum-duration-for-spacing 
-    arithmetic-basicspace 
-    arithmetic-multiplier 
+spacing-increment
+shortest-duration-space
     
     ))
 
-- 
2.39.5