Merge remote-tracking branch 'origin/dev' into wip/cmake

Change-Id: Ifecc2d9db396d783124df8567553ba5f846f30bb

10 files changed, 71 insertions, 42 deletions

diff --git a/src/gui/text/qfontengine_p.h b/src/gui/text/qfontengine_p.h
index a5c78d5372..03e14c737a 100644
--- a/src/gui/text/qfontengine_p.h
+++ b/src/gui/text/qfontengine_p.h
@@ -136,7 +136,7 @@ public:
         signed char format = 0;
         uchar *data = nullptr;
     private:
-        Q_DISABLE_COPY(Glyph);
+        Q_DISABLE_COPY(Glyph)
     };
 
     virtual ~QFontEngine();
diff --git a/src/gui/text/qfontengine_qpf2.cpp b/src/gui/text/qfontengine_qpf2.cpp
index 409176d41b..36d1cd5b9b 100644
--- a/src/gui/text/qfontengine_qpf2.cpp
+++ b/src/gui/text/qfontengine_qpf2.cpp
@@ -168,7 +168,7 @@ const QFontEngineQPF2::Glyph *QFontEngineQPF2::findGlyph(glyph_t g) const
 
 bool QFontEngineQPF2::verifyHeader(const uchar *data, int size)
 {
-    VERIFY(quintptr(data) % Q_ALIGNOF(Header) == 0);
+    VERIFY(quintptr(data) % alignof(Header) == 0);
     VERIFY(size >= int(sizeof(Header)));
     const Header *header = reinterpret_cast<const Header *>(data);
     if (header->magic[0] != 'Q'
diff --git a/src/gui/text/qharfbuzzng.cpp b/src/gui/text/qharfbuzzng.cpp
index 2f25aea92b..9c8582b43d 100644
--- a/src/gui/text/qharfbuzzng.cpp
+++ b/src/gui/text/qharfbuzzng.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2019 The Qt Company Ltd.
 ** Copyright (C) 2013 Konstantin Ritt
 ** Contact: https://www.qt.io/licensing/
 **
@@ -216,7 +216,20 @@ static const hb_script_t _qtscript_to_hbscript[] = {
     HB_SCRIPT_MASARAM_GONDI,
     HB_SCRIPT_NUSHU,
     HB_SCRIPT_SOYOMBO,
-    HB_SCRIPT_ZANABAZAR_SQUARE
+    HB_SCRIPT_ZANABAZAR_SQUARE,
+
+    // Unicode 12.1 additions (not present in harfbuzz-ng 1.7.4)
+    hb_script_t(HB_TAG('D', 'o', 'g', 'r')), // Script_Dogra
+    hb_script_t(HB_TAG('G', 'o', 'n', 'g')), // Script_GunjalaGondi
+    hb_script_t(HB_TAG('R', 'o', 'h', 'g')), // Script_HanifiRohingya
+    hb_script_t(HB_TAG('M', 'a', 'k', 'a')), // Script_Makasar
+    hb_script_t(HB_TAG('M', 'e', 'd', 'f')), // Script_Medefaidrin
+    hb_script_t(HB_TAG('S', 'o', 'g', 'o')), // Script_OldSogdian
+    hb_script_t(HB_TAG('S', 'o', 'g', 'd')), // Script_Sogdian
+    hb_script_t(HB_TAG('E', 'l', 'y', 'm')), // Script_Elymaic
+    hb_script_t(HB_TAG('N', 'a', 'n', 'd')), // Script_Nandinagari
+    hb_script_t(HB_TAG('H', 'm', 'n', 'p')), // Script_NyiakengPuachueHmong
+    hb_script_t(HB_TAG('W', 'c', 'h', 'o')), // Script_Wancho
 };
 Q_STATIC_ASSERT(QChar::ScriptCount == sizeof(_qtscript_to_hbscript) / sizeof(_qtscript_to_hbscript[0]));
 
diff --git a/src/gui/text/qtextdocument.cpp b/src/gui/text/qtextdocument.cpp
index 22c249d604..e94f635651 100644
--- a/src/gui/text/qtextdocument.cpp
+++ b/src/gui/text/qtextdocument.cpp
@@ -3420,7 +3420,7 @@ QString QTextDocument::toMarkdown(QTextDocument::MarkdownFeatures features) cons
 #if QT_CONFIG(textmarkdownreader)
 void QTextDocument::setMarkdown(const QString &markdown, QTextDocument::MarkdownFeatures features)
 {
-    QTextMarkdownImporter(static_cast<QTextMarkdownImporter::Features>(int(features))).import(this, markdown);
+    QTextMarkdownImporter(features).import(this, markdown);
 }
 #endif
 
diff --git a/src/gui/text/qtextdocument.h b/src/gui/text/qtextdocument.h
index 2fadc40cd2..7d46238257 100644
--- a/src/gui/text/qtextdocument.h
+++ b/src/gui/text/qtextdocument.h
@@ -152,7 +152,6 @@ public:
 #endif
 
 #if QT_CONFIG(textmarkdownwriter) || QT_CONFIG(textmarkdownreader)
-    // Must be in sync with QTextMarkdownImporter::Features, should be in sync with #define MD_FLAG_* in md4c
     enum MarkdownFeature {
         MarkdownNoHTML = 0x0020 | 0x0040,
         MarkdownDialectCommonMark = 0,
diff --git a/src/gui/text/qtextdocumentlayout.cpp b/src/gui/text/qtextdocumentlayout.cpp
index 7be114adf9..ed23a4d8d9 100644
--- a/src/gui/text/qtextdocumentlayout.cpp
+++ b/src/gui/text/qtextdocumentlayout.cpp
@@ -2088,8 +2088,12 @@ void QTextDocumentLayoutPrivate::drawBlock(const QPointF &offset, QPainter *pain
 
     tl->draw(painter, offset, selections, context.clip.isValid() ? (context.clip & clipRect) : clipRect);
 
-    if ((context.cursorPosition >= blpos && context.cursorPosition < blpos + bllen)
-        || (context.cursorPosition < -1 && !tl->preeditAreaText().isEmpty())) {
+    // if the block is empty and it precedes a table, do not draw the cursor.
+    // the cursor is drawn later after the table has been drawn so no need
+    // to draw it here.
+    if (!isEmptyBlockBeforeTable(frameIteratorForTextPosition(blpos))
+        && ((context.cursorPosition >= blpos && context.cursorPosition < blpos + bllen)
+            || (context.cursorPosition < -1 && !tl->preeditAreaText().isEmpty()))) {
         int cpos = context.cursorPosition;
         if (cpos < -1)
             cpos = tl->preeditAreaPosition() - (cpos + 2);
diff --git a/src/gui/text/qtextengine.cpp b/src/gui/text/qtextengine.cpp
index b37353bf2c..209433dac5 100644
--- a/src/gui/text/qtextengine.cpp
+++ b/src/gui/text/qtextengine.cpp
@@ -2125,22 +2125,7 @@ void QTextEngine::itemize() const
     }
 #if QT_CONFIG(harfbuzz)
     analysis = scriptAnalysis.data();
-    if (qt_useHarfbuzzNG()) {
-        // ### pretend HB-old behavior for now
-        for (int i = 0; i < length; ++i) {
-            switch (analysis[i].script) {
-            case QChar::Script_Latin:
-            case QChar::Script_Hiragana:
-            case QChar::Script_Katakana:
-            case QChar::Script_Bopomofo:
-            case QChar::Script_Han:
-                analysis[i].script = QChar::Script_Common;
-                break;
-            default:
-                break;
-            }
-        }
-    } else {
+    if (!qt_useHarfbuzzNG()) {
         for (int i = 0; i < length; ++i)
             analysis[i].script = hbscript_to_script(script_to_hbscript(analysis[i].script));
     }
@@ -3619,7 +3604,12 @@ int QTextEngine::positionInLigature(const QScriptItem *si, int end,
     int clusterLength = 0;
 
     if (si->analysis.script != QChar::Script_Common &&
-        si->analysis.script != QChar::Script_Greek) {
+        si->analysis.script != QChar::Script_Greek &&
+        si->analysis.script != QChar::Script_Latin &&
+        si->analysis.script != QChar::Script_Hiragana &&
+        si->analysis.script != QChar::Script_Katakana &&
+        si->analysis.script != QChar::Script_Bopomofo &&
+        si->analysis.script != QChar::Script_Han) {
         if (glyph_pos == -1)
             return si->position + end;
         else {
diff --git a/src/gui/text/qtextengine_p.h b/src/gui/text/qtextengine_p.h
index fddda7f2f8..76b9757eba 100644
--- a/src/gui/text/qtextengine_p.h
+++ b/src/gui/text/qtextengine_p.h
@@ -351,7 +351,7 @@ struct QScriptItem
     Q_DECL_CONSTEXPR QFixed height() const noexcept { return ascent + descent; }
 private:
     friend class QVector<QScriptItem>;
-    QScriptItem() {}; // for QVector, don't use
+    QScriptItem() {} // for QVector, don't use
 };
 Q_DECLARE_TYPEINFO(QScriptItem, Q_PRIMITIVE_TYPE);
 
diff --git a/src/gui/text/qtextmarkdownimporter.cpp b/src/gui/text/qtextmarkdownimporter.cpp
index fe7e422923..87ade1f973 100644
--- a/src/gui/text/qtextmarkdownimporter.cpp
+++ b/src/gui/text/qtextmarkdownimporter.cpp
@@ -60,6 +60,22 @@ static const QChar Space = QLatin1Char(' ');
 // TODO maybe eliminate the margins after all views recognize BlockQuoteLevel, CSS can format it, etc.
 static const int BlockQuoteIndent = 40; // pixels, same as in QTextHtmlParserNode::initializeProperties
 
+Q_STATIC_ASSERT(int(QTextMarkdownImporter::FeatureCollapseWhitespace) == MD_FLAG_COLLAPSEWHITESPACE);
+Q_STATIC_ASSERT(int(QTextMarkdownImporter::FeaturePermissiveATXHeaders) == MD_FLAG_PERMISSIVEATXHEADERS);
+Q_STATIC_ASSERT(int(QTextMarkdownImporter::FeaturePermissiveURLAutoLinks) == MD_FLAG_PERMISSIVEURLAUTOLINKS);
+Q_STATIC_ASSERT(int(QTextMarkdownImporter::FeaturePermissiveMailAutoLinks) == MD_FLAG_PERMISSIVEEMAILAUTOLINKS);
+Q_STATIC_ASSERT(int(QTextMarkdownImporter::FeatureNoIndentedCodeBlocks) == MD_FLAG_NOINDENTEDCODEBLOCKS);
+Q_STATIC_ASSERT(int(QTextMarkdownImporter::FeatureNoHTMLBlocks) == MD_FLAG_NOHTMLBLOCKS);
+Q_STATIC_ASSERT(int(QTextMarkdownImporter::FeatureNoHTMLSpans) == MD_FLAG_NOHTMLSPANS);
+Q_STATIC_ASSERT(int(QTextMarkdownImporter::FeatureTables) == MD_FLAG_TABLES);
+Q_STATIC_ASSERT(int(QTextMarkdownImporter::FeatureStrikeThrough) == MD_FLAG_STRIKETHROUGH);
+Q_STATIC_ASSERT(int(QTextMarkdownImporter::FeaturePermissiveWWWAutoLinks) == MD_FLAG_PERMISSIVEWWWAUTOLINKS);
+Q_STATIC_ASSERT(int(QTextMarkdownImporter::FeaturePermissiveAutoLinks) == MD_FLAG_PERMISSIVEAUTOLINKS);
+Q_STATIC_ASSERT(int(QTextMarkdownImporter::FeatureTasklists) == MD_FLAG_TASKLISTS);
+Q_STATIC_ASSERT(int(QTextMarkdownImporter::FeatureNoHTML) == MD_FLAG_NOHTML);
+Q_STATIC_ASSERT(int(QTextMarkdownImporter::DialectCommonMark) == MD_DIALECT_COMMONMARK);
+Q_STATIC_ASSERT(int(QTextMarkdownImporter::DialectGitHub) == MD_DIALECT_GITHUB);
+
 // --------------------------------------------------------
 // MD4C callback function wrappers
 
@@ -122,6 +138,11 @@ QTextMarkdownImporter::QTextMarkdownImporter(QTextMarkdownImporter::Features fea
 {
 }
 
+QTextMarkdownImporter::QTextMarkdownImporter(QTextDocument::MarkdownFeatures features)
+  : QTextMarkdownImporter(static_cast<QTextMarkdownImporter::Features>(int(features)))
+{
+}
+
 void QTextMarkdownImporter::import(QTextDocument *doc, const QString &markdown)
 {
     MD_PARSER callbacks = {
diff --git a/src/gui/text/qtextmarkdownimporter_p.h b/src/gui/text/qtextmarkdownimporter_p.h
index 35655aff8a..f450da5eb3 100644
--- a/src/gui/text/qtextmarkdownimporter_p.h
+++ b/src/gui/text/qtextmarkdownimporter_p.h
@@ -54,6 +54,7 @@
 #include <QtGui/qfont.h>
 #include <QtGui/qtguiglobal.h>
 #include <QtGui/qpalette.h>
+#include <QtGui/qtextdocument.h>
 #include <QtGui/qtextlist.h>
 #include <QtCore/qstack.h>
 
@@ -67,27 +68,28 @@ class Q_GUI_EXPORT QTextMarkdownImporter
 {
 public:
     enum Feature {
-        // Must be kept in sync with MD_FLAG_* in md4c.h
-        FeatureCollapseWhitespace =       0x0001, // MD_FLAG_COLLAPSEWHITESPACE
-        FeaturePermissiveATXHeaders =     0x0002, // MD_FLAG_PERMISSIVEATXHEADERS
-        FeaturePermissiveURLAutoLinks =   0x0004, // MD_FLAG_PERMISSIVEURLAUTOLINKS
-        FeaturePermissiveMailAutoLinks =  0x0008, // MD_FLAG_PERMISSIVEEMAILAUTOLINKS
-        FeatureNoIndentedCodeBlocks =     0x0010, // MD_FLAG_NOINDENTEDCODEBLOCKS
-        FeatureNoHTMLBlocks =             0x0020, // MD_FLAG_NOHTMLBLOCKS
-        FeatureNoHTMLSpans =              0x0040, // MD_FLAG_NOHTMLSPANS
-        FeatureTables =                   0x0100, // MD_FLAG_TABLES
-        FeatureStrikeThrough =            0x0200, // MD_FLAG_STRIKETHROUGH
-        FeaturePermissiveWWWAutoLinks =   0x0400, // MD_FLAG_PERMISSIVEWWWAUTOLINKS
-        FeatureTasklists =                0x0800, // MD_FLAG_TASKLISTS
+        FeatureCollapseWhitespace =       0x0001,
+        FeaturePermissiveATXHeaders =     0x0002,
+        FeaturePermissiveURLAutoLinks =   0x0004,
+        FeaturePermissiveMailAutoLinks =  0x0008,
+        FeatureNoIndentedCodeBlocks =     0x0010,
+        FeatureNoHTMLBlocks =             0x0020,
+        FeatureNoHTMLSpans =              0x0040,
+        FeatureTables =                   0x0100,
+        FeatureStrikeThrough =            0x0200,
+        FeaturePermissiveWWWAutoLinks =   0x0400,
+        FeatureTasklists =                0x0800,
         // composite flags
-        FeaturePermissiveAutoLinks =  FeaturePermissiveMailAutoLinks | FeaturePermissiveURLAutoLinks | FeaturePermissiveWWWAutoLinks, // MD_FLAG_PERMISSIVEAUTOLINKS
-        FeatureNoHTML = FeatureNoHTMLBlocks | FeatureNoHTMLSpans, // MD_FLAG_NOHTML
-        DialectCommonMark = 0,                   // MD_DIALECT_COMMONMARK
-        DialectGitHub = FeaturePermissiveAutoLinks | FeatureTables | FeatureStrikeThrough | FeatureTasklists // MD_DIALECT_GITHUB
+        FeaturePermissiveAutoLinks = FeaturePermissiveMailAutoLinks
+            | FeaturePermissiveURLAutoLinks | FeaturePermissiveWWWAutoLinks,
+        FeatureNoHTML = QTextDocument::MarkdownNoHTML,
+        DialectCommonMark = QTextDocument::MarkdownDialectCommonMark,
+        DialectGitHub = QTextDocument::MarkdownDialectGitHub
     };
     Q_DECLARE_FLAGS(Features, Feature)
 
     QTextMarkdownImporter(Features features);
+    QTextMarkdownImporter(QTextDocument::MarkdownFeatures features);
 
     void import(QTextDocument *doc, const QString &markdown);