Add post_blank to the rust types.

This commit is contained in:
Tom Alexander 2023-12-21 14:56:58 -05:00
parent 8b85c02ef1
commit 72952adb6b
Signed by: talexander
GPG Key ID: D3A179C9A53C0EDE
108 changed files with 318 additions and 109 deletions

View File

@ -9,6 +9,8 @@ use super::macros::rnoop;
#[derive(Debug, Serialize)] #[derive(Debug, Serialize)]
#[serde(tag = "type")] #[serde(tag = "type")]
#[serde(rename = "angle_link")] #[serde(rename = "angle_link")]
pub(crate) struct RenderAngleLink {} pub(crate) struct RenderAngleLink {
post_blank: organic::types::PostBlank,
}
rnoop!(RenderAngleLink, IAngleLink); rnoop!(RenderAngleLink, IAngleLink);

View File

@ -9,6 +9,8 @@ use super::macros::rnoop;
#[derive(Debug, Serialize)] #[derive(Debug, Serialize)]
#[serde(tag = "type")] #[serde(tag = "type")]
#[serde(rename = "babel_call")] #[serde(rename = "babel_call")]
pub(crate) struct RenderBabelCall {} pub(crate) struct RenderBabelCall {
post_blank: organic::types::PostBlank,
}
rnoop!(RenderBabelCall, IBabelCall); rnoop!(RenderBabelCall, IBabelCall);

View File

@ -12,6 +12,7 @@ use super::RenderObject;
#[serde(rename = "bold")] #[serde(rename = "bold")]
pub(crate) struct RenderBold { pub(crate) struct RenderBold {
children: Vec<RenderObject>, children: Vec<RenderObject>,
post_blank: organic::types::PostBlank,
} }
render!(RenderBold, IBold, original, render_context, { render!(RenderBold, IBold, original, render_context, {
@ -23,5 +24,8 @@ render!(RenderBold, IBold, original, render_context, {
ret ret
}; };
Ok(RenderBold { children }) Ok(RenderBold {
children,
post_blank: original.post_blank,
})
}); });

View File

@ -9,6 +9,8 @@ use super::macros::rnoop;
#[derive(Debug, Serialize)] #[derive(Debug, Serialize)]
#[serde(tag = "type")] #[serde(tag = "type")]
#[serde(rename = "center_block")] #[serde(rename = "center_block")]
pub(crate) struct RenderCenterBlock {} pub(crate) struct RenderCenterBlock {
post_blank: organic::types::PostBlank,
}
rnoop!(RenderCenterBlock, ICenterBlock); rnoop!(RenderCenterBlock, ICenterBlock);

View File

@ -9,6 +9,8 @@ use super::macros::rnoop;
#[derive(Debug, Serialize)] #[derive(Debug, Serialize)]
#[serde(tag = "type")] #[serde(tag = "type")]
#[serde(rename = "citation")] #[serde(rename = "citation")]
pub(crate) struct RenderCitation {} pub(crate) struct RenderCitation {
post_blank: organic::types::PostBlank,
}
rnoop!(RenderCitation, ICitation); rnoop!(RenderCitation, ICitation);

View File

@ -9,6 +9,8 @@ use super::macros::rnoop;
#[derive(Debug, Serialize)] #[derive(Debug, Serialize)]
#[serde(tag = "type")] #[serde(tag = "type")]
#[serde(rename = "citation_reference")] #[serde(rename = "citation_reference")]
pub(crate) struct RenderCitationReference {} pub(crate) struct RenderCitationReference {
post_blank: organic::types::PostBlank,
}
rnoop!(RenderCitationReference, ICitationReference); rnoop!(RenderCitationReference, ICitationReference);

View File

@ -9,6 +9,8 @@ use super::macros::rnoop;
#[derive(Debug, Serialize)] #[derive(Debug, Serialize)]
#[serde(tag = "type")] #[serde(tag = "type")]
#[serde(rename = "clock")] #[serde(rename = "clock")]
pub(crate) struct RenderClock {} pub(crate) struct RenderClock {
post_blank: organic::types::PostBlank,
}
rnoop!(RenderClock, IClock); rnoop!(RenderClock, IClock);

View File

@ -11,10 +11,12 @@ use super::macros::render;
#[serde(rename = "code")] #[serde(rename = "code")]
pub(crate) struct RenderCode { pub(crate) struct RenderCode {
contents: String, contents: String,
post_blank: organic::types::PostBlank,
} }
render!(RenderCode, ICode, original, _render_context, { render!(RenderCode, ICode, original, _render_context, {
Ok(RenderCode { Ok(RenderCode {
contents: original.contents.clone(), contents: original.contents.clone(),
post_blank: original.post_blank,
}) })
}); });

View File

@ -9,6 +9,8 @@ use super::macros::rnoop;
#[derive(Debug, Serialize)] #[derive(Debug, Serialize)]
#[serde(tag = "type")] #[serde(tag = "type")]
#[serde(rename = "comment")] #[serde(rename = "comment")]
pub(crate) struct RenderComment {} pub(crate) struct RenderComment {
post_blank: organic::types::PostBlank,
}
rnoop!(RenderComment, IComment); rnoop!(RenderComment, IComment);

View File

@ -9,6 +9,8 @@ use super::macros::rnoop;
#[derive(Debug, Serialize)] #[derive(Debug, Serialize)]
#[serde(tag = "type")] #[serde(tag = "type")]
#[serde(rename = "comment_block")] #[serde(rename = "comment_block")]
pub(crate) struct RenderCommentBlock {} pub(crate) struct RenderCommentBlock {
post_blank: organic::types::PostBlank,
}
rnoop!(RenderCommentBlock, ICommentBlock); rnoop!(RenderCommentBlock, ICommentBlock);

View File

@ -9,6 +9,8 @@ use super::macros::rnoop;
#[derive(Debug, Serialize)] #[derive(Debug, Serialize)]
#[serde(tag = "type")] #[serde(tag = "type")]
#[serde(rename = "diary_sexp")] #[serde(rename = "diary_sexp")]
pub(crate) struct RenderDiarySexp {} pub(crate) struct RenderDiarySexp {
post_blank: organic::types::PostBlank,
}
rnoop!(RenderDiarySexp, IDiarySexp); rnoop!(RenderDiarySexp, IDiarySexp);

View File

@ -9,6 +9,8 @@ use super::macros::rnoop;
#[derive(Debug, Serialize)] #[derive(Debug, Serialize)]
#[serde(tag = "type")] #[serde(tag = "type")]
#[serde(rename = "drawer")] #[serde(rename = "drawer")]
pub(crate) struct RenderDrawer {} pub(crate) struct RenderDrawer {
post_blank: organic::types::PostBlank,
}
rnoop!(RenderDrawer, IDrawer); rnoop!(RenderDrawer, IDrawer);

View File

