1 files changed, 38 insertions, 14 deletions

diff --git a/src/generator/config.rs b/src/generator/config.rs
index 43fee60..3057fee 100644
--- a/src/generator/config.rs
+++ b/src/generator/config.rs
@@ -1,40 +1,58 @@
+use crate::types::*;
+
 use serde_derive::{Deserialize, Serialize};
 use structopt::StructOpt;
 
 use std::collections::{HashMap, HashSet};
 
+pub(crate) type Inlines = HashMap<Language, HashMap<EntityKind, HashSet<ChildrenKind>>>;
+
 #[derive(Debug, Clone, Serialize)]
 pub(crate) struct Config {
+    pub(super) from: String,
+    pub(super) to: String,
+    pub(super) pandoc_filters: Vec<String>,
     /// Tells us in which language, which entity types should inline which children entity type in
     /// their documentation.
     ///
     /// e.g. in C++, classes should inline their children methods documentation.
-    pub(crate) inlines: HashMap<String, HashMap<String, HashSet<String>>>,
+    pub(super) inlines: Inlines,
 }
 
 impl Config {
-    pub(crate) fn from_merge(_cli: ProvidedConfig, conf: ProvidedConfig) -> Self {
+    pub(crate) fn from_merge(mut cli: ProvidedConfig, mut conf: ProvidedConfig) -> Self {
+        conf.pandoc_filters.append(&mut cli.pandoc_filters);
         Self {
+            from: cli
+                .from
+                .or(conf.from)
+                .unwrap_or_else(|| String::from("markdown-raw_tex")),
+            to: cli.to.or(conf.to).unwrap_or_else(|| String::from("html")),
+            pandoc_filters: conf.pandoc_filters,
             inlines: conf.inlines.unwrap_or_else(default_inlines),
         }
     }
 }
 
-fn default_inlines() -> HashMap<String, HashMap<String, HashSet<String>>> {
+fn default_inlines() -> Inlines {
     let mut clang = HashMap::new();
     let mut clang_inline_children = HashSet::new();
-    // TODO: this is not great: no differences between variable/field for children, but differences
-    // as a parent...
-    clang_inline_children.insert(String::from("variable"));
-    //classes.insert(String::from("field"));
-    clang_inline_children.insert(String::from("function"));
-    //classes.insert(String::from("method"));
-    clang.insert(String::from("struct"), clang_inline_children.clone());
-    clang.insert(String::from("class"), clang_inline_children.clone());
-    clang.insert(String::from("namespace"), clang_inline_children);
+    clang_inline_children.insert(ChildrenKind(String::from("variables")));
+    clang_inline_children.insert(ChildrenKind(String::from("fields")));
+    clang_inline_children.insert(ChildrenKind(String::from("functions")));
+    clang_inline_children.insert(ChildrenKind(String::from("methods")));
+    clang.insert(
+        EntityKind(String::from("struct")),
+        clang_inline_children.clone(),
+    );
+    clang.insert(
+        EntityKind(String::from("class")),
+        clang_inline_children.clone(),
+    );
+    clang.insert(EntityKind(String::from("namespace")), clang_inline_children);
 
     let mut inlines = HashMap::new();
-    inlines.insert(String::from("clang"), clang);
+    inlines.insert(Language::Clang, clang);
 
     inlines
 }
@@ -48,6 +66,12 @@ impl Default for Config {
 #[derive(Debug, Clone, Default, StructOpt, Deserialize, Serialize)]
 #[serde(rename_all = "kebab-case")]
 pub(crate) struct ProvidedConfig {
+    #[structopt(long = "generator-from")]
+    pub(super) from: Option<String>,
+    #[structopt(long = "generator-to")]
+    pub(super) to: Option<String>,
+    #[structopt(long = "generator-pandoc-filters", number_of_values = 1)]
+    pub(super) pandoc_filters: Vec<String>,
     #[structopt(skip)]
-    pub(crate) inlines: Option<HashMap<String, HashMap<String, HashSet<String>>>>,
+    pub(super) inlines: Option<Inlines>,
 }