From 1eb2c46f6e5b32f5dde46e47fb03dfd4a94277dc Mon Sep 17 00:00:00 2001
From: hanwen <hanwen>
Date: Thu, 4 Apr 2002 23:12:43 +0000
Subject: [PATCH] ''

---
 mf/feta-din-code.mf | 14 +++++++++-----
 mf/feta-din.mf      |  2 +-
 scm/font.scm        |  9 +++++----
 3 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/mf/feta-din-code.mf b/mf/feta-din-code.mf
index db4d7f17c9..dba8d5dc65 100644
--- a/mf/feta-din-code.mf
+++ b/mf/feta-din-code.mf
@@ -29,7 +29,10 @@ define_blacker_pixels (serif_thick);
 med_thick = round (1.5 stafflinethickness);
 
 fet_beginchar("dynamic p", "p", "dynp")
-	set_char_box (0, 13/12 ex#, descender#, 1.0 ex#);
+	%
+	% TODO w really   is 13/12 ex
+	% but should do kerning
+	set_char_box (0, 15/12 ex#, descender#, 1.0 ex#);
 
 	save twiddle_thick, stem_thick, cheek_thick;
 	save updir, fill_up;
@@ -169,12 +172,13 @@ fet_beginchar("dynamic f", "f", "dynf");
 	serif_length = 0.96 ex;
 	serif_excentricity = 0.01 ex;
 
-	z1 = (0.375 ex,0);
+	z1 = (0.375 ex, - serif_thick);
 	y2 = y1 + ex;
+
 	z2l = z1 + whatever*dir (90 - left_angle);
 	penpos2 (f_thick, 0);
 
-	y3l = ex + ascender;
+	y3l = y1 + ex + ascender;
 	x3l = x1 + 1 ex;
 	penpos3 (med_thick, -90);
 	penpos4 (bulb_thick, -20);
@@ -187,10 +191,10 @@ fet_beginchar("dynamic f", "f", "dynf");
 	y5l = y4l - bulb_diam;
 
 	z6 = z2r + whatever* dir (90 - right_angle);
-	y6 = 3/8 ex;
+	y6 = y1 + 3/8 ex;
 
 	x7 = x1 - 1/4 ex;
-	y7r = -descender;
+	y7r = y1 -descender;
 	penpos7(med_thick, -90);
 
 	penpos8 (bulb_thick, 160);
diff --git a/mf/feta-din.mf b/mf/feta-din.mf
index 037e0712a6..fd16aefaf5 100644
--- a/mf/feta-din.mf
+++ b/mf/feta-din.mf
@@ -8,7 +8,7 @@ input feta-macros;
 % input feta-params;
 mode_setup;
 
-ex# :=  (design_size / 2.6)* pt#;
+ex# :=  (design_size / 2.4)* pt#;
 descender# := 0.5 ex#;
 ascender# := 0.75 ex#;
 staffspace# := 1.75 / 2.0 * ex#;
diff --git a/scm/font.scm b/scm/font.scm
index 1adcf54c14..1c17dd63f3 100644
--- a/scm/font.scm
+++ b/scm/font.scm
@@ -84,10 +84,10 @@
 
     ((3 medium italic roman 12) . "cmti12")
     ((2 medium italic roman 12) . "cmti12")
-    ((1 medium italic roman 12) . "cmti12")
-    ((0 medium italic roman 10) . "cmti10")
-    ((-1 medium italic roman 8) . "cmti8")    
-    ((-2 medium italic roman 7) . "cmti7")
+    ((1 medium italic roman 12) . "cmti12") ;;; ugh. Should add magnification here! 
+    ((0 medium italic roman 10) . "cmti12")
+    ((-1 medium italic roman 8) . "cmti10")    
+    ((-2 medium italic roman 7) . "cmti8")
     ((-3 medium italic roman 7) . "cmti7")    
 
     ((4 bold upright roman 17) . "cmbx17")
@@ -172,6 +172,7 @@
 	    (map-alist-keys func (cdr list)))
       ))
  
+
 ;; 
 (define (map-alist-vals func list)
   "map a function FUNC over the vals of  LIST, leaving the keys."
-- 
2.39.5