9 files changed, 26 insertions, 18 deletions
diff --git a/src/main.cpp b/src/main.cpp
index 0f2a157..6477e0f 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -21,7 +21,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <string>
 #include "elements.h"
 #include "generators/latex/document_g.h"
-#include "parser/document_p.h"
+#include "parsers/mdown2/document_p.h"
 
 namespace ka = boost::spirit::karma;
 namespace po = boost::program_options;
@@ -71,7 +71,7 @@ int main(int argc, char** argv) {
 
     ifile.close();
 
-    document_p parser;
+    mdown2::document_p parser;
     iiterator begin = input.begin();
     iiterator end = input.end();
     document_t ast;
diff --git a/src/parser/document_p.cpp b/src/parsers/mdown2/document_p.cpp
index fe11aed..e0214ad 100644
--- a/src/parser/document_p.cpp
+++ b/src/parsers/mdown2/document_p.cpp
@@ -15,6 +15,6 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 #include "document_p.h"
 
-document_p::document_p() : document_p::base_type(document_) {
+mdown2::document_p::document_p() : document_p::base_type(document_) {
     document_ = +paragraph_;
 }
diff --git a/src/parser/document_p.h b/src/parsers/mdown2/document_p.h
index 19565d7..c949a06 100644
--- a/src/parser/document_p.h
+++ b/src/parsers/mdown2/document_p.h
@@ -13,19 +13,21 @@ WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
-#ifndef _MPPDOWN_DOCUMENT_P
-#define _MPPDOWN_DOCUMENT_P
+#ifndef _MPPDOWN_MDOWN2_DOCUMENT_P
+#define _MPPDOWN_MDOWN2_DOCUMENT_P
 #include <boost/spirit/include/qi.hpp>
-#include "../elements.h"
+#include "../../elements.h"
 #include "paragraph_p.h"
 
 namespace qi = boost::spirit::qi;
 namespace ph = boost::phoenix;
 
+namespace mdown2 {
 struct document_p : qi::grammar<iiterator, document_t()> {
     qi::rule<iiterator, document_t()> document_;
     paragraph_p paragraph_;
 
     document_p();
 };
+}
 #endif
diff --git a/src/parser/line_p.cpp b/src/parsers/mdown2/line_p.cpp
index 8426679..f408418 100644
--- a/src/parser/line_p.cpp
+++ b/src/parsers/mdown2/line_p.cpp
@@ -15,6 +15,6 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 #include "line_p.h"
 
-line_p::line_p() : line_p::base_type(line_) {
+mdown2::line_p::line_p() : line_p::base_type(line_) {
     line_ = +text_(ph::val(L"*'`$@_[\n")) > qi::eol;
 }
diff --git a/src/parser/line_p.h b/src/parsers/mdown2/line_p.h
index be4b61b..ecdfd46 100644
--- a/src/parser/line_p.h
+++ b/src/parsers/mdown2/line_p.h
@@ -13,19 +13,21 @@ WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
-#ifndef _MPPDOWN_LINE_P
-#define _MPPDOWN_LINE_P
+#ifndef _MPPDOWN_MDOWN2_LINE_P
+#define _MPPDOWN_MDOWN2_LINE_P
 #include <boost/spirit/include/qi.hpp>
-#include "../elements.h"
+#include "../../elements.h"
 #include "text_p.h"
 
 namespace qi = boost::spirit::qi;
 namespace ph = boost::phoenix;
 
+namespace mdown2 {
 struct line_p : qi::grammar<iiterator, line_t()> {
     qi::rule<iiterator, line_t()> line_;
     text_p text_;
 
     line_p();
 };
+}
 #endif
diff --git a/src/parser/paragraph_p.cpp b/src/parsers/mdown2/paragraph_p.cpp
index d7470ea..7dbbc61 100644
--- a/src/parser/paragraph_p.cpp
+++ b/src/parsers/mdown2/paragraph_p.cpp
@@ -15,6 +15,6 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 #include "paragraph_p.h"
 
-paragraph_p::paragraph_p() : paragraph_p::base_type(paragraph_) {
+mdown2::paragraph_p::paragraph_p() : paragraph_p::base_type(paragraph_) {
     paragraph_ = +line_ > qi::eol;
 }
diff --git a/src/parser/paragraph_p.h b/src/parsers/mdown2/paragraph_p.h
index f7f1f56..b90a2d1 100644
--- a/src/parser/paragraph_p.h
+++ b/src/parsers/mdown2/paragraph_p.h
@@ -13,19 +13,21 @@ WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
-#ifndef _MPPDOWN_PARAGRAPH_P
-#define _MPPDOWN_PARAGRAPH_P
+#ifndef _MPPDOWN_MDOWN2_PARAGRAPH_P
+#define _MPPDOWN_MDOWN2_PARAGRAPH_P
 #include <boost/spirit/include/qi.hpp>
-#include "../elements.h"
+#include "../../elements.h"
 #include "line_p.h"
 
 namespace qi = boost::spirit::qi;
 namespace ph = boost::phoenix;
 
+namespace mdown2 {
 struct paragraph_p : qi::grammar<iiterator, paragraph_t()> {
     qi::rule<iiterator, paragraph_t()> paragraph_;
     line_p line_;
 
     paragraph_p();
 };
+}
 #endif
diff --git a/src/parser/text_p.cpp b/src/parsers/mdown2/text_p.cpp
index bd16a60..d4d5e03 100644
--- a/src/parser/text_p.cpp
+++ b/src/parsers/mdown2/text_p.cpp
@@ -15,7 +15,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 #include "text_p.h"
 
-text_p::text_p() : text_p::base_type(text_) {
+mdown2::text_p::text_p() : text_p::base_type(text_) {
     using namespace qi;
     using namespace ph;
     using qi::standard_wide::char_;
diff --git a/src/parser/text_p.h b/src/parsers/mdown2/text_p.h
index 27f84c0..bbed1bd 100644
--- a/src/parser/text_p.h
+++ b/src/parsers/mdown2/text_p.h
@@ -13,16 +13,17 @@ WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
-#ifndef _MPPDOWN_TEXT_P
-#define _MPPDOWN_TEXT_P
+#ifndef _MPPDOWN_MDOWN2_TEXT_P
+#define _MPPDOWN_MDOWN2_TEXT_P
 #include <boost/spirit/include/qi.hpp>
 #include <boost/spirit/include/support_standard_wide.hpp>
 #include <string>
-#include "../elements.h"
+#include "../../elements.h"
 
 namespace qi = boost::spirit::qi;
 namespace ph = boost::phoenix;
 
+namespace mdown2 {
 struct text_p : qi::grammar<iiterator, text_t(std::wstring)> {
     qi::rule<iiterator, text_t(std::wstring)> text_;
     qi::rule<iiterator, stext_t(std::wstring)> stext_;
@@ -34,4 +35,5 @@ struct text_p : qi::grammar<iiterator, text_t(std::wstring)> {
 
     text_p();
 };
+}
 #endif