@ -9,6 +9,8 @@ use super::macros::rnoop;
#[derive(Debug, Serialize)] #[derive(Debug, Serialize)]
#[serde(tag = "type")] #[serde(tag = "type")]
#[serde(rename = "dynamic_block")] #[serde(rename = "dynamic_block")]
pub(crate) struct RenderDynamicBlock {} pub(crate) struct RenderDynamicBlock {
post_blank: organic::types::PostBlank,
}
rnoop!(RenderDynamicBlock, IDynamicBlock); rnoop!(RenderDynamicBlock, IDynamicBlock);

View File

@ -11,10 +11,12 @@ use super::macros::render;
#[serde(rename = "entity")] #[serde(rename = "entity")]
pub(crate) struct RenderEntity { pub(crate) struct RenderEntity {
html: String, html: String,
post_blank: organic::types::PostBlank,
} }
render!(RenderEntity, IEntity, original, _render_context, { render!(RenderEntity, IEntity, original, _render_context, {
Ok(RenderEntity { Ok(RenderEntity {
html: original.html.clone(), html: original.html.clone(),
post_blank: original.post_blank,
}) })
}); });

View File

@ -9,6 +9,8 @@ use super::macros::rnoop;
#[derive(Debug, Serialize)] #[derive(Debug, Serialize)]
#[serde(tag = "type")] #[serde(tag = "type")]
#[serde(rename = "example_block")] #[serde(rename = "example_block")]
pub(crate) struct RenderExampleBlock {} pub(crate) struct RenderExampleBlock {
post_blank: organic::types::PostBlank,
}
rnoop!(RenderExampleBlock, IExampleBlock); rnoop!(RenderExampleBlock, IExampleBlock);

View File

@ -9,6 +9,8 @@ use super::macros::rnoop;
#[derive(Debug, Serialize)] #[derive(Debug, Serialize)]
#[serde(tag = "type")] #[serde(tag = "type")]
#[serde(rename = "export_block")] #[serde(rename = "export_block")]
pub(crate) struct RenderExportBlock {} pub(crate) struct RenderExportBlock {
post_blank: organic::types::PostBlank,
}
rnoop!(RenderExportBlock, IExportBlock); rnoop!(RenderExportBlock, IExportBlock);

View File

@ -9,6 +9,8 @@ use super::macros::rnoop;
#[derive(Debug, Serialize)] #[derive(Debug, Serialize)]
#[serde(tag = "type")] #[serde(tag = "type")]
#[serde(rename = "export_snippet")] #[serde(rename = "export_snippet")]
pub(crate) struct RenderExportSnippet {} pub(crate) struct RenderExportSnippet {
post_blank: organic::types::PostBlank,
}
rnoop!(RenderExportSnippet, IExportSnippet); rnoop!(RenderExportSnippet, IExportSnippet);

View File

@ -9,6 +9,8 @@ use super::macros::rnoop;
#[derive(Debug, Serialize)] #[derive(Debug, Serialize)]
#[serde(tag = "type")] #[serde(tag = "type")]
#[serde(rename = "fixed_width_area")] #[serde(rename = "fixed_width_area")]
pub(crate) struct RenderFixedWidthArea {} pub(crate) struct RenderFixedWidthArea {
post_blank: organic::types::PostBlank,
}
rnoop!(RenderFixedWidthArea, IFixedWidthArea); rnoop!(RenderFixedWidthArea, IFixedWidthArea);

View File

@ -13,18 +13,21 @@ use super::macros::rnoop;
#[derive(Debug, Serialize)] #[derive(Debug, Serialize)]
#[serde(tag = "type")] #[serde(tag = "type")]
#[serde(rename = "footnote_definition")] #[serde(rename = "footnote_definition")]
pub(crate) struct RenderFootnoteDefinition {} pub(crate) struct RenderFootnoteDefinition {
post_blank: organic::types::PostBlank,
}
rnoop!(RenderFootnoteDefinition, IFootnoteDefinition); rnoop!(RenderFootnoteDefinition, IFootnoteDefinition);
#[derive(Debug, Serialize)] #[derive(Debug, Serialize)]
#[serde(tag = "type")] #[serde(tag = "type")]
#[serde(rename = "footnote_reference")] #[serde(rename = "real_footnote_definition")]
pub(crate) struct RenderRealFootnoteDefinition { pub(crate) struct RenderRealFootnoteDefinition {
definition_id: String, definition_id: String,
reference_link: String, reference_link: String,
label: String, label: String,
contents: Vec<RenderAstNode>, contents: Vec<RenderAstNode>,
// TODO: Do I need post_blank for real footnote definitions?
} }
render!( render!(

View File

@ -13,6 +13,7 @@ pub(crate) struct RenderFootnoteReference {
reference_id: String, reference_id: String,
definition_link: String, definition_link: String,
label: String, label: String,
post_blank: organic::types::PostBlank,
} }
render!( render!(
@ -28,6 +29,7 @@ render!(
original.get_definition_id(render_context.id_addition) original.get_definition_id(render_context.id_addition)
), ),
label: original.get_display_label(), label: original.get_display_label(),
post_blank: original.post_blank,
}) })
} }
); );

View File

@ -15,6 +15,7 @@ pub(crate) struct RenderHeading {
level: organic::types::HeadlineLevel, level: organic::types::HeadlineLevel,
title: Vec<RenderObject>, title: Vec<RenderObject>,
children: Vec<RenderDocumentElement>, children: Vec<RenderDocumentElement>,
post_blank: organic::types::PostBlank,
} }
render!(RenderHeading, IHeading, original, render_context, { render!(RenderHeading, IHeading, original, render_context, {
@ -38,5 +39,6 @@ render!(RenderHeading, IHeading, original, render_context, {
level: original.level + 1, // Adding 1 because the page title is going to be h1. level: original.level + 1, // Adding 1 because the page title is going to be h1.
title, title,
children, children,
post_blank: original.post_blank,
}) })
}); });

View File

@ -9,6 +9,8 @@ use super::macros::rnoop;
#[derive(Debug, Serialize)] #[derive(Debug, Serialize)]
#[serde(tag = "type")] #[serde(tag = "type")]
#[serde(rename = "horizontal_rule")] #[serde(rename = "horizontal_rule")]
pub(crate) struct RenderHorizontalRule {} pub(crate) struct RenderHorizontalRule {
post_blank: organic::types::PostBlank,
}
rnoop!(RenderHorizontalRule, IHorizontalRule); rnoop!(RenderHorizontalRule, IHorizontalRule);

View File

@ -9,6 +9,8 @@ use super::macros::rnoop;
#[derive(Debug, Serialize)] #[derive(Debug, Serialize)]
#[serde(tag = "type")] #[serde(tag = "type")]
#[serde(rename = "inline_babel_call")] #[serde(rename = "inline_babel_call")]
pub(crate) struct RenderInlineBabelCall {} pub(crate) struct RenderInlineBabelCall {
post_blank: organic::types::PostBlank,
}
rnoop!(RenderInlineBabelCall, IInlineBabelCall); rnoop!(RenderInlineBabelCall, IInlineBabelCall);

