From cf24a890ca9a007b1910b18d5dc0805280ebf4df Mon Sep 17 00:00:00 2001
From: Daniel James <daniel@calamity.org.uk>
Date: Wed, 27 Jan 2010 22:05:45 +0000
Subject: [PATCH] Flatten the file hierarchy.

The division between detail and main wasn't making much sense.

[SVN r59317]
---
 Jamfile.v2                                    | 20 +++++++++----------
 detail/actions.cpp => actions.cpp             | 12 +++++------
 detail/actions.hpp => actions.hpp             |  6 +++---
 detail/actions_class.cpp => actions_class.cpp |  4 ++--
 detail/actions_class.hpp => actions_class.hpp |  2 +-
 block.cpp                                     | 14 ++++++-------
 block.hpp                                     |  4 ++--
 block_actions.cpp                             | 12 +++++------
 block_list.cpp                                |  4 ++--
 code_snippet.cpp                              | 10 +++++-----
 code_snippet.hpp                              | 10 +++++-----
 code_snippet_types.hpp                        |  4 ++--
 detail/collector.cpp => collector.cpp         |  2 +-
 detail/collector.hpp => collector.hpp         |  0
 doc_info.cpp                                  |  8 ++++----
 grammars.hpp                                  |  2 +-
 detail/input_path.cpp => input_path.cpp       |  2 +-
 detail/input_path.hpp => input_path.hpp       |  0
 detail/markups.cpp => markups.cpp             |  2 +-
 detail/markups.hpp => markups.hpp             |  0
 phrase.cpp                                    | 14 ++++++-------
 phrase.hpp                                    |  6 +++---
 phrase_actions.cpp                            |  6 +++---
 phrase_image.cpp                              |  4 ++--
 phrase_template.cpp                           |  8 ++++----
 detail/post_process.cpp => post_process.cpp   |  6 +++---
 detail/post_process.hpp => post_process.hpp   |  0
 detail/quickbook.cpp => quickbook.cpp         | 10 +++++-----
 detail/quickbook.hpp => quickbook.hpp         |  0
 ...ntax_highlight.cpp => syntax_highlight.cpp |  4 ++--
 syntax_highlight.hpp                          |  6 +++---
 .../template_stack.cpp => template_stack.cpp  |  2 +-
 .../template_stack.hpp => template_stack.hpp  |  0
 detail/utils.cpp => utils.cpp                 |  2 +-
 detail/utils.hpp => utils.hpp                 |  0
 35 files changed, 93 insertions(+), 93 deletions(-)
 rename detail/actions.cpp => actions.cpp (98%)
 rename detail/actions.hpp => actions.hpp (98%)
 rename detail/actions_class.cpp => actions_class.cpp (97%)
 rename detail/actions_class.hpp => actions_class.hpp (99%)
 rename detail/collector.cpp => collector.cpp (98%)
 rename detail/collector.hpp => collector.hpp (100%)
 rename detail/input_path.cpp => input_path.cpp (97%)
 rename detail/input_path.hpp => input_path.hpp (100%)
 rename detail/markups.cpp => markups.cpp (99%)
 rename detail/markups.hpp => markups.hpp (100%)
 rename detail/post_process.cpp => post_process.cpp (99%)
 rename detail/post_process.hpp => post_process.hpp (100%)
 rename detail/quickbook.cpp => quickbook.cpp (98%)
 rename detail/quickbook.hpp => quickbook.hpp (100%)
 rename detail/syntax_highlight.cpp => syntax_highlight.cpp (92%)
 rename detail/template_stack.cpp => template_stack.cpp (98%)
 rename detail/template_stack.hpp => template_stack.hpp (100%)
 rename detail/utils.cpp => utils.cpp (99%)
 rename detail/utils.hpp => utils.hpp (100%)

diff --git a/Jamfile.v2 b/Jamfile.v2
index 12d65a8..47efe1d 100644
--- a/Jamfile.v2
+++ b/Jamfile.v2
@@ -19,15 +19,15 @@ project quickbook
 
 exe quickbook
     :
-    detail/quickbook.cpp
-    detail/actions.cpp
-    detail/actions_class.cpp
-    detail/utils.cpp
-    detail/input_path.cpp
-    detail/post_process.cpp
-    detail/collector.cpp
-    detail/template_stack.cpp
-    detail/markups.cpp
+    quickbook.cpp
+    actions.cpp
+    actions_class.cpp
+    utils.cpp
+    input_path.cpp
+    post_process.cpp
+    collector.cpp
+    template_stack.cpp
+    markups.cpp
     phrase.cpp
     phrase_actions.cpp
     phrase_image.cpp
