1 files changed, 27 insertions, 15 deletions

diff --git a/src/generator/mod.rs b/src/generator/mod.rs
index b4e1c94..3f62779 100644
--- a/src/generator/mod.rs
+++ b/src/generator/mod.rs
@@ -2,11 +2,8 @@ pub(crate) mod config;
 mod pandoc;
 
 use self::config::Config;
-//use crate::entities::{
-//    Description, DynEntity, EntitiesManager, EntitiesManagerComponents, Usr,
-//};
 use self::pandoc::into_pandoc;
-use crate::types::Entity;
+use crate::types::*;
 
 use anyhow::{ensure, Context, Result};
 use rayon::Scope;
@@ -18,7 +15,11 @@ use std::path::Path;
 
 const DEFAULT_CSS: &[u8] = include_bytes!("../../res/style.css");
 
-pub(crate) fn generate(base_dir: &Path, entities: BTreeMap<String, Entity>, config: &Config) -> Result<()> {
+pub(crate) fn generate(
+    base_dir: &Path,
+    entities: BTreeMap<EntityId, Entity>,
+    config: &Config,
+) -> Result<()> {
     let md_output_dir = base_dir.join("markdown");
     let html_output_dir = base_dir.join("html");
 
@@ -54,7 +55,7 @@ pub(crate) fn generate(base_dir: &Path, entities: BTreeMap<String, Entity>, conf
 }
 
 fn generate_recursively<'a>(
-    id: String,
+    id: EntityId,
     entity: Entity,
     pool: &Scope<'a>,
     md_output_dir: &'a Path,
@@ -63,7 +64,7 @@ fn generate_recursively<'a>(
     config: &'a Config,
 ) {
     pool.spawn(move |pool| {
-        trace!("Trying to generate {}", id);
+        trace!("Trying to generate {}", id.0);
 
         let leftovers = generate_single(
             &id,
@@ -90,18 +91,18 @@ fn generate_recursively<'a>(
 }
 
 fn generate_single(
-    id: &str,
+    id: &EntityId,
     entity: Entity,
     md_output_dir: impl AsRef<Path>,
     html_output_dir: impl AsRef<Path>,
     css_path: impl AsRef<Path>,
-    config: &Config
-) -> Result<BTreeMap<String, Entity>> {
+    config: &Config,
+) -> Result<BTreeMap<EntityId, Entity>> {
     use std::io::prelude::*;
     use std::process::{Command, Stdio};
 
-    let md_output_file = md_output_dir.as_ref().join(id);
-    let html_output_file = html_output_dir.as_ref().join(id);
+    let md_output_file = md_output_dir.as_ref().join(&id.0);
+    let html_output_file = html_output_dir.as_ref().join(&id.0);
 
     let mut command = Command::new("pandoc");
 
@@ -111,7 +112,10 @@ fn generate_single(
         .stderr(Stdio::piped())
         .args(&[
             "--from=json",
-            "--to=markdown",
+            // standalone keeps the sent metadat
+            "--standalone",
+            "--to",
+            &config.from,
             "--output",
             md_output_file
                 .to_str()
@@ -165,8 +169,10 @@ fn generate_single(
         .stdout(Stdio::piped())
         .stderr(Stdio::piped())
         .args(&[
-            "--from=markdown-raw_tex",
-            "--to=html",
+            "--from",
+            &config.from,
+            "--to",
+            &config.to,
             "--css",
             css_path
                 .as_ref()
@@ -183,6 +189,10 @@ fn generate_single(
                 .context("Entity name is not valid UTF-8")?,
         ]);
 
+    for filter in &config.pandoc_filters {
+        command.args(&["--filter", filter]);
+    }
+
     let command_str = format!("{:?}", command);
     debug!("Launching command: {}", command_str);
 
@@ -190,6 +200,8 @@ fn generate_single(
         .output()
         .context("Failed to execute Pandoc command")?;
 
+    std::io::stderr().lock().write_all(&output.stderr)?;
+
     ensure!(
         output.status.success(),
         CommandError {