diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | buildscripts/gen-bigcheese-scripts.py | 1 | ||||
| -rw-r--r-- | buildscripts/mf-to-table.py | 3 | ||||
| -rw-r--r-- | lily/open-type-font.cc | 11 |
4 files changed, 15 insertions, 4 deletions
@@ -1,3 +1,7 @@ +2004-12-17 Han-Wen Nienhuys <hanwen@xs4all.nl> + + * lily/open-type-font.cc (design_size): use design_size + 2004-12-17 Pedro Kroger <kroeger@pedrokroeger.net> * lily/font-metric.cc (LY_DEFINE): Fix the docstring. diff --git a/buildscripts/gen-bigcheese-scripts.py b/buildscripts/gen-bigcheese-scripts.py index 3a62ccceea..f5e47d42e4 100644 --- a/buildscripts/gen-bigcheese-scripts.py +++ b/buildscripts/gen-bigcheese-scripts.py @@ -70,7 +70,6 @@ Generate("%(name)s%(design_size)d.cff");''' % vars() path = os.path.join (outdir, name + '%d' % design_size + '.pe') open (path, 'w').write (script) - subfonts = ['feta%(design_size)d', 'parmesan%(design_size)d', 'feta-alphabet%(design_size)d'] diff --git a/buildscripts/mf-to-table.py b/buildscripts/mf-to-table.py index 97effe82ce..d162e0bd18 100644 --- a/buildscripts/mf-to-table.py +++ b/buildscripts/mf-to-table.py @@ -105,7 +105,7 @@ def parse_logfile (fn): encoding = re.sub (' ','-', tags[5]) tags = tags[:-1] name = tags[1:] - global_info['DesignSize'] = string.atof (tags[4]) + global_info['design_size'] = string.atof (tags[4]) global_info['FontName'] = string.join (name, '-') global_info['FullName'] = string.join (name,' ') global_info['FamilyName'] = string.join (name[1:-1], @@ -198,6 +198,7 @@ def write_global_lisp_table (file, global_info): keys = ['staffsize', 'stafflinethickness', 'staff_space', 'linethickness', 'black_notehead_width', 'ledgerlinethickness', + 'design_size', 'blot_diameter' ] for k in keys: diff --git a/lily/open-type-font.cc b/lily/open-type-font.cc index ac7b2d5bb9..da9677f073 100644 --- a/lily/open-type-font.cc +++ b/lily/open-type-font.cc @@ -211,8 +211,15 @@ Real Open_type_font::design_size () const { SCM entry = scm_hashq_ref (lily_global_table_, - ly_symbol2scm ("staffsize"), - scm_from_int (12)); + ly_symbol2scm ("design_size"), + + /* + Hmm. Design size is arbitrary for + non-designe-size fonts. I vote for 1 - + which will trip errors more + quickly. --hwn. + */ + scm_from_int (1)); return scm_to_double (entry); } |