From 64983a29e380a04eaf1b730e54cfe6f3399809f1 Mon Sep 17 00:00:00 2001 From: Nick White Date: Thu, 31 Oct 2019 17:57:41 +0000 Subject: Add capability to embed font files into tool --- pdf.go | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'pdf.go') diff --git a/pdf.go b/pdf.go index 69e2daf..f1ffe19 100644 --- a/pdf.go +++ b/pdf.go @@ -28,14 +28,11 @@ type Fpdf struct { } // Setup creates a new PDF with appropriate settings and fonts -// TODO: find a font that's closer to the average dimensions of the -// text we're dealing with -// TODO: once we have a good font, embed it in the binary as bytes func (p *Fpdf) Setup() error { p.fpdf = gofpdf.New("P", "pt", "A4", "") // Even though it's invisible, we need to add a font which can do // UTF-8 so that text renders correctly. - p.fpdf.AddUTF8Font("dejavu", "", "DejaVuSansCondensed.ttf") + p.fpdf.AddUTF8FontFromBytes("dejavu", "", DejaVuCondensedBytes) p.fpdf.SetFont("dejavu", "", 10) p.fpdf.SetAutoPageBreak(false, float64(0)) return p.fpdf.Error() @@ -66,8 +63,6 @@ func (p *Fpdf) AddPage(imgpath, hocrpath string) error { b := img.Bounds() p.fpdf.AddPageFormat("P", gofpdf.SizeType{Wd: pxToPt(b.Dx()), Ht: pxToPt(b.Dy())}) - // TODO: check for errors in pdf as going through - _ = p.fpdf.RegisterImageOptions(imgpath, gofpdf.ImageOptions{}) p.fpdf.ImageOptions(imgpath, 0, 0, pxToPt(b.Dx()), pxToPt(b.Dy()), false, gofpdf.ImageOptions{}, 0, "") -- cgit v1.2.1-24-ge1ad