From 7a724c8f0114b301b8d526906bde12dbe7a58de7 Mon Sep 17 00:00:00 2001 From: jghali Date: Wed, 26 Sep 2012 19:18:09 +0000 Subject: #11094: Excessive line spacing in exported pdf form fields git-svn-id: svn://scribus.net/branches/Version14x/Scribus@17777 11d20701-8431-0410-a711-e3c959e3b870 --- scribus/fonts/ftface.cpp | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'scribus/fonts/ftface.cpp') diff --git a/scribus/fonts/ftface.cpp b/scribus/fonts/ftface.cpp index 6889312..d0dc4d6 100644 --- a/scribus/fonts/ftface.cpp +++ b/scribus/fonts/ftface.cpp @@ -111,11 +111,14 @@ void FtFace::load() const m_strikeoutPos = m_ascent / 3; m_strokeWidth = m_face->underline_thickness / m_uniEM; const_cast(this)->isFixedPitch = m_face->face_flags & 4; - Ascent = QString::number(m_face->ascender); - CapHeight = QString::number(m_face->height); - Descender = QString::number(m_face->descender); - FontBBox = QString::number(m_face->bbox.xMin)+" "+QString::number(m_face->bbox.yMin)+" "+QString::number(m_face->bbox.xMax)+" "+QString::number(m_face->bbox.yMax); - ItalicAngle = "0"; + m_pdfAscent = QString::number(m_face->ascender / m_uniEM * 1000); + m_pdfCapHeight = QString::number(m_face->height / m_uniEM * 1000); + m_pdfDescender = QString::number(m_face->descender / m_uniEM * 1000); + m_pdfFontBBox = QString::number(m_face->bbox.xMin / m_uniEM * 1000) + " " + + QString::number(m_face->bbox.yMin / m_uniEM * 1000) + " " + + QString::number(m_face->bbox.xMax / m_uniEM * 1000) + " " + + QString::number(m_face->bbox.yMax / m_uniEM * 1000); + m_italicAngle = "0"; //FIXME: FT_Set_Charmap(m_face, m_face->charmaps[m_encoding]); setBestEncoding(m_face); -- cgit