eric: comparison eric6/ThirdParty/Pygments/pygments/formatters/img.py

-:bf5f777260a6
+:21b0534faebc
 pygments.formatters.img
 ~~~~~~~~~~~~~~~~~~~~~~~
 Formatter for Pixmap output.
-:copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
+:copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
 :license: BSD, see LICENSE for details.
 """
 import os
 import sys
 from pygments.formatter import Formatter
 from pygments.util import get_bool_opt, get_int_opt, get_list_opt, \
-get_choice_opt, xrange
+get_choice_opt
 import subprocess
 # Import this carefully
 try:
 'BOLD':       ['Bold'],
 'BOLDITALIC': ['Bold Oblique', 'Bold Italic'],
 }
 # A sane default for modern systems
-DEFAULT_FONT_NAME_NIX = 'Bitstream Vera Sans Mono'
+DEFAULT_FONT_NAME_NIX = 'DejaVu Sans Mono'
 DEFAULT_FONT_NAME_WIN = 'Courier New'
-DEFAULT_FONT_NAME_MAC = 'Courier New'
+DEFAULT_FONT_NAME_MAC = 'Menlo'
 class PilNotAvailable(ImportError):
 """When Python imaging library is not available"""
 class FontNotFound(Exception):
 """When there are no usable fonts specified"""
-class FontManager(object):
+class FontManager:
 """
 Manages a set of fonts: normal, italic, bold, etc...
 """
 def __init__(self, font_name, font_size=14):
 def _create_mac(self):
 font_map = {}
 for font_dir in (os.path.join(os.getenv("HOME"), 'Library/Fonts/'),
 '/Library/Fonts/', '/System/Library/Fonts/'):
 font_map.update(
-((os.path.splitext(f)[0].lower(), os.path.join(font_dir, f))
+(os.path.splitext(f)[0].lower(), os.path.join(font_dir, f))
-for f in os.listdir(font_dir) if f.lower().endswith('ttf')))
+for f in os.listdir(font_dir) if f.lower().endswith('ttf'))
 for name in STYLES['NORMAL']:
 path = self._get_mac_font_path(font_map, self.font_name, name)
 if path is not None:
 self.fonts['NORMAL'] = ImageFont.truetype(path, self.font_size)
 raise FontNotFound('Font %s (%s) not found in registry' %
 (basename, styles[0]))
 return None
 def _create_win(self):
-try:
+lookuperror = None
-key = _winreg.OpenKey(
+keynames = [ (_winreg.HKEY_CURRENT_USER, r'Software\Microsoft\Windows NT\CurrentVersion\Fonts'),
-_winreg.HKEY_LOCAL_MACHINE,
+(_winreg.HKEY_CURRENT_USER, r'Software\Microsoft\Windows\CurrentVersion\Fonts'),
-r'Software\Microsoft\Windows NT\CurrentVersion\Fonts')
+(_winreg.HKEY_LOCAL_MACHINE, r'Software\Microsoft\Windows NT\CurrentVersion\Fonts'),
-except EnvironmentError:
+(_winreg.HKEY_LOCAL_MACHINE, r'Software\Microsoft\Windows\CurrentVersion\Fonts') ]
+for keyname in keynames:
 try:
-key = _winreg.OpenKey(
+key = _winreg.OpenKey(*keyname)
-_winreg.HKEY_LOCAL_MACHINE,
+try:
-r'Software\Microsoft\Windows\CurrentVersion\Fonts')
+path = self._lookup_win(key, self.font_name, STYLES['NORMAL'], True)
+self.fonts['NORMAL'] = ImageFont.truetype(path, self.font_size)
+for style in ('ITALIC', 'BOLD', 'BOLDITALIC'):
+path = self._lookup_win(key, self.font_name, STYLES[style])
+if path:
+self.fonts[style] = ImageFont.truetype(path, self.font_size)
+else:
+if style == 'BOLDITALIC':
+self.fonts[style] = self.fonts['BOLD']
+else:
+self.fonts[style] = self.fonts['NORMAL']
+return
+except FontNotFound as err:
+lookuperror = err
+finally:
+_winreg.CloseKey(key)
 except EnvironmentError:
-raise FontNotFound('Can\'t open Windows font registry key')
+pass
-try:
+else:
-path = self._lookup_win(key, self.font_name, STYLES['NORMAL'], True)
+# If we get here, we checked all registry keys and had no luck
-self.fonts['NORMAL'] = ImageFont.truetype(path, self.font_size)
+# We can be in one of two situations now:
-for style in ('ITALIC', 'BOLD', 'BOLDITALIC'):
+# * All key lookups failed. In this case lookuperror is None and we
-path = self._lookup_win(key, self.font_name, STYLES[style])
+#   will raise a generic error
-if path:
+# * At least one lookup failed with a FontNotFound error. In this
-self.fonts[style] = ImageFont.truetype(path, self.font_size)
+#   case, we will raise that as a more specific error
-else:
+if lookuperror:
-if style == 'BOLDITALIC':
+raise lookuperror
-self.fonts[style] = self.fonts['BOLD']
+raise FontNotFound('Can\'t open Windows font registry key')
-else:
-self.fonts[style] = self.fonts['NORMAL']
-finally:
-_winreg.CloseKey(key)
 def get_char_size(self):
 """
 Get the character size.
 """
 `font_name`
 The font name to be used as the base font from which others, such as
 bold and italic fonts will be generated.  This really should be a
 monospace font to look sane.
-Default: "Bitstream Vera Sans Mono" on Windows, Courier New on \\*nix
+Default: "Courier New" on Windows, "Menlo" on Mac OS, and
+"DejaVu Sans Mono" on \\*nix
 `font_size`
 The font size in points to be used.
 Default: 14
 """
 Create drawables for the line numbers.
 """
 if not self.line_numbers:
 return
-for p in xrange(self.maxlineno):
+for p in range(self.maxlineno):
 n = p + self.line_number_start
 if (n % self.line_number_step) == 0:
 self._draw_linenumber(p, n)
 def _paint_line_number_bg(self, im):
 draw = ImageDraw.Draw(im)
 recth = im.size[-1]
 rectw = self.image_pad + self.line_number_width - self.line_number_pad
 draw.rectangle([(0, 0), (rectw, recth)],
 fill=self.line_number_bg)
-draw.line([(rectw, 0), (rectw, recth)], fill=self.line_number_fg)
+if self.line_number_separator:
+draw.line([(rectw, 0), (rectw, recth)], fill=self.line_number_fg)
 del draw
 def format(self, tokensource, outfile):
 """
 Format ``tokensource``, an iterable of ``(tokentype, tokenstring)``

Mercurial Repositories > eric / file comparison

comparison: eric6/ThirdParty/Pygments/pygments/formatters/img.py

eric6/ThirdParty/Pygments/pygments/formatters/img.py