Merge branch 'pretty'

main
Tom Alexander 4 months ago
commit d641c8d638
Signed by: talexander
GPG Key ID: D3A179C9A53C0EDE

@ -0,0 +1,187 @@
:root {
--main-max-width: 800px;
--site-background-color: #0a0a0a;
--site-text-color: #fffffc;
--header-divider-color: #6a687a;
--stream-divider-color: #6ccff6;
--src-font-family: ui-monospace, 'Cascadia Code', 'Source Code Pro', Menlo, Consolas, 'DejaVu Sans Mono', monospace;
--src-block-background-color: #141414;
--src-block-border-color: #84828f;
--src-block-language-color: #0a0a0a;
--src-block-language-background: #84828f;
--quote-block-border-color: #84828f;
}
body {
color: var(--site-text-color);
background-color: var(--site-background-color);
font-family: source-sans-pro, Seravek, 'Gill Sans Nova', Ubuntu, Calibri, 'DejaVu Sans', sans-serif;
a:link, a:visited {
/* TODO: Should I use a different color for links? */
color: var(--site-text-color);
}
}
.page_centering {
display: flex;
flex-direction: column;
align-items: center;
}
.page_header {
width: 100%;
max-width: var(--main-max-width);
border-bottom: 0.1rem solid var(--header-divider-color);
.home_link {
font-size: 1.2rem;
font-weight: 600;
text-decoration: none;
&:link, &:visited {
color: var(--site-text-color);
}
}
}
.main_content {
width: 100%;
max-width: var(--main-max-width);
font-size: 1.2rem;
line-height: 1.2;
/* A stand-alone blog post (not in a blog stream). */
.blog_post {
padding: 1rem 0 3rem 0;
}
.blog_stream {
.stream_divider {
color: var(--stream-divider-color);
}
}
/* A blog post in a blog stream (for example, the homepage). */
.blog_stream_post {
background: #1F1F1F;
padding: 1rem 0.2rem;
}
.blog_post_title {
font-size: 2.5rem;
font-weight: 700;
padding-bottom: 1rem;
}
p {
margin: 1rem 0;
}
.src_block {
background: var(--src-block-background-color);
border-radius: 3px;
border: 1px solid var(--src-block-border-color);
font-size: 1rem;
font-family: var(--src-font-family);
margin: 1rem 0;
.src_language {
display: inline-block;
color: var(--src-block-language-color);
background: var(--src-block-language-background);
border-radius: 0 0 3px 0;
padding: 0.1rem 0.5rem;
font-size: 0.8rem;
vertical-align: top;
}
.src_body {
margin: 0.5rem;
.src_line {
white-space: pre-wrap;
}
}
}
.inline_source_block {
font-family: var(--src-font-family);
font-size: 1rem;
}
.code, .verbatim {
font-family: var(--src-font-family);
font-size: 1rem;
}
.quote_block {
border-left: 1px solid var(--quote-block-border-color);
padding: 0 0 0 1rem;
margin: 1rem 0 1rem 2rem;
}
h2, h3 {
margin: 1rem 0;
padding-bottom: 0.5rem;
}
h2 {
font-size: 2.3rem;
font-weight: 600;
}
h3 {
font-size: 2.1rem;
font-weight: 600;
}
.plain_list {
&.unordered {
list-style-type: disc;
padding-left: 2.5rem;
}
&.ordered {
list-style-type: decimal;
padding-left: 2.5rem;
}
&.descriptive {
font-size: 1rem;
> dt {
font-weight: 600;
}
> dd {
padding-left: 2.5rem;
}
}
}
.footnote_reference {
vertical-align: super;
font-size: 80%;
> a {
text-decoration: none;
}
}
.footnote_definition {
.label {
text-decoration: none;
}
.definition {
display: inline;
> p {
display: inline;
}
}
}
}

@ -1,8 +1,6 @@
<div class="blog_post">
<div class="blog_post_intro">
{?.title}{?.self_link}<a class="blog_post_title" href="{.self_link}">{.title}</a>{:else}<div class="blog_post_title">{.title}</div>{/.self_link}{/.title}
{! TODO: date? !}
</div>
<article class="blog_post">
{?.title}<h1 class="blog_post_title"><span>{.title}</span></h1>{/.title}
{! TODO: date? !}
{! TODO: Table of contents? !}
@ -18,4 +16,4 @@
{/.footnotes}
{/.footnotes}
</div>
</div>
</article>