View File

@ -11,6 +11,7 @@ use super::macros::render;
#[serde(rename = "inline_source_block")] #[serde(rename = "inline_source_block")]
pub(crate) struct RenderInlineSourceBlock { pub(crate) struct RenderInlineSourceBlock {
value: String, value: String,
post_blank: organic::types::PostBlank,
} }
render!( render!(
@ -21,6 +22,7 @@ render!(
{ {
Ok(RenderInlineSourceBlock { Ok(RenderInlineSourceBlock {
value: original.value.clone(), value: original.value.clone(),
post_blank: original.post_blank,
}) })
} }
); );

View File

@ -12,6 +12,7 @@ use super::RenderObject;
#[serde(rename = "italic")] #[serde(rename = "italic")]
pub(crate) struct RenderItalic { pub(crate) struct RenderItalic {
children: Vec<RenderObject>, children: Vec<RenderObject>,
post_blank: organic::types::PostBlank,
} }
render!(RenderItalic, IItalic, original, render_context, { render!(RenderItalic, IItalic, original, render_context, {
@ -23,5 +24,8 @@ render!(RenderItalic, IItalic, original, render_context, {
ret ret
}; };
Ok(RenderItalic { children }) Ok(RenderItalic {
children,
post_blank: original.post_blank,
})
}); });

View File

@ -9,6 +9,8 @@ use super::macros::rnoop;
#[derive(Debug, Serialize)] #[derive(Debug, Serialize)]
#[serde(tag = "type")] #[serde(tag = "type")]
#[serde(rename = "keyword")] #[serde(rename = "keyword")]
pub(crate) struct RenderKeyword {} pub(crate) struct RenderKeyword {
post_blank: organic::types::PostBlank,
}
rnoop!(RenderKeyword, IKeyword); rnoop!(RenderKeyword, IKeyword);

View File

@ -9,6 +9,8 @@ use super::macros::rnoop;
#[derive(Debug, Serialize)] #[derive(Debug, Serialize)]
#[serde(tag = "type")] #[serde(tag = "type")]
#[serde(rename = "latex_environment")] #[serde(rename = "latex_environment")]
pub(crate) struct RenderLatexEnvironment {} pub(crate) struct RenderLatexEnvironment {
post_blank: organic::types::PostBlank,
}
rnoop!(RenderLatexEnvironment, ILatexEnvironment); rnoop!(RenderLatexEnvironment, ILatexEnvironment);

View File

@ -11,6 +11,7 @@ use super::macros::render;
#[serde(rename = "latex_fragment")] #[serde(rename = "latex_fragment")]
pub(crate) struct RenderLatexFragment { pub(crate) struct RenderLatexFragment {
value: String, value: String,
post_blank: organic::types::PostBlank,
} }
render!( render!(
@ -21,6 +22,7 @@ render!(
{ {
Ok(RenderLatexFragment { Ok(RenderLatexFragment {
value: original.value.clone(), value: original.value.clone(),
post_blank: original.post_blank,
}) })
} }
); );

View File

@ -9,6 +9,8 @@ use super::macros::rnoop;
#[derive(Debug, Serialize)] #[derive(Debug, Serialize)]
#[serde(tag = "type")] #[serde(tag = "type")]
#[serde(rename = "line_break")] #[serde(rename = "line_break")]
pub(crate) struct RenderLineBreak {} pub(crate) struct RenderLineBreak {
post_blank: organic::types::PostBlank,
}
rnoop!(RenderLineBreak, ILineBreak); rnoop!(RenderLineBreak, ILineBreak);

View File

@ -24,9 +24,11 @@ macro_rules! rnoop {
impl $rstruct { impl $rstruct {
pub(crate) fn new( pub(crate) fn new(
_render_context: RenderContext<'_>, _render_context: RenderContext<'_>,
_original: &$istruct, original: &$istruct,
) -> Result<$rstruct, CustomError> { ) -> Result<$rstruct, CustomError> {
Ok($rstruct {}) Ok($rstruct {
post_blank: original.post_blank,
})
} }
} }
}; };

View File

@ -9,6 +9,8 @@ use super::macros::rnoop;
#[derive(Debug, Serialize)] #[derive(Debug, Serialize)]
#[serde(tag = "type")] #[serde(tag = "type")]
#[serde(rename = "org_macro")] #[serde(rename = "org_macro")]
pub(crate) struct RenderOrgMacro {} pub(crate) struct RenderOrgMacro {
post_blank: organic::types::PostBlank,
}
rnoop!(RenderOrgMacro, IOrgMacro); rnoop!(RenderOrgMacro, IOrgMacro);

View File

@ -12,6 +12,7 @@ use super::RenderObject;
#[serde(rename = "paragraph")] #[serde(rename = "paragraph")]
pub(crate) struct RenderParagraph { pub(crate) struct RenderParagraph {
children: Vec<RenderObject>, children: Vec<RenderObject>,
post_blank: organic::types::PostBlank,
} }
render!(RenderParagraph, IParagraph, original, render_context, { render!(RenderParagraph, IParagraph, original, render_context, {
@ -23,5 +24,8 @@ render!(RenderParagraph, IParagraph, original, render_context, {
ret ret
}; };
Ok(RenderParagraph { children }) Ok(RenderParagraph {
children,
post_blank: original.post_blank,
})
}); });

View File

@ -9,6 +9,8 @@ use super::macros::rnoop;
#[derive(Debug, Serialize)] #[derive(Debug, Serialize)]
#[serde(tag = "type")] #[serde(tag = "type")]
#[serde(rename = "plain_link")] #[serde(rename = "plain_link")]
pub(crate) struct RenderPlainLink {} pub(crate) struct RenderPlainLink {
post_blank: organic::types::PostBlank,
}
rnoop!(RenderPlainLink, IPlainLink); rnoop!(RenderPlainLink, IPlainLink);

View File

@ -13,6 +13,7 @@ use super::plain_list_item::RenderPlainListItem;
pub(crate) struct RenderPlainList { pub(crate) struct RenderPlainList {
list_type: String, list_type: String,
children: Vec<RenderPlainListItem>, children: Vec<RenderPlainListItem>,
post_blank: organic::types::PostBlank,
} }
render!(RenderPlainList, IPlainList, original, render_context, { render!(RenderPlainList, IPlainList, original, render_context, {
@ -32,5 +33,6 @@ render!(RenderPlainList, IPlainList, original, render_context, {
Ok(RenderPlainList { Ok(RenderPlainList {
list_type, list_type,
children, children,
post_blank: original.post_blank,
}) })
}); });

View File

@ -11,10 +11,12 @@ use super::macros::render;
#[serde(rename = "plain_text")] #[serde(rename = "plain_text")]
pub(crate) struct RenderPlainText { pub(crate) struct RenderPlainText {
source: String, source: String,
post_blank: organic::types::PostBlank,
} }
render!(RenderPlainText, IPlainText, original, _render_context, { render!(RenderPlainText, IPlainText, original, _render_context, {
Ok(RenderPlainText { Ok(RenderPlainText {
source: original.source.clone(), source: original.source.clone(),
post_blank: original.post_blank,
}) })
}); });

View File

@ -9,6 +9,8 @@ use super::macros::rnoop;
#[derive(Debug, Serialize)] #[derive(Debug, Serialize)]
#[serde(tag = "type")] #[serde(tag = "type")]
#[serde(rename = "planning")] #[serde(rename = "planning")]
pub(crate) struct RenderPlanning {} pub(crate) struct RenderPlanning {
post_blank: organic::types::PostBlank,
}
rnoop!(RenderPlanning, IPlanning); rnoop!(RenderPlanning, IPlanning);

View File

@ -9,6 +9,8 @@ use super::macros::rnoop;
#[derive(Debug, Serialize)] #[derive(Debug, Serialize)]
#[serde(tag = "type")] #[serde(tag = "type")]
#[serde(rename = "property_drawer")] #[serde(rename = "property_drawer")]
pub(crate) struct RenderPropertyDrawer {} pub(crate) struct RenderPropertyDrawer {
post_blank: organic::types::PostBlank,
}
rnoop!(RenderPropertyDrawer, IPropertyDrawer); rnoop!(RenderPropertyDrawer, IPropertyDrawer);

View File

@ -12,6 +12,7 @@ use super::RenderElement;
#[serde(rename = "quote_block")] #[serde(rename = "quote_block")]
pub(crate) struct RenderQuoteBlock { pub(crate) struct RenderQuoteBlock {
children: Vec<RenderElement>, children: Vec<RenderElement>,
post_blank: organic::types::PostBlank,
} }
render!(RenderQuoteBlock, IQuoteBlock, original, render_context, { render!(RenderQuoteBlock, IQuoteBlock, original, render_context, {
@ -23,5 +24,8 @@ render!(RenderQuoteBlock, IQuoteBlock, original, render_context, {
ret ret
}; };
Ok(RenderQuoteBlock { children }) Ok(RenderQuoteBlock {
children,
post_blank: original.post_blank,
})
}); });

View File

@ -9,6 +9,8 @@ use super::macros::rnoop;
#[derive(Debug, Serialize)] #[derive(Debug, Serialize)]
#[serde(tag = "type")] #[serde(tag = "type")]
#[serde(rename = "radio_link")] #[serde(rename = "radio_link")]
pub(crate) struct RenderRadioLink {} pub(crate) struct RenderRadioLink {
post_blank: organic::types::PostBlank,
}
rnoop!(RenderRadioLink, IRadioLink); rnoop!(RenderRadioLink, IRadioLink);

View File

@ -9,6 +9,8 @@ use super::macros::rnoop;
#[derive(Debug, Serialize)] #[derive(Debug, Serialize)]
#[serde(tag = "type")] #[serde(tag = "type")]
#[serde(rename = "radio_target")] #[serde(rename = "radio_target")]
pub(crate) struct RenderRadioTarget {} pub(crate) struct RenderRadioTarget {
post_blank: organic::types::PostBlank,
}
rnoop!(RenderRadioTarget, IRadioTarget); rnoop!(RenderRadioTarget, IRadioTarget);

View File

@ -13,6 +13,7 @@ use super::RenderObject;
pub(crate) struct RenderRegularLink { pub(crate) struct RenderRegularLink {
raw_link: String, raw_link: String,
children: Vec<RenderObject>, children: Vec<RenderObject>,
post_blank: organic::types::PostBlank,
} }
render!(RenderRegularLink, IRegularLink, original, render_context, { render!(RenderRegularLink, IRegularLink, original, render_context, {
@ -27,5 +28,6 @@ render!(RenderRegularLink, IRegularLink, original, render_context, {
Ok(RenderRegularLink { Ok(RenderRegularLink {
raw_link: original.raw_link.clone(), raw_link: original.raw_link.clone(),
children, children,
post_blank: original.post_blank,
}) })
}); });

View File

@ -12,6 +12,7 @@ use super::RenderElement;
#[serde(rename = "section")] #[serde(rename = "section")]
pub(crate) struct RenderSection { pub(crate) struct RenderSection {
children: Vec<RenderElement>, children: Vec<RenderElement>,
post_blank: organic::types::PostBlank,
} }
render!(RenderSection, ISection, original, render_context, { render!(RenderSection, ISection, original, render_context, {
@ -23,5 +24,8 @@ render!(RenderSection, ISection, original, render_context, {
ret ret
}; };
Ok(RenderSection { children }) Ok(RenderSection {
children,
post_blank: original.post_blank,
})
}); });

View File

@ -9,6 +9,8 @@ use super::macros::rnoop;
#[derive(Debug, Serialize)] #[derive(Debug, Serialize)]
#[serde(tag = "type")] #[serde(tag = "type")]
#[serde(rename = "special_block")] #[serde(rename = "special_block")]
pub(crate) struct RenderSpecialBlock {} pub(crate) struct RenderSpecialBlock {
post_blank: organic::types::PostBlank,
}
rnoop!(RenderSpecialBlock, ISpecialBlock); rnoop!(RenderSpecialBlock, ISpecialBlock);

View File

@ -12,11 +12,13 @@ use super::macros::render;
pub(crate) struct RenderSrcBlock { pub(crate) struct RenderSrcBlock {
lines: Vec<String>, lines: Vec<String>,
language: Option<String>, language: Option<String>,
post_blank: organic::types::PostBlank,
} }
render!(RenderSrcBlock, ISrcBlock, original, _render_context, { render!(RenderSrcBlock, ISrcBlock, original, _render_context, {
Ok(RenderSrcBlock { Ok(RenderSrcBlock {
lines: original.lines.clone(), lines: original.lines.clone(),
language: original.language.clone(), language: original.language.clone(),
post_blank: original.post_blank,
}) })
}); });

View File

@ -9,6 +9,8 @@ use super::macros::rnoop;
#[derive(Debug, Serialize)] #[derive(Debug, Serialize)]
#[serde(tag = "type")] #[serde(tag = "type")]
#[serde(rename = "statistics_cookie")] #[serde(rename = "statistics_cookie")]
pub(crate) struct RenderStatisticsCookie {} pub(crate) struct RenderStatisticsCookie {
post_blank: organic::types::PostBlank,
}
rnoop!(RenderStatisticsCookie, IStatisticsCookie); rnoop!(RenderStatisticsCookie, IStatisticsCookie);

View File

@ -12,6 +12,7 @@ use super::RenderObject;
#[serde(rename = "strike_through")] #[serde(rename = "strike_through")]
pub(crate) struct RenderStrikeThrough { pub(crate) struct RenderStrikeThrough {
children: Vec<RenderObject>, children: Vec<RenderObject>,
post_blank: organic::types::PostBlank,
} }
render!( render!(
@ -28,6 +29,9 @@ render!(
ret ret
}; };
Ok(RenderStrikeThrough { children }) Ok(RenderStrikeThrough {
children,
post_blank: original.post_blank,
})
} }
); );

View File

@ -9,6 +9,8 @@ use super::macros::rnoop;
#[derive(Debug, Serialize)] #[derive(Debug, Serialize)]
#[serde(tag = "type")] #[serde(tag = "type")]
#[serde(rename = "subscript")] #[serde(rename = "subscript")]
pub(crate) struct RenderSubscript {} pub(crate) struct RenderSubscript {
post_blank: organic::types::PostBlank,
}
rnoop!(RenderSubscript, ISubscript); rnoop!(RenderSubscript, ISubscript);

View File

@ -9,6 +9,8 @@ use super::macros::rnoop;
#[derive(Debug, Serialize)] #[derive(Debug, Serialize)]
#[serde(tag = "type")] #[serde(tag = "type")]
#[serde(rename = "superscript")] #[serde(rename = "superscript")]
pub(crate) struct RenderSuperscript {} pub(crate) struct RenderSuperscript {
post_blank: organic::types::PostBlank,
}
rnoop!(RenderSuperscript, ISuperscript); rnoop!(RenderSuperscript, ISuperscript);

View File

@ -12,6 +12,7 @@ use super::table_row::RenderTableRow;
#[serde(rename = "table")] #[serde(rename = "table")]
pub(crate) struct RenderTable { pub(crate) struct RenderTable {
children: Vec<RenderTableRow>, children: Vec<RenderTableRow>,
post_blank: organic::types::PostBlank,
} }
render!(RenderTable, ITable, original, render_context, { render!(RenderTable, ITable, original, render_context, {
@ -23,5 +24,8 @@ render!(RenderTable, ITable, original, render_context, {
ret ret
}; };
Ok(RenderTable { children }) Ok(RenderTable {
children,
post_blank: original.post_blank,
})
}); });

View File

@ -11,10 +11,12 @@ use super::macros::render;
#[serde(rename = "target")] #[serde(rename = "target")]
pub(crate) struct RenderTarget { pub(crate) struct RenderTarget {
id: String, id: String,
post_blank: organic::types::PostBlank,
} }
render!(RenderTarget, ITarget, original, _render_context, { render!(RenderTarget, ITarget, original, _render_context, {
Ok(RenderTarget { Ok(RenderTarget {
id: original.id.clone(), id: original.id.clone(),
post_blank: original.post_blank,
}) })
}); });

View File

@ -9,6 +9,8 @@ use super::macros::rnoop;
#[derive(Debug, Serialize)] #[derive(Debug, Serialize)]
#[serde(tag = "type")] #[serde(tag = "type")]
#[serde(rename = "timestamp")] #[serde(rename = "timestamp")]
pub(crate) struct RenderTimestamp {} pub(crate) struct RenderTimestamp {
post_blank: organic::types::PostBlank,
}
rnoop!(RenderTimestamp, ITimestamp); rnoop!(RenderTimestamp, ITimestamp);

View File

@ -12,6 +12,7 @@ use super::RenderObject;
#[serde(rename = "underline")] #[serde(rename = "underline")]
pub(crate) struct RenderUnderline { pub(crate) struct RenderUnderline {
children: Vec<RenderObject>, children: Vec<RenderObject>,
post_blank: organic::types::PostBlank,
} }
render!(RenderUnderline, IUnderline, original, render_context, { render!(RenderUnderline, IUnderline, original, render_context, {
@ -23,5 +24,8 @@ render!(RenderUnderline, IUnderline, original, render_context, {
ret ret
}; };
Ok(RenderUnderline { children }) Ok(RenderUnderline {
children,
post_blank: original.post_blank,
})
}); });

View File

@ -11,10 +11,12 @@ use super::macros::render;
#[serde(rename = "verbatim")] #[serde(rename = "verbatim")]
pub(crate) struct RenderVerbatim { pub(crate) struct RenderVerbatim {
contents: String, contents: String,
post_blank: organic::types::PostBlank,
} }
render!(RenderVerbatim, IVerbatim, original, _render_context, { render!(RenderVerbatim, IVerbatim, original, _render_context, {
Ok(RenderVerbatim { Ok(RenderVerbatim {
contents: original.contents.clone(), contents: original.contents.clone(),
post_blank: original.post_blank,
}) })
}); });

View File

@ -9,6 +9,8 @@ use super::macros::rnoop;
#[derive(Debug, Serialize)] #[derive(Debug, Serialize)]
#[serde(tag = "type")] #[serde(tag = "type")]
#[serde(rename = "verse_block")] #[serde(rename = "verse_block")]
pub(crate) struct RenderVerseBlock {} pub(crate) struct RenderVerseBlock {
post_blank: organic::types::PostBlank,
}
rnoop!(RenderVerseBlock, IVerseBlock); rnoop!(RenderVerseBlock, IVerseBlock);

View File

@ -1,5 +1,5 @@
use super::macros::inoop; use super::macros::inoop;
use crate::error::CustomError; use crate::error::CustomError;
use organic::types::StandardProperties;
inoop!(IAngleLink, AngleLink); inoop!(IAngleLink, AngleLink);

View File

@ -1,5 +1,5 @@
use super::macros::inoop; use super::macros::inoop;
use crate::error::CustomError; use crate::error::CustomError;
use organic::types::StandardProperties;
inoop!(IBabelCall, BabelCall); inoop!(IBabelCall, BabelCall);

View File

@ -1,3 +1,5 @@
use organic::types::StandardProperties;
use super::macros::intermediate; use super::macros::intermediate;
use super::IObject; use super::IObject;
@ -6,6 +8,7 @@ use crate::error::CustomError;
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
pub(crate) struct IBold { pub(crate) struct IBold {
pub(crate) children: Vec<IObject>, pub(crate) children: Vec<IObject>,
pub(crate) post_blank: organic::types::PostBlank,
} }
intermediate!( intermediate!(
@ -22,6 +25,9 @@ intermediate!(
ret ret
}; };
Ok(IBold { children }) Ok(IBold {
children,
post_blank: original.get_post_blank(),
})
} }
); );

