Skip to content

Use metric identifiers to parse an AFM character metric line #2783

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Jun 22, 2015
Merged

Use metric identifiers to parse an AFM character metric line #2783

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4e1f19a
Use metric identifiers to parse an AFM character metric line
jdeblese Feb 2, 2014
02d2e83
Be consistent in string type, or python 3 complains
jdeblese Feb 19, 2014
240c5df
Var type of 'bbox' should be list, causes issues otherwise
jdeblese May 24, 2015
eb9250a
Reformatted to respect maximum line length
jdeblese May 24, 2015
f5396cf
PEP8 Conformance
jdeblese May 24, 2015
5fc9809
Convert byte-literal to string to avoid use of b''
jdeblese May 25, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Reformatted to respect maximum line length
  • Loading branch information
@jdeblese
jdeblese committed May 24, 2015
commit eb9250a18465b7debedb22a3cb113c4d9d99eed8
8 changes: 5 additions & 3 deletions lib/matplotlib/afm.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,9 +197,11 @@ def _parse_char_metrics(fh):
line = line.rstrip()
if line.startswith(b'EndCharMetrics'):
return ascii_d, name_d
vals = filter(lambda s: s != b'', line.split(b';')) # Split into a list of metrics
vals = dict(map(lambda s: tuple(s.strip().split(b' ', 1)), vals)) # Split out the metric identifier and use as key for a dictionary
if b'C' not in vals.keys() or b'WX' not in vals.keys() or b'N' not in vals.keys() or b'B' not in vals.keys() :
# Split metric line into dictonary keyed by the metric identifiers
vals = filter(lambda s: s != b'', line.split(b';'))
vals = dict(map(lambda s: tuple(s.strip().split(b' ', 1)), vals))
# check for the required metrics
if any([id not in vals.keys() for id in (b'C', b'WX', b'N', b'B')]) :
raise RuntimeError('Bad char metrics line: %s' % line)
num = _to_int(vals[b'C'])
wx = _to_float(vals[b'WX'])
Expand Down