lilypond-0.1.41

diff --git a/mf/feta-beum.mf b/mf/feta-beum.mf
new file mode 100644 (file)
index 0000000..53c8cc4
--- /dev/null
+++ b/mf/feta-beum.mf
@@ -0,0 +1,23 @@
+% 
+% feta-beum.mf --  implement runtime MF beams
+% 
+% source file of LilyPond's pretty-but-neat music font
+% 
+% (c) 1997 Jan Nieuwenhuizen <jan@digicash.com>
+% 
+mode_setup;
+
+def drawbeam(expr widths,slope,thicks) =
+       beginchar(0,0,0,0) "Embedded mf";
+               width#:=widths*1pt#;
+               thick#:=thicks*1pt#;
+               height#:=slope*width#;
+               % do separately, to identify "value too large"
+               define_pixels(height);
+               define_pixels(thick);
+               define_pixels(width);
+               fill (0, - thick/2)--(width,height - thick/2)--(width,height+thick/2)--(0,thick/2)
+                       -- cycle;
+               endchar;
+       enddef;
+

diff --git a/mf/feta-generic.mf b/mf/feta-generic.mf
index 98390a6713c99a38675d9ec7faca27abfe4be7bd..9891168c1ef37785ddbe27667644155f22d5a424 100644 (file)
--- a/mf/feta-generic.mf
+++ b/mf/feta-generic.mf
@@ -28,7 +28,7 @@ else:
 %      input feta-bolletjes;   
 %      input feta-banier;
 %      input feta-eindelijk;
-%      input feta-klef;
+       input feta-klef;
 %      input feta-toevallig;
-       input feta-schrift;
+%      input feta-schrift;
 fi

diff --git a/tex/lily-ps-defs.tex b/tex/lily-ps-defs.tex
index 9b0ed425a54167bd9bd607b2f59cf58793ee77ac..92d9825afe4b35a6b99f419ec5cb10b6cb7e688d 100644 (file)
--- a/tex/lily-ps-defs.tex
+++ b/tex/lily-ps-defs.tex
@@ -37,14 +37,14 @@
 1 setlinecap
 /draw_beam
 {
-        /beam_thick exch def
+        2 div /beam_thick exch def
         /beam_slope exch def
         /beam_wd exch def
         beam_slope beam_wd mul /beam_ht exch def
-        0 0 moveto 
+        0 beam_thick neg moveto 
         beam_wd beam_ht rlineto 
-        0 beam_thick rlineto
-        0 beam_thick  lineto
+        0 beam_thick 2 mul rlineto
+        0 beam_thick lineto
         closepath fill
 } bind def
 % PS helper: convert (0.2pt) to the token 0.2
@@ -125,7 +125,6 @@ def
         slur_indent slur_ht
         slur_b slur_indent sub slur_ht
         slur_b 0
- %      pstack
         rcurveto        
  %
         slur_indent neg slur_ht slur_dir slur_thick mul  sub