default_environment/templates/html/code.dust

@@ -1 +1 @@
-<code>{.contents}</code>
+<code>{.source}</code>

default_environment/templates/html/verbatim.dust

@@ -1 +1 @@
-<code>{.contents}</code>
+<code>{.source}</code>

src/context/bold.rs

@@ -6,37 +6,11 @@ use crate::config::Config;
 use crate::error::CustomError;
 use crate::intermediate::IBold;
 
-use super::macros::render;
+use super::macros::rnoop;
-use super::RenderObject;
 
 #[derive(Debug, Serialize)]
 #[serde(tag = "type")]
 #[serde(rename = "bold")]
-pub(crate) struct RenderBold {
+pub(crate) struct RenderBold {}
-    children: Vec<RenderObject>,
-}
 
-render!(
+rnoop!(RenderBold, IBold);
-    RenderBold,
-    IBold,
-    original,
-    config,
-    output_directory,
-    output_file,
-    {
-        let children = {
-            let mut ret = Vec::new();
-            for obj in original.children.iter() {
-                ret.push(RenderObject::new(
-                    config,
-                    output_directory,
-                    output_file,
-                    obj,
-                )?);
-            }
-            ret
-        };
-
-        Ok(RenderBold { children })
-    }
-);

src/context/code.rs

@@ -6,25 +6,11 @@ use crate::config::Config;
 use crate::error::CustomError;
 use crate::intermediate::ICode;
 
-use super::macros::render;
+use super::macros::rnoop;
 
 #[derive(Debug, Serialize)]
 #[serde(tag = "type")]
 #[serde(rename = "code")]
-pub(crate) struct RenderCode {
+pub(crate) struct RenderCode {}
-    contents: String,
-}
 
-render!(
+rnoop!(RenderCode, ICode);
-    RenderCode,
-    ICode,
-    original,
-    config,
-    output_directory,
-    output_file,
-    {
-        Ok(RenderCode {
-            contents: original.contents.clone(),
-        })
-    }
-);

src/context/italic.rs

@@ -6,37 +6,11 @@ use crate::config::Config;
 use crate::error::CustomError;
 use crate::intermediate::IItalic;
 
-use super::macros::render;
+use super::macros::rnoop;
-use super::RenderObject;
 
 #[derive(Debug, Serialize)]
 #[serde(tag = "type")]
 #[serde(rename = "italic")]
-pub(crate) struct RenderItalic {
+pub(crate) struct RenderItalic {}
-    children: Vec<RenderObject>,
-}
 
-render!(
+rnoop!(RenderItalic, IItalic);
-    RenderItalic,
-    IItalic,
-    original,
-    config,
-    output_directory,
-    output_file,
-    {
-        let children = {
-            let mut ret = Vec::new();
-            for obj in original.children.iter() {
-                ret.push(RenderObject::new(
-                    config,
-                    output_directory,
-                    output_file,
-                    obj,
-                )?);
-            }
-            ret
-        };
-
-        Ok(RenderItalic { children })
-    }
-);

src/context/strike_through.rs

@@ -6,37 +6,11 @@ use crate::config::Config;
 use crate::error::CustomError;
 use crate::intermediate::IStrikeThrough;
 
-use super::macros::render;
+use super::macros::rnoop;
-use super::RenderObject;
 
 #[derive(Debug, Serialize)]
 #[serde(tag = "type")]
 #[serde(rename = "strike_through")]
-pub(crate) struct RenderStrikeThrough {
+pub(crate) struct RenderStrikeThrough {}
-    children: Vec<RenderObject>,
-}
 
-render!(
+rnoop!(RenderStrikeThrough, IStrikeThrough);
-    RenderStrikeThrough,
-    IStrikeThrough,
-    original,
-    config,
-    output_directory,
-    output_file,
-    {
-        let children = {
-            let mut ret = Vec::new();
-            for obj in original.children.iter() {
-                ret.push(RenderObject::new(
-                    config,
-                    output_directory,
-                    output_file,
-                    obj,
-                )?);
-            }
-            ret
-        };
-
-        Ok(RenderStrikeThrough { children })
-    }
-);

src/context/underline.rs

@@ -6,37 +6,11 @@ use crate::config::Config;
 use crate::error::CustomError;
 use crate::intermediate::IUnderline;
 
-use super::macros::render;
+use super::macros::rnoop;
-use super::RenderObject;
 
 #[derive(Debug, Serialize)]
 #[serde(tag = "type")]
 #[serde(rename = "underline")]
-pub(crate) struct RenderUnderline {
+pub(crate) struct RenderUnderline {}
-    children: Vec<RenderObject>,
-}
 
-render!(
+rnoop!(RenderUnderline, IUnderline);
-    RenderUnderline,
-    IUnderline,
-    original,
-    config,
-    output_directory,
-    output_file,
-    {
-        let children = {
-            let mut ret = Vec::new();
-            for obj in original.children.iter() {
-                ret.push(RenderObject::new(
-                    config,
-                    output_directory,
-                    output_file,
-                    obj,
-                )?);
-            }
-            ret
-        };
-
-        Ok(RenderUnderline { children })
-    }
-);

