X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=mf%2Ffeta-accordion.mf;fp=mf%2Ffeta-accordion.mf;h=97de6e494c9aedbe4339742e9d2f04385fd41de5;hb=941dff9d2a67080e0dd8474f1e70f0c72ace6424;hp=f1058000873bdf7039b5987b5ee1cbf80f5e4736;hpb=5a22d6233a39d3164e1ca043244794c268be4ad0;p=lilypond.git

diff --git a/mf/feta-accordion.mf b/mf/feta-accordion.mf
index f105800087..97de6e494c 100644
--- a/mf/feta-accordion.mf
+++ b/mf/feta-accordion.mf
@@ -1,9 +1,20 @@
+% Feta (not the Font-En-Tja) music font -- draw accordion symbols
+% This file is part of LilyPond, the GNU music typesetter.
 %
-% feta-accordion.mf -- draw accordion symbols
+% Copyright (C) 1998--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
 %
-% source file of the GNU LilyPond music typesetter
+% LilyPond is free software: you can redistribute it and/or modify
+% it under the terms of the GNU General Public License as published by
+% the Free Software Foundation, either version 3 of the License, or
+% (at your option) any later version.
 %
-% (c) 1998--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
+% LilyPond is distributed in the hope that it will be useful,
+% but WITHOUT ANY WARRANTY; without even the implied warranty of
+% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+% GNU General Public License for more details.
+%
+% You should have received a copy of the GNU General Public License
+% along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 
 fet_begingroup ("accordion");
 
@@ -19,7 +30,7 @@ accreg_lh# := 1.0 staff_space#;
 define_pixels (accreg_dot_size, accreg_linethickness, accreg_lh);
 
 
-fet_beginchar ("accDiscant", "accDiscant")
+fet_beginchar ("accordion register discant", "discant")
 	save r, pat, lh, lt;
 	path pat;
 
@@ -90,7 +101,7 @@ fet_beginchar ("accDiscant", "accDiscant")
 fet_endchar;
 
 
-fet_beginchar ("accDot", "accDot")
+fet_beginchar ("accordion register dot", "dot")
 	set_char_box (accreg_dot_size# / 2, accreg_dot_size# / 2,
 		      accreg_dot_size# / 2, accreg_dot_size# / 2);
 
@@ -103,7 +114,7 @@ fet_beginchar ("accDot", "accDot")
 fet_endchar;
 
 
-fet_beginchar ("accFreebase", "accFreebase")
+fet_beginchar ("accordion register freebass", "freebass")
 	save r, lh, lt;
 
 	r# = accreg_lh#;
@@ -160,7 +171,7 @@ fet_beginchar ("accFreebase", "accFreebase")
 fet_endchar;
 
 
-fet_beginchar ("accStdbase", "accStdbase")
+fet_beginchar ("accordion register stdbass", "stdbass")
 	save r, p, lh, lt;
 	path pat;
 
@@ -233,7 +244,7 @@ fet_beginchar ("accStdbase", "accStdbase")
 fet_endchar;
 
 
-fet_beginchar ("accBayanbase", "accBayanbase")
+fet_beginchar ("accordion register bayanbass", "bayanbass")
 	save lh, lt;
 
 	lh = vround accreg_lh;
@@ -361,7 +372,7 @@ def def_some_vars =
 enddef;
 
 
-fet_beginchar ("accOldEE", "accOldEE")
+fet_beginchar ("accordion oldEE", "oldEE")
 	save r, pp, ir, lh, lt, stroke_width;
 
 	r# = staff_space#;
@@ -442,4 +453,111 @@ fet_beginchar ("accOldEE", "accOldEE")
 fet_endchar;
 
 
+fet_beginchar ("accordion push", "push");
+	save width, height;
+
+	height# := 2.0 staff_space# + 3.0 stafflinethickness#;
+	width# := 0.4 height#;
+
+	define_pixels(height, width);
+
+	save linewidth;
+
+	linewidth# := stafflinethickness# + .05 staff_space#;
+	define_whole_blacker_pixels (linewidth);
+
+	set_char_box (width#, 0,
+	              0, height#);
+
+	pickup pencircle scaled linewidth;
+
+	lft x1 = -width;
+	top y1 = height;
+
+	rt x2 = 0;
+	y2 = 0.5 * (y1 + y3);
+
+	x3 = x1;
+	bot y3 = 0;
+
+	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;
+
+	height# := 2.0 staff_space# + 3.0 stafflinethickness#;
+	width# := 0.4 height#;
+
+	define_pixels(height, width);
+
+	save linewidth;
+
+	linewidth# := stafflinethickness# + .05 staff_space#;
+	define_whole_blacker_pixels (linewidth);
+
+	set_char_box (width# - linewidth#, linewidth#,
+	              0, height#);
+
+	pickup pencircle scaled linewidth;
+
+	save penradius;
+	penradius := linewidth / 2;
+
+	rt x1 = linewidth;
+	bot y1 = 0;
+
+        x2 = x1;
+	top y2 = height;
+
+	lft x3= -width + linewidth;
+	y3 = y2;
+
+	x4 = x3;
+	y4 = y2 - linewidth;
+
+	x5 = x1;
+	y5 = y4;
+
+	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");