@@ -37,7 +37,7 @@ exe quickbook
     block_list.cpp
     doc_info.cpp
     code_snippet.cpp
-    detail/syntax_highlight.cpp
+    syntax_highlight.cpp
     /boost//program_options
     /boost//filesystem
     : #<define>QUICKBOOK_NO_DATES
diff --git a/detail/actions.cpp b/actions.cpp
similarity index 98%
rename from detail/actions.cpp
rename to actions.cpp
index 6b3ee5c..073b141 100644
--- a/detail/actions.cpp
+++ b/actions.cpp
@@ -15,12 +15,12 @@
 #include <boost/filesystem/convenience.hpp>
 #include <boost/filesystem/fstream.hpp>
 #include <boost/spirit/include/support_unused.hpp>
-#include "./quickbook.hpp"
-#include "./actions.hpp"
-#include "./utils.hpp"
-#include "./markups.hpp"
-#include "./actions_class.hpp"
-#include "../grammars.hpp"
+#include "quickbook.hpp"
+#include "actions.hpp"
+#include "utils.hpp"
+#include "markups.hpp"
+#include "actions_class.hpp"
+#include "grammars.hpp"
 
 namespace quickbook
 {
diff --git a/detail/actions.hpp b/actions.hpp
similarity index 98%
rename from detail/actions.hpp
rename to actions.hpp
index f35c47a..6de45df 100644
--- a/detail/actions.hpp
+++ b/actions.hpp
@@ -20,9 +20,9 @@
 #include <boost/filesystem/operations.hpp>
 #include <boost/foreach.hpp>
 #include <boost/tuple/tuple.hpp>
-#include "./collector.hpp"
-#include "./template_stack.hpp"
-#include "./utils.hpp"
+#include "collector.hpp"
+#include "template_stack.hpp"
+#include "utils.hpp"
 
 #ifdef BOOST_MSVC
 // disable copy/assignment could not be generated, unreferenced formal params
diff --git a/detail/actions_class.cpp b/actions_class.cpp
similarity index 97%
rename from detail/actions_class.cpp
rename to actions_class.cpp
index 34d3d9f..1da9872 100644
--- a/detail/actions_class.cpp
+++ b/actions_class.cpp
@@ -8,8 +8,8 @@
     License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
     http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
-#include "./actions_class.hpp"
-#include "./markups.hpp"
+#include "actions_class.hpp"
+#include "markups.hpp"
 
 #if (defined(BOOST_MSVC) && (BOOST_MSVC <= 1310))
 #pragma warning(disable:4355)
diff --git a/detail/actions_class.hpp b/actions_class.hpp
similarity index 99%
rename from detail/actions_class.hpp
rename to actions_class.hpp
index 678fe55..13f9c6b 100644
--- a/detail/actions_class.hpp
+++ b/actions_class.hpp
@@ -10,7 +10,7 @@
 #if !defined(BOOST_SPIRIT_ACTIONS_CLASS_HPP)
 #define BOOST_SPIRIT_ACTIONS_CLASS_HPP
 
-#include "./actions.hpp"
+#include "actions.hpp"
 #include <boost/tuple/tuple.hpp>
 
 namespace quickbook
diff --git a/block.cpp b/block.cpp
index b8e5b3f..082139c 100644
--- a/block.cpp
+++ b/block.cpp
@@ -8,13 +8,13 @@
     http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
 
-#include "./grammars.hpp"
-#include "./block.hpp"
-#include "./detail/quickbook.hpp"
-#include "./detail/utils.hpp"
-#include "./detail/actions_class.hpp"
-#include "./parse_utils.hpp"
-#include "./detail/markups.hpp"
+#include "grammars.hpp"
+#include "block.hpp"
+#include "quickbook.hpp"
+#include "utils.hpp"
+#include "actions_class.hpp"
+#include "parse_utils.hpp"
+#include "markups.hpp"
 #include <boost/spirit/include/qi_core.hpp>
 #include <boost/spirit/include/qi_eol.hpp>
 #include <boost/spirit/include/qi_eps.hpp>
diff --git a/block.hpp b/block.hpp
index b3abd8c..d7037e7 100644
--- a/block.hpp
+++ b/block.hpp
@@ -14,8 +14,8 @@
 #include <vector>
 #include <boost/optional.hpp>
 #include <boost/spirit/include/classic_position_iterator.hpp>
-#include "./parse_types.hpp"
-#include "./code.hpp"
+#include "parse_types.hpp"
+#include "code.hpp"
 
 namespace quickbook
 {
diff --git a/block_actions.cpp b/block_actions.cpp
index 529c11e..85f55e1 100644
--- a/block_actions.cpp
+++ b/block_actions.cpp
@@ -8,12 +8,12 @@
     http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
 
-#include "./block.hpp"
-#include "./detail/actions_class.hpp"
-#include "./detail/markups.hpp"
-#include "./detail/quickbook.hpp"
-#include "./grammars.hpp"
-#include "./code_snippet_types.hpp"
+#include "block.hpp"
+#include "actions_class.hpp"
+#include "markups.hpp"
+#include "quickbook.hpp"
+#include "grammars.hpp"
+#include "code_snippet_types.hpp"
 #include <numeric>
 #include <boost/assert.hpp>
 #include <boost/filesystem/convenience.hpp>
diff --git a/block_list.cpp b/block_list.cpp
index e07a012..57a0509 100644
--- a/block_list.cpp
+++ b/block_list.cpp
@@ -8,8 +8,8 @@
     http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
 
-#include "./block.hpp"
-#include "./detail/actions_class.hpp"
+#include "block.hpp"
+#include "actions_class.hpp"
 #include <boost/assert.hpp>
 
 namespace quickbook
diff --git a/code_snippet.cpp b/code_snippet.cpp
index fb07a3e..a23c422 100644
--- a/code_snippet.cpp
+++ b/code_snippet.cpp
@@ -15,11 +15,11 @@
 #include <algorithm>
 #include <iterator>
 #include <boost/lexical_cast.hpp>
-#include "./detail/utils.hpp"
-#include "./detail/markups.hpp"
-#include "./detail/actions_class.hpp"
-#include "./grammars.hpp"
-#include "./code_snippet.hpp"
+#include "utils.hpp"
+#include "markups.hpp"
+#include "actions_class.hpp"
+#include "grammars.hpp"
+#include "code_snippet.hpp"
 
 namespace quickbook
 {
diff --git a/code_snippet.hpp b/code_snippet.hpp
index 2488fbe..e9fa527 100644
--- a/code_snippet.hpp
+++ b/code_snippet.hpp
@@ -16,11 +16,11 @@
 #include <boost/spirit/include/phoenix_core.hpp>
 #include <boost/spirit/include/phoenix_bind.hpp>
 #include <boost/spirit/include/phoenix_operator.hpp>
-#include "./code_snippet_types.hpp"
-#include "./grammars.hpp"
-#include "./parse_utils.hpp"
-#include "./detail/actions.hpp"
-#include "./detail/actions_class.hpp"
+#include "code_snippet_types.hpp"
+#include "grammars.hpp"
+#include "parse_utils.hpp"
+#include "actions.hpp"
+#include "actions_class.hpp"
 
 namespace quickbook
 {
diff --git a/code_snippet_types.hpp b/code_snippet_types.hpp
index 61bbb55..976092e 100644
--- a/code_snippet_types.hpp
+++ b/code_snippet_types.hpp
@@ -15,8 +15,8 @@
 #include <vector>
 #include <string>
 #include <boost/fusion/include/adapt_struct.hpp>
-#include "./parse_types.hpp"
-#include "./detail/actions.hpp"
+#include "parse_types.hpp"
+#include "actions.hpp"
 
 namespace quickbook
 {
diff --git a/detail/collector.cpp b/collector.cpp
similarity index 98%
rename from detail/collector.cpp
rename to collector.cpp
index c54993a..fb2daec 100644
--- a/detail/collector.cpp
+++ b/collector.cpp
@@ -6,7 +6,7 @@
     License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
     http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
-#include "./collector.hpp"
+#include "collector.hpp"
 #include <boost/assert.hpp>
 
 namespace quickbook
diff --git a/detail/collector.hpp b/collector.hpp
similarity index 100%
rename from detail/collector.hpp
rename to collector.hpp
diff --git a/doc_info.cpp b/doc_info.cpp
index da91137..df45531 100644
--- a/doc_info.cpp
+++ b/doc_info.cpp
@@ -10,10 +10,10 @@
 #if !defined(BOOST_SPIRIT_QUICKBOOK_DOC_INFO_HPP)
 #define BOOST_SPIRIT_QUICKBOOK_DOC_INFO_HPP
 
-#include "./grammars.hpp"
-#include "./detail/quickbook.hpp"
-#include "./detail/actions_class.hpp"
-#include "./parse_utils.hpp"
+#include "grammars.hpp"
+#include "quickbook.hpp"
+#include "actions_class.hpp"
+#include "parse_utils.hpp"
 #include <boost/spirit/include/qi_core.hpp>
 #include <boost/spirit/include/qi_uint.hpp>
 #include <boost/spirit/include/qi_eol.hpp>
diff --git a/grammars.hpp b/grammars.hpp
index 1a5454c..de77d7a 100644
--- a/grammars.hpp
+++ b/grammars.hpp
@@ -13,7 +13,7 @@
 #include <boost/spirit/include/qi_core.hpp>
 #include <boost/spirit/include/qi_symbols.hpp>
 #include <boost/scoped_ptr.hpp>
-#include "./detail/actions_class.hpp"
+#include "actions_class.hpp"
 
 namespace quickbook
 {
diff --git a/detail/input_path.cpp b/input_path.cpp
similarity index 97%
rename from detail/input_path.cpp
rename to input_path.cpp
index 63563ad..15a82da 100644
--- a/detail/input_path.cpp
+++ b/input_path.cpp
@@ -7,7 +7,7 @@
 =============================================================================*/
 
 #include <boost/program_options.hpp>
-#include "./input_path.hpp"
+#include "input_path.hpp"
 
 #if defined(__cygwin__) || defined(__CYGWIN__)
 #include <boost/filesystem/config.hpp>
diff --git a/detail/input_path.hpp b/input_path.hpp
similarity index 100%
rename from detail/input_path.hpp
rename to input_path.hpp
diff --git a/detail/markups.cpp b/markups.cpp
similarity index 99%
rename from detail/markups.cpp
rename to markups.cpp
index 7ed6bfb..62573af 100644
--- a/detail/markups.cpp
+++ b/markups.cpp
@@ -8,7 +8,7 @@
     http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
 
-#include "./markups.hpp"
+#include "markups.hpp"
 
 namespace quickbook
 {
diff --git a/detail/markups.hpp b/markups.hpp
similarity index 100%
rename from detail/markups.hpp
rename to markups.hpp
diff --git a/phrase.cpp b/phrase.cpp
index 74f6c5a..87c2f5e 100644
--- a/phrase.cpp
+++ b/phrase.cpp
@@ -8,13 +8,13 @@
     http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
 
-#include "./phrase.hpp"
-#include "./grammars.hpp"
-#include "./detail/quickbook.hpp"
-#include "./detail/utils.hpp"
-#include "./detail/markups.hpp"
-#include "./detail/actions_class.hpp"
-#include "./parse_utils.hpp"
+#include "phrase.hpp"
+#include "grammars.hpp"
+#include "quickbook.hpp"
+#include "utils.hpp"
+#include "markups.hpp"
+#include "actions_class.hpp"
+#include "parse_utils.hpp"
 #include <map>
 #include <boost/spirit/include/qi_core.hpp>
 #include <boost/spirit/include/qi_auxiliary.hpp>
diff --git a/phrase.hpp b/phrase.hpp
index f18d477..0be9398 100644
--- a/phrase.hpp
+++ b/phrase.hpp
@@ -12,9 +12,9 @@
 
 #include <string>
 #include <map>
-#include "./parse_types.hpp"
-#include "./code.hpp"
-#include "./detail/template_stack.hpp"
+#include "parse_types.hpp"
+#include "code.hpp"
+#include "template_stack.hpp"
 
 namespace quickbook
 {
diff --git a/phrase_actions.cpp b/phrase_actions.cpp
index 1906972..f7de24e 100644
--- a/phrase_actions.cpp
+++ b/phrase_actions.cpp
@@ -8,9 +8,9 @@
     http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
 
-#include "./phrase.hpp"
-#include "./detail/actions_class.hpp"
-#include "./detail/markups.hpp"
+#include "phrase.hpp"
+#include "actions_class.hpp"
+#include "markups.hpp"
 #include <boost/assert.hpp>
 
 namespace quickbook
diff --git a/phrase_image.cpp b/phrase_image.cpp
index 0cec7d5..a0bf7a4 100644
--- a/phrase_image.cpp
+++ b/phrase_image.cpp
@@ -8,8 +8,8 @@
     http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
 
-#include "./phrase.hpp"
-#include "./detail/actions_class.hpp"
+#include "phrase.hpp"
+#include "actions_class.hpp"
 #include <boost/filesystem/convenience.hpp>
 #include <boost/filesystem/fstream.hpp>
 
diff --git a/phrase_template.cpp b/phrase_template.cpp
index 4fcba88..51f7877 100644
--- a/phrase_template.cpp
+++ b/phrase_template.cpp
@@ -8,10 +8,10 @@
     http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
 
-#include "./phrase.hpp"
-#include "./grammars.hpp"
-#include "./detail/actions_class.hpp"
-#include "./detail/quickbook.hpp"
+#include "phrase.hpp"
+#include "grammars.hpp"
+#include "actions_class.hpp"
+#include "quickbook.hpp"
 
 namespace quickbook
 {    
diff --git a/detail/post_process.cpp b/post_process.cpp
similarity index 99%
rename from detail/post_process.cpp
rename to post_process.cpp
index 8132b8f..05e061b 100644
--- a/detail/post_process.cpp
+++ b/post_process.cpp
@@ -6,9 +6,9 @@
     License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
     http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
-#include "./post_process.hpp"
-#include "./utils.hpp"
-#include "../parse_utils.hpp"
+#include "post_process.hpp"
+#include "utils.hpp"
+#include "parse_utils.hpp"
 #include <boost/spirit/include/qi_core.hpp>
 #include <boost/spirit/include/qi_lexeme.hpp>
 #include <boost/spirit/include/qi_char_.hpp>
diff --git a/detail/post_process.hpp b/post_process.hpp
similarity index 100%
rename from detail/post_process.hpp
rename to post_process.hpp
diff --git a/detail/quickbook.cpp b/quickbook.cpp
similarity index 98%
rename from detail/quickbook.cpp
rename to quickbook.cpp
index ad825d8..df3412a 100644
--- a/detail/quickbook.cpp
+++ b/quickbook.cpp
@@ -7,11 +7,11 @@
     License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
     http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
-#include "./actions_class.hpp"
-#include "../grammars.hpp"
-#include "./post_process.hpp"
-#include "./utils.hpp"
-#include "./input_path.hpp"
+#include "actions_class.hpp"
+#include "grammars.hpp"
+#include "post_process.hpp"
+#include "utils.hpp"
+#include "input_path.hpp"
 #include <boost/spirit/include/classic_iterator.hpp>
 #include <boost/program_options.hpp>
 #include <boost/filesystem/path.hpp>
diff --git a/detail/quickbook.hpp b/quickbook.hpp
similarity index 100%
rename from detail/quickbook.hpp
rename to quickbook.hpp
diff --git a/detail/syntax_highlight.cpp b/syntax_highlight.cpp
similarity index 92%
rename from detail/syntax_highlight.cpp
rename to syntax_highlight.cpp
index 4e4df6a..6a512bf 100644
--- a/detail/syntax_highlight.cpp
+++ b/syntax_highlight.cpp
@@ -1,5 +1,5 @@
-#include "../syntax_highlight.hpp"
-#include "./actions_class.hpp"
+#include "syntax_highlight.hpp"
+#include "actions_class.hpp"
 
 namespace quickbook
 {
diff --git a/syntax_highlight.hpp b/syntax_highlight.hpp
index 9397661..bfde632 100644
--- a/syntax_highlight.hpp
+++ b/syntax_highlight.hpp
@@ -15,9 +15,9 @@
 #include <boost/spirit/include/qi_string.hpp>
 #include <boost/spirit/include/qi_directive.hpp>
 #include <boost/fusion/include/adapt_struct.hpp>
-#include "./parse_types.hpp"
-#include "./grammars.hpp"
-#include "./phrase.hpp"
+#include "parse_types.hpp"
+#include "grammars.hpp"
+#include "phrase.hpp"
 
 namespace quickbook
 {
diff --git a/detail/template_stack.cpp b/template_stack.cpp
similarity index 98%
rename from detail/template_stack.cpp
rename to template_stack.cpp
index cba6c18..eabb6c1 100644
--- a/detail/template_stack.cpp
+++ b/template_stack.cpp
@@ -6,7 +6,7 @@
     License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
     http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
-#include "./template_stack.hpp"
+#include "template_stack.hpp"
 
 #ifdef BOOST_MSVC
 #pragma warning(disable : 4355)
diff --git a/detail/template_stack.hpp b/template_stack.hpp
similarity index 100%
rename from detail/template_stack.hpp
rename to template_stack.hpp
diff --git a/detail/utils.cpp b/utils.cpp
similarity index 99%
rename from detail/utils.cpp
rename to utils.cpp
index a71f302..a5a2dca 100644
--- a/detail/utils.cpp
+++ b/utils.cpp
@@ -7,7 +7,7 @@
     License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
     http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
-#include "./utils.hpp"
+#include "utils.hpp"
 #include <boost/spirit/include/classic_core.hpp>
 
 #include <cctype>
diff --git a/detail/utils.hpp b/utils.hpp
similarity index 100%
rename from detail/utils.hpp
rename to utils.hpp