Support font-family names with quotes #186

sammycage · Oct 18, 2024 · 3769b62 · 3769b62
1 parent 4628afe
commit 3769b62
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 7 deletions.
diff --git a/source/graphics.cpp b/source/graphics.cpp
@@ -417,12 +417,10 @@ bool FontFaceCache::addFontFace(const std::string& family, bool bold, bool itali
     return !face.isNull();
 }
 
-FontFace FontFaceCache::getFontFace(const std::string& family, bool bold, bool italic)
+FontFace FontFaceCache::getFontFace(const std::string_view& family, bool bold, bool italic)
 {
     auto it = m_table.find(family);
     if(it == m_table.end()) {
-        if(!family.empty())
-            return getFontFace(emptyString, bold, italic);
         return FontFace();
     }
 

diff --git a/source/graphics.h b/source/graphics.h
@@ -420,13 +420,12 @@ class FontFace {
 class FontFaceCache {
 public:
     bool addFontFace(const std::string& family, bool bold, bool italic, const FontFace& face);
-
-    FontFace getFontFace(const std::string& family, bool bold, bool italic);
+    FontFace getFontFace(const std::string_view& family, bool bold, bool italic);
 
 private:
     FontFaceCache();
     using FontFaceEntry = std::tuple<bool, bool, FontFace>;
-    std::map<std::string, std::vector<FontFaceEntry>> m_table;
+    std::map<std::string, std::vector<FontFaceEntry>, std::less<>> m_table;
     friend FontFaceCache* fontFaceCache();
 };
 

diff --git a/source/svglayoutstate.cpp b/source/svglayoutstate.cpp
@@ -434,7 +434,28 @@ Font SVGLayoutState::font() const
 {
     auto bold = m_font_weight == FontWeight::Bold;
     auto italic = m_font_style == FontStyle::Italic;
-    auto face = fontFaceCache()->getFontFace(m_font_family, bold, italic);
+
+    FontFace face;
+    std::string_view input(m_font_family);
+    while(!input.empty() && face.isNull()) {
+        auto family = input.substr(0, input.find(','));
+        input.remove_prefix(family.length());
+        if(!input.empty() && input.front() == ',')
+            input.remove_prefix(1);
+        stripLeadingAndTrailingSpaces(family);
+        if(!family.empty() && (family.front() == '\'' || family.front() == '"')) {
+            auto quote = family.front();
+            family.remove_prefix(1);
+            if(!family.empty() && family.back() == quote)
+                family.remove_suffix(1);
+            stripLeadingAndTrailingSpaces(family);
+        }
+
+        face = fontFaceCache()->getFontFace(family, bold, italic);
+    }
+
+    if(face.isNull())
+        face = fontFaceCache()->getFontFace(emptyString, bold, italic);
     return Font(face, m_font_size);
 }