From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Tue, 2 Apr 2002 23:34:06 +0000 (+0000)
Subject: ''
X-Git-Tag: release/1.5.51~18
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=309ada32606ca5fbca6e2233cb7e6faf7ec3b0da;p=lilypond.git

''
---

diff --git a/ChangeLog b/ChangeLog
index 0fe621b8a9..3043d94715 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2002-04-03  Han-Wen  <hanwen@cs.uu.nl>
+
+	* mf/feta-new-code.mf (currenttransform): new dynamic p sign.
+
 2002-04-02  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
 
 	* lily/note-spacing.cc (stem_dir_correction): only do
diff --git a/mf/feta-din-code.mf b/mf/feta-din-code.mf
index ed795cb4e8..97cd5aa4ad 100644
--- a/mf/feta-din-code.mf
+++ b/mf/feta-din-code.mf
@@ -139,13 +139,8 @@ save fcode;
 fcode = 102;
 
 input feta-ital-f;
-stem#:=M*54/36pt#;    % lowercase stem breadth
-hair#:=M*12/36pt#;    % lowercase hairline breadth
-vair#:=M*7/36pt#;    % vertical diameter of hairlines
 
-font_setup;
-
-input feta-ital-p;
+input feta-new-code;
 
 slant:=.28;      % tilt ratio $(\Delta x/\Delta y)$
 stem#:=M*32/36pt#;    % lowercase stem breadth
diff --git a/mf/feta-din.mf b/mf/feta-din.mf
index c314f4468d..6b3e2a646d 100644
--- a/mf/feta-din.mf
+++ b/mf/feta-din.mf
@@ -7,6 +7,14 @@ input feta-autometric;
 input feta-macros;
 input feta-params;
 
+
+ex# :=  1/3 design_size;
+descender# := 0.5 ex#;
+staffspace# := 1.75 / 2.0 * ex#;
+stafflinethickness# := staffspace# / 10;
+
+define_pixels (staffspace, stafflinethickness, ex, descender)
+
 fet_beginfont("feta-din", design_size);
 %mode_setup;
 
diff --git a/mf/feta-new-code.mf b/mf/feta-new-code.mf
new file mode 100644
index 0000000000..3e640dfee7
--- /dev/null
+++ b/mf/feta-new-code.mf
@@ -0,0 +1,110 @@
+
+
+code := 111;
+save slant;
+slant := 20;
+currenttransform := identity;
+fet_beginchar("dynamic p", "p", "dynp")
+	set_char_box (0, 13/12 ex#, descender#, 1.0 ex#);
+
+	save twiddle_thick, stem_thick, cheek_thick, serif_thick;
+	save updir, fill_up;
+	save serif, dishing_angle, p, q;
+	save cheek_medium, left_serif_protude, right_serif_protude;
+
+	pair updir;
+	path serif,q,p;
+
+	updir := dir (90 - slant );
+	twiddle_thick = 1.5 stafflinethickness;
+	cheek_medium = 1/6 ex;
+	serif_thick =1.0 stafflinethickness;
+	dishing_angle = 5;
+	fill_up := 1.5 serif_thick;
+
+	stem_thick = 2/6 ex;
+	cheek_thick = 5/16 ex;
+	cheek_width = 3/4 ex;
+	left_serif_protude = 18/60 ex;
+	right_serif_protude= 15/60 ex;
+	
+	penpos1 (twiddle_thick, -slant - 5);
+	penpos2 (cheek_medium, 90 - slant );
+	penpos3 (cheek_medium, 90 - slant);
+
+	x4r - x4l = cheek_thick; 
+	penpos4 (whatever, -slant);
+	penpos5 (cheek_medium, -55);
+	penpos6 (stem_thick, 0);
+
+	x6l = 0;
+	y6l = - descender + serif_thick/2;
+	x1l = x6l;
+	y1r = 0.5 ex;
+	y2r = ex;
+	z7 = whatever * updir + z6l;
+	y7 = 43/60  ex;
+	
+	z2l = whatever *updir + 0.3 [z7, z1r];
+	y8 = ypart (0.9 [z7, z2l]);
+	z8 = 2/3 [z6l, z6r] + whatever * updir;
+
+
+	y3r = ex;
+	z3l = 0.58 [(stem_thick, -descender), (stem_thick + cheek_width - cheek_thick, -descender)] + whatever * updir;
+	y4r = 1/3 ex;
+	z4r = whatever*updir + (stem_thick+  cheek_width, -descender);
+
+	z5l = whatever*updir  + z3l;
+	y5l = 1/12 ex;
+
+	z9 = z6r + whatever*updir;
+	y9 = y5l;
+
+	p :=
+		z2r{right} .. {dir( -60)}z8 & z8{dir 35} .. z3r{right}
+		.. tension 0.9 .. z4r{-updir} .. z5r{left} .. z9
+		& z9 -- z6r -- z6l -- z7{updir} 
+		..  z2l{left} .. tension 1.2 ..
+		% z1r & z1r -- z1l & z1l
+		simple_serif (z1r, z1l, -90)
+		.. cycle;
+	pickup pencircle scaled 1;
+	fill p;
+
+	y12  = 0.5 ex;
+	z12 = z6r + whatever*updir;
+
+	save inner_tension;
+	inner_tension = 1.4;
+	q :=
+		z4l{updir} .. tension 1.1 inner_tension .. z3l{left}.. z12{-updir} .. z5l{right} .. tension inner_tension .. cycle; 
+	unfill q;
+	penlabels (1, 2, 3, 4, 5, 6);
+
+
+
+
+	pickup pencircle scaled serif_thick;
+	lft x11 = -left_serif_protude;
+	rt x10 = stem_thick+ right_serif_protude;
+	bot y10 = bot y11 = -descender;
+
+	
+	serif := simple_serif (z10, z11, dishing_angle);
+	draw serif;
+
+	labels(7,8, 9, 10, 11,12);
+
+	
+	z13 = point 0.05 of serif;
+	z14 = point 0.85 of serif;
+	z15 = z6l + updir * fill_up +( serif_thick/2, 0);
+	z16 = z6r + updir * 1.2fill_up- +( serif_thick/2, 0);
+	labels(13,14, 15, 16);
+
+%	pickup pencircle scaled 1;
+	draw z13{direction 0.05 of serif} .. z16{updir};
+	draw z14{-(direction 0.85 of serif)} .. z15{updir};
+fet_endchar;
+