talexander/natter
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'element_template'

Browse Source
This commit is contained in:
Tom Alexander 2023-10-27 19:26:38 -04:00
commit 0e9d74b2c8
Signed by: talexander
GPG Key ID: D3A179C9A53C0EDE
119 changed files with 528 additions and 202 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

111
Cargo.lock generated
View File

@ -71,6 +71,12 @@ version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b"
[[package]]
name = "autocfg"
version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
[[package]] [[package]]
name = "backtrace" name = "backtrace"
version = "0.3.69" version = "0.3.69"
@ -192,6 +198,95 @@ version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fed34cd105917e91daa4da6b3728c47b068749d6a62c59811f06ed2ac71d9da7" checksum = "fed34cd105917e91daa4da6b3728c47b068749d6a62c59811f06ed2ac71d9da7"
[[package]]
name = "futures"
version = "0.3.29"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "da0290714b38af9b4a7b094b8a37086d1b4e61f2df9122c3cad2577669145335"
dependencies = [
"futures-channel",
"futures-core",
"futures-executor",
"futures-io",
"futures-sink",
"futures-task",
"futures-util",
]
[[package]]
name = "futures-channel"
version = "0.3.29"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ff4dd66668b557604244583e3e1e1eada8c5c2e96a6d0d6653ede395b78bbacb"
dependencies = [
"futures-core",
"futures-sink",
]
[[package]]
name = "futures-core"
version = "0.3.29"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c"
[[package]]
name = "futures-executor"
version = "0.3.29"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0f4fb8693db0cf099eadcca0efe2a5a22e4550f98ed16aba6c48700da29597bc"
dependencies = [
"futures-core",
"futures-task",
"futures-util",
]
[[package]]
name = "futures-io"
version = "0.3.29"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa"
[[package]]
name = "futures-macro"
version = "0.3.29"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb"
dependencies = [
"proc-macro2",
"quote",
"syn",
]
[[package]]
name = "futures-sink"
version = "0.3.29"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e36d3378ee38c2a36ad710c5d30c2911d752cb941c00c72dbabfb786a7970817"
[[package]]
name = "futures-task"
version = "0.3.29"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2"
[[package]]
name = "futures-util"
version = "0.3.29"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104"
dependencies = [
"futures-channel",
"futures-core",
"futures-io",
"futures-macro",
"futures-sink",
"futures-task",
"memchr",
"pin-project-lite",
"pin-utils",
"slab",
]
[[package]] [[package]]
name = "gimli" name = "gimli"
version = "0.28.0" version = "0.28.0"
@ -347,6 +442,12 @@ version = "0.2.13"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58"
[[package]]
name = "pin-utils"
version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
[[package]] [[package]]
name = "proc-macro2" name = "proc-macro2"
version = "1.0.69" version = "1.0.69"
@ -432,6 +533,15 @@ dependencies = [
"serde", "serde",
] ]
[[package]]
name = "slab"
version = "0.4.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67"
dependencies = [
"autocfg",
]
[[package]] [[package]]
name = "static_assertions" name = "static_assertions"
version = "1.1.0" version = "1.1.0"
@ -641,6 +751,7 @@ version = "0.0.1"
dependencies = [ dependencies = [
"clap", "clap",
"duster", "duster",
"futures",
"include_dir", "include_dir",
"organic", "organic",
"serde", "serde",

1
Cargo.toml
View File

@ -8,6 +8,7 @@ edition = "2021"
[dependencies] [dependencies]
clap = { version = "4.4.6", default-features = false, features = ["std", "color", "help", "derive"] } clap = { version = "4.4.6", default-features = false, features = ["std", "color", "help", "derive"] }
duster = { git = "https://code.fizz.buzz/talexander/duster.git", branch = "master" } duster = { git = "https://code.fizz.buzz/talexander/duster.git", branch = "master" }
futures = "0.3.29"
include_dir = "0.7.3" include_dir = "0.7.3"
# TODO: This is temporary to work on the latest organic code. Eventually switch back to using the published crate. # TODO: This is temporary to work on the latest organic code. Eventually switch back to using the published crate.
organic = { path = "../organic" } organic = { path = "../organic" }

1
default_environment/templates/html/angle_link.dust Normal file
View File

@ -0,0 +1 @@
angle_link

1
default_environment/templates/html/babel_call.dust Normal file
View File

@ -0,0 +1 @@
babel_call

3
default_environment/templates/html/blog_post_page.dust
View File

@ -7,5 +7,8 @@
{! TODO: Table of contents? !} {! TODO: Table of contents? !}
<div class="blog_post_body"> <div class="blog_post_body">
{#.children}
{>document_element/}
{/.children}
</div> </div>
</div> </div>

1
default_environment/templates/html/bold.dust Normal file
View File

@ -0,0 +1 @@
bold

1
default_environment/templates/html/center_block.dust Normal file
View File

@ -0,0 +1 @@
center_block

1
default_environment/templates/html/citation.dust Normal file
View File

@ -0,0 +1 @@
citation

1
default_environment/templates/html/citation_reference.dust Normal file
View File

@ -0,0 +1 @@
citation_reference

1
default_environment/templates/html/clock.dust Normal file
View File

@ -0,0 +1 @@
clock

1
default_environment/templates/html/code.dust Normal file
View File

@ -0,0 +1 @@
code

1
default_environment/templates/html/comment.dust Normal file
View File

@ -0,0 +1 @@
comment

1
default_environment/templates/html/comment_block.dust Normal file
View File

@ -0,0 +1 @@
comment_block

1
default_environment/templates/html/diary_sexp.dust Normal file
View File

@ -0,0 +1 @@
diary_sexp

5
default_environment/templates/html/document_element.dust Normal file
View File

@ -0,0 +1,5 @@
{@select key=.type}
{@eq value="heading"}{>heading/}{/eq}
{@eq value="section"}{>section/}{/eq}
{@none}{!TODO: make this panic!}ERROR: Unrecognized type {.type}.{/none}
{/select}

1
default_environment/templates/html/drawer.dust Normal file
View File

@ -0,0 +1 @@
drawer

1
default_environment/templates/html/dynamic_block.dust Normal file
View File

@ -0,0 +1 @@
dynamic_block

27
default_environment/templates/html/element.dust Normal file
View File

@ -0,0 +1,27 @@
{@select key=.type}
{@eq value="paragraph"}{>paragraph/}{/eq}
{@eq value="plain_list"}{>plain_list/}{/eq}
{@eq value="center_block"}{>center_block/}{/eq}
{@eq value="quote_block"}{>quote_block/}{/eq}
{@eq value="special_block"}{>special_block/}{/eq}
{@eq value="dynamic_block"}{>dynamic_block/}{/eq}
{@eq value="footnote_definition"}{>footnote_definition/}{/eq}
{@eq value="comment"}{>comment/}{/eq}
{@eq value="drawer"}{>drawer/}{/eq}
{@eq value="property_drawer"}{>property_drawer/}{/eq}
{@eq value="table"}{>table/}{/eq}
{@eq value="verse_block"}{>verse_block/}{/eq}
{@eq value="comment_block"}{>comment_block/}{/eq}
{@eq value="example_block"}{>example_block/}{/eq}
{@eq value="export_block"}{>export_block/}{/eq}
{@eq value="src_block"}{>src_block/}{/eq}
{@eq value="clock"}{>clock/}{/eq}
{@eq value="diary_sexp"}{>diary_sexp/}{/eq}
{@eq value="planning"}{>planning/}{/eq}
{@eq value="fixed_width_area"}{>fixed_width_area/}{/eq}
{@eq value="horizontal_rule"}{>horizontal_rule/}{/eq}
{@eq value="keyword"}{>keyword/}{/eq}
{@eq value="babel_call"}{>babel_call/}{/eq}
{@eq value="latex_environment"}{>latex_environment/}{/eq}
{@none}{!TODO: make this panic!}ERROR: Unrecognized type {.type}.{/none}
{/select}

1
default_environment/templates/html/entity.dust Normal file
View File

@ -0,0 +1 @@
entity

1
default_environment/templates/html/example_block.dust Normal file
View File

@ -0,0 +1 @@
example_block

1
default_environment/templates/html/export_block.dust Normal file
View File

@ -0,0 +1 @@
export_block

1
default_environment/templates/html/export_snippet.dust Normal file
View File

@ -0,0 +1 @@
export_snippet

1
default_environment/templates/html/fixed_width_area.dust Normal file
View File

@ -0,0 +1 @@
fixed_width_area

1
default_environment/templates/html/footnote_definition.dust Normal file
View File

@ -0,0 +1 @@
footnote_definition

1
default_environment/templates/html/footnote_reference.dust Normal file
View File

@ -0,0 +1 @@
footnote_reference

1
default_environment/templates/html/global_settings.dust Normal file
View File

@ -0,0 +1 @@
global_settings

11
default_environment/templates/html/heading.dust Normal file
View File

@ -0,0 +1,11 @@
{@lte key=.level value=4}
<h{.level}>{#.title}{>object/}{/.title}</h{.level}>
{:else}
<ol>
<li>{#.title}{>object/}{/.title}</li>
</ol>
{/lte}
{#.children}
{>document_element/}
{/.children}

1
default_environment/templates/html/horizontal_rule.dust Normal file
View File

@ -0,0 +1 @@
horizontal_rule

1
default_environment/templates/html/inline_babel_call.dust Normal file
View File

@ -0,0 +1 @@
inline_babel_call

1
default_environment/templates/html/inline_source_block.dust Normal file
View File

@ -0,0 +1 @@
inline_source_block

1
default_environment/templates/html/italic.dust Normal file
View File

@ -0,0 +1 @@
italic

1
default_environment/templates/html/keyword.dust Normal file
View File

@ -0,0 +1 @@
keyword

1
default_environment/templates/html/latex_environment.dust Normal file
View File

@ -0,0 +1 @@
latex_environment

1
default_environment/templates/html/latex_fragment.dust Normal file
View File

@ -0,0 +1 @@
latex_fragment

1
default_environment/templates/html/line_break.dust Normal file
View File

@ -0,0 +1 @@
line_break

30
default_environment/templates/html/object.dust Normal file
View File

@ -0,0 +1,30 @@
{@select key=.type}
{@eq value="bold"}{>bold/}{/eq}
{@eq value="italic"}{>italic/}{/eq}
{@eq value="underline"}{>underline/}{/eq}
{@eq value="strike_through"}{>strike_through/}{/eq}
{@eq value="code"}{>code/}{/eq}
{@eq value="verbatim"}{>verbatim/}{/eq}
{@eq value="plain_text"}{>plain_text/}{/eq}
{@eq value="regular_link"}{>regular_link/}{/eq}
{@eq value="radio_link"}{>radio_link/}{/eq}
{@eq value="radio_target"}{>radio_target/}{/eq}
{@eq value="plain_link"}{>plain_link/}{/eq}
{@eq value="angle_link"}{>angle_link/}{/eq}
{@eq value="org_macro"}{>org_macro/}{/eq}
{@eq value="entity"}{>entity/}{/eq}
{@eq value="latex_fragment"}{>latex_fragment/}{/eq}
{@eq value="export_snippet"}{>export_snippet/}{/eq}
{@eq value="footnote_reference"}{>footnote_reference/}{/eq}
{@eq value="citation"}{>citation/}{/eq}
{@eq value="citation_reference"}{>citation_reference/}{/eq}
{@eq value="inline_babel_call"}{>inline_babel_call/}{/eq}
{@eq value="inline_source_block"}{>inline_source_block/}{/eq}
{@eq value="line_break"}{>line_break/}{/eq}
{@eq value="target"}{>target/}{/eq}
{@eq value="statistics_cookie"}{>statistics_cookie/}{/eq}
{@eq value="subscript"}{>subscript/}{/eq}
{@eq value="superscript"}{>superscript/}{/eq}
{@eq value="timestamp"}{>timestamp/}{/eq}
{@none}{!TODO: make this panic!}ERROR: Unrecognized type {.type}.{/none}
{/select}

1
default_environment/templates/html/org_macro.dust Normal file
View File

@ -0,0 +1 @@
org_macro

3
default_environment/templates/html/paragraph.dust Normal file
View File

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

1
default_environment/templates/html/plain_link.dust Normal file
View File

@ -0,0 +1 @@
plain_link

1
default_environment/templates/html/plain_list.dust Normal file
View File

@ -0,0 +1 @@
plain_list

1
default_environment/templates/html/plain_text.dust Normal file
View File

@ -0,0 +1 @@
plain_text

1
default_environment/templates/html/planning.dust Normal file
View File

@ -0,0 +1 @@
planning

1
default_environment/templates/html/property_drawer.dust Normal file
View File

@ -0,0 +1 @@
property_drawer

1
default_environment/templates/html/quote_block.dust Normal file
View File

@ -0,0 +1 @@
quote_block

1
default_environment/templates/html/radio_link.dust Normal file
View File

@ -0,0 +1 @@
radio_link

1
default_environment/templates/html/radio_target.dust Normal file
View File

@ -0,0 +1 @@
radio_target

1
default_environment/templates/html/regular_link.dust Normal file
View File

@ -0,0 +1 @@
regular_link

3
default_environment/templates/html/section.dust Normal file
View File

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

1
default_environment/templates/html/special_block.dust Normal file
View File

@ -0,0 +1 @@
special_block

1
default_environment/templates/html/src_block.dust Normal file
View File

@ -0,0 +1 @@
src_block

1
default_environment/templates/html/statistics_cookie.dust Normal file
View File

@ -0,0 +1 @@
statistics_cookie

1
default_environment/templates/html/strike_through.dust Normal file
View File

@ -0,0 +1 @@
strike_through

1
default_environment/templates/html/subscript.dust Normal file
View File

@ -0,0 +1 @@
subscript

1
default_environment/templates/html/superscript.dust Normal file
View File

@ -0,0 +1 @@
superscript

1
default_environment/templates/html/table.dust Normal file
View File

@ -0,0 +1 @@
table

1
default_environment/templates/html/target.dust Normal file
View File

@ -0,0 +1 @@
target

1
default_environment/templates/html/timestamp.dust Normal file
View File

@ -0,0 +1 @@
timestamp

1
default_environment/templates/html/underline.dust Normal file
View File

@ -0,0 +1 @@
underline

1
default_environment/templates/html/verbatim.dust Normal file
View File

@ -0,0 +1 @@
verbatim

1
default_environment/templates/html/verse_block.dust Normal file
View File

@ -0,0 +1 @@
verse_block

6
src/context/angle_link.rs
View File

@ -12,10 +12,10 @@ use crate::intermediate::IAngleLink;
pub(crate) struct RenderAngleLink {} pub(crate) struct RenderAngleLink {}
impl RenderAngleLink { impl RenderAngleLink {
pub(crate) fn new<D: AsRef<Path>, F: AsRef<Path>>( pub(crate) fn new(
config: &Config, config: &Config,
output_directory: D, output_directory: &Path,
output_file: F, output_file: &Path,
comment: &IAngleLink, comment: &IAngleLink,
) -> Result<RenderAngleLink, CustomError> { ) -> Result<RenderAngleLink, CustomError> {
Ok(RenderAngleLink {}) Ok(RenderAngleLink {})

6
src/context/babel_call.rs
View File

@ -12,10 +12,10 @@ use crate::intermediate::IBabelCall;
pub(crate) struct RenderBabelCall {} pub(crate) struct RenderBabelCall {}
impl RenderBabelCall { impl RenderBabelCall {
pub(crate) fn new<D: AsRef<Path>, F: AsRef<Path>>( pub(crate) fn new(
config: &Config, config: &Config,
output_directory: D, output_directory: &Path,
output_file: F, output_file: &Path,
original: &IBabelCall, original: &IBabelCall,
) -> Result<RenderBabelCall, CustomError> { ) -> Result<RenderBabelCall, CustomError> {
Ok(RenderBabelCall {}) Ok(RenderBabelCall {})

6
src/context/bold.rs
View File

@ -12,10 +12,10 @@ use crate::intermediate::IBold;
pub(crate) struct RenderBold {} pub(crate) struct RenderBold {}
impl RenderBold { impl RenderBold {
pub(crate) fn new<D: AsRef<Path>, F: AsRef<Path>>( pub(crate) fn new(
config: &Config, config: &Config,
output_directory: D, output_directory: &Path,
output_file: F, output_file: &Path,
comment: &IBold, comment: &IBold,
) -> Result<RenderBold, CustomError> { ) -> Result<RenderBold, CustomError> {
Ok(RenderBold {}) Ok(RenderBold {})

6
src/context/center_block.rs
View File

@ -12,10 +12,10 @@ use crate::intermediate::ICenterBlock;
pub(crate) struct RenderCenterBlock {} pub(crate) struct RenderCenterBlock {}
impl RenderCenterBlock { impl RenderCenterBlock {
pub(crate) fn new<D: AsRef<Path>, F: AsRef<Path>>( pub(crate) fn new(
config: &Config, config: &Config,
output_directory: D, output_directory: &Path,
output_file: F, output_file: &Path,
original: &ICenterBlock, original: &ICenterBlock,
) -> Result<RenderCenterBlock, CustomError> { ) -> Result<RenderCenterBlock, CustomError> {
Ok(RenderCenterBlock {}) Ok(RenderCenterBlock {})

6
src/context/citation.rs
View File

@ -12,10 +12,10 @@ use crate::intermediate::ICitation;
pub(crate) struct RenderCitation {} pub(crate) struct RenderCitation {}
impl RenderCitation { impl RenderCitation {
pub(crate) fn new<D: AsRef<Path>, F: AsRef<Path>>( pub(crate) fn new(
config: &Config, config: &Config,
output_directory: D, output_directory: &Path,
output_file: F, output_file: &Path,
comment: &ICitation, comment: &ICitation,
) -> Result<RenderCitation, CustomError> { ) -> Result<RenderCitation, CustomError> {
Ok(RenderCitation {}) Ok(RenderCitation {})

6
src/context/citation_reference.rs
View File

@ -12,10 +12,10 @@ use crate::intermediate::ICitationReference;
pub(crate) struct RenderCitationReference {} pub(crate) struct RenderCitationReference {}
impl RenderCitationReference { impl RenderCitationReference {
pub(crate) fn new<D: AsRef<Path>, F: AsRef<Path>>( pub(crate) fn new(
config: &Config, config: &Config,
output_directory: D, output_directory: &Path,
output_file: F, output_file: &Path,
comment: &ICitationReference, comment: &ICitationReference,
) -> Result<RenderCitationReference, CustomError> { ) -> Result<RenderCitationReference, CustomError> {
Ok(RenderCitationReference {}) Ok(RenderCitationReference {})

6
src/context/clock.rs
View File

@ -12,10 +12,10 @@ use crate::intermediate::IClock;
pub(crate) struct RenderClock {} pub(crate) struct RenderClock {}
impl RenderClock { impl RenderClock {
pub(crate) fn new<D: AsRef<Path>, F: AsRef<Path>>( pub(crate) fn new(
config: &Config, config: &Config,
output_directory: D, output_directory: &Path,
output_file: F, output_file: &Path,
original: &IClock, original: &IClock,
) -> Result<RenderClock, CustomError> { ) -> Result<RenderClock, CustomError> {
Ok(RenderClock {}) Ok(RenderClock {})

6
src/context/code.rs
View File

@ -12,10 +12,10 @@ use crate::intermediate::ICode;
pub(crate) struct RenderCode {} pub(crate) struct RenderCode {}
impl RenderCode { impl RenderCode {
pub(crate) fn new<D: AsRef<Path>, F: AsRef<Path>>( pub(crate) fn new(
config: &Config, config: &Config,
output_directory: D, output_directory: &Path,
output_file: F, output_file: &Path,
comment: &ICode, comment: &ICode,
) -> Result<RenderCode, CustomError> { ) -> Result<RenderCode, CustomError> {
Ok(RenderCode {}) Ok(RenderCode {})

6
src/context/comment.rs
View File

@ -12,10 +12,10 @@ use crate::intermediate::IComment;
pub(crate) struct RenderComment {} pub(crate) struct RenderComment {}
impl RenderComment { impl RenderComment {
pub(crate) fn new<D: AsRef<Path>, F: AsRef<Path>>( pub(crate) fn new(
config: &Config, config: &Config,
output_directory: D, output_directory: &Path,
output_file: F, output_file: &Path,
comment: &IComment, comment: &IComment,
) -> Result<RenderComment, CustomError> { ) -> Result<RenderComment, CustomError> {
Ok(RenderComment {}) Ok(RenderComment {})

6
src/context/comment_block.rs
View File

@ -12,10 +12,10 @@ use crate::intermediate::ICommentBlock;
pub(crate) struct RenderCommentBlock {} pub(crate) struct RenderCommentBlock {}
impl RenderCommentBlock { impl RenderCommentBlock {
pub(crate) fn new<D: AsRef<Path>, F: AsRef<Path>>( pub(crate) fn new(
config: &Config, config: &Config,
output_directory: D, output_directory: &Path,
output_file: F, output_file: &Path,
original: &ICommentBlock, original: &ICommentBlock,
) -> Result<RenderCommentBlock, CustomError> { ) -> Result<RenderCommentBlock, CustomError> {
Ok(RenderCommentBlock {}) Ok(RenderCommentBlock {})

6
src/context/diary_sexp.rs
View File

@ -12,10 +12,10 @@ use crate::intermediate::IDiarySexp;
pub(crate) struct RenderDiarySexp {} pub(crate) struct RenderDiarySexp {}
impl RenderDiarySexp { impl RenderDiarySexp {
pub(crate) fn new<D: AsRef<Path>, F: AsRef<Path>>( pub(crate) fn new(
config: &Config, config: &Config,
output_directory: D, output_directory: &Path,
output_file: F, output_file: &Path,
original: &IDiarySexp, original: &IDiarySexp,
) -> Result<RenderDiarySexp, CustomError> { ) -> Result<RenderDiarySexp, CustomError> {
Ok(RenderDiarySexp {}) Ok(RenderDiarySexp {})

24
src/context/document_element.rs
View File

@ -1,5 +1,11 @@
use std::path::Path;
use serde::Serialize; use serde::Serialize;
use crate::config::Config;
use crate::error::CustomError;
use crate::intermediate::IDocumentElement;
use super::RenderHeading; use super::RenderHeading;
use super::RenderSection; use super::RenderSection;
@ -9,3 +15,21 @@ pub(crate) enum RenderDocumentElement {
Heading(RenderHeading), Heading(RenderHeading),
Section(RenderSection), Section(RenderSection),
} }
impl RenderDocumentElement {
pub(crate) fn new(
config: &Config,
output_directory: &Path,
output_file: &Path,
original: &IDocumentElement,
) -> Result<RenderDocumentElement, CustomError> {
match original {
IDocumentElement::Heading(inner) => Ok(RenderDocumentElement::Heading(
RenderHeading::new(config, output_directory, output_file, inner)?,
)),
IDocumentElement::Section(inner) => Ok(RenderDocumentElement::Section(
RenderSection::new(config, output_directory, output_file, inner)?,
)),
}
}
}

6
src/context/drawer.rs
View File

@ -12,10 +12,10 @@ use crate::intermediate::IDrawer;
pub(crate) struct RenderDrawer {} pub(crate) struct RenderDrawer {}
impl RenderDrawer { impl RenderDrawer {
pub(crate) fn new<D: AsRef<Path>, F: AsRef<Path>>( pub(crate) fn new(
config: &Config, config: &Config,
output_directory: D, output_directory: &Path,
output_file: F, output_file: &Path,
original: &IDrawer, original: &IDrawer,
) -> Result<RenderDrawer, CustomError> { ) -> Result<RenderDrawer, CustomError> {
Ok(RenderDrawer {}) Ok(RenderDrawer {})

6
src/context/dynamic_block.rs
View File

@ -12,10 +12,10 @@ use crate::intermediate::IDynamicBlock;
pub(crate) struct RenderDynamicBlock {} pub(crate) struct RenderDynamicBlock {}
impl RenderDynamicBlock { impl RenderDynamicBlock {
pub(crate) fn new<D: AsRef<Path>, F: AsRef<Path>>( pub(crate) fn new(
config: &Config, config: &Config,
output_directory: D, output_directory: &Path,
output_file: F, output_file: &Path,
original: &IDynamicBlock, original: &IDynamicBlock,
) -> Result<RenderDynamicBlock, CustomError> { ) -> Result<RenderDynamicBlock, CustomError> {
Ok(RenderDynamicBlock {}) Ok(RenderDynamicBlock {})

6
src/context/element.rs
View File

@ -61,10 +61,10 @@ pub(crate) enum RenderElement {
} }
impl RenderElement { impl RenderElement {
pub(crate) fn new<D: AsRef<Path>, F: AsRef<Path>>( pub(crate) fn new(
config: &Config, config: &Config,
output_directory: D, output_directory: &Path,
output_file: F, output_file: &Path,
element: &IElement, element: &IElement,
) -> Result<RenderElement, CustomError> { ) -> Result<RenderElement, CustomError> {
match element { match element {

6
src/context/entity.rs
View File

@ -12,10 +12,10 @@ use crate::intermediate::IEntity;
pub(crate) struct RenderEntity {} pub(crate) struct RenderEntity {}
impl RenderEntity { impl RenderEntity {
pub(crate) fn new<D: AsRef<Path>, F: AsRef<Path>>( pub(crate) fn new(
config: &Config, config: &Config,
output_directory: D, output_directory: &Path,
output_file: F, output_file: &Path,
comment: &IEntity, comment: &IEntity,
) -> Result<RenderEntity, CustomError> { ) -> Result<RenderEntity, CustomError> {
Ok(RenderEntity {}) Ok(RenderEntity {})

6
src/context/example_block.rs
View File

@ -12,10 +12,10 @@ use crate::intermediate::IExampleBlock;
pub(crate) struct RenderExampleBlock {} pub(crate) struct RenderExampleBlock {}
impl RenderExampleBlock { impl RenderExampleBlock {
pub(crate) fn new<D: AsRef<Path>, F: AsRef<Path>>( pub(crate) fn new(
config: &Config, config: &Config,
output_directory: D, output_directory: &Path,
output_file: F, output_file: &Path,
original: &IExampleBlock, original: &IExampleBlock,
) -> Result<RenderExampleBlock, CustomError> { ) -> Result<RenderExampleBlock, CustomError> {
Ok(RenderExampleBlock {}) Ok(RenderExampleBlock {})

6
src/context/export_block.rs
View File

@ -12,10 +12,10 @@ use crate::intermediate::IExportBlock;
pub(crate) struct RenderExportBlock {} pub(crate) struct RenderExportBlock {}
impl RenderExportBlock { impl RenderExportBlock {
pub(crate) fn new<D: AsRef<Path>, F: AsRef<Path>>( pub(crate) fn new(
config: &Config, config: &Config,
output_directory: D, output_directory: &Path,
output_file: F, output_file: &Path,
original: &IExportBlock, original: &IExportBlock,
) -> Result<RenderExportBlock, CustomError> { ) -> Result<RenderExportBlock, CustomError> {
Ok(RenderExportBlock {}) Ok(RenderExportBlock {})

6
src/context/export_snippet.rs
View File

@ -12,10 +12,10 @@ use crate::intermediate::IExportSnippet;
pub(crate) struct RenderExportSnippet {} pub(crate) struct RenderExportSnippet {}
impl RenderExportSnippet { impl RenderExportSnippet {
pub(crate) fn new<D: AsRef<Path>, F: AsRef<Path>>( pub(crate) fn new(
config: &Config, config: &Config,
output_directory: D, output_directory: &Path,
output_file: F, output_file: &Path,
comment: &IExportSnippet, comment: &IExportSnippet,
) -> Result<RenderExportSnippet, CustomError> { ) -> Result<RenderExportSnippet, CustomError> {
Ok(RenderExportSnippet {}) Ok(RenderExportSnippet {})

6
src/context/fixed_width_area.rs
View File

@ -12,10 +12,10 @@ use crate::intermediate::IFixedWidthArea;
pub(crate) struct RenderFixedWidthArea {} pub(crate) struct RenderFixedWidthArea {}
impl RenderFixedWidthArea { impl RenderFixedWidthArea {
pub(crate) fn new<D: AsRef<Path>, F: AsRef<Path>>( pub(crate) fn new(
config: &Config, config: &Config,
output_directory: D, output_directory: &Path,
output_file: F, output_file: &Path,
original: &IFixedWidthArea, original: &IFixedWidthArea,
) -> Result<RenderFixedWidthArea, CustomError> { ) -> Result<RenderFixedWidthArea, CustomError> {
Ok(RenderFixedWidthArea {}) Ok(RenderFixedWidthArea {})

6
src/context/footnote_definition.rs
View File

@ -12,10 +12,10 @@ use crate::intermediate::IFootnoteDefinition;
pub(crate) struct RenderFootnoteDefinition {} pub(crate) struct RenderFootnoteDefinition {}
impl RenderFootnoteDefinition { impl RenderFootnoteDefinition {
pub(crate) fn new<D: AsRef<Path>, F: AsRef<Path>>( pub(crate) fn new(
config: &Config, config: &Config,
output_directory: D, output_directory: &Path,
output_file: F, output_file: &Path,
original: &IFootnoteDefinition, original: &IFootnoteDefinition,
) -> Result<RenderFootnoteDefinition, CustomError> { ) -> Result<RenderFootnoteDefinition, CustomError> {
Ok(RenderFootnoteDefinition {}) Ok(RenderFootnoteDefinition {})

6
src/context/footnote_reference.rs
View File

@ -12,10 +12,10 @@ use crate::intermediate::IFootnoteReference;
pub(crate) struct RenderFootnoteReference {} pub(crate) struct RenderFootnoteReference {}
impl RenderFootnoteReference { impl RenderFootnoteReference {
pub(crate) fn new<D: AsRef<Path>, F: AsRef<Path>>( pub(crate) fn new(
config: &Config, config: &Config,
output_directory: D, output_directory: &Path,
output_file: F, output_file: &Path,
comment: &IFootnoteReference, comment: &IFootnoteReference,
) -> Result<RenderFootnoteReference, CustomError> { ) -> Result<RenderFootnoteReference, CustomError> {
Ok(RenderFootnoteReference {}) Ok(RenderFootnoteReference {})

42
src/context/heading.rs
View File

@ -6,6 +6,7 @@ use crate::config::Config;
use crate::error::CustomError; use crate::error::CustomError;
use crate::intermediate::IHeading; use crate::intermediate::IHeading;
use super::RenderDocumentElement;
use super::RenderObject; use super::RenderObject;
#[derive(Debug, Serialize)] #[derive(Debug, Serialize)]
@ -14,23 +15,46 @@ use super::RenderObject;
pub(crate) struct RenderHeading { pub(crate) struct RenderHeading {
level: organic::types::HeadlineLevel, level: organic::types::HeadlineLevel,
title: Vec<RenderObject>, title: Vec<RenderObject>,
children: Vec<RenderDocumentElement>,
} }
impl RenderHeading { impl RenderHeading {
pub(crate) fn new<D: AsRef<Path>, F: AsRef<Path>>( pub(crate) fn new(
config: &Config, config: &Config,
output_directory: D, output_directory: &Path,
output_file: F, output_file: &Path,
heading: &IHeading, heading: &IHeading,
) -> Result<RenderHeading, CustomError> { ) -> Result<RenderHeading, CustomError> {
let title = heading let title = {
.title let mut ret = Vec::new();
.iter() for obj in heading.title.iter() {
.map(|obj| RenderObject::new(config, &output_directory, &output_file, obj)) ret.push(RenderObject::new(
.collect::<Result<Vec<_>, _>>()?; config,
&output_directory,
&output_file,
obj,
)?);
}
ret
};
let children = {
let mut ret = Vec::new();
for obj in heading.children.iter() {
ret.push(RenderDocumentElement::new(
config,
&output_directory,
&output_file,
obj,
)?);
}
ret
};
Ok(RenderHeading { Ok(RenderHeading {
level: heading.level, level: heading.level + 1, // Adding 1 because the page title is going to be h1.
title, title,
children,
}) })
} }
} }

6
src/context/horizontal_rule.rs
View File

@ -12,10 +12,10 @@ use crate::intermediate::IHorizontalRule;
pub(crate) struct RenderHorizontalRule {} pub(crate) struct RenderHorizontalRule {}
impl RenderHorizontalRule { impl RenderHorizontalRule {
pub(crate) fn new<D: AsRef<Path>, F: AsRef<Path>>( pub(crate) fn new(
config: &Config, config: &Config,
output_directory: D, output_directory: &Path,
output_file: F, output_file: &Path,
original: &IHorizontalRule, original: &IHorizontalRule,
) -> Result<RenderHorizontalRule, CustomError> { ) -> Result<RenderHorizontalRule, CustomError> {
Ok(RenderHorizontalRule {}) Ok(RenderHorizontalRule {})

6
src/context/inline_babel_call.rs
View File

@ -12,10 +12,10 @@ use crate::intermediate::IInlineBabelCall;
pub(crate) struct RenderInlineBabelCall {} pub(crate) struct RenderInlineBabelCall {}
impl RenderInlineBabelCall { impl RenderInlineBabelCall {
pub(crate) fn new<D: AsRef<Path>, F: AsRef<Path>>( pub(crate) fn new(
config: &Config, config: &Config,
output_directory: D, output_directory: &Path,
output_file: F, output_file: &Path,
comment: &IInlineBabelCall, comment: &IInlineBabelCall,
) -> Result<RenderInlineBabelCall, CustomError> { ) -> Result<RenderInlineBabelCall, CustomError> {
Ok(RenderInlineBabelCall {}) Ok(RenderInlineBabelCall {})

6
src/context/inline_source_block.rs
View File

@ -12,10 +12,10 @@ use crate::intermediate::IInlineSourceBlock;
pub(crate) struct RenderInlineSourceBlock {} pub(crate) struct RenderInlineSourceBlock {}
impl RenderInlineSourceBlock { impl RenderInlineSourceBlock {
pub(crate) fn new<D: AsRef<Path>, F: AsRef<Path>>( pub(crate) fn new(
config: &Config, config: &Config,
output_directory: D, output_directory: &Path,
output_file: F, output_file: &Path,
comment: &IInlineSourceBlock, comment: &IInlineSourceBlock,
) -> Result<RenderInlineSourceBlock, CustomError> { ) -> Result<RenderInlineSourceBlock, CustomError> {
Ok(RenderInlineSourceBlock {}) Ok(RenderInlineSourceBlock {})

6
src/context/italic.rs
View File

@ -12,10 +12,10 @@ use crate::intermediate::IItalic;
pub(crate) struct RenderItalic {} pub(crate) struct RenderItalic {}
impl RenderItalic { impl RenderItalic {
pub(crate) fn new<D: AsRef<Path>, F: AsRef<Path>>( pub(crate) fn new(
config: &Config, config: &Config,
output_directory: D, output_directory: &Path,
output_file: F, output_file: &Path,
comment: &IItalic, comment: &IItalic,
) -> Result<RenderItalic, CustomError> { ) -> Result<RenderItalic, CustomError> {
Ok(RenderItalic {}) Ok(RenderItalic {})

6
src/context/keyword.rs
View File

@ -12,10 +12,10 @@ use crate::intermediate::IKeyword;
pub(crate) struct RenderKeyword {} pub(crate) struct RenderKeyword {}
impl RenderKeyword { impl RenderKeyword {
pub(crate) fn new<D: AsRef<Path>, F: AsRef<Path>>( pub(crate) fn new(
config: &Config, config: &Config,
output_directory: D, output_directory: &Path,
output_file: F, output_file: &Path,
keyword: &IKeyword, keyword: &IKeyword,
) -> Result<RenderKeyword, CustomError> { ) -> Result<RenderKeyword, CustomError> {
Ok(RenderKeyword {}) Ok(RenderKeyword {})

6
src/context/latex_environment.rs
View File

@ -12,10 +12,10 @@ use crate::intermediate::ILatexEnvironment;
pub(crate) struct RenderLatexEnvironment {} pub(crate) struct RenderLatexEnvironment {}
impl RenderLatexEnvironment { impl RenderLatexEnvironment {
pub(crate) fn new<D: AsRef<Path>, F: AsRef<Path>>( pub(crate) fn new(
config: &Config, config: &Config,
output_directory: D, output_directory: &Path,
output_file: F, output_file: &Path,
original: &ILatexEnvironment, original: &ILatexEnvironment,
) -> Result<RenderLatexEnvironment, CustomError> { ) -> Result<RenderLatexEnvironment, CustomError> {
Ok(RenderLatexEnvironment {}) Ok(RenderLatexEnvironment {})

6
src/context/latex_fragment.rs
View File

@ -12,10 +12,10 @@ use crate::intermediate::ILatexFragment;
pub(crate) struct RenderLatexFragment {} pub(crate) struct RenderLatexFragment {}
impl RenderLatexFragment { impl RenderLatexFragment {
pub(crate) fn new<D: AsRef<Path>, F: AsRef<Path>>( pub(crate) fn new(
config: &Config, config: &Config,
output_directory: D, output_directory: &Path,
output_file: F, output_file: &Path,
comment: &ILatexFragment, comment: &ILatexFragment,
) -> Result<RenderLatexFragment, CustomError> { ) -> Result<RenderLatexFragment, CustomError> {
Ok(RenderLatexFragment {}) Ok(RenderLatexFragment {})

6
src/context/line_break.rs
View File

@ -12,10 +12,10 @@ use crate::intermediate::ILineBreak;
pub(crate) struct RenderLineBreak {} pub(crate) struct RenderLineBreak {}
impl RenderLineBreak { impl RenderLineBreak {
pub(crate) fn new<D: AsRef<Path>, F: AsRef<Path>>( pub(crate) fn new(
config: &Config, config: &Config,
output_directory: D, output_directory: &Path,
output_file: F, output_file: &Path,
comment: &ILineBreak, comment: &ILineBreak,
) -> Result<RenderLineBreak, CustomError> { ) -> Result<RenderLineBreak, CustomError> {
Ok(RenderLineBreak {}) Ok(RenderLineBreak {})

6
src/context/object.rs
View File

@ -67,10 +67,10 @@ pub(crate) enum RenderObject {
} }
impl RenderObject { impl RenderObject {
pub(crate) fn new<D: AsRef<Path>, F: AsRef<Path>>( pub(crate) fn new(
config: &Config, config: &Config,
output_directory: D, output_directory: &Path,
output_file: F, output_file: &Path,
object: &IObject, object: &IObject,
) -> Result<RenderObject, CustomError> { ) -> Result<RenderObject, CustomError> {
match object { match object {

6
src/context/org_macro.rs
View File

@ -12,10 +12,10 @@ use crate::intermediate::IOrgMacro;
pub(crate) struct RenderOrgMacro {} pub(crate) struct RenderOrgMacro {}
impl RenderOrgMacro { impl RenderOrgMacro {
pub(crate) fn new<D: AsRef<Path>, F: AsRef<Path>>( pub(crate) fn new(
config: &Config, config: &Config,
output_directory: D, output_directory: &Path,
output_file: F, output_file: &Path,
comment: &IOrgMacro, comment: &IOrgMacro,
) -> Result<RenderOrgMacro, CustomError> { ) -> Result<RenderOrgMacro, CustomError> {
Ok(RenderOrgMacro {}) Ok(RenderOrgMacro {})

24
src/context/paragraph.rs
View File

@ -16,17 +16,25 @@ pub(crate) struct RenderParagraph {
} }
impl RenderParagraph { impl RenderParagraph {
pub(crate) fn new<D: AsRef<Path>, F: AsRef<Path>>( pub(crate) fn new(
config: &Config, config: &Config,
output_directory: D, output_directory: &Path,
output_file: F, output_file: &Path,
paragraph: &IParagraph, paragraph: &IParagraph,
) -> Result<RenderParagraph, CustomError> { ) -> Result<RenderParagraph, CustomError> {
let children = paragraph let children = {
.children let mut ret = Vec::new();
.iter() for obj in paragraph.children.iter() {
.map(|obj| RenderObject::new(config, &output_directory, &output_file, obj)) ret.push(RenderObject::new(
.collect::<Result<Vec<_>, _>>()?; config,
&output_directory,
&output_file,
obj,
)?);
}
ret
};
Ok(RenderParagraph { children }) Ok(RenderParagraph { children })
} }
} }

6
src/context/plain_link.rs
View File

@ -12,10 +12,10 @@ use crate::intermediate::IPlainLink;
pub(crate) struct RenderPlainLink {} pub(crate) struct RenderPlainLink {}
impl RenderPlainLink { impl RenderPlainLink {
pub(crate) fn new<D: AsRef<Path>, F: AsRef<Path>>( pub(crate) fn new(
config: &Config, config: &Config,
output_directory: D, output_directory: &Path,
output_file: F, output_file: &Path,
comment: &IPlainLink, comment: &IPlainLink,
) -> Result<RenderPlainLink, CustomError> { ) -> Result<RenderPlainLink, CustomError> {
Ok(RenderPlainLink {}) Ok(RenderPlainLink {})

6
src/context/plain_list.rs
View File

@ -12,10 +12,10 @@ use crate::intermediate::IPlainList;
pub(crate) struct RenderPlainList {} pub(crate) struct RenderPlainList {}
impl RenderPlainList { impl RenderPlainList {
pub(crate) fn new<D: AsRef<Path>, F: AsRef<Path>>( pub(crate) fn new(
config: &Config, config: &Config,
output_directory: D, output_directory: &Path,
output_file: F, output_file: &Path,
original: &IPlainList, original: &IPlainList,
) -> Result<RenderPlainList, CustomError> { ) -> Result<RenderPlainList, CustomError> {
Ok(RenderPlainList {}) Ok(RenderPlainList {})

6
src/context/plain_text.rs
View File

@ -12,10 +12,10 @@ use crate::intermediate::IPlainText;
pub(crate) struct RenderPlainText {} pub(crate) struct RenderPlainText {}
impl RenderPlainText { impl RenderPlainText {
pub(crate) fn new<D: AsRef<Path>, F: AsRef<Path>>( pub(crate) fn new(
config: &Config, config: &Config,
output_directory: D, output_directory: &Path,
output_file: F, output_file: &Path,
heading: &IPlainText, heading: &IPlainText,
) -> Result<RenderPlainText, CustomError> { ) -> Result<RenderPlainText, CustomError> {
Ok(RenderPlainText {}) Ok(RenderPlainText {})

6
src/context/planning.rs
View File

@ -12,10 +12,10 @@ use crate::intermediate::IPlanning;
pub(crate) struct RenderPlanning {} pub(crate) struct RenderPlanning {}
impl RenderPlanning { impl RenderPlanning {
pub(crate) fn new<D: AsRef<Path>, F: AsRef<Path>>( pub(crate) fn new(
config: &Config, config: &Config,
output_directory: D, output_directory: &Path,
output_file: F, output_file: &Path,
original: &IPlanning, original: &IPlanning,
) -> Result<RenderPlanning, CustomError> { ) -> Result<RenderPlanning, CustomError> {
Ok(RenderPlanning {}) Ok(RenderPlanning {})

6
src/context/property_drawer.rs
View File

@ -12,10 +12,10 @@ use crate::intermediate::IPropertyDrawer;
pub(crate) struct RenderPropertyDrawer {} pub(crate) struct RenderPropertyDrawer {}
impl RenderPropertyDrawer { impl RenderPropertyDrawer {
pub(crate) fn new<D: AsRef<Path>, F: AsRef<Path>>( pub(crate) fn new(
config: &Config, config: &Config,
output_directory: D, output_directory: &Path,
output_file: F, output_file: &Path,
original: &IPropertyDrawer, original: &IPropertyDrawer,
) -> Result<RenderPropertyDrawer, CustomError> { ) -> Result<RenderPropertyDrawer, CustomError> {
Ok(RenderPropertyDrawer {}) Ok(RenderPropertyDrawer {})

6
src/context/quote_block.rs
View File

@ -12,10 +12,10 @@ use crate::intermediate::IQuoteBlock;
pub(crate) struct RenderQuoteBlock {} pub(crate) struct RenderQuoteBlock {}
impl RenderQuoteBlock { impl RenderQuoteBlock {
pub(crate) fn new<D: AsRef<Path>, F: AsRef<Path>>( pub(crate) fn new(
config: &Config, config: &Config,
output_directory: D, output_directory: &Path,
output_file: F, output_file: &Path,
original: &IQuoteBlock, original: &IQuoteBlock,
) -> Result<RenderQuoteBlock, CustomError> { ) -> Result<RenderQuoteBlock, CustomError> {
Ok(RenderQuoteBlock {}) Ok(RenderQuoteBlock {})

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