From 66f345b074f8fc43fe90ca03616c74e0bb69bdc2 Mon Sep 17 00:00:00 2001
From: fred <fred>
Date: Tue, 26 Mar 2002 21:50:26 +0000
Subject: [PATCH] lilypond-1.1.49

---
 Documentation/mail.yo       |  2 +-
 buildscripts/mf-to-table.py | 24 ++++++++++++++----------
 mf/GNUmakefile              |  2 +-
 3 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/Documentation/mail.yo b/Documentation/mail.yo
index 69e3dd12de..c3d4e894a9 100644
--- a/Documentation/mail.yo
+++ b/Documentation/mail.yo
@@ -35,7 +35,7 @@ dit(gnu-music-discuss@gnu.org,)
     mail with subject "subscribe" to
     email(gnu-music-discuss-request@gnu.org)
     This list is archived at
-    lurl(http://www.jab.org/mail/gnu-music-discuss@gnu.org)
+    lurl(http://www.mail-archive.org/gnu-music-discuss@gnu.org)
 )
 
 Announces of new versions will be sent to info-gnu-music and
diff --git a/buildscripts/mf-to-table.py b/buildscripts/mf-to-table.py
index 2b57d02c6f..7b6ecd183e 100644
--- a/buildscripts/mf-to-table.py
+++ b/buildscripts/mf-to-table.py
@@ -42,7 +42,7 @@ begin_autometric_re = regex.compile('@{')
 end_autometric_re = regex.compile('@}')
 include_re = regex.compile ('(\([a-zA-Z_0-9-]+\.mf\)')
 autometric_re = regex.compile('@{\(.*\)@}')
-version = '0.7'
+version = '0.8'
 postfixes = ['log', 'dvi', '2602gf', 'tfm']
 
 class Feta_file(File):
@@ -116,7 +116,7 @@ class Indentable_file(File):
         self.writeline (lines[-1])
 
 class Afm_file (File):
-    def print_f_dimen(self, f):
+    def print_dimen(self, f):
 	f = f * 1000 / self.fontsize
     
 	dimstr = '%.2f' % f
@@ -126,19 +126,23 @@ class Afm_file (File):
 		dimstr = '0.00'
 	self.write( dimstr  +' ');
 
-    def neg_print_dimen(self, str):
-	self.print_f_dimen(-atof(str))
-    def print_dimen(self, str):
-	self.print_f_dimen(atof(str))
     def def_symbol (self, code, lily_id, tex_id, xdim, ydim):
-	self.write ('C %s; N %s-%s; B ' % (code, self.groupname, lily_id))
+	xdim = map (atof, xdim)
+	ydim = map (atof, ydim)
+	
+	wid = xdim[0] + xdim[1]
+	self.write ('C %s ; ' % code)
+	self.write ('WX ')
+	self.print_dimen (wid)
+
+	self.write (' ; N %s-%s ; B ' % (self.groupname, lily_id))
 
-	self.neg_print_dimen(xdim [0])
-	self.neg_print_dimen(ydim [0])
+	self.print_dimen(-xdim [0])
+	self.print_dimen(-ydim [0])
 	self.print_dimen(xdim [1])
 	self.print_dimen(ydim [1])
 
-	self.write (';\n');
+	self.write (' ;\n');
 	
     def start (self,nm):
 	self.write ('Start%s\n' % nm)
diff --git a/mf/GNUmakefile b/mf/GNUmakefile
index 2566a2f5f7..44946caef7 100644
--- a/mf/GNUmakefile
+++ b/mf/GNUmakefile
@@ -4,7 +4,7 @@ depth = ..
 
 STEPMAKE_TEMPLATES=metafont metapost install install-out
 
-EXTRA_DIST_FILES += TODO README feta.mp mfplain.ini
+EXTRA_DIST_FILES += README feta.mp mfplain.ini
 
 FET_FILES = $(wildcard feta[0-9]*.mf)
 
-- 
2.39.5