* buildscripts/mf-to-table.py (base): remove AFM support.

* lily/open-type-font.cc (design_size): use design_size

diff --git a/ChangeLog b/ChangeLog
index 382b4fd5d64441d52a21e21dd986f55f1e89a904..181eb347f39da9f314cbe3e1c6bfd56930fde8d9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2004-12-17  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+       * buildscripts/mf-to-table.py (base): remove AFM support.
+
        * lily/open-type-font.cc (design_size): use design_size
 
 2004-12-17  Pedro Kroger  <kroeger@pedrokroeger.net>

diff --git a/buildscripts/mf-to-table.py b/buildscripts/mf-to-table.py
index d162e0bd187ef853c89aa3daef91745eead51727..9b65577e7d65955453456019089fd4b714c2527f 100644 (file)
--- a/buildscripts/mf-to-table.py
+++ b/buildscripts/mf-to-table.py
@@ -126,34 +126,6 @@ def parse_logfile (fn):
        return (global_info, charmetrics, deps)
 
 
-def write_afm_char_metric (file, charmetric):
-       f = 1000;
-       tup = (charmetric['code'],
-              charmetric['name'],
-              -charmetric['breapth'] * f,
-              -charmetric['depth'] * f,
-              charmetric['width'] * f,
-              charmetric['height'] * f,
-              charmetric['wx'] * f,
-              charmetric['wy'] * f)
-
-       file.write ('C %d ; N %s ; B %d %d %d %d ; W %d %d ;\n' % tup)
-
-
-def write_afm_header (file):
-       file.write ("StartFontMetrics 2.0\n")
-       file.write ("Comment Automatically generated by mf-to-table.py\n")
-
-
-def write_afm_metric (file, global_info, charmetrics):
-       for (k, v) in global_info.items():
-               file.write ("%s %s\n" % (k, v))
-       file.write ('StartCharMetrics %d\n' % len(charmetrics ))
-       for m in charmetrics:
-               write_afm_char_metric (file, m)
-       file.write ('EndCharMetrics\n')
-       file.write ('EndFontMetrics\n')
-
 
 def write_tex_defs (file, global_info, charmetrics):
        nm = font_family
@@ -284,7 +256,6 @@ def help ():
 Generate feta metrics table from preparated feta log.
 
 Options:
-  -a, --afm=FILE         specify .afm file
   -d, --dep=FILE         print dependency info to FILE
   -h, --help             print this help
   -l, --ly=FILE          name output table
@@ -299,7 +270,7 @@ Options:
 (options, files) = \
   getopt.getopt (sys.argv[1:],
                 'a:d:hl:o:p:t:',
-                ['enc=', 'afm=', 'outdir=', 'dep=', 'lisp=',
+                ['enc=',  'outdir=', 'dep=', 'lisp=',
                  'global-lisp=',
                  'tex=', 'ly=', 'debug', 'help', 'package='])
 
@@ -308,7 +279,6 @@ char_lisp_nm = ''
 enc_nm = ''
 texfile_nm = ''
 depfile_nm = ''
-afmfile_nm = ''
 lyfile_nm = ''
 outdir_prefix = '.'
 
@@ -331,8 +301,6 @@ for opt in options:
                lyfile_nm = a
        elif o== '--help' or o == '-h':
                help()
-       elif o=='--afm' or o == '-a':
-               afmfile_nm = a
        elif o == '--debug':
                debug_b = 1
        else:
@@ -344,15 +312,6 @@ base = re.sub ('.tex$', '', texfile_nm)
 for filenm in files:
        (g, m, deps) = parse_logfile (filenm)
        cs = tfm_checksum (re.sub ('.log$', '.tfm', filenm))
-       afm = open (afmfile_nm, 'w')
-
-       write_afm_header (afm)
-       afm.write ("Comment TfmCheckSum %d\n" % cs)
-       afm.write ("Comment DesignSize %.2f\n" % g['DesignSize'])
-
-       del g['DesignSize']
-
-       write_afm_metric (afm, g, m)
 
        write_tex_defs (open (texfile_nm, 'w'), g, m)
        enc_name = 'FetaEncoding'

diff --git a/lily/open-type-font.cc b/lily/open-type-font.cc
index da9677f07333355cb136d0abc206e8f0e90be12b..3b209c0a2c104e61f4429cd437f733f697a06850 100644 (file)
--- a/lily/open-type-font.cc
+++ b/lily/open-type-font.cc
@@ -215,7 +215,7 @@ Open_type_font::design_size () const
 
                             /*
                               Hmm. Design size is arbitrary for
-                              non-designe-size fonts. I vote for 1 -
+                              non-design-size fonts. I vote for 1 -
                               which will trip errors more
                               quickly. --hwn.
                              */