Merge branch 'vedderb:master' into ci

darwinbeing · Jul 6, 2024 · 6491a41 · 6491a41
2 parents a0dcd5a + 48e6e34
commit 6491a41
Show file tree

Hide file tree

Showing 5 changed files with 82 additions and 46 deletions.
diff --git a/maddy/blockparser.h b/maddy/blockparser.h
@@ -7,6 +7,7 @@
 // -----------------------------------------------------------------------------
 
 #include <functional>
+#include <memory>
 #include <sstream>
 #include <string>
 // windows compatibility includes
@@ -119,6 +120,12 @@ class BlockParser
     return this->result;
   }
 
+  std::string
+  GetReparseLine()
+  {
+    return this->reparseLine;
+  }
+
   /**
    * Clear
    *
@@ -138,6 +145,7 @@ class BlockParser
 protected:
   std::stringstream result;
   std::shared_ptr<BlockParser> childParser;
+  std::string reparseLine;
 
   virtual bool isInlineBlockAllowed() const = 0;
   virtual bool isLineParserAllowed() const = 0;

diff --git a/maddy/paragraphparser.h b/maddy/paragraphparser.h
@@ -8,8 +8,18 @@
 
 #include <functional>
 #include <string>
+#include <QDebug>
 
 #include "maddy/blockparser.h"
+#include "maddy/codeblockparser.h"
+#include "maddy/headlineparser.h"
+#include "maddy/horizontallineparser.h"
+#include "maddy/quoteparser.h"
+#include "maddy/tableparser.h"
+#include "maddy/checklistparser.h"
+#include "maddy/orderedlistparser.h"
+#include "maddy/unorderedlistparser.h"
+#include "maddy/htmlparser.h"
 
 // -----------------------------------------------------------------------------
 
@@ -87,42 +97,48 @@ class ParagraphParser : public BlockParser
     return true;
   }
 
-  void
-  parseBlock(std::string& line) override
-  {
-    if (this->isEnabled && !this->isStarted)
-    {
-      line = "<p>" + line + " ";
-      this->isStarted = true;
-      return;
-    }
-    else if (!this->isEnabled && !this->isStarted)
-    {
-      line += " ";
-      this->isStarted = true;
-      return;
-    }
-
-    if (this->isEnabled && line.empty())
-    {
-      line += "</p>";
-      this->isFinished = true;
-      return;
-    }
-    else if (!this->isEnabled && line.empty())
-    {
-      line += "<br/>";
-      this->isFinished = true;
-      return;
-    }
-
-    line += " ";
+  void parseBlock(std::string& line) override {
+      // Check if another parser should take over
+      if (this->isStarted && (
+                  maddy::CodeBlockParser::IsStartingLine(line) ||
+                  maddy::HeadlineParser::IsStartingLine(line) ||
+                  maddy::HorizontalLineParser::IsStartingLine(line) ||
+                  maddy::QuoteParser::IsStartingLine(line) ||
+                  maddy::TableParser::IsStartingLine(line) ||
+                  maddy::ChecklistParser::IsStartingLine(line) ||
+                  maddy::OrderedListParser::IsStartingLine(line) ||
+                  maddy::UnorderedListParser::IsStartingLine(line) ||
+                  maddy::HtmlParser::IsStartingLine(line)
+                  )) {
+          this->reparseLine = line;
+          line = this->isEnabled ? "</p>" : "<br/>";
+          this->isFinished = true;
+          return;
+      }
+
+      if (!this->isStarted) {
+          if (this->isEnabled) {
+              line = "<p>" + line + " ";
+          } else {
+              line += " ";
+          }
+
+          this->isStarted = true;
+      } else {
+          if (line.empty()) {
+              line += this->isEnabled ? "</p>" : "<br/>";
+              this->isFinished = true;
+          } else {
+              line += " ";
+          }
+      }
   }
 
 private:
   bool isStarted;
   bool isFinished;
   bool isEnabled;
+
 }; // class ParagraphParser
 
 // -----------------------------------------------------------------------------

diff --git a/maddy/parser.h b/maddy/parser.h
@@ -9,6 +9,7 @@
 #include <memory>
 #include <functional>
 #include <string>
+#include <QDebug>
 
 #include "maddy/parserconfig.h"
 
@@ -158,23 +159,34 @@ class Parser
     std::string result = "";
     std::shared_ptr<BlockParser> currentBlockParser = nullptr;
 
-    for (std::string line; std::getline(markdown, line);)
-    {
-      if (!currentBlockParser)
-      {
-        currentBlockParser = getBlockParserForLine(line);
-      }
+    for (std::string line; std::getline(markdown, line);) {
+        bool reparse = true;
 
-      if (currentBlockParser)
-      {
-        currentBlockParser->AddLine(line);
+        while (reparse) {
+            reparse = false;
 
-        if (currentBlockParser->IsFinished())
-        {
-          result += currentBlockParser->GetResult().str();
-          currentBlockParser = nullptr;
+            if (!currentBlockParser)
+            {
+                currentBlockParser = getBlockParserForLine(line);
+            }
+
+            if (currentBlockParser)
+            {
+                currentBlockParser->AddLine(line);
+
+                if (currentBlockParser->IsFinished())
+                {
+                    result += currentBlockParser->GetResult().str();
+
+                    if (!currentBlockParser->GetReparseLine().empty()) {
+                        reparse = true;
+                        line = currentBlockParser->GetReparseLine();
+                    }
+
+                    currentBlockParser = nullptr;
+                }
+            }
         }
-      }
     }
 
     // make sure, that all parsers are finished

diff --git a/maddy/parserconfig.h b/maddy/parserconfig.h
@@ -43,7 +43,7 @@ enum PARSER_TYPE : uint32_t
   UNORDERED_LIST_PARSER    = 0b0100000000000000000,
   LATEX_BLOCK_PARSER       = 0b1000000000000000000,
 
-  DEFAULT                  = 0b0111111111110111111,
+  DEFAULT                  = 0b0111111111111111111,
   ALL                      = 0b1111111111111111111,
   TEST                     = 0b1110011110111110111,
 };

diff --git a/utility.cpp b/utility.cpp
@@ -2338,7 +2338,7 @@ bool Utility::downloadUrlEventloop(QString path, QString dest)
 QString Utility::md2html(QString md)
 {
     std::shared_ptr<maddy::ParserConfig> config = std::make_shared<maddy::ParserConfig>();
-    config->enabledParsers = maddy::types::ALL;
+    config->enabledParsers = maddy::types::DEFAULT;
     std::shared_ptr<maddy::Parser> parser = std::make_shared<maddy::Parser>(config);
 
     std::stringstream markdownInput(md.toStdString());