(parse_logfile): don't append

encoding to fontname.

diff --git a/ChangeLog b/ChangeLog
index 6f584a6a524df788ff00657e3f9f83c33a778a80..d83518bbe55d9fddf8ea2132896e7f7bf3bebaea 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-04-08  Han-Wen Nienhuys   <hanwen@xs4all.nl>
+
+       * buildscripts/mf-to-table.py (parse_logfile): don't append
+       encoding to fontname.
+
 2004-04-07  Jan Nieuwenhuizen  <janneke@gnu.org>
 
        * scm/output-ps.scm (define-fonts): Load .enc only once.

diff --git a/buildscripts/mf-to-table.py b/buildscripts/mf-to-table.py
index 86db11c1bbcf74426f9c3575e8bd27c72c0dbd57..365dedb02afd1112a7815f5092e7f7f21df3ef1d 100644 (file)
--- a/buildscripts/mf-to-table.py
+++ b/buildscripts/mf-to-table.py
@@ -91,7 +91,10 @@ def parse_logfile (fn):
                        #urg
                        if 0: #testing
                                tags.append ('Regular')
-                       tags[5] = re.sub (' ','-', tags[5])
+
+                       
+                       encoding = re.sub (' ','-', tags[5])
+                       tags = tags[:-1]
                        name = tags[1:]
                        global_info['DesignSize'] = string.atof (tags[4])
                        global_info['FontName'] = string.join (name,'-')
@@ -106,7 +109,7 @@ def parse_logfile (fn):
                        global_info['FontBBox'] = '0 0 1000 1000'
                        global_info['Ascender'] = '0'
                        global_info['Descender'] = '0'
-                       global_info['EncodingScheme'] = tags[5]
+                       global_info['EncodingScheme'] = encoding
        
        return (global_info, charmetrics, deps)