diff options
| author | Jan Nieuwenhuizen <janneke@gnu.org> | 2004-11-21 14:43:57 +0000 |
|---|---|---|
| committer | Jan Nieuwenhuizen <janneke@gnu.org> | 2004-11-21 14:43:57 +0000 |
| commit | 029137c21a30934db946d7ac4d3d5e187484e269 (patch) | |
| tree | 1355aff94425cb993c7452188eb9db4e18605a79 /lily/afm.cc | |
| parent | f61bd6a69dec63300c68fc9455bd54d6a6067696 (diff) | |
* scm/encoding.scm (coding-alist):
* scm/font.scm (add-ec-fonts):
* ly/paper-defaults.ly: Use actual name for EC fontencoding:
Extended-TeX-Font-Encoding---Latin.
* lily/side-position-interface.cc (general_side_position): Add
actual offset to error message (avoid constant error messages).
* scm/encoding.scm (coding-alist): Add fetaDynamic.
(read-encoding-file): Bugfix: do not require space after bracket.
* scm/font.scm (add-cork-lm-fonts): Remove lmbxi8 and lmbxi14,
these do not exist.
Diffstat (limited to 'lily/afm.cc')
| -rw-r--r-- | lily/afm.cc | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/lily/afm.cc b/lily/afm.cc index ccb0562c1e..155bfa96f6 100644 --- a/lily/afm.cc +++ b/lily/afm.cc @@ -149,22 +149,18 @@ read_afm_file (String nm) return Adobe_font_metric::make_afm (fi, cs, ds); } - -/* Actually, AFMs will be printers point, usually, but our .py script dumps - real points. */ Box afm_bbox_to_box (AFM_BBox bb) { - return Box (Interval (bb.llx, bb.urx)* (1/1000.0) PT, - Interval (bb.lly, bb.ury)* (1/1000.0) PT); - + return Box (Interval (bb.llx, bb.urx) * 0.001 PT, + Interval (bb.lly, bb.ury) * 0.001 PT); } Offset Adobe_font_metric::get_indexed_wxwy (int k) const { - AFM_CharMetricInfo const *mi = font_info_->cmi+ k; - return 1/1000.0 PT * Offset (mi->wx, mi->wy); + AFM_CharMetricInfo const *mi = font_info_->cmi + k; + return Offset (mi->wx, mi->wy) * 0.001 PT; } Real |