default_environment/templates/html/table.dust

@@ -1 +1 @@
-<table>{#.children}{>table_row/}{/.children}</table>
+!!!!!!!! table

default_environment/templates/html/table_cell.dust

@@ -1 +0,0 @@
-<td>{#.children}{>object/}{/.children}</td>

default_environment/templates/html/table_row.dust

@@ -1 +0,0 @@
-<tr>{#.children}{>table_cell/}{/.children}</tr>

src/context/mod.rs

@@ -54,8 +54,6 @@ mod strike_through;
 mod subscript;
 mod superscript;
 mod table;
-mod table_cell;
-mod table_row;
 mod target;
 mod timestamp;
 mod underline;

src/context/table.rs

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

src/context/table_cell.rs

@@ -1,42 +0,0 @@
-use std::path::Path;
-
-use serde::Serialize;
-
-use crate::config::Config;
-use crate::error::CustomError;
-use crate::intermediate::ITableCell;
-
-use super::macros::render;
-use super::RenderObject;
-
-#[derive(Debug, Serialize)]
-#[serde(tag = "type")]
-#[serde(rename = "table_cell")]
-pub(crate) struct RenderTableCell {
-    children: Vec<RenderObject>,
-}
-
-render!(
-    RenderTableCell,
-    ITableCell,
-    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(RenderTableCell { children })
-    }
-);

src/context/table_row.rs

@@ -1,42 +0,0 @@
-use std::path::Path;
-
-use serde::Serialize;
-
-use crate::config::Config;
-use crate::error::CustomError;
-use crate::intermediate::ITableRow;
-
-use super::macros::render;
-use super::table_cell::RenderTableCell;
-
-#[derive(Debug, Serialize)]
-#[serde(tag = "type")]
-#[serde(rename = "table_row")]
-pub(crate) struct RenderTableRow {
-    children: Vec<RenderTableCell>,
-}
-
-render!(
-    RenderTableRow,
-    ITableRow,
-    original,
-    config,
-    output_directory,
-    output_file,
-    {
-        let children = {
-            let mut ret = Vec::new();
-            for obj in original.children.iter() {
-                ret.push(RenderTableCell::new(
-                    config,
-                    output_directory,
-                    output_file,
-                    obj,
-                )?);
-            }
-            ret
-        };
-
-        Ok(RenderTableRow { children })
-    }
-);

src/intermediate/mod.rs

@@ -56,8 +56,6 @@ mod strike_through;
 mod subscript;
 mod superscript;
 mod table;
-mod table_cell;
-mod table_row;
 mod target;
 mod timestamp;
 mod underline;
@@ -121,8 +119,6 @@ pub(crate) use strike_through::IStrikeThrough;
 pub(crate) use subscript::ISubscript;
 pub(crate) use superscript::ISuperscript;
 pub(crate) use table::ITable;
-pub(crate) use table_cell::ITableCell;
-pub(crate) use table_row::ITableRow;
 pub(crate) use target::ITarget;
 pub(crate) use timestamp::ITimestamp;
 pub(crate) use underline::IUnderline;

src/intermediate/table.rs

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

src/intermediate/table_cell.rs

@@ -1,21 +0,0 @@
-use super::macros::intermediate;
-
-use super::IObject;
-use crate::error::CustomError;
-
-#[derive(Debug, Clone)]
-pub(crate) struct ITableCell {
-    pub(crate) children: Vec<IObject>,
-}
-
-intermediate!(ITableCell, TableCell, 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(ITableCell { children })
-});

src/intermediate/table_row.rs

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