X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=mf%2Ffeta-accordion.mf;h=c96ff8d06cbe57f3d7e40525d13980fbc4e0211f;hb=66f9cbcfe348419cf09597f0f00c748e8849a6b9;hp=3920e36c4d4458fd2c526b41738cc53b062b919c;hpb=e1a149d0cc60b02e86209387958f4028567dd366;p=lilypond.git

diff --git a/mf/feta-accordion.mf b/mf/feta-accordion.mf
index 3920e36c4d..c96ff8d06c 100644
--- a/mf/feta-accordion.mf
+++ b/mf/feta-accordion.mf
@@ -1,7 +1,7 @@
 % Feta (not the Font-En-Tja) music font -- draw accordion symbols
 % This file is part of LilyPond, the GNU music typesetter.
 %
-% Copyright (C) 1998--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
+% Copyright (C) 1998--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
 %
 % LilyPond is free software: you can redistribute it and/or modify
 % it under the terms of the GNU General Public License as published by
@@ -452,6 +452,7 @@ fet_beginchar ("accordion oldEE", "oldEE")
 	fi;
 fet_endchar;
 
+
 fet_beginchar ("accordion push", "push");
 	save width, height;
 
@@ -474,21 +475,42 @@ fet_beginchar ("accordion push", "push");
 	top y1 = height;
 
 	rt x2 = 0;
-	y2 = 0.5 * (y1+y3);
+	y2 = 0.5 * (y1 + y3);
 
-	x3= x1;
+	x3 = x1;
 	bot y3 = 0;
 
-	save pat;
-
-	path pat;
-
-	pat = z1 -- z2 -- z3;
-
-	draw pat;
-
+	save nw_offset, ne_offset;
+	pair nw_offset, ne_offset;
+	save sw_offset, se_offset, line_radius;
+	pair sw_offset, se_offset;
+
+	line_radius := linewidth / 2;
+	nw_offset := line_radius * unitvector (z1 - z2);
+	ne_offset := nw_offset rotated -90;
+	sw_offset := line_radius * unitvector (z3 - z2);
+	se_offset := sw_offset rotated 90;
+
+	z4 = ((z1 - ne_offset)
+	     -- (z2 - ne_offset))
+	     intersectionpoint
+	     ((z2 - se_offset)
+	     -- (z3 - se_offset));
+
+	fill z1 + ne_offset
+	     -- z2 + ne_offset
+	     .. rt z2 {down}
+	     .. z2 + se_offset
+	     -- z3 + se_offset
+	     .. z3 + sw_offset {- se_offset}
+	     .. z3 - se_offset
+	     -- z4
+	     -- z1 - ne_offset
+	     .. z1 + nw_offset {ne_offset}
+	     .. cycle;
 fet_endchar;
 
+
 fet_beginchar ("accordion pull", "pull");
 	save width, height;
 
@@ -525,24 +547,17 @@ fet_beginchar ("accordion pull", "pull");
 	x5 = x1;
 	y5 = y4;
 
-	save pat;
-
-	path pat;
-
-	pat = z1 + penradius * right {up} --
-	      z2 + penradius * right {up} ..
-	      z2 + penradius * up {left} --
-	      z3 + penradius * up {left} ..
-	      z3 + penradius * left {down} --
-	      z4 + penradius * left {down} ..
-	      z4 + penradius * down {right} --
-	      z5 + penradius * (down + left) --
-	      z1 + penradius * left {down} ..
-	      z1 + penradius * down {right} ..
-	      cycle;
-
-	fill pat;
-
+	fill z1 + penradius * right {up}
+	     -- z2 + penradius * right {up}
+	     .. z2 + penradius * up {left}
+	     -- z3 + penradius * up {left}
+	     .. z3 + penradius * left {down}
+	     -- z4 + penradius * left {down}
+	     .. z4 + penradius * down {right}
+	     -- z5 + penradius * (down + left)
+	     -- z1 + penradius * left {down}
+	     .. z1 + penradius * down {right}
+	     .. cycle;
 fet_endchar;
 
 fet_endgroup ("accordion");