Added heading support.

So far, the LaTeX generator will output unnumbered headings, but this
may change in the future.

4 files changed, 63 insertions, 1 deletions

diff --git a/src/parsers/mdown2/heading_p.cpp b/src/parsers/mdown2/heading_p.cpp
new file mode 100644
index 0000000..7c97d84
--- /dev/null
+++ b/src/parsers/mdown2/heading_p.cpp
@@ -0,0 +1,27 @@
+/*
+Copyright (c) 2010, 2011, Grégoire Duchêne <gduchene@fastmail.net>
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+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.
+*/
+#include "heading_p.h"
+
+mdown2::heading_p::heading_p() : heading_p::base_type(heading_) {
+    using qi::lit;
+
+    heading_ = prefix_ >> *lit(' ') >> line_ >> qi::eol;
+    prefix_ = lit("#####") >> qi::attr(HEADING_5)
+            | lit("####") >> qi::attr(HEADING_4)
+            | lit("###") >> qi::attr(HEADING_3)
+            | lit("##") >> qi::attr(HEADING_2)
+            | lit('#') >> qi::attr(HEADING_1);
+}
diff --git a/src/parsers/mdown2/heading_p.h b/src/parsers/mdown2/heading_p.h
new file mode 100644
index 0000000..0cac8fe
--- /dev/null
+++ b/src/parsers/mdown2/heading_p.h
@@ -0,0 +1,33 @@
+/*
+Copyright (c) 2010, 2011, Grégoire Duchêne <gduchene@fastmail.net>
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+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_MDOWN2_HEADING_P
+#define _MPPDOWN_MDOWN2_HEADING_P
+#include <boost/spirit/include/qi.hpp>
+#include "../../elements.h"
+#include "line_p.h"
+
+namespace qi = boost::spirit::qi;
+
+namespace mdown2 {
+struct heading_p : qi::grammar<iiterator, heading_t()> {
+    qi::rule<iiterator, heading_t()> heading_;
+    qi::rule<iiterator, hattribute_t()> prefix_;
+    line_p line_;
+
+    heading_p();
+};
+}
+#endif
diff --git a/src/parsers/mdown2/paragraph_p.cpp b/src/parsers/mdown2/paragraph_p.cpp
index 7dbbc61..3d8e987 100644
--- a/src/parsers/mdown2/paragraph_p.cpp
+++ b/src/parsers/mdown2/paragraph_p.cpp
@@ -16,5 +16,5 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "paragraph_p.h"
 
 mdown2::paragraph_p::paragraph_p() : paragraph_p::base_type(paragraph_) {
-    paragraph_ = +line_ > qi::eol;
+    paragraph_ = heading_ | (+line_ > qi::eol);
 }
diff --git a/src/parsers/mdown2/paragraph_p.h b/src/parsers/mdown2/paragraph_p.h
index b90a2d1..cb1cbc0 100644
--- a/src/parsers/mdown2/paragraph_p.h
+++ b/src/parsers/mdown2/paragraph_p.h
@@ -17,6 +17,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #define _MPPDOWN_MDOWN2_PARAGRAPH_P
 #include <boost/spirit/include/qi.hpp>
 #include "../../elements.h"
+#include "heading_p.h"
 #include "line_p.h"
 
 namespace qi = boost::spirit::qi;
@@ -25,6 +26,7 @@ namespace ph = boost::phoenix;
 namespace mdown2 {
 struct paragraph_p : qi::grammar<iiterator, paragraph_t()> {
     qi::rule<iiterator, paragraph_t()> paragraph_;
+    heading_p heading_;
     line_p line_;
 
     paragraph_p();