tidy generators for single-page config

Author: vinniefalco

include/mrdox/Config.hpp

@@ -80,6 +80,10 @@ class MRDOX_VISIBLE
     */
     bool ignoreFailures = false;
 
+    /** `true` if everything should be output to a single page.
+    */
+    bool singlePage = false;
+
     /** `true` if tool output should be verbose.
 
         @code
@@ -88,6 +92,8 @@ class MRDOX_VISIBLE
     */
     bool verboseOutput = false;
 
+    //--------------------------------------------
+
     /** A string holding the complete configuration YAML.
     */
     std::string_view configYaml;

source/api/ConfigImpl.cpp

@@ -45,11 +45,11 @@ struct llvm::yaml::MappingTraits<
         IO& io, clang::mrdox::ConfigImpl& cfg)
     {
         io.mapOptional("ignore-failures", cfg.ignoreFailures);
+        io.mapOptional("single-page",     cfg.singlePage);
         io.mapOptional("verbose",         cfg.verboseOutput);
 
         io.mapOptional("concurrency",  cfg.concurrency_);
         io.mapOptional("defines",      cfg.additionalDefines_);
-        io.mapOptional("single-page",  cfg.singlePage_);
         io.mapOptional("source-root",  cfg.sourceRoot_);
         io.mapOptional("with-private", cfg.includePrivate_);
 

source/api/ConfigImpl.hpp

@@ -39,7 +39,6 @@ class ConfigImpl
 
     int concurrency_ = 0;
     std::vector<std::string> additionalDefines_;
-    bool singlePage_ = false;
     std::string sourceRoot_;
     bool includePrivate_ = false;
 

source/api/_adoc/AdocGenerator.cpp

@@ -33,8 +33,10 @@ build(
     Corpus const& corpus,
     Reporter& R) const
 {
-    //if(corpus.config().
-    return AdocPagesBuilder(llvm::StringRef(outputPath), corpus, R).build();
+    if(corpus.config.singlePage)
+        return Generator::build(outputPath, corpus, R);
+    return AdocPagesBuilder(
+        llvm::StringRef(outputPath), corpus, R).build();
 }
 
 Err

source/tool/ToolMain.cpp

@@ -143,8 +143,7 @@ toolMain(
     // Run the generator.
     if(config->verboseOutput)
         llvm::outs() << "Generating docs...\n";
-    auto err = generator->build(
-        OutputPath.getValue(), **corpus, R);
+    auto err = generator->build(OutputPath.getValue(), **corpus, R);
     if(err)
         R.print(err.message(), "generate '", OutputPath, "'");
 }