QTextMarkdownWriter: Handle lists in blockquotes correctly

But we do not yet handle a blockquote in a list item. Presumably
that's less common anyway.

We now also continue block-quote prefixes onto blank lines
within a block quote, which looks more normal.

Pick-to: 6.7
Task-number: QTBUG-104997
Change-Id: I2b5642cf3a0c81a94444a33f026a02ad53e7e6bb
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Axel Spoerl <axel.spoerl@qt.io>

4 files changed, 27 insertions, 3 deletions

diff --git a/tests/auto/gui/text/qtextmarkdownwriter/data/blockquotes.md b/tests/auto/gui/text/qtextmarkdownwriter/data/blockquotes.md
index a021f15aba..8e605ef7e6 100644
--- a/tests/auto/gui/text/qtextmarkdownwriter/data/blockquotes.md
+++ b/tests/auto/gui/text/qtextmarkdownwriter/data/blockquotes.md
@@ -8,17 +8,17 @@ MacFarlane writes:
 
 > What distinguishes Markdown from many other lightweight markup syntaxes,
 > which are often easier to write, is its readability. As Gruber writes:
-
+> 
 > > The overriding design goal for Markdown's formatting syntax is to make it
 > > as readable as possible. The idea is that a Markdown-formatted document should
 > > be publishable as-is, as plain text, without looking like it's been marked up
 > > with tags or formatting instructions. ( 
 > > <http://daringfireball.net/projects/markdown/> )
-
+> 
 > The point can be illustrated by comparing a sample of AsciiDoc with an
 > equivalent sample of Markdown. Here is a sample of AsciiDoc from the AsciiDoc
 > manual:
-
+> 
 > ```AsciiDoc
 > 1. List item one.
 > +
diff --git a/tests/auto/gui/text/qtextmarkdownwriter/data/blockquotesWithLists.md b/tests/auto/gui/text/qtextmarkdownwriter/data/blockquotesWithLists.md
new file mode 100644
index 0000000000..1728889adc
--- /dev/null
+++ b/tests/auto/gui/text/qtextmarkdownwriter/data/blockquotesWithLists.md
@@ -0,0 +1,14 @@
+What if we have a quotation containing a list?
+
+> First some quoted text, and then a list:
+> 
+> - one
+> - two is longer and has enough words to form a paragraph with text continuing
+>   onto the next line
+> 
+> enough of that, let's try a numbered list
+> 
+> 1.  List item one
+> 2.  List item two is longer and has enough words to form a paragraph with
+>     text continuing onto the next line.
+> 
\ No newline at end of file
diff --git a/tests/auto/gui/text/qtextmarkdownwriter/data/listItemWithBlockquote.md b/tests/auto/gui/text/qtextmarkdownwriter/data/listItemWithBlockquote.md
new file mode 100644
index 0000000000..c417125fea
--- /dev/null
+++ b/tests/auto/gui/text/qtextmarkdownwriter/data/listItemWithBlockquote.md
@@ -0,0 +1,6 @@
+What if we have a list item containing a block quote?
+
+- one
+- > two is longer and has enough words to form a paragraph with text continuing
+  > onto the next line
+
diff --git a/tests/auto/gui/text/qtextmarkdownwriter/tst_qtextmarkdownwriter.cpp b/tests/auto/gui/text/qtextmarkdownwriter/tst_qtextmarkdownwriter.cpp
index ce21ff730b..03c0fa0adc 100644
--- a/tests/auto/gui/text/qtextmarkdownwriter/tst_qtextmarkdownwriter.cpp
+++ b/tests/auto/gui/text/qtextmarkdownwriter/tst_qtextmarkdownwriter.cpp
@@ -544,6 +544,8 @@ void tst_QTextMarkdownWriter::rewriteDocument_data()
     QTest::addColumn<QString>("inputFile");
 
     QTest::newRow("block quotes") << "blockquotes.md";
+    QTest::newRow("block quotes with lists") << "blockquotesWithLists.md";
+    // QTest::newRow("list item with block quote") << "listItemWithBlockquote.md"; // not supported for now
     QTest::newRow("example") << "example.md";
     QTest::newRow("list items after headings") << "headingsAndLists.md";
     QTest::newRow("word wrap") << "wordWrap.md";
@@ -644,6 +646,8 @@ void tst_QTextMarkdownWriter::fromHtml()
     }
 #endif
 
+    output = output.trimmed();
+    expectedOutput = expectedOutput.trimmed();
     if (output != expectedOutput && (isMainFontFixed() || isFixedFontProportional()))
         QEXPECT_FAIL("", "fixed main font or proportional fixed font (QTBUG-103484)", Continue);
     QCOMPARE(output, expectedOutput);