From b5e1d63092238f020afab1378596c1ba5b7a3b83 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Fri, 17 Dec 2004 13:13:01 +0000 Subject: [PATCH] * buildscripts/mf-to-table.py (base): remove AFM support. * lily/open-type-font.cc (design_size): use design_size --- ChangeLog | 2 ++ buildscripts/mf-to-table.py | 43 +------------------------------------ lily/open-type-font.cc | 2 +- 3 files changed, 4 insertions(+), 43 deletions(-) diff --git a/ChangeLog b/ChangeLog index 382b4fd5d6..181eb347f3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2004-12-17 Han-Wen Nienhuys + * buildscripts/mf-to-table.py (base): remove AFM support. + * lily/open-type-font.cc (design_size): use design_size 2004-12-17 Pedro Kroger diff --git a/buildscripts/mf-to-table.py b/buildscripts/mf-to-table.py index d162e0bd18..9b65577e7d 100644 --- 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 da9677f073..3b209c0a2c 100644 --- 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. */ -- 2.39.2