Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Handle dvi font names as ASCII bytestrings #6977

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 24 commits into from
Feb 26, 2017
Merged

Handle dvi font names as ASCII bytestrings #6977

Changes from 1 commit
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
705b021
Handle dvi font names as ASCII bytestrings
jkseppan Aug 25, 2016
dbc8b9e
Test that the KeyError is raised when the font is missing
jkseppan Aug 25, 2016
93fad55
Mention bytestrings in docstring
jkseppan Aug 25, 2016
4874e4e
Add a helpful note when raising KeyError from dviread.PsFonts
jkseppan Aug 25, 2016
a130ba7
Attempted fix for Python 3.4 compatibility
jkseppan Aug 25, 2016
0f0e41a
More python 3.4 compatibility
jkseppan Aug 26, 2016
a7b5772
Use numpydoc format for several dviread docstrings
jkseppan Dec 27, 2016
803a96e
Remove useless docstring
jkseppan Dec 27, 2016
ec5d80e
Raise a more useful exception
jkseppan Dec 27, 2016
fe52808
Remove misleading parentheses from assert
jkseppan Dec 27, 2016
aa8c4f6
Simplify parsing with regular expressions
jkseppan Dec 27, 2016
9de07aa
Perhaps simplify further with regular expressions
jkseppan Dec 27, 2016
c87b653
Remove useless assert
jkseppan Dec 29, 2016
2e19a61
Fix dvi font name handling in pdf backend
jkseppan Dec 31, 2016
119934a
Separate the handling of dvi fonts in the pdf backend
jkseppan Jan 1, 2017
8fa303f
Simplify enc file parsing
jkseppan Jan 2, 2017
94587b1
Small changes in response to code review
jkseppan Jan 3, 2017
254e3df
Simplify psfonts.map parsing further
jkseppan Jan 3, 2017
a8674b3
Try to fix the KeyError test
jkseppan Jan 29, 2017
25a8fed
ENH: make texFontMap a property
tacaswell Feb 11, 2017
92e2c52
Merge pull request #6 from tacaswell/dvi-ascii
jkseppan Feb 12, 2017
5ba21b0
Use file system encoding for the psfonts file name
jkseppan Feb 12, 2017
10135bf
Document minor API changes
jkseppan Feb 12, 2017
6de9813
Explain named group ordering
jkseppan Feb 12, 2017
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
Perhaps simplify further with regular expressions
  • Loading branch information
@jkseppan
jkseppan committed Jan 29, 2017
commit 9de07aa4cf57cedd8ea1f3e9f6f21abd0787f5df
61 changes: 33 additions & 28 deletions lib/matplotlib/dviread.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -906,38 +906,43 @@ def _register(self, words):
assert isinstance(word, bytes)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A while ago where was an effort to remove assert from all of the main code base and replace with if not ...: raise blocks. Are these here for testing reasons or run-time checks?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a private function and should only be called from the same class, so if this triggers it's an internal error in the code. While writing this code I felt this was more obvious than the later errors you get from mixing bytestrings and strings, but perhaps this is not really needed.


Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Again, the logic of this function may perhaps be more easily expressed using regexes.

texname, psname = words[:2]
words = words[2:]
effects, encoding, filename = b'', None, None
for word in words[2:]:
if not word.startswith(b'<'):
effects = word
else:
word = word.lstrip(b'<')
if word.startswith(b'[') or word.endswith(b'.enc'):
if encoding is not None:
matplotlib.verbose.report(
'Multiple encodings for %s = %s'
% (texname, psname), 'debug')
if word.startswith(b'['):
encoding = word[1:]
else:
encoding = word
else:
assert filename is None
filename = word

eff = effects.split()
effects = {}
try:
effects['slant'] = float(eff[eff.index(b'SlantFont')-1])
except ValueError:
pass
try:
effects['extend'] = float(eff[eff.index(b'ExtendFont')-1])
except ValueError:
pass
# pick the last non-filename word for effects
effects_words = [word for word in words if not word.startswith(b'<')]
if effects_words:
effects = effects_words[-1]

encoding_re = br'<<?(\[.*|.*\.enc)'
encoding_files = [word.lstrip(b'<').lstrip(b'[')
for word in words
if re.match(encoding_re, word)]
if len(encoding_files) > 1:
matplotlib.verbose.report(
'Multiple encodings for %s = %s' % (texname, psname), 'debug')
if encoding_files:
encoding = encoding_files[-1]

font_files = [word.lstrip(b'<')
for word in words
if word.startswith(b'<')
and not re.match(encoding_re, word)]
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure that 3 list comprehensions over words was the best change, efficiency-wise.

if font_files:
filename = font_files[-1]

eff = {}
for psword, keyword in ((b'SlantFont', 'slant'),
(b'ExtendFont', 'extend')):
match = re.search(b'([^ ]+) +' + psword, effects)
if match:
try:
eff[keyword] = float(match.group(1))
except ValueError:
pass

self._font[texname] = PsFont(
texname=texname, psname=psname, effects=effects,
texname=texname, psname=psname, effects=eff,
encoding=encoding, filename=filename)


Expand Down