@ -1,5 +1,6 @@
<div class="blog_stream">
{#.children}
{@gt key=$idx value=0}<hr class="stream_divider" />{/gt}
<div class="blog_stream_post">
<div class="blog_post_intro">
{?.title}{?.self_link}<a class="blog_post_title" href="{.self_link}">{.title}</a>{:else}<div class="blog_post_title">{.title}</div>{/.self_link}{/.title}

@ -1 +1 @@
<code>{.contents}</code>
<code class="code">{.contents}</code>

@ -1,6 +1,7 @@
{@select key=.type}
{@eq value="paragraph"}{>paragraph/}{/eq}
{@eq value="plain_list"}{>plain_list/}{/eq}
{@eq value="plain_list_simple_item"}{>plain_list_simple_item/}{/eq}
{@eq value="center_block"}{>center_block/}{/eq}
{@eq value="quote_block"}{>quote_block/}{/eq}
{@eq value="special_block"}{>special_block/}{/eq}

@ -1 +1 @@
<sup><a id="{.reference_id}" href="{.definition_link}">{.label}</a></sup>
<sup class="footnote_reference"><a id="{.reference_id}" href="{.definition_link}">{.label}</a></sup>

@ -1 +1 @@
<code>{.value}</code>
<code class="inline_source_block">{.value}</code>

@ -6,14 +6,14 @@
{#global_settings.js_files}<script type="text/javascript" src="{.}"></script>{/global_settings.js_files}
{?global_settings.page_title}<title>{global_settings.page_title}</title>{/global_settings.page_title}
</head>
<body>
<body class="page_centering">
{#.page_header}{>page_header/}{/.page_header}
<div class="main_content">
<main class="main_content">
{@select key=.type}
{@eq value="blog_post_page"}{>blog_post_page/}{/eq}
{@eq value="blog_stream"}{>blog_stream/}{/eq}
{@none}{!TODO: make this panic!}ERROR: Unrecognized page content type{/none}
{/select}
</div>
</main>
</body>
</html>

@ -27,5 +27,4 @@
{@eq value="superscript"}{>superscript/}{/eq}
{@eq value="timestamp"}{>timestamp/}{/eq}
{@none}{!TODO: make this panic!}ERROR: Unrecognized type {.type}.{/none}
{/select}{~s}
{! TODO: Maybe the final space should be conditional on end blank in the org source !}
{/select}{@gt key=.post_blank value=0}{~s}{/gt}

@ -1,4 +1,4 @@
<div class="page_header">
<a href="{.home_link}">{.website_title}</a>
{! TODO: Additional links? !}
</div>
<header class="page_header">
<a class="home_link" href="{.home_link}">{.website_title}</a>
{! TODO: Additional links? Probably using the nav semantic element. !}
</header>

@ -1,6 +1,6 @@
{@select key=.list_type}
{@eq value="unordered"}<ul>{#.children}{>plain_list_item/}{/.children}</ul>{/eq}
{@eq value="ordered"}<ol>{#.children}{>plain_list_item/}{/.children}</ol>{/eq}
{@eq value="descriptive"}<dl>{#.children}{>plain_list_item/}{/.children}</dl>{/eq}
{@eq value="unordered"}<ul class="plain_list unordered">{#.children}{>plain_list_item/}{/.children}</ul>{/eq}
{@eq value="ordered"}<ol class="plain_list ordered">{#.children}{>plain_list_item/}{/.children}</ol>{/eq}
{@eq value="descriptive"}<dl class="plain_list descriptive">{#.children}{>plain_list_item/}{/.children}</dl>{/eq}
{@none}{!TODO: make this panic!}ERROR: Unrecognized list type {.list_type}.{/none}
{/select}

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

@ -1,3 +1,3 @@
<blockquote>{#.children}
<blockquote class="quote_block">{#.children}
{>element/}
{/.children}</blockquote>

@ -1 +1 @@
<div><sup><a id="{.definition_id}" href="{.reference_link}">{.label}</a></sup><div>{#.contents}{>ast_node/}{/.contents}</div></div>
<div class="footnote_definition"><a id="{.definition_id}" href="{.reference_link}" class="label">{.label}.</a> <div class="definition">{#.contents}{>ast_node/}{/.contents}</div></div>

@ -1,9 +1,12 @@
<table>
<tbody>
{#.lines}
<tr>
<td><code>{.}</code></td>
</tr>
{/.lines}
</tbody>
</table>
<div class="src_block">
{?.language}<div class="src_language">{.language}</div>{/.language}
<table class="src_body">
<tbody>
{#.lines}
<tr>
<td><code class="src_line">{.}</code></td>
</tr>
{/.lines}
</tbody>
</table>
</div>

@ -1 +1 @@
<code>{.contents}</code>
<code class="verbatim">{.contents}</code>

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

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

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

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

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

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

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

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

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

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

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

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

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

@ -1,5 +1,6 @@
use serde::Serialize;
use super::plain_list_simple_item::RenderPlainListSimpleItem;
use super::render_context::RenderContext;
use crate::error::CustomError;
use crate::intermediate::IElement;
@ -35,6 +36,7 @@ use super::verse_block::RenderVerseBlock;
pub(crate) enum RenderElement {
Paragraph(RenderParagraph),
PlainList(RenderPlainList),
PlainListSimpleItem(RenderPlainListSimpleItem),
CenterBlock(RenderCenterBlock),
QuoteBlock(RenderQuoteBlock),
SpecialBlock(RenderSpecialBlock),
@ -69,6 +71,9 @@ render!(RenderElement, IElement, original, render_context, {
render_context.clone(),
inner,
)?)),
IElement::PlainListSimpleItem(inner) => Ok(RenderElement::PlainListSimpleItem(
RenderPlainListSimpleItem::new(render_context.clone(), inner)?,
)),
IElement::CenterBlock(inner) => Ok(RenderElement::CenterBlock(RenderCenterBlock::new(
render_context.clone(),
inner,

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

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

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

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

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

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

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

@ -15,6 +15,7 @@ pub(crate) struct RenderHeading {
level: organic::types::HeadlineLevel,
title: Vec<RenderObject>,
children: Vec<RenderDocumentElement>,
post_blank: organic::types::PostBlank,
}
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.
title,
children,
post_blank: original.post_blank,
})
});

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

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

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

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

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

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

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

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

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

@ -41,6 +41,7 @@ mod paragraph;
mod plain_link;
mod plain_list;
mod plain_list_item;
mod plain_list_simple_item;
mod plain_text;
mod planning;
mod property_drawer;

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

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

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

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

@ -0,0 +1,38 @@
use serde::Serialize;
use super::render_context::RenderContext;
use crate::error::CustomError;
use crate::intermediate::IPlainListSimpleItem;
use super::macros::render;
use super::RenderObject;
/// Special case for list items with only paragraphs and sublists as their children. In those cases, the paragraph tags are omitted. This is equivalent to a Paragraph but in a different struct to have a different type tag.
#[derive(Debug, Serialize)]
#[serde(tag = "type")]
#[serde(rename = "plain_list_simple_item")]
pub(crate) struct RenderPlainListSimpleItem {
children: Vec<RenderObject>,
post_blank: organic::types::PostBlank,
}
render!(
RenderPlainListSimpleItem,
IPlainListSimpleItem,
original,
render_context,
{
let children = {
let mut ret = Vec::new();
for obj in original.children.iter() {
ret.push(RenderObject::new(render_context.clone(), obj)?);
}
ret
};
Ok(RenderPlainListSimpleItem {
children,
post_blank: original.post_blank,
})
}
);

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

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

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

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

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

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

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

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

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

@ -11,10 +11,14 @@ use super::macros::render;
#[serde(rename = "src_block")]
pub(crate) struct RenderSrcBlock {
lines: Vec<String>,
language: Option<String>,
post_blank: organic::types::PostBlank,
}
render!(RenderSrcBlock, ISrcBlock, original, _render_context, {
Ok(RenderSrcBlock {
lines: original.lines.clone(),
language: original.language.clone(),
post_blank: original.post_blank,
})
});

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

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

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

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

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

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

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

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

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

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

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

@ -18,7 +18,6 @@ use super::plain_link::IPlainLink;
use super::plain_text::IPlainText;
use super::radio_link::IRadioLink;
use super::radio_target::IRadioTarget;
use super::regular_link::IRegularLink;
use super::statistics_cookie::IStatisticsCookie;
use super::strike_through::IStrikeThrough;
@ -52,7 +51,7 @@ use super::ITimestamp;
use super::IUnderline;
use super::IVerbatim;
use super::IVerseBlock;
use super::RefRegistry;
use super::IntermediateContext;
use crate::error::CustomError;
use futures::future::{BoxFuture, FutureExt};
@ -116,23 +115,23 @@ pub(crate) enum IAstNode {
pub(crate) trait IntoIAstNode<'parse> {
fn into_ast_node<'orig>(
&'orig self,
registry: RefRegistry<'orig, 'parse>,
intermediate_context: IntermediateContext<'orig, 'parse>,
) -> BoxFuture<'orig, Result<IAstNode, CustomError>>;
}
impl<'parse> IntoIAstNode<'parse> for organic::types::DocumentElement<'parse> {
fn into_ast_node<'orig>(
&'orig self,
registry: RefRegistry<'orig, 'parse>,
intermediate_context: IntermediateContext<'orig, 'parse>,
) -> BoxFuture<'orig, Result<IAstNode, CustomError>> {
async move {
match self {
organic::types::DocumentElement::Heading(inner) => {
Ok(IAstNode::Heading(IHeading::new(registry, inner).await?))
}
organic::types::DocumentElement::Section(inner) => {
Ok(IAstNode::Section(ISection::new(registry, inner).await?))
}
organic::types::DocumentElement::Heading(inner) => Ok(IAstNode::Heading(
IHeading::new(intermediate_context, inner).await?,
)),
organic::types::DocumentElement::Section(inner) => Ok(IAstNode::Section(
ISection::new(intermediate_context, inner).await?,