Merge branch 'liw/refactor' into 'main'

Refactoring ready for YAML-from-separate-file

See merge request subplot/subplot!286

1 files changed, 4 insertions, 4 deletions

diff --git a/src/typeset.rs b/src/typeset.rs
index 9522e69..f63206a 100644
--- a/src/typeset.rs
+++ b/src/typeset.rs
@@ -4,7 +4,7 @@ use crate::PartialStep;
 use crate::ScenarioStep;
 use crate::StepKind;
 use crate::SubplotError;
-use crate::{DiagramMarkup, DotMarkup, PikchrMarkup, PlantumlMarkup};
+use crate::{DiagramMarkup, DotMarkup, PikchrMarkup, PlantumlMarkup, Svg};
 use crate::{Warning, Warnings};
 
 use pandoc_ast::Attr;
@@ -213,7 +213,7 @@ pub fn roadmap_to_block(yaml: &str, warnings: &mut Warnings) -> Block {
 
 // Typeset an SVG, represented as a byte vector, as a Pandoc AST Block
 // element.
-fn typeset_svg(svg: Vec<u8>) -> Block {
+fn typeset_svg(svg: Svg) -> Block {
     let url = svg_as_data_url(svg);
     let attr = ("".to_string(), vec![], vec![]);
     let img = Inline::Image(attr, vec![], (url, "".to_string()));
@@ -223,7 +223,7 @@ fn typeset_svg(svg: Vec<u8>) -> Block {
 // Convert an SVG, represented as a byte vector, into a data: URL,
 // which can be inlined so the image can be rendered without
 // referencing external files.
-fn svg_as_data_url(svg: Vec<u8>) -> String {
-    let svg = base64::encode(&svg);
+fn svg_as_data_url(svg: Svg) -> String {
+    let svg = base64::encode(svg.data());
     format!("data:image/svg+xml;base64,{}", svg)
 }