Handle fonts that have commas/quotes in the family name

Since the comma character was originally used as a separator, we
need to extend QFont to have setFamilies() so that we can avoid
joining the family strings together. This enables us to see the
family name as a single string and for multiple family names,
we have families().

Subsequently, this has added functions to QTextCharFormat to
account for multiple font families too. So it is now possible to
set a single one directly with setFontFamily() and multiple ones
with setFontFamilies().

This also bumps up the datastream version to 19 as QFont now
streams the families list as well.

[ChangeLog][QtGui][QFont] Add setFamilies()/families() to aid using of font families with commas and quotes in their name.
[ChangeLog][Important Behavior Changes] QDataStream version bumped up to 19 to account for changes in the serialization of QFont.

Fixes: QTBUG-46322
Change-Id: Iee9f715e47544a7a705c7f36401aba216a7d42b0
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

1 files changed, 37 insertions, 14 deletions

diff --git a/tests/auto/gui/text/qtextdocumentfragment/tst_qtextdocumentfragment.cpp b/tests/auto/gui/text/qtextdocumentfragment/tst_qtextdocumentfragment.cpp
index 3e354b7523..08f7cf4fb2 100644
--- a/tests/auto/gui/text/qtextdocumentfragment/tst_qtextdocumentfragment.cpp
+++ b/tests/auto/gui/text/qtextdocumentfragment/tst_qtextdocumentfragment.cpp
@@ -159,6 +159,7 @@ private slots:
     void nonZeroMarginOnImport();
     void html_charFormatPropertiesUnset();
     void html_headings();
+    void html_quotedFontFamily_data();
     void html_quotedFontFamily();
     void html_spanBackgroundColor();
     void defaultFont();
@@ -2184,23 +2185,45 @@ void tst_QTextDocumentFragment::html_headings()
     QCOMPARE(doc->blockCount(), 2);
 }
 
-void tst_QTextDocumentFragment::html_quotedFontFamily()
+void tst_QTextDocumentFragment::html_quotedFontFamily_data()
 {
-    setHtml("<div style=\"font-family: 'Foo Bar';\">Test</div>");
-    QCOMPARE(doc->begin().begin().fragment().charFormat().fontFamily(), QString("Foo Bar"));
-
-    setHtml("<div style='font-family: \"Foo Bar\";'>Test</div>");
-    QCOMPARE(doc->begin().begin().fragment().charFormat().fontFamily(), QString("Foo Bar"));
-
-    setHtml("<div style='font-family: \"Foo  Bar\";'>Test</div>");
-    QCOMPARE(doc->begin().begin().fragment().charFormat().fontFamily(), QString("Foo  Bar"));
-
-    setHtml("<div style='font-family: Foo\n  Bar;'>Test</div>");
-    QCOMPARE(doc->begin().begin().fragment().charFormat().fontFamily(), QString("Foo Bar"));
+    QTest::addColumn<QString>("html");
+    QTest::addColumn<QString>("fontFamily");
+    QTest::addColumn<QStringList>("fontFamilies");
+
+    const QString fooFamily = QLatin1String("Foo Bar");
+    const QString weirdFamily = QLatin1String("'Weird, & font '' name',");
+
+    QTest::newRow("data1") << QString("<div style=\"font-family: 'Foo Bar';\">Test</div>")
+                           << fooFamily << QStringList(fooFamily);
+    QTest::newRow("data2") << QString("<div style='font-family: \"Foo  Bar\";'>Test</div>")
+                           << QString("Foo  Bar") << QStringList("Foo  Bar");
+    QTest::newRow("data3") << QString("<div style='font-family: Foo\n  Bar;'>Test</div>")
+                           << fooFamily << QStringList(fooFamily);
+    QTest::newRow("data4") << QString("<div style='font-family: Foo\n  Bar, serif, \"bar foo\";'>Test"
+                                      "</div>")
+                           << fooFamily << (QStringList() << "Foo Bar" << "serif" << "bar foo");
+    QTest::newRow("data5") << QString("<div style='font-family: \"\\'Weird, & font \\'\\' name\\',"
+                                      "\";'>Test</div>")
+                           << weirdFamily << QStringList(weirdFamily);
+    QTest::newRow("data6") << QString("<div style='font-family: \"\\'Weird, & font \\'\\' name\\',"
+                                      "\";'>Test</div>")
+                           << weirdFamily << QStringList(weirdFamily);
+    QTest::newRow("data7") << QString("<div style='font-family: \"\\'Weird, & font \\'\\' name\\',\", "
+                                      "serif, \"bar foo\";'>Test</div>")
+                            << weirdFamily
+                            << (QStringList() << weirdFamily << "serif" << "bar foo");
+}
 
-    setHtml("<div style='font-family: Foo\n  Bar, serif, \"bar foo\";'>Test</div>");
-    QCOMPARE(doc->begin().begin().fragment().charFormat().fontFamily(), QString("Foo Bar,serif,bar foo"));
+void tst_QTextDocumentFragment::html_quotedFontFamily()
+{
+    QFETCH(QString, html);
+    QFETCH(QString, fontFamily);
+    QFETCH(QStringList, fontFamilies);
 
+    setHtml(html);
+    QCOMPARE(doc->begin().begin().fragment().charFormat().fontFamily(), fontFamily);
+    QCOMPARE(doc->begin().begin().fragment().charFormat().font().families(), fontFamilies);
 }
 
 void tst_QTextDocumentFragment::defaultFont()