Better finding of fonts

FreeType/include/freetype/config/ftoption.h

@@ -503,7 +503,7 @@ FT_BEGIN_HEADER
    *
    *   More details can be found in the file `fterrors.h`.
    */
-/* #define FT_CONFIG_OPTION_ERROR_STRINGS */
+#define FT_CONFIG_OPTION_ERROR_STRINGS
 
 
   /*************************************************************************/

PdfForQtLib/sources/pdffont.cpp

@@ -63,9 +63,13 @@ private:
     /// Retrieves font data for desired font
     static QByteArray getFontData(const LOGFONT* font, HDC hdc);
 
+    /// Create a postscript name for comparation purposes
+    static QString getFontPostscriptName(QString fontName);
+
     struct FontInfo
     {
         QString faceName;
+        QString faceNameAdjusted;
         LOGFONT logFont;
         TEXTMETRIC textMetric;
     };
@@ -93,14 +97,59 @@ QByteArray PDFSystemFontInfoStorage::loadFont(const FontDescriptor* descriptor)
 #ifdef Q_OS_WIN
     HDC hdc = GetDC(NULL);
 
+    const BYTE lfItalic = (descriptor->italicAngle != 0.0 ? TRUE : FALSE);
+
+    // Exact match font face name
+    QString fontName = getFontPostscriptName(descriptor->fontName);
+    if (!fontName.isEmpty())
+    {
+        for (const FontInfo& fontInfo : m_fontInfos)
+        {
+            if (fontInfo.faceNameAdjusted == fontName &&
+                fontInfo.logFont.lfWeight == descriptor->fontWeight &&
+                fontInfo.logFont.lfItalic == lfItalic)
+            {
+                result = getFontData(&fontInfo.logFont, hdc);
+
+                if (!result.isEmpty())
+                {
+                    break;
+                }
+            }
+        }
+
+        // Match for font family
+        if (result.isEmpty())
+        {
+            for (const FontInfo& fontInfo : m_fontInfos)
+            {
+                if (fontInfo.faceNameAdjusted == fontName)
+                {
+                    LOGFONT logFont = fontInfo.logFont;
+                    logFont.lfWeight = descriptor->fontWeight;
+                    logFont.lfItalic = lfItalic;
+                    result = getFontData(&logFont, hdc);
+
+                    if (!result.isEmpty())
+                    {
+                        break;
+                    }
+                }
+            }
+        }
+    }
+
     // Exact match for font, if font can't be exact matched, then match font family
     // and try to set weight
     QString fontFamily = QString::fromLatin1(descriptor->fontFamily);
+
+    if (!fontFamily.isEmpty())
+    {
         for (const FontInfo& fontInfo : m_fontInfos)
         {
             if (fontInfo.faceName.contains(fontFamily) &&
                 fontInfo.logFont.lfWeight == descriptor->fontWeight &&
-            fontInfo.logFont.lfItalic == (descriptor->italicAngle != 0.0 ? TRUE : FALSE))
+                fontInfo.logFont.lfItalic == lfItalic)
             {
                 result = getFontData(&fontInfo.logFont, hdc);
 
@@ -120,7 +169,7 @@ QByteArray PDFSystemFontInfoStorage::loadFont(const FontDescriptor* descriptor)
                 {
                     LOGFONT logFont = fontInfo.logFont;
                     logFont.lfWeight = descriptor->fontWeight;
-                logFont.lfItalic = (descriptor->italicAngle != 0.0 ? TRUE : FALSE);
+                    logFont.lfItalic = lfItalic;
                     result = getFontData(&logFont, hdc);
 
                     if (!result.isEmpty())
@@ -130,6 +179,7 @@ QByteArray PDFSystemFontInfoStorage::loadFont(const FontDescriptor* descriptor)
                 }
             }
         }
+    }
 
     ReleaseDC(NULL, hdc);
 #endif
@@ -166,6 +216,7 @@ int PDFSystemFontInfoStorage::enumerateFontProc(const LOGFONT* font, const TEXTM
         fontInfo.logFont = *font;
         fontInfo.textMetric = *textMetrics;
         fontInfo.faceName = QString::fromWCharArray(font->lfFaceName);
+        fontInfo.faceNameAdjusted = getFontPostscriptName(fontInfo.faceName);
         callbackInfo->storage->m_fontInfos.push_back(qMove(fontInfo));
 
         // For debug purposes only!
@@ -199,6 +250,17 @@ QByteArray PDFSystemFontInfoStorage::getFontData(const LOGFONT* font, HDC hdc)
 
     return byteArray;
 }
+
+QString PDFSystemFontInfoStorage::getFontPostscriptName(QString fontName)
+{
+    for (const char* string : { "PS", "MT", "Regular", "Bold", "Italic", "Oblique" })
+    {
+        fontName.remove(QLatin1String(string), Qt::CaseInsensitive);
+    }
+
+    return fontName.remove(QChar(' ')).remove(QChar('-')).trimmed();
+}
+
 #endif
 
 PDFFont::PDFFont(FontDescriptor fontDescriptor) :

PdfForQtLib/sources/pdffunction.cpp

@@ -1661,8 +1661,12 @@ PDFPostScriptFunction::~PDFPostScriptFunction()
 
 PDFPostScriptFunction::Program PDFPostScriptFunction::parseProgram(const QByteArray& byteArray)
 {
+    // Lexical analyzer can't handle when '{' or '}' is near next token (for example '{0' etc.)
+    QByteArray adjustedArray = byteArray;
+    adjustedArray.replace('{', " { ").replace('}', " } ");
+
     Program result;
-    PDFLexicalAnalyzer parser(byteArray.constBegin(), byteArray.constEnd());
+    PDFLexicalAnalyzer parser(adjustedArray.constBegin(), adjustedArray.constEnd());
 
     std::stack<InstructionPointer> blockCallStack;
     while (true)