View File

@ -1,5 +1,5 @@
use super::macros::inoop; use super::macros::inoop;
use crate::error::CustomError; use crate::error::CustomError;
use organic::types::StandardProperties;
inoop!(ICenterBlock, CenterBlock); inoop!(ICenterBlock, CenterBlock);

View File

@ -1,5 +1,5 @@
use super::macros::inoop; use super::macros::inoop;
use crate::error::CustomError; use crate::error::CustomError;
use organic::types::StandardProperties;
inoop!(ICitation, Citation); inoop!(ICitation, Citation);

View File

@ -1,5 +1,5 @@
use super::macros::inoop; use super::macros::inoop;
use crate::error::CustomError; use crate::error::CustomError;
use organic::types::StandardProperties;
inoop!(ICitationReference, CitationReference); inoop!(ICitationReference, CitationReference);

View File

@ -1,5 +1,5 @@
use super::macros::inoop; use super::macros::inoop;
use crate::error::CustomError; use crate::error::CustomError;
use organic::types::StandardProperties;
inoop!(IClock, Clock); inoop!(IClock, Clock);

View File

@ -1,3 +1,5 @@
use organic::types::StandardProperties;
use super::macros::intermediate; use super::macros::intermediate;
use crate::error::CustomError; use crate::error::CustomError;
@ -5,6 +7,7 @@ use crate::error::CustomError;
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
pub(crate) struct ICode { pub(crate) struct ICode {
pub(crate) contents: String, pub(crate) contents: String,
pub(crate) post_blank: organic::types::PostBlank,
} }
intermediate!( intermediate!(
@ -16,6 +19,7 @@ intermediate!(
Ok(ICode { Ok(ICode {
// TODO: Should this coalesce whitespace like PlainText? // TODO: Should this coalesce whitespace like PlainText?
contents: original.contents.to_owned(), contents: original.contents.to_owned(),
post_blank: original.get_post_blank(),
}) })
} }
); );

