Improve font lookup in wxPdfFontManager

On the [wxWidgets forum](https://forums.wxwidgets.org/viewtopic.php?f=30&t=51732) a problem was reported about selecting the wrong font. The user had registered a font with regular style under the font family name "Arial" (which is also an alias for the font family "Helvetica"). Thereafter the user tried to select the font "Arial" with bold style. However, the registered font with regular style was selected. This happened, because registering the font "Arial" with regular style created the font family "Arial", hiding the equivalent font family "Helvetica" under its alias family name "Arial".

The font lookup was improved to search also the font family registered under the font family alias.

Author: utelle

CHANGELOG.md

@@ -7,6 +7,10 @@ and from version 0.9.0 onwards this project adheres to [Semantic Versioning](htt
 
 ## [Unreleased]
 
+### Changed
+
+- Improved font lookup in wxPdfFontManager to search also under the font family alias, if given
+
 ## [1.2.0] - 2024-02-18
 
 **wxPdfDocument** is compatible with wxWidgets versions 3.2.x and above.

src/pdffontmanager.cpp

@@ -1086,31 +1086,49 @@ wxPdfFontManagerBase::GetFont(const wxString& fontName, int fontStyle) const
   int searchStyle = (fontStyle & ~wxPDF_FONTSTYLE_DECORATION_MASK) & wxPDF_FONTSTYLE_MASK;
   wxPdfFontData* fontData = NULL;
 
+  // 0. Determine whether a family alias exists
+  wxPdfFontFamilyMap::const_iterator familyAliasIter = m_fontFamilyMap.end();
+  wxPdfFontAliasMap::const_iterator aliasIter = m_fontAliasMap.find(lcFontName);
+  if (aliasIter != m_fontAliasMap.end())
+  {
+    familyAliasIter = m_fontFamilyMap.find(aliasIter->second);
+  }
+
   // Check whether font name equals font family
   wxPdfFontFamilyMap::const_iterator familyIter = m_fontFamilyMap.find(lcFontName);
   if (familyIter == m_fontFamilyMap.end())
   {
-    // 1. Check family alias if given name was not a family name
-    wxPdfFontAliasMap::const_iterator aliasIter = m_fontAliasMap.find(lcFontName);
-    if (aliasIter != m_fontAliasMap.end())
-    {
-      familyIter = m_fontFamilyMap.find(aliasIter->second);
-    }
+    // 1. Use family alias (may be empty)
+    familyIter = familyAliasIter;
   }
 
   if (familyIter != m_fontFamilyMap.end())
   {
     // 2. Check whether the family contains a font with the requested style
     size_t n = familyIter->second.GetCount();
     size_t j;
-    for (j = 0; j < n && fontData == NULL; ++j)
+    do
     {
-      fontData = m_fontList[familyIter->second[j]]->GetFontData();
-      if (fontData->GetStyle() != searchStyle)
+      for (j = 0; j < n && fontData == NULL; ++j)
       {
-        fontData = NULL;
+        fontData = m_fontList[familyIter->second[j]]->GetFontData();
+        if (fontData->GetStyle() != searchStyle)
+        {
+          fontData = NULL;
+        }
+      }
+      n = 0;
+      // Search in alias font family if not already searched
+      if (fontData == NULL && familyAliasIter != familyIter)
+      {
+        if (familyAliasIter != m_fontFamilyMap.end())
+        {
+          familyIter = familyAliasIter;
+          n = familyIter->second.GetCount();
+        }
       }
     }
+    while (n > 0);
   }
 
   if (fontData == NULL)