italicparser: Parse(): Add static keyword to regex

In line with the other parsers, add the static keyword to the
regex.

AUTHORS

@@ -9,3 +9,4 @@ Patrick José Pereira (patrickelectric@gmail.com)
 Martin Kopecky (martin.kopecky357@gmail.com)
 Andrew Mettlach (dmmettlach@gmail.com)
 Evan Klitzke (evan@eklitzke.org)
+Albert Schwarzkopf (dev-maddy@quitesimple.org)

README.md

@@ -1,3 +1,82 @@
-# qsmaddy
+# maddy
 
-Fork of [maddy](https://github.com/progsource/maddy) with some quick hacks to make it fit better for [qswiki](https://gitea.quitesimple.org/crtxcr/qswiki)
+[![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
+[![Version: 1.1.2](https://img.shields.io/badge/Version-1.1.2-brightgreen.svg)](https://semver.org/)
+[![Travis Build Status](https://travis-ci.org/progsource/maddy.svg?branch=master)](https://travis-ci.org/progsource/maddy)
+[![Appveyor Build Status](https://ci.appveyor.com/api/projects/status/04m0lg27kigv1pg8/branch/master?svg=true)](https://ci.appveyor.com/project/progsource/maddy/branch/master)
+
+maddy is a C++ Markdown to HTML **header-only** parser library.
+
+## Supported OS
+
+It actually should work on any OS, that supports the C++14 standard library.
+
+It is tested to work on:
+
+* Linux (gcc)
+* OSX (clang)
+* Windows (Visual Studio 2017)
+
+## Dependencies
+
+* C++14
+
+## Why maddy?
+
+When I was needing a Markdown parser in C++ I couldn't find any, that was
+fitting my needs. So I simply wrote my own one.
+
+## Markdown syntax
+
+The supported syntax can be found in the [definitions docs](docs/definitions.md).
+
+## How to use
+
+To use maddy in your project, simply add the include path of maddy to yours
+and in the code, you can then do the following:
+
+```c++
+#include <memory>
+#include <string>
+
+#include "maddy/parser.h"
+
+std::stringstream markdownInput("");
+
+// config is optional
+std::shared_ptr<maddy::ParserConfig> config = std::make_shared<maddy::ParserConfig>();
+config->isEmphasizedParserEnabled = true; // default
+config->isHTMLWrappedInParagraph = true; // default
+
+std::shared_ptr<maddy::Parser> parser = std::make_shared<maddy::Parser>(config);
+std::string htmlOutput = parser->Parse(markdownInput);
+```
+
+## How to run the tests
+
+*(tested on Linux with
+[git](https://git-scm.com/book/en/v2/Getting-Started-Installing-Git) and
+[cmake](https://cmake.org/install/) installed)*
+
+Open your preferred terminal and type:
+
+```shell
+git clone https://github.com/progsource/maddy.git
+cd maddy
+git submodule update --init --recursive
+mkdir tmp
+cd tmp
+cmake ..
+make
+make test # or run the executable in ../build/MaddyTests
+```
+
+## How to contribute
+
+There are different possibilities:
+
+* [Create a GitHub issue](https://github.com/progsource/maddy/issues/new)
+* Create a pull request with an own branch (don't forget to put yourself in the
+  AUTHORS file)
+
+Please also read [CONTRIBUTING.md](CONTRIBUTING.md).

include/maddy/callbackreplacer.h

@@ -1,36 +0,0 @@
-/*
- * This project is licensed under the MIT license. For more information see the
- * LICENSE file.
- */
-#pragma once
-
-#include <string>
-#include <regex>
-#include <functional>
-
-namespace maddy {
-
-inline std::string regex_callback_replacer(std::regex &regex, const std::string &input,
-                                           std::function<std::string(std::smatch &)> &callback)
-{
-  std::string result;
-  auto tagsbegin = std::sregex_iterator(input.begin(), input.end(), regex);
-  auto tagsend = std::sregex_iterator();
-  auto matchbegin = 0;
-  for(std::sregex_iterator i = tagsbegin; i != tagsend; ++i)
-  {
-    std::smatch match = *i;
-
-    auto matchlength = match.length(0);
-    auto matchpos = match.position();
-
-    result += input.substr(matchbegin, matchpos - matchbegin);
-    result += callback(match);
-    matchbegin = matchpos + matchlength;
-  }
-  result += input.substr(matchbegin);
-  return result;
-}
-
-}
-

include/maddy/linkparser.h

@@ -10,7 +10,6 @@
 #include <regex>
 
 #include "maddy/lineparser.h"
-#include "maddy/callbackreplacer.h"
 
 // -----------------------------------------------------------------------------
 
@@ -27,16 +26,6 @@ namespace maddy {
  */
 class LinkParser : public LineParser
 {
-private:
-  std::function<std::string(std::smatch &)> callback = [](std::smatch & match){
-    std::string inner = match.str(1);
-    std::string link = match.str(2);
-    return "<a href=\"" + link + "\">" + inner + "</a>";
-  };
-
-  std::regex re = std::regex("\\[([^\\]]*)\\]\\(([^\\]]*)\\)");
-
-
 public:
   /**
    * Parse
@@ -52,12 +41,10 @@ public:
   void
   Parse(std::string& line) override
   {
-    line = regex_callback_replacer(re,line,callback);
+    static std::regex re("\\[([^\\]]*)\\]\\(([^\\]]*)\\)");
-  }
+    static std::string replacement = "<a href=\"$2\">$1</a>";
 
-  void setCallback(std::function<std::string(std::smatch &)> callback)
+    line = std::regex_replace(line, re, replacement);
-  {
-    this->callback = callback;
   }
 }; // class LinkParser
 

include/maddy/parser.h

@@ -116,54 +116,6 @@ public:
     return result;
   }
 
-  void
-  setBreakLineParser(std::shared_ptr<BreakLineParser> breakLineParser)
-  {
-    this->breakLineParser = breakLineParser;
-  }
-
-  void
-  setEmphasizedParser(std::shared_ptr<EmphasizedParser> emphasizedParser)
-  {
-    this->emphasizedParser = emphasizedParser;
-  }
-
-  void
-  setImageParser(std::shared_ptr<ImageParser> imageParser)
-  {
-    this->imageParser = imageParser;
-  }
-
-  void
-  setInlineCodeParser(std::shared_ptr<InlineCodeParser> inlineCodeParser)
-  {
-    this->inlineCodeParser = inlineCodeParser;
-  }
-
-  void
-  setItalicParser(std::shared_ptr<ItalicParser> italicParser)
-  {
-    this->italicParser = italicParser;
-  }
-
-  void
-  setLinkParser(std::shared_ptr<LinkParser> linkParser)
-  {
-    this->linkParser = linkParser;
-  }
-
-  void
-  setStrikeThroughParser(std::shared_ptr<StrikeThroughParser> strikeThroughParser)
-  {
-    this->strikeThroughParser = strikeThroughParser;
-  }
-
-  void
-  setStrongParser(std::shared_ptr<StrongParser> strongParser)
-  {
-    this->strongParser = strongParser;
-  }
-
 private:
   std::shared_ptr<ParserConfig> config;
   std::shared_ptr<BreakLineParser> breakLineParser;