View File

@ -1,5 +1,5 @@
use super::macros::inoop; use super::macros::inoop;
use crate::error::CustomError; use crate::error::CustomError;
use organic::types::StandardProperties;
inoop!(IComment, Comment); inoop!(IComment, Comment);

View File

@ -1,5 +1,5 @@
use super::macros::inoop; use super::macros::inoop;
use crate::error::CustomError; use crate::error::CustomError;
use organic::types::StandardProperties;
inoop!(ICommentBlock, CommentBlock); inoop!(ICommentBlock, CommentBlock);

View File

@ -1,5 +1,5 @@
use super::macros::inoop; use super::macros::inoop;
use crate::error::CustomError; use crate::error::CustomError;
use organic::types::StandardProperties;
inoop!(IDiarySexp, DiarySexp); inoop!(IDiarySexp, DiarySexp);

View File

@ -1,5 +1,5 @@
use super::macros::inoop; use super::macros::inoop;
use crate::error::CustomError; use crate::error::CustomError;
use organic::types::StandardProperties;
inoop!(IDrawer, Drawer); inoop!(IDrawer, Drawer);

View File

@ -1,5 +1,5 @@
use super::macros::inoop; use super::macros::inoop;
use crate::error::CustomError; use crate::error::CustomError;
use organic::types::StandardProperties;
inoop!(IDynamicBlock, DynamicBlock); inoop!(IDynamicBlock, DynamicBlock);

