Unified how generators and parsers are organized.

3 files changed, 15 insertions, 13 deletions

diff --git a/src/generators/latex_g.cpp b/src/generators/latex/document_g.cpp
index 8d5326f..622aa6e 100644
--- a/src/generators/latex_g.cpp
+++ b/src/generators/latex/document_g.cpp
@@ -13,8 +13,8 @@ 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 "latex_g.h"
+#include "document_g.h"
 
-latex_g::latex_g() : latex_g::base_type(latex_) {
-    latex_ = +paragraph_;
+latex::document_g::document_g() : document_g::base_type(document_) {
+    document_ = +paragraph_;
 }
diff --git a/src/generators/latex_g.h b/src/generators/latex/document_g.h
index 260e288..99d33ae 100644
--- a/src/generators/latex_g.h
+++ b/src/generators/latex/document_g.h
@@ -13,18 +13,20 @@ 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_LATEX_G
-#define _MPPDOWN_LATEX_G
+#ifndef _MPPDOWN_LATEX_DOCUMENT_G
+#define _MPPDOWN_LATEX_DOCUMENT_G
 #include <boost/spirit/include/karma.hpp>
-#include "../elements.h"
-#include "latex/paragraph_g.h"
+#include "../../elements.h"
+#include "paragraph_g.h"
 
 namespace ka = boost::spirit::karma;
 
-struct latex_g : ka::grammar<oiterator, document_t()> {
-    ka::rule<oiterator, document_t()> latex_;
-    latex::paragraph_g paragraph_;
+namespace latex {
+struct document_g : ka::grammar<oiterator, document_t()> {
+    ka::rule<oiterator, document_t()> document_;
+    paragraph_g paragraph_;
 
-    latex_g();
+    document_g();
 };
+}
 #endif
diff --git a/src/main.cpp b/src/main.cpp
index 92a0f04..0f2a157 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -20,7 +20,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <iostream>
 #include <string>
 #include "elements.h"
-#include "generators/latex_g.h"
+#include "generators/latex/document_g.h"
 #include "parser/document_p.h"
 
 namespace ka = boost::spirit::karma;
@@ -86,7 +86,7 @@ int main(int argc, char** argv) {
         return 1;
     }
 
-    latex_g generator;
+    latex::document_g generator;
     wstring output;
     oiterator sink(output);