src/context/verbatim.rs

@@ -6,25 +6,11 @@ use crate::config::Config;
 use crate::error::CustomError;
 use crate::intermediate::IVerbatim;
 
-use super::macros::render;
+use super::macros::rnoop;
 
 #[derive(Debug, Serialize)]
 #[serde(tag = "type")]
 #[serde(rename = "verbatim")]
-pub(crate) struct RenderVerbatim {
+pub(crate) struct RenderVerbatim {}
-    contents: String,
-}
 
-render!(
+rnoop!(RenderVerbatim, IVerbatim);
-    RenderVerbatim,
-    IVerbatim,
-    original,
-    config,
-    output_directory,
-    output_file,
-    {
-        Ok(RenderVerbatim {
-            contents: original.contents.clone(),
-        })
-    }
-);

src/intermediate/bold.rs

@@ -1,21 +1,5 @@
-use super::macros::intermediate;
+use super::macros::inoop;
-use super::IObject;
 
 use crate::error::CustomError;
 
-#[derive(Debug, Clone)]
+inoop!(IBold, Bold);
-pub(crate) struct IBold {
-    pub(crate) children: Vec<IObject>,
-}
-
-intermediate!(IBold, Bold, original, registry, {
-    let children = {
-        let mut ret = Vec::new();
-        for obj in original.children.iter() {
-            ret.push(IObject::new(registry.clone(), obj).await?);
-        }
-        ret
-    };
-
-    Ok(IBold { children })
-});

src/intermediate/code.rs

@@ -1,15 +1,5 @@
-use super::macros::intermediate;
+use super::macros::inoop;
 
 use crate::error::CustomError;
 
-#[derive(Debug, Clone)]
+inoop!(ICode, Code);
-pub(crate) struct ICode {
-    pub(crate) contents: String,
-}
-
-intermediate!(ICode, Code, original, _registry, {
-    Ok(ICode {
-        // TODO: Should this coalesce whitespace like PlainText?
-        contents: original.contents.to_owned(),
-    })
-});

src/intermediate/italic.rs

@@ -1,21 +1,5 @@
-use super::macros::intermediate;
+use super::macros::inoop;
-use super::IObject;
 
 use crate::error::CustomError;
 
-#[derive(Debug, Clone)]
+inoop!(IItalic, Italic);
-pub(crate) struct IItalic {
-    pub(crate) children: Vec<IObject>,
-}
-
-intermediate!(IItalic, Italic, original, registry, {
-    let children = {
-        let mut ret = Vec::new();
-        for obj in original.children.iter() {
-            ret.push(IObject::new(registry.clone(), obj).await?);
-        }
-        ret
-    };
-
-    Ok(IItalic { children })
-});

src/intermediate/strike_through.rs

@@ -1,21 +1,5 @@
-use super::macros::intermediate;
+use super::macros::inoop;
-use super::IObject;
 
 use crate::error::CustomError;
 
-#[derive(Debug, Clone)]
+inoop!(IStrikeThrough, StrikeThrough);
-pub(crate) struct IStrikeThrough {
-    pub(crate) children: Vec<IObject>,
-}
-
-intermediate!(IStrikeThrough, StrikeThrough, original, registry, {
-    let children = {
-        let mut ret = Vec::new();
-        for obj in original.children.iter() {
-            ret.push(IObject::new(registry.clone(), obj).await?);
-        }
-        ret
-    };
-
-    Ok(IStrikeThrough { children })
-});

src/intermediate/underline.rs

@@ -1,21 +1,6 @@
-use super::macros::intermediate;
-use super::IObject;
-
 use crate::error::CustomError;
 
-#[derive(Debug, Clone)]
+use super::macros::inoop;
-pub(crate) struct IUnderline {
-    pub(crate) children: Vec<IObject>,
-}
 
-intermediate!(IUnderline, Underline, original, registry, {
-    let children = {
-        let mut ret = Vec::new();
-        for obj in original.children.iter() {
-            ret.push(IObject::new(registry.clone(), obj).await?);
-        }
-        ret
-    };
 
-    Ok(IUnderline { children })
+inoop!(IUnderline, Underline);
-});

src/intermediate/verbatim.rs

@@ -1,15 +1,6 @@
-use super::macros::intermediate;
-
 use crate::error::CustomError;
 
-#[derive(Debug, Clone)]
+use super::macros::inoop;
-pub(crate) struct IVerbatim {
-    pub(crate) contents: String,
-}
 
-intermediate!(IVerbatim, Verbatim, original, _registry, {
+
-    Ok(IVerbatim {
+inoop!(IVerbatim, Verbatim);
-        // TODO: Should this coalesce whitespace like PlainText?
-        contents: original.contents.to_owned(),
-    })
-});