View File

@ -1,10 +1,11 @@
use super::macros::intermediate; use super::macros::intermediate;
use crate::error::CustomError; use crate::error::CustomError;
use organic::types::StandardProperties;
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
pub(crate) struct IEntity { pub(crate) struct IEntity {
pub(crate) html: String, pub(crate) html: String,
pub(crate) post_blank: organic::types::PostBlank,
} }
intermediate!( intermediate!(
@ -15,6 +16,7 @@ intermediate!(
{ {
Ok(IEntity { Ok(IEntity {
html: original.html.to_owned(), html: original.html.to_owned(),
post_blank: original.get_post_blank(),
}) })
} }
); );

View File

@ -1,5 +1,5 @@
use super::macros::inoop; use super::macros::inoop;
use crate::error::CustomError; use crate::error::CustomError;
use organic::types::StandardProperties;
inoop!(IExampleBlock, ExampleBlock); inoop!(IExampleBlock, ExampleBlock);

View File

@ -1,5 +1,5 @@
use super::macros::inoop; use super::macros::inoop;
use crate::error::CustomError; use crate::error::CustomError;
use organic::types::StandardProperties;
inoop!(IExportBlock, ExportBlock); inoop!(IExportBlock, ExportBlock);

View File

@ -1,5 +1,5 @@
use super::macros::inoop; use super::macros::inoop;
use crate::error::CustomError; use crate::error::CustomError;
use organic::types::StandardProperties;
inoop!(IExportSnippet, ExportSnippet); inoop!(IExportSnippet, ExportSnippet);

View File

@ -1,5 +1,5 @@
use super::macros::inoop; use super::macros::inoop;
use crate::error::CustomError; use crate::error::CustomError;
use organic::types::StandardProperties;
inoop!(IFixedWidthArea, FixedWidthArea); inoop!(IFixedWidthArea, FixedWidthArea);

View File

@ -1,12 +1,14 @@
use super::macros::intermediate; use super::macros::intermediate;
use super::registry::register_footnote_definition; use super::registry::register_footnote_definition;
use super::IntermediateContext;
use super::IAstNode; use super::IAstNode;
use super::IntermediateContext;
use crate::error::CustomError; use crate::error::CustomError;
use organic::types::StandardProperties;
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
pub(crate) struct IFootnoteDefinition {} pub(crate) struct IFootnoteDefinition {
pub(crate) post_blank: organic::types::PostBlank,
}
intermediate!( intermediate!(
IFootnoteDefinition, IFootnoteDefinition,
@ -16,12 +18,15 @@ intermediate!(
{ {
register_footnote_definition(intermediate_context, original.label, &original.children) register_footnote_definition(intermediate_context, original.label, &original.children)
.await?; .await?;
Ok(IFootnoteDefinition {}) Ok(IFootnoteDefinition {
post_blank: original.get_post_blank(),
})
} }
); );
#[derive(Debug)] #[derive(Debug)]
pub(crate) struct IRealFootnoteDefinition { pub(crate) struct IRealFootnoteDefinition {
// TODO: Do I need post_blank for the real footnote definitions?
pub(crate) footnote_id: usize, pub(crate) footnote_id: usize,
pub(crate) contents: Vec<IAstNode>, pub(crate) contents: Vec<IAstNode>,
} }

View File

@ -1,12 +1,13 @@
use super::macros::intermediate; use super::macros::intermediate;
use super::registry::get_footnote_reference_id; use super::registry::get_footnote_reference_id;
use crate::error::CustomError; use crate::error::CustomError;
use organic::types::StandardProperties;
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
pub(crate) struct IFootnoteReference { pub(crate) struct IFootnoteReference {
footnote_id: usize, footnote_id: usize,
duplicate_offset: usize, duplicate_offset: usize,
pub(crate) post_blank: organic::types::PostBlank,
} }
intermediate!( intermediate!(
@ -21,6 +22,7 @@ intermediate!(
Ok(IFootnoteReference { Ok(IFootnoteReference {
footnote_id, footnote_id,
duplicate_offset: reference_count, duplicate_offset: reference_count,
post_blank: original.get_post_blank(),
}) })
} }
); );

View File

@ -1,14 +1,15 @@
use super::macros::intermediate; use super::macros::intermediate;
use super::IDocumentElement; use super::IDocumentElement;
use super::IObject; use super::IObject;
use crate::error::CustomError; use crate::error::CustomError;
use organic::types::StandardProperties;
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
pub(crate) struct IHeading { pub(crate) struct IHeading {
pub(crate) level: organic::types::HeadlineLevel, pub(crate) level: organic::types::HeadlineLevel,
pub(crate) title: Vec<IObject>, pub(crate) title: Vec<IObject>,
pub(crate) children: Vec<IDocumentElement>, pub(crate) children: Vec<IDocumentElement>,
pub(crate) post_blank: organic::types::PostBlank,
} }
intermediate!( intermediate!(
@ -35,6 +36,7 @@ intermediate!(
title, title,
level: original.level, level: original.level,
children, children,
post_blank: original.get_post_blank(),
}) })
} }
); );

