diff options
| author | Jeremy Rimpo <jrim@rimpo.org> | 2019-07-22 01:01:40 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-22 01:01:40 -0500 |
| commit | e69078e2399a88bda7bb9ffae7a3d57db9a4e9cf (patch) | |
| tree | 0b80a88279b04be8c3da9ada2f54d2bc08e98eaf /src/bbcode.cpp | |
| parent | dcd6d624672019727d7effd17aac86f72bff438b (diff) | |
| parent | 613aa037cf8dc728eac474ee6cf6b790293d5114 (diff) | |
Merge pull request #793 from ModOrganizer2/Develop
Stage for release 2.2.1
Diffstat (limited to 'src/bbcode.cpp')
| -rw-r--r-- | src/bbcode.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/bbcode.cpp b/src/bbcode.cpp index 9f064106..323dd128 100644 --- a/src/bbcode.cpp +++ b/src/bbcode.cpp @@ -137,11 +137,13 @@ private: m_TagMap["center"] = std::make_pair(QRegExp("\\[center\\](.*)\\[/center\\]"),
"<div align=\"center\">\\1</div>");
m_TagMap["quote"] = std::make_pair(QRegExp("\\[quote\\](.*)\\[/quote\\]"),
- "<blockquote>\"\\1\"</blockquote>");
+ "<figure class=\"quote\"><blockquote>\\1</blockquote></figure>");
m_TagMap["quote="] = std::make_pair(QRegExp("\\[quote=([^\\]]*)\\](.*)\\[/quote\\]"),
- "<blockquote>\"\\2\"<br/><span>--\\1</span></blockquote></p>");
+ "<figure class=\"quote\"><blockquote>\\2</blockquote></figure>");
+ m_TagMap["spoiler"] = std::make_pair(QRegExp("\\[spoiler\\](.*)\\[/spoiler\\]"),
+ "<details><summary>Spoiler: <div class=\"bbc_spoiler_show\">Show</div></summary><div class=\"spoiler_content\">\\1</div></details>");
m_TagMap["code"] = std::make_pair(QRegExp("\\[code\\](.*)\\[/code\\]"),
- "<pre>\\1</pre>");
+ "<code>\\1</code>");
m_TagMap["heading"]= std::make_pair(QRegExp("\\[heading\\](.*)\\[/heading\\]"),
"<h2><strong>\\1</strong></h2>");
m_TagMap["line"] = std::make_pair(QRegExp("\\[line\\]"),
@@ -181,7 +183,7 @@ private: m_TagMap["email="] = std::make_pair(QRegExp("\\[email=\"?([^\\]]*)\"?\\](.*)\\[/email\\]"),
"<a href=\"mailto:\\1\">\\2</a>");
m_TagMap["youtube"] = std::make_pair(QRegExp("\\[youtube\\](.*)\\[/youtube\\]"),
- "<a href=\"http://www.youtube.com/v/\\1\">http://www.youtube.com/v/\\1</a>");
+ "<a href=\"https://www.youtube.com/watch?v=\\1\">https://www.youtube.com/watch?v=\\1</a>");
// make all patterns non-greedy and case-insensitive
|