src/wasm/export_snippet.rs

@@ -4,15 +4,15 @@ 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::ExportSnippet;
 use crate::wasm::to_wasm::ToWasmStandardProperties;
 
 #[derive(Debug, Serialize, Deserialize)]
 pub struct WasmExportSnippet {
-    #[serde(rename = "back-end")]
+    #[serde(flatten)]
-    pub(crate) backend: String,
+    pub(crate) additional_properties: AdditionalProperties,
-    pub(crate) value: Option<String>,
 }
 
 to_wasm!(
@@ -21,13 +21,12 @@ to_wasm!(
     original,
     wasm_context,
     { WasmAstNode::ExportSnippet(original) },
-    { "export-snippet".into() },
+    { "TODO".into() },
     {
         Ok((
             Vec::new(),
             WasmExportSnippet {
-                backend: original.backend.to_owned(),
+                additional_properties: AdditionalProperties::default(),
-                value: original.contents.map(|s| s.to_owned()),
             },
         ))
     }

src/wasm/footnote_definition.rs

@@ -2,22 +2,17 @@ use serde::Deserialize;
 use serde::Serialize;
 
 use super::ast_node::WasmAstNode;
-use super::headline::Noop;
 use super::macros::to_wasm;
 use super::to_wasm::ToWasm;
 use super::AdditionalProperties;
 use crate::compare::ElispFact;
 use crate::types::FootnoteDefinition;
-use crate::types::GetAffiliatedKeywords;
 use crate::wasm::to_wasm::ToWasmStandardProperties;
 
 #[derive(Debug, Serialize, Deserialize)]
 pub struct WasmFootnoteDefinition {
     #[serde(flatten)]
     pub(crate) additional_properties: AdditionalProperties,
-    pub(crate) label: String,
-    #[serde(rename = "pre-blank")]
-    pub(crate) pre_blank: Noop,
 }
 
 to_wasm!(
@@ -26,12 +21,8 @@ to_wasm!(
     original,
     wasm_context,
     { WasmAstNode::FootnoteDefinition(original) },
-    { "footnote-definition".into() },
+    { "TODO".into() },
     {
-        let additional_properties = original
-            .get_affiliated_keywords()
-            .to_wasm(wasm_context.clone())?;
-
         let children = original
             .children
             .iter()
@@ -45,9 +36,7 @@ to_wasm!(
         Ok((
             children,
             WasmFootnoteDefinition {
-                additional_properties,
+                additional_properties: AdditionalProperties::default(),
-                label: original.label.to_owned(),
-                pre_blank: Noop {},
             },
         ))
     }

src/wasm/footnote_reference.rs

@@ -4,16 +4,15 @@ 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::FootnoteReference;
-use crate::types::FootnoteReferenceType;
 use crate::wasm::to_wasm::ToWasmStandardProperties;
 
 #[derive(Debug, Serialize, Deserialize)]
 pub struct WasmFootnoteReference {
-    pub(crate) label: Option<String>,
+    #[serde(flatten)]
-    #[serde(rename = "type")]
+    pub(crate) additional_properties: AdditionalProperties,
-    pub(crate) footnote_reference_type: String,
 }
 
 to_wasm!(
@@ -22,27 +21,12 @@ to_wasm!(
     original,
     wasm_context,
     { WasmAstNode::FootnoteReference(original) },
-    { "footnote-reference".into() },
+    { "TODO".into() },
     {
-        let children = original
-            .definition
-            .iter()
-            .map(|child| {
-                child
-                    .to_wasm(wasm_context.clone())
-                    .map(Into::<WasmAstNode>::into)
-            })
-            .collect::<Result<Vec<_>, _>>()?;
-
         Ok((
-            children,
+            Vec::new(),
             WasmFootnoteReference {
-                label: original.label.map(|s| s.to_owned()),
+                additional_properties: AdditionalProperties::default(),
-                footnote_reference_type: match original.get_type() {
-                    FootnoteReferenceType::Standard => "standard",
-                    FootnoteReferenceType::Inline => "inline",
-                }
-                .to_owned(),
             },
         ))
     }

src/wasm/inline_babel_call.rs

@@ -4,19 +4,15 @@ 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::InlineBabelCall;
 use crate::wasm::to_wasm::ToWasmStandardProperties;
 
 #[derive(Debug, Serialize, Deserialize)]
 pub struct WasmInlineBabelCall {
-    pub(crate) call: String,
+    #[serde(flatten)]
-    #[serde(rename = "inside-header")]
+    pub(crate) additional_properties: AdditionalProperties,
-    pub(crate) inside_header: Option<String>,
-    pub(crate) arguments: Option<String>,
-    #[serde(rename = "end-header")]
-    pub(crate) end_header: Option<String>,
-    pub(crate) value: String,
 }
 
 to_wasm!(
@@ -25,16 +21,12 @@ to_wasm!(
     original,
     wasm_context,
     { WasmAstNode::InlineBabelCall(original) },
-    { "inline-babel-call".into() },
+    { "TODO".into() },
     {
         Ok((
             Vec::new(),
             WasmInlineBabelCall {
-                call: original.call.to_owned(),
+                additional_properties: AdditionalProperties::default(),
-                inside_header: original.inside_header.map(|s| s.to_owned()),
-                arguments: original.arguments.map(|s| s.to_owned()),
-                end_header: original.end_header.map(|s| s.to_owned()),
-                value: original.value.to_owned(),
             },
         ))
     }

src/wasm/inline_source_block.rs

@@ -4,15 +4,15 @@ 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::InlineSourceBlock;
 use crate::wasm::to_wasm::ToWasmStandardProperties;
 
 #[derive(Debug, Serialize, Deserialize)]
 pub struct WasmInlineSourceBlock {
-    pub(crate) language: String,
+    #[serde(flatten)]
-    pub(crate) value: String,
+    pub(crate) additional_properties: AdditionalProperties,
-    pub(crate) parameters: Option<String>,
 }
 
 to_wasm!(
@@ -21,14 +21,12 @@ to_wasm!(
     original,
     wasm_context,
     { WasmAstNode::InlineSourceBlock(original) },
-    { "inline-src-block".into() },
+    { "TODO".into() },
     {
         Ok((
             Vec::new(),
             WasmInlineSourceBlock {
-                language: original.language.to_owned(),
+                additional_properties: AdditionalProperties::default(),
-                value: original.value.to_owned(),
-                parameters: original.parameters.map(str::to_owned),
             },
         ))
     }

src/wasm/latex_environment.rs

@@ -6,7 +6,6 @@ use super::macros::to_wasm;
 use super::to_wasm::ToWasm;
 use super::AdditionalProperties;
 use crate::compare::ElispFact;
-use crate::types::GetAffiliatedKeywords;
 use crate::types::LatexEnvironment;
 use crate::wasm::to_wasm::ToWasmStandardProperties;
 
@@ -14,7 +13,6 @@ use crate::wasm::to_wasm::ToWasmStandardProperties;
 pub struct WasmLatexEnvironment {
     #[serde(flatten)]
     pub(crate) additional_properties: AdditionalProperties,
-    pub(crate) value: String,
 }
 
 to_wasm!(
@@ -23,17 +21,12 @@ to_wasm!(
     original,
     wasm_context,
     { WasmAstNode::LatexEnvironment(original) },
-    { "latex-environment".into() },
+    { "TODO".into() },
     {
-        let additional_properties = original
-            .get_affiliated_keywords()
-            .to_wasm(wasm_context.clone())?;
-
         Ok((
             Vec::new(),
             WasmLatexEnvironment {
-                additional_properties,
+                additional_properties: AdditionalProperties::default(),
-                value: original.value.to_owned(),
             },
         ))
     }