View File

@ -1,5 +1,5 @@
use super::macros::inoop; use super::macros::inoop;
use crate::error::CustomError; use crate::error::CustomError;
use organic::types::StandardProperties;
inoop!(IHorizontalRule, HorizontalRule); inoop!(IHorizontalRule, HorizontalRule);

View File

@ -1,5 +1,5 @@
use super::macros::inoop; use super::macros::inoop;
use crate::error::CustomError; use crate::error::CustomError;
use organic::types::StandardProperties;
inoop!(IInlineBabelCall, InlineBabelCall); inoop!(IInlineBabelCall, InlineBabelCall);

View File

@ -1,10 +1,11 @@
use super::macros::intermediate; use super::macros::intermediate;
use crate::error::CustomError; use crate::error::CustomError;
use organic::types::StandardProperties;
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
pub(crate) struct IInlineSourceBlock { pub(crate) struct IInlineSourceBlock {
pub(crate) value: String, pub(crate) value: String,
pub(crate) post_blank: organic::types::PostBlank,
} }
intermediate!( intermediate!(
@ -15,6 +16,7 @@ intermediate!(
{ {
Ok(IInlineSourceBlock { Ok(IInlineSourceBlock {
value: original.value.to_owned(), value: original.value.to_owned(),
post_blank: original.get_post_blank(),
}) })
} }
); );

View File

@ -1,3 +1,5 @@
use organic::types::StandardProperties;
use super::macros::intermediate; use super::macros::intermediate;
use super::IObject; use super::IObject;
@ -6,6 +8,7 @@ use crate::error::CustomError;
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
pub(crate) struct IItalic { pub(crate) struct IItalic {
pub(crate) children: Vec<IObject>, pub(crate) children: Vec<IObject>,
pub(crate) post_blank: organic::types::PostBlank,
} }
intermediate!( intermediate!(
@ -22,6 +25,9 @@ intermediate!(
ret ret
}; };
Ok(IItalic { children }) Ok(IItalic {
children,
post_blank: original.get_post_blank(),
})
} }
); );

View File

@ -1,5 +1,5 @@
use super::macros::inoop; use super::macros::inoop;
use crate::error::CustomError; use crate::error::CustomError;
use organic::types::StandardProperties;
inoop!(IKeyword, Keyword); inoop!(IKeyword, Keyword);

View File

@ -1,5 +1,5 @@
use super::macros::inoop; use super::macros::inoop;
use crate::error::CustomError; use crate::error::CustomError;
use organic::types::StandardProperties;
inoop!(ILatexEnvironment, LatexEnvironment); inoop!(ILatexEnvironment, LatexEnvironment);

View File

@ -1,10 +1,11 @@
use super::macros::intermediate; use super::macros::intermediate;
use crate::error::CustomError; use crate::error::CustomError;
use organic::types::StandardProperties;
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
pub(crate) struct ILatexFragment { pub(crate) struct ILatexFragment {
pub(crate) value: String, pub(crate) value: String,
pub(crate) post_blank: organic::types::PostBlank,
} }
intermediate!( intermediate!(
@ -20,6 +21,9 @@ intermediate!(
} else { } else {
original.value.to_owned() original.value.to_owned()
}; };
Ok(ILatexFragment { value }) Ok(ILatexFragment {
value,
post_blank: original.get_post_blank(),
})
} }
); );

View File

@ -1,5 +1,5 @@
use super::macros::inoop; use super::macros::inoop;
use crate::error::CustomError; use crate::error::CustomError;
use organic::types::StandardProperties;
inoop!(ILineBreak, LineBreak); inoop!(ILineBreak, LineBreak);

View File

@ -4,14 +4,18 @@
macro_rules! inoop { macro_rules! inoop {
($istruct:ident, $pstruct:ident) => { ($istruct:ident, $pstruct:ident) => {
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
pub(crate) struct $istruct {} pub(crate) struct $istruct {
pub(crate) post_blank: organic::types::PostBlank,
}
impl $istruct { impl $istruct {
pub(crate) async fn new<'reg, 'orig, 'parse>( pub(crate) async fn new<'reg, 'orig, 'parse>(
_intermediate_context: crate::intermediate::IntermediateContext<'orig, 'parse>, _intermediate_context: crate::intermediate::IntermediateContext<'orig, 'parse>,
_original: &'orig organic::types::$pstruct<'parse>, original: &'orig organic::types::$pstruct<'parse>,
) -> Result<$istruct, CustomError> { ) -> Result<$istruct, CustomError> {
Ok($istruct {}) Ok($istruct {
post_blank: original.get_post_blank(),
})
} }
} }
}; };

View File

@ -1,5 +1,5 @@
use super::macros::inoop; use super::macros::inoop;
use crate::error::CustomError; use crate::error::CustomError;
use organic::types::StandardProperties;
inoop!(IOrgMacro, OrgMacro); inoop!(IOrgMacro, OrgMacro);

View File

@ -1,11 +1,12 @@
use super::macros::intermediate; use super::macros::intermediate;
use super::IObject; use super::IObject;
use crate::error::CustomError; use crate::error::CustomError;
use organic::types::StandardProperties;
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
pub(crate) struct IParagraph { pub(crate) struct IParagraph {
pub(crate) children: Vec<IObject>, pub(crate) children: Vec<IObject>,
pub(crate) post_blank: organic::types::PostBlank,
} }
intermediate!( intermediate!(
@ -22,6 +23,9 @@ intermediate!(
ret ret
}; };
Ok(IParagraph { children }) Ok(IParagraph {
children,
post_blank: original.get_post_blank(),
})
} }
); );

View File

@ -1,5 +1,5 @@
use super::macros::inoop; use super::macros::inoop;
use crate::error::CustomError; use crate::error::CustomError;
use organic::types::StandardProperties;
inoop!(IPlainLink, PlainLink); inoop!(IPlainLink, PlainLink);

View File

