Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 21067 → Rev 21066

/trunk/Scribus/scribus/fonts/ftface.cpp
7,7 → 7,6
 
#include "fonts/ftface.h"
 
#include FT_CID_H
#include FT_OUTLINE_H
#include FT_GLYPH_H
#include FT_TRUETYPE_IDS_H
90,10 → 89,6
}
}
 
FT_Bool isCID = false;
FT_Get_CID_Is_Internally_CID_Keyed(m_face, &isCID);
 
const_cast<FtFace*>(this)->isCIDFont = isCID;
const_cast<FtFace*>(this)->isStroked = false;
const_cast<FtFace*>(this)->hasGlyphNames = FT_HAS_GLYPH_NAMES(m_face);
 
/trunk/Scribus/scribus/fonts/scface.cpp
23,7 → 23,6
embedPs(false),
subset(false),
outline(false),
isCIDFont(false),
isStroked(false),
isFixedPitch(false),
hasGlyphNames(false),
/trunk/Scribus/scribus/fonts/scface.h
122,9 → 122,8
bool usable;
bool embedPs;
bool subset;
bool outline;
bool outline;
 
bool isCIDFont;
bool isStroked;
bool isFixedPitch;
bool hasGlyphNames;
186,7 → 185,6
virtual bool EmbedFont(QByteArray &/*str*/) const { return false; }
virtual void RawData(QByteArray & /*bb*/) const {}
 
virtual bool isCIDKeyed() const { return isCIDFont; }
virtual bool hasNames() const { return hasGlyphNames; }
virtual bool glyphNames(QMap<gid_type, std::pair<ucs4_type, QString> >& gList) const;
 
302,9 → 300,6
/// deprecated? tells if the face has PS names
bool hasNames() const { return m_m->hasNames(); }
 
/// tells if the font is a CID font
virtual bool isCIDKeyed() const { return m_m->isCIDFont; }
 
/// tells if this font is an outline font
bool isStroked() const { return m_m->isStroked; }
 
/trunk/Scribus/scribus/pdflib_core.cpp
1988,10 → 1988,6
{
pdfFont = PDF_WriteTtfSubsetFont(fontName, face, usedGlyphs);
}
else if (face.isCIDKeyed())
{
pdfFont = PDF_WriteType3Font(fontName, face, usedGlyphs);
}
else
{
pdfFont = PDF_WriteCffSubsetFont(fontName, face, usedGlyphs);