Kozea/WeasyPrint
1
1
Fork 0
mirror of https://github.com/Kozea/WeasyPrint.git synced 2024-10-05 00:21:15 +03:00
Code Issues Projects Releases Wiki Activity

Fix font bounding box

Browse Source
This commit is contained in:
Guillaume Ayoub 2020-05-08 01:30:07 +02:00
parent 36ed176a36
commit 3342386a28
2 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
weasyprint/document.py
View File

@ -66,8 +66,9 @@ def _w3c_date_to_pdf(string, attr_name):
class Font: class Font:
def __init__(self, font, pango_font, glyph_item): def __init__(self, font, pango_font, glyph_item):
pango_metrics = pango.pango_font_get_metrics(pango_font, ffi.NULL) pango_metrics = pango.pango_font_get_metrics(pango_font, ffi.NULL)
font_description = pango.pango_font_describe(pango_font)
font_family = ffi.string(pango.pango_font_description_get_family( font_family = ffi.string(pango.pango_font_description_get_family(
pango.pango_font_describe(pango_font))) font_description))
glyph_string = glyph_item.glyphs glyph_string = glyph_item.glyphs
num_glyphs = glyph_string.num_glyphs num_glyphs = glyph_string.num_glyphs
@ -87,6 +88,8 @@ class Font:
self.stemv = 80 self.stemv = 80
self.stemh = 80 self.stemh = 80
self.glyphs = {glyph_string.glyphs[x].glyph for x in range(num_glyphs)} self.glyphs = {glyph_string.glyphs[x].glyph for x in range(num_glyphs)}
self.font_size = 3 / 4 * pango.pango_units_to_double(
pango.pango_font_description_get_size(font_description))
def add_glyphs(self, glyph_item): def add_glyphs(self, glyph_item):
glyph_string = glyph_item.glyphs glyph_string = glyph_item.glyphs
@ -95,27 +98,27 @@ class Font:
glyph_string.glyphs[x].glyph for x in range(num_glyphs)} glyph_string.glyphs[x].glyph for x in range(num_glyphs)}
def compute_font_bbox(self): def compute_font_bbox(self):
font_bbox = None font_bbox = [0, 0, 0, 0]
ink_rect = ffi.new('PangoRectangle *') ink_rect = ffi.new('PangoRectangle *')
for glyph in self.glyphs: for glyph in self.glyphs:
pango.pango_font_get_glyph_extents( pango.pango_font_get_glyph_extents(
self.pango_font, glyph, ink_rect, ffi.NULL) self.pango_font, glyph, ink_rect, ffi.NULL)
if font_bbox is None: x1, y1, x2, y2 = (
font_bbox = [ ink_rect.x, -ink_rect.y - ink_rect.height,
ink_rect.x, ink_rect.y, ink_rect.width, ink_rect.height] ink_rect.x + ink_rect.width, -ink_rect.y)
if ink_rect.x > font_bbox[0]: if x1 < font_bbox[0]:
font_bbox[0] = ink_rect.x font_bbox[0] = x1
if ink_rect.y > font_bbox[1]: if y1 < font_bbox[1]:
font_bbox[1] = ink_rect.y font_bbox[1] = y1
if ink_rect.width > font_bbox[2]: if x2 > font_bbox[2]:
font_bbox[2] = ink_rect.width font_bbox[2] = x2
if ink_rect.height > font_bbox[3]: if y2 > font_bbox[3]:
font_bbox[3] = ink_rect.height font_bbox[3] = y2
ffi.release(ink_rect) ffi.release(ink_rect)
self.font_bbox = font_bbox if font_bbox else [] self.font_bbox = [value / self.font_size for value in font_bbox]
self.cap_height = font_bbox[1] if font_bbox else 0 self.cap_height = font_bbox[1]
class Context(pydyf.Stream): class Context(pydyf.Stream):

1
weasyprint/text.py
View File

@ -243,6 +243,7 @@ ffi.cdef('''
PangoFontDescription *desc, PangoWeight weight); PangoFontDescription *desc, PangoWeight weight);
void pango_font_description_set_absolute_size ( void pango_font_description_set_absolute_size (
PangoFontDescription *desc, double size); PangoFontDescription *desc, double size);
int pango_font_description_get_size (PangoFontDescription *desc);
PangoFontDescription * pango_font_describe (PangoFont *font); PangoFontDescription * pango_font_describe (PangoFont *font);
const char * pango_font_description_get_family ( const char * pango_font_description_get_family (