From 96cea3b1681dd24a0ec3a53078b78f902e3211a6 Mon Sep 17 00:00:00 2001 From: Andy Shaw Date: Mon, 11 May 2020 14:34:27 +0200 Subject: Export the letter and word spacing settings set on the default format When the default format has letter and word spacing set then these should be exported in the HTML's body tag. This also adds support for the reading of letter-spacing and word-spacing set too, so that the same html outputted can be read back in. Fixes: QTBUG-83718 Change-Id: Ic4afca21eb05efb779dbf99c6b3c13373e851f15 Pick-to: 5.15 Reviewed-by: Volker Hilsheimer --- .../gui/text/qtextdocument/tst_qtextdocument.cpp | 31 ++++++++++++++++ .../tst_qtextdocumentfragment.cpp | 43 ++++++++++++++++++++++ 2 files changed, 74 insertions(+) (limited to 'tests') diff --git a/tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp b/tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp index 17ce507cdf..5d7f41efda 100644 --- a/tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp +++ b/tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp @@ -102,6 +102,7 @@ private slots: void toHtmlBodyBgColorTransparent(); void toHtmlRootFrameProperties(); void toHtmlLineHeightProperties(); + void toHtmlDefaultFontSpacingProperties(); void capitalizationHtmlInExport(); void wordspacingHtmlExport(); @@ -1964,6 +1965,36 @@ void tst_QTextDocument::toHtmlLineHeightProperties() QCOMPARE(doc.toHtml(), expectedOutput); } +void tst_QTextDocument::toHtmlDefaultFontSpacingProperties() +{ + CREATE_DOC_AND_CURSOR(); + + cursor.insertText("Blah"); + + QFont fnt = doc.defaultFont(); + fnt.setLetterSpacing(QFont::AbsoluteSpacing, 13); + fnt.setWordSpacing(15); + doc.setDefaultFont(fnt); + + QString expectedOutput = QString("\n" + "" + "" + "\n" + "

Blah

" + ""); + expectedOutput = expectedOutput.arg(defaultFont.family()) + .arg(cssFontSizeString(defaultFont)) + .arg(defaultFont.weight() * 8) + .arg((defaultFont.italic() ? "italic" : "normal")); + + QCOMPARE(doc.toHtml(), expectedOutput); +} + void tst_QTextDocument::capitalizationHtmlInExport() { doc->setPlainText("Test"); diff --git a/tests/auto/gui/text/qtextdocumentfragment/tst_qtextdocumentfragment.cpp b/tests/auto/gui/text/qtextdocumentfragment/tst_qtextdocumentfragment.cpp index 67bb628215..3b4c55d406 100644 --- a/tests/auto/gui/text/qtextdocumentfragment/tst_qtextdocumentfragment.cpp +++ b/tests/auto/gui/text/qtextdocumentfragment/tst_qtextdocumentfragment.cpp @@ -266,6 +266,7 @@ private slots: void html_importImageWithoutAspectRatio(); void html_fromFirefox(); void html_emptyInlineInsideBlock(); + void css_fontAndWordSpacing(); private: inline void setHtml(const QString &html) @@ -4239,5 +4240,47 @@ void tst_QTextDocumentFragment::html_emptyInlineInsideBlock() QVERIFY(doc->firstBlock().blockFormat().leftMargin() > 0); } +void tst_QTextDocumentFragment::css_fontAndWordSpacing() +{ + { + const char html[] = "Foo"; + doc->setHtml(html); + cursor.movePosition(QTextCursor::Start); + cursor.movePosition(QTextCursor::NextCharacter); + QCOMPARE(cursor.charFormat().property(QTextFormat::FontLetterSpacing).toInt(), 13); + QCOMPARE(cursor.charFormat().property(QTextFormat::FontLetterSpacingType).toUInt(), + (uint)(QFont::AbsoluteSpacing)); + QCOMPARE(cursor.charFormat().property(QTextFormat::FontWordSpacing).toInt(), 15); + } + { + const char html[] = "Foo"; + doc->setHtml(html); + cursor.movePosition(QTextCursor::Start); + cursor.movePosition(QTextCursor::NextCharacter); + QCOMPARE(cursor.charFormat().property(QTextFormat::FontLetterSpacing).toInt(), 200); + QCOMPARE(cursor.charFormat().property(QTextFormat::FontLetterSpacingType).toUInt(), + (uint)(QFont::PercentageSpacing)); + QCOMPARE(cursor.charFormat().property(QTextFormat::FontWordSpacing).toInt(), 0); + } + { + const char html[] = "Foo"; + doc->setHtml(html); + cursor.movePosition(QTextCursor::Start); + cursor.movePosition(QTextCursor::NextCharacter); + QCOMPARE(cursor.charFormat().property(QTextFormat::FontLetterSpacing).toInt(), 100); + QCOMPARE(cursor.charFormat().property(QTextFormat::FontLetterSpacingType).toUInt(), + (uint)(QFont::PercentageSpacing)); + } + { + const char html[] = "Foo"; + doc->setHtml(html); + cursor.movePosition(QTextCursor::Start); + cursor.movePosition(QTextCursor::NextCharacter); + QCOMPARE(cursor.charFormat().property(QTextFormat::FontLetterSpacing).toInt(), 50); + QCOMPARE(cursor.charFormat().property(QTextFormat::FontLetterSpacingType).toUInt(), + (uint)(QFont::PercentageSpacing)); + } +} + QTEST_MAIN(tst_QTextDocumentFragment) #include "tst_qtextdocumentfragment.moc" -- cgit v1.2.3