From 24c8ac8e2128a63590d681df16dfb86c622d4199 Mon Sep 17 00:00:00 2001 From: Tom Alexander Date: Fri, 29 Dec 2023 23:41:15 -0500 Subject: [PATCH] Implement all the text markup. --- src/wasm/code.rs | 8 +++----- src/wasm/italic.rs | 15 +++------------ src/wasm/strike_through.rs | 15 +++------------ src/wasm/underline.rs | 15 +++------------ src/wasm/verbatim.rs | 8 +++----- 5 files changed, 15 insertions(+), 46 deletions(-) diff --git a/src/wasm/code.rs b/src/wasm/code.rs index e191116..3e9ac6a 100644 --- a/src/wasm/code.rs +++ b/src/wasm/code.rs @@ -4,15 +4,13 @@ use serde::Serialize; use super::ast_node::WasmAstNode; use super::macros::to_wasm; use super::to_wasm::ToWasm; -use super::AdditionalProperties; use crate::compare::ElispFact; use crate::types::Code; use crate::wasm::to_wasm::ToWasmStandardProperties; #[derive(Debug, Serialize, Deserialize)] pub struct WasmCode { - #[serde(flatten)] - pub(crate) additional_properties: AdditionalProperties, + pub(crate) value: String, } to_wasm!( @@ -21,12 +19,12 @@ to_wasm!( original, wasm_context, { WasmAstNode::Code(original) }, - { "TODO".into() }, + { "code".into() }, { Ok(( Vec::new(), WasmCode { - additional_properties: AdditionalProperties::default(), + value: original.contents.to_owned(), }, )) } diff --git a/src/wasm/italic.rs b/src/wasm/italic.rs index e38854e..b5aa097 100644 --- a/src/wasm/italic.rs +++ b/src/wasm/italic.rs @@ -4,16 +4,12 @@ use serde::Serialize; use super::ast_node::WasmAstNode; use super::macros::to_wasm; use super::to_wasm::ToWasm; -use super::AdditionalProperties; use crate::compare::ElispFact; use crate::types::Italic; use crate::wasm::to_wasm::ToWasmStandardProperties; #[derive(Debug, Serialize, Deserialize)] -pub struct WasmItalic { - #[serde(flatten)] - pub(crate) additional_properties: AdditionalProperties, -} +pub struct WasmItalic {} to_wasm!( WasmItalic, @@ -21,7 +17,7 @@ to_wasm!( original, wasm_context, { WasmAstNode::Italic(original) }, - { "TODO".into() }, + { "italic".into() }, { let children = original .children @@ -33,11 +29,6 @@ to_wasm!( }) .collect::, _>>()?; - Ok(( - children, - WasmItalic { - additional_properties: AdditionalProperties::default(), - }, - )) + Ok((children, WasmItalic {})) } ); diff --git a/src/wasm/strike_through.rs b/src/wasm/strike_through.rs index 9c272c9..2776ee9 100644 --- a/src/wasm/strike_through.rs +++ b/src/wasm/strike_through.rs @@ -4,16 +4,12 @@ use serde::Serialize; use super::ast_node::WasmAstNode; use super::macros::to_wasm; use super::to_wasm::ToWasm; -use super::AdditionalProperties; use crate::compare::ElispFact; use crate::types::StrikeThrough; use crate::wasm::to_wasm::ToWasmStandardProperties; #[derive(Debug, Serialize, Deserialize)] -pub struct WasmStrikeThrough { - #[serde(flatten)] - pub(crate) additional_properties: AdditionalProperties, -} +pub struct WasmStrikeThrough {} to_wasm!( WasmStrikeThrough, @@ -21,7 +17,7 @@ to_wasm!( original, wasm_context, { WasmAstNode::StrikeThrough(original) }, - { "TODO".into() }, + { "strike-through".into() }, { let children = original .children @@ -33,11 +29,6 @@ to_wasm!( }) .collect::, _>>()?; - Ok(( - children, - WasmStrikeThrough { - additional_properties: AdditionalProperties::default(), - }, - )) + Ok((children, WasmStrikeThrough {})) } ); diff --git a/src/wasm/underline.rs b/src/wasm/underline.rs index 6cedab3..530693a 100644 --- a/src/wasm/underline.rs +++ b/src/wasm/underline.rs @@ -4,16 +4,12 @@ use serde::Serialize; use super::ast_node::WasmAstNode; use super::macros::to_wasm; use super::to_wasm::ToWasm; -use super::AdditionalProperties; use crate::compare::ElispFact; use crate::types::Underline; use crate::wasm::to_wasm::ToWasmStandardProperties; #[derive(Debug, Serialize, Deserialize)] -pub struct WasmUnderline { - #[serde(flatten)] - pub(crate) additional_properties: AdditionalProperties, -} +pub struct WasmUnderline {} to_wasm!( WasmUnderline, @@ -21,7 +17,7 @@ to_wasm!( original, wasm_context, { WasmAstNode::Underline(original) }, - { "TODO".into() }, + { "underline".into() }, { let children = original .children @@ -33,11 +29,6 @@ to_wasm!( }) .collect::, _>>()?; - Ok(( - children, - WasmUnderline { - additional_properties: AdditionalProperties::default(), - }, - )) + Ok((children, WasmUnderline {})) } ); diff --git a/src/wasm/verbatim.rs b/src/wasm/verbatim.rs index 1655112..bdb136d 100644 --- a/src/wasm/verbatim.rs +++ b/src/wasm/verbatim.rs @@ -4,15 +4,13 @@ use serde::Serialize; use super::ast_node::WasmAstNode; use super::macros::to_wasm; use super::to_wasm::ToWasm; -use super::AdditionalProperties; use crate::compare::ElispFact; use crate::types::Verbatim; use crate::wasm::to_wasm::ToWasmStandardProperties; #[derive(Debug, Serialize, Deserialize)] pub struct WasmVerbatim { - #[serde(flatten)] - pub(crate) additional_properties: AdditionalProperties, + pub(crate) value: String, } to_wasm!( @@ -21,12 +19,12 @@ to_wasm!( original, wasm_context, { WasmAstNode::Verbatim(original) }, - { "TODO".into() }, + { "verbatim".into() }, { Ok(( Vec::new(), WasmVerbatim { - additional_properties: AdditionalProperties::default(), + value: original.contents.to_owned(), }, )) }