@ -1,12 +1,13 @@
use super::macros::intermediate; use super::macros::intermediate;
use super::IPlainListItem; use super::IPlainListItem;
use crate::error::CustomError; use crate::error::CustomError;
use organic::types::StandardProperties;
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
pub(crate) struct IPlainList { pub(crate) struct IPlainList {
pub(crate) list_type: organic::types::PlainListType, pub(crate) list_type: organic::types::PlainListType,
pub(crate) children: Vec<IPlainListItem>, pub(crate) children: Vec<IPlainListItem>,
pub(crate) post_blank: organic::types::PostBlank,
} }
intermediate!( intermediate!(
@ -26,6 +27,7 @@ intermediate!(
Ok(IPlainList { Ok(IPlainList {
list_type: original.list_type, list_type: original.list_type,
children, children,
post_blank: original.get_post_blank(),
}) })
} }
); );

View File

@ -1,3 +1,5 @@
use organic::types::StandardProperties;
use super::macros::intermediate; use super::macros::intermediate;
use super::util::coalesce_whitespace; use super::util::coalesce_whitespace;
@ -6,6 +8,7 @@ use crate::error::CustomError;
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
pub(crate) struct IPlainText { pub(crate) struct IPlainText {
pub(crate) source: String, pub(crate) source: String,
pub(crate) post_blank: organic::types::PostBlank,
} }
intermediate!( intermediate!(
@ -16,6 +19,7 @@ intermediate!(
{ {
Ok(IPlainText { Ok(IPlainText {
source: coalesce_whitespace(original.source).into_owned(), source: coalesce_whitespace(original.source).into_owned(),
post_blank: original.get_post_blank(),
}) })
} }
); );

View File

@ -1,5 +1,5 @@
use super::macros::inoop; use super::macros::inoop;
use crate::error::CustomError; use crate::error::CustomError;
use organic::types::StandardProperties;
inoop!(IPlanning, Planning); inoop!(IPlanning, Planning);

View File

@ -1,5 +1,5 @@
use super::macros::inoop; use super::macros::inoop;
use crate::error::CustomError; use crate::error::CustomError;
use organic::types::StandardProperties;
inoop!(IPropertyDrawer, PropertyDrawer); inoop!(IPropertyDrawer, PropertyDrawer);

View File

@ -1,11 +1,12 @@
use super::macros::intermediate; use super::macros::intermediate;
use super::IElement; use super::IElement;
use crate::error::CustomError; use crate::error::CustomError;
use organic::types::StandardProperties;
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
pub(crate) struct IQuoteBlock { pub(crate) struct IQuoteBlock {
pub(crate) children: Vec<IElement>, pub(crate) children: Vec<IElement>,
pub(crate) post_blank: organic::types::PostBlank,
} }
intermediate!( intermediate!(
@ -22,6 +23,9 @@ intermediate!(
ret ret
}; };
Ok(IQuoteBlock { children }) Ok(IQuoteBlock {
children,
post_blank: original.get_post_blank(),
})
} }
); );

View File

@ -1,5 +1,5 @@
use super::macros::inoop; use super::macros::inoop;
use crate::error::CustomError; use crate::error::CustomError;
use organic::types::StandardProperties;
inoop!(IRadioLink, RadioLink); inoop!(IRadioLink, RadioLink);

View File

@ -1,5 +1,5 @@
use super::macros::inoop; use super::macros::inoop;
use crate::error::CustomError; use crate::error::CustomError;
use organic::types::StandardProperties;
inoop!(IRadioTarget, RadioTarget); inoop!(IRadioTarget, RadioTarget);

View File

@ -1,3 +1,5 @@
use organic::types::StandardProperties;
use super::macros::intermediate; use super::macros::intermediate;
use super::IObject; use super::IObject;
@ -7,6 +9,7 @@ use crate::error::CustomError;
pub(crate) struct IRegularLink { pub(crate) struct IRegularLink {
pub(crate) raw_link: String, pub(crate) raw_link: String,
pub(crate) children: Vec<IObject>, pub(crate) children: Vec<IObject>,
pub(crate) post_blank: organic::types::PostBlank,
} }
intermediate!( intermediate!(
@ -25,6 +28,7 @@ intermediate!(
Ok(IRegularLink { Ok(IRegularLink {
raw_link: original.get_raw_link().into_owned(), raw_link: original.get_raw_link().into_owned(),
children, children,
post_blank: original.get_post_blank(),
}) })
} }
); );

View File

@ -1,11 +1,12 @@
use super::macros::intermediate; use super::macros::intermediate;
use super::IElement; use super::IElement;
use crate::error::CustomError; use crate::error::CustomError;
use organic::types::StandardProperties;
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
pub(crate) struct ISection { pub(crate) struct ISection {
pub(crate) children: Vec<IElement>, pub(crate) children: Vec<IElement>,
pub(crate) post_blank: organic::types::PostBlank,
} }
intermediate!( intermediate!(
@ -22,6 +23,9 @@ intermediate!(
ret ret
}; };
Ok(ISection { children }) Ok(ISection {
children,
post_blank: original.get_post_blank(),
})
} }
); );

View File

@ -1,5 +1,5 @@
use super::macros::inoop; use super::macros::inoop;
use crate::error::CustomError; use crate::error::CustomError;
use organic::types::StandardProperties;
inoop!(ISpecialBlock, SpecialBlock); inoop!(ISpecialBlock, SpecialBlock);

View File

@ -1,11 +1,12 @@
use super::macros::intermediate; use super::macros::intermediate;
use crate::error::CustomError; use crate::error::CustomError;
use organic::types::StandardProperties;
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
pub(crate) struct ISrcBlock { pub(crate) struct ISrcBlock {
pub(crate) lines: Vec<String>, pub(crate) lines: Vec<String>,
pub(crate) language: Option<String>, pub(crate) language: Option<String>,
pub(crate) post_blank: organic::types::PostBlank,
} }
intermediate!( intermediate!(
@ -58,7 +59,11 @@ intermediate!(
}) })
.collect(); .collect();
let language = original.language.map(str::to_owned); let language = original.language.map(str::to_owned);
Ok(ISrcBlock { lines, language }) Ok(ISrcBlock {
lines,
language,
post_blank: original.get_post_blank(),
})
} }
); );

View File

@ -1,5 +1,5 @@
use super::macros::inoop; use super::macros::inoop;
use crate::error::CustomError; use crate::error::CustomError;
use organic::types::StandardProperties;
inoop!(IStatisticsCookie, StatisticsCookie); inoop!(IStatisticsCookie, StatisticsCookie);

View File

@ -1,3 +1,5 @@
use organic::types::StandardProperties;
use super::macros::intermediate; use super::macros::intermediate;
use super::IObject; use super::IObject;
@ -6,6 +8,7 @@ use crate::error::CustomError;
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
pub(crate) struct IStrikeThrough { pub(crate) struct IStrikeThrough {
pub(crate) children: Vec<IObject>, pub(crate) children: Vec<IObject>,
pub(crate) post_blank: organic::types::PostBlank,
} }
intermediate!( intermediate!(
@ -22,6 +25,9 @@ intermediate!(
ret ret
}; };
Ok(IStrikeThrough { children }) Ok(IStrikeThrough {
children,
post_blank: original.get_post_blank(),
})
} }
); );

Some files were not shown because too many files have